TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 09:23:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

glgsg: fix shader version in macOS 3.2+ context

Browse Source
This commit is contained in:
rdb 2017-12-20 14:16:05 +01:00
parent f0b21ee969
commit f82a940878
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
panda/src/glstuff/glGraphicsStateGuardian_src.cxx
View File

@ -155,7 +155,11 @@ null_glBlendColor(GLclampf, GLclampf, GLclampf, GLclampf) {
// drawing GUIs and such. // drawing GUIs and such.
static const string default_vshader = static const string default_vshader =
#ifndef OPENGLES #ifndef OPENGLES
#ifdef __APPLE__ // Apple's GL 3.2 contexts require at least GLSL 1.50.
"#version 150\n"
#else
"#version 130\n" "#version 130\n"
#endif
"in vec4 p3d_Vertex;\n" "in vec4 p3d_Vertex;\n"
"in vec4 p3d_Color;\n" "in vec4 p3d_Color;\n"
"in vec2 p3d_MultiTexCoord0;\n" "in vec2 p3d_MultiTexCoord0;\n"
@ -179,7 +183,11 @@ static const string default_vshader =
static const string default_fshader = static const string default_fshader =
#ifndef OPENGLES #ifndef OPENGLES
#ifdef __APPLE__ // Apple's GL 3.2 contexts require at least GLSL 1.50.
"#version 150\n"
#else
"#version 130\n" "#version 130\n"
#endif
"in vec2 texcoord;\n" "in vec2 texcoord;\n"
"in vec4 color;\n" "in vec4 color;\n"
"out vec4 p3d_FragColor;\n" "out vec4 p3d_FragColor;\n"