Browse Source

Examples: OpenGL3+GLFW: Using 3.2 context + GLSL version 150 (#1466)

omar 7 years ago
parent
commit
39cb56c39e

+ 2 - 2
examples/opengl3_example/imgui_impl_glfw_gl3.cpp

@@ -217,7 +217,7 @@ bool ImGui_ImplGlfwGL3_CreateDeviceObjects()
     glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &last_vertex_array);
     glGetIntegerv(GL_VERTEX_ARRAY_BINDING, &last_vertex_array);
 
 
     const GLchar *vertex_shader =
     const GLchar *vertex_shader =
-        "#version 330\n"
+        "#version 150\n"
         "uniform mat4 ProjMtx;\n"
         "uniform mat4 ProjMtx;\n"
         "in vec2 Position;\n"
         "in vec2 Position;\n"
         "in vec2 UV;\n"
         "in vec2 UV;\n"
@@ -232,7 +232,7 @@ bool ImGui_ImplGlfwGL3_CreateDeviceObjects()
         "}\n";
         "}\n";
 
 
     const GLchar* fragment_shader =
     const GLchar* fragment_shader =
-        "#version 330\n"
+        "#version 150\n"
         "uniform sampler2D Texture;\n"
         "uniform sampler2D Texture;\n"
         "in vec2 Frag_UV;\n"
         "in vec2 Frag_UV;\n"
         "in vec4 Frag_Color;\n"
         "in vec4 Frag_Color;\n"

+ 1 - 1
examples/opengl3_example/main.cpp

@@ -21,7 +21,7 @@ int main(int, char**)
     if (!glfwInit())
     if (!glfwInit())
         return 1;
         return 1;
     glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
-    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
+    glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
     glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
     glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
 #if __APPLE__
 #if __APPLE__
     glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
     glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);