From f82a940878de5983b9f3dd19ba7680ef28f174e3 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 20 Dec 2017 14:16:05 +0100 Subject: [PATCH] glgsg: fix shader version in macOS 3.2+ context --- panda/src/glstuff/glGraphicsStateGuardian_src.cxx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx index 5330129f9d..fab18bcb62 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx @@ -155,7 +155,11 @@ null_glBlendColor(GLclampf, GLclampf, GLclampf, GLclampf) { // drawing GUIs and such. static const string default_vshader = #ifndef OPENGLES +#ifdef __APPLE__ // Apple's GL 3.2 contexts require at least GLSL 1.50. + "#version 150\n" +#else "#version 130\n" +#endif "in vec4 p3d_Vertex;\n" "in vec4 p3d_Color;\n" "in vec2 p3d_MultiTexCoord0;\n" @@ -179,7 +183,11 @@ static const string default_vshader = static const string default_fshader = #ifndef OPENGLES +#ifdef __APPLE__ // Apple's GL 3.2 contexts require at least GLSL 1.50. + "#version 150\n" +#else "#version 130\n" +#endif "in vec2 texcoord;\n" "in vec4 color;\n" "out vec4 p3d_FragColor;\n"