luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ported to OpenGL 3.2 for Windows compatibility.

This commit is contained in:
Matthias Koefferlein 2021-01-23 15:54:02 +01:00
parent dc40f9a885
commit 1a3675956e
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/tools/view_25d/lay_plugin/layD25ViewWidget.cc
View File

@ -195,9 +195,6 @@ D25ViewWidget::D25ViewWidget (QWidget *parent)
format.setDepthBufferSize (24);
format.setSamples (4); // more -> widget extends beyond boundary!
format.setStencilBufferSize (8);
format.setProfile (QSurfaceFormat::CoreProfile);
format.setVersion(3, 2);
format.setRenderableType (QSurfaceFormat::OpenGLES);
setFormat (format);
m_zmin = m_zmax = 0.0;
@ -738,16 +735,16 @@ D25ViewWidget::do_initialize_gl ()
glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
static const char *shapes_vertex_shader_source =
"#version 320 es\n"
"#version 150\n"
"\n"
"layout (location = 0) in vec4 posAttr;\n"
"in vec4 posAttr;\n"
"\n"
"void main() {\n"
" gl_Position = posAttr;\n"
"}\n";
static const char *shapes_geometry_shader_source =
"#version 320 es\n"
"#version 150\n"
"\n"
"uniform vec4 color;\n"
"uniform vec4 ambient;\n"
@ -775,7 +772,7 @@ D25ViewWidget::do_initialize_gl ()
"}\n";
static const char *shapes_fragment_shader_source =
"#version 320 es\n"
"#version 150\n"
"\n"
"in lowp vec4 vertexColor;\n"
"out lowp vec4 fragColor;\n"
@ -817,11 +814,9 @@ D25ViewWidget::do_initialize_gl ()
// grid plane shader source
static const char *gridplan_vertex_shader_source =
"#version 320 es\n"
"#undef lowp\n"
"#undef highp\n"
"#undef mediump\n"
"layout (location = 0) in vec4 posAttr;\n"
"#version 150\n"
"\n"
"in vec4 posAttr;\n"
"uniform mat4 matrix;\n"
"\n"
"void main() {\n"
@ -829,10 +824,8 @@ D25ViewWidget::do_initialize_gl ()
"}\n";
static const char *gridplan_fragment_shader_source =
"#version 320 es\n"
"#undef lowp\n"
"#undef highp\n"
"#undef mediump\n"
"#version 150\n"
"\n"
"uniform lowp vec4 color;\n"
"out lowp vec4 fragColor;\n"
"void main() {\n"
@ -865,12 +858,12 @@ D25ViewWidget::paintGL ()
glClearColor (float (c.red ()) / 255.0f, float (c.green ()) / 255.0f, float (c.blue ()) / 255.0f, 1.0);
glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
const int positions = 0;
if (! m_shapes_program || ! m_gridplane_program) {
return;
}
int positions = m_shapes_program->attributeLocation ("posAttr");
QMatrix4x4 scene_trans, scene_trans_wo_y;
// provide the displacement and scaling (in this order!)
@ -907,8 +900,11 @@ D25ViewWidget::paintGL ()
m_shapes_program->release ();
// decoration
positions = m_gridplane_program->attributeLocation ("posAttr");
// a vertex buffer for the decoration
lay::mem_chunks<float, 1024 * 18> vertexes;