Browse Source

Fix deprecation warning for default shader in GL3.2+ core context

rdb 10 years ago
parent
commit
283713a382
1 changed files with 4 additions and 2 deletions
  1. 4 2
      panda/src/glstuff/glGraphicsStateGuardian_src.cxx

+ 4 - 2
panda/src/glstuff/glGraphicsStateGuardian_src.cxx

@@ -170,6 +170,7 @@ static const string default_fshader =
   "#version 130\n"
   "#version 130\n"
   "in vec2 texcoord;\n"
   "in vec2 texcoord;\n"
   "in vec4 color;\n"
   "in vec4 color;\n"
+  "out vec4 p3d_FragColor;"
 #else
 #else
   "precision mediump float;\n"
   "precision mediump float;\n"
   "varying vec2 texcoord;\n"
   "varying vec2 texcoord;\n"
@@ -178,11 +179,12 @@ static const string default_fshader =
   "uniform sampler2D p3d_Texture0;\n"
   "uniform sampler2D p3d_Texture0;\n"
   "void main(void) {\n"
   "void main(void) {\n"
 #ifndef OPENGLES
 #ifndef OPENGLES
-  "  gl_FragColor = texture(p3d_Texture0, texcoord);\n"
+  "  p3d_FragColor = texture(p3d_Texture0, texcoord);\n"
+  "  p3d_FragColor *= color;\n"
 #else
 #else
   "  gl_FragColor = texture2D(p3d_Texture0, texcoord).bgra;\n"
   "  gl_FragColor = texture2D(p3d_Texture0, texcoord).bgra;\n"
-#endif
   "  gl_FragColor *= color;\n"
   "  gl_FragColor *= color;\n"
+#endif
   "}\n";
   "}\n";
 #endif
 #endif