Browse Source

Fix Text shader non-SDF mode on OpenGL 3. Closes #685.

Lasse Öörni 10 years ago
parent
commit
b26b2c470b
1 changed files with 6 additions and 1 deletions
  1. 6 1
      bin/CoreData/Shaders/GLSL/Text.glsl

+ 6 - 1
bin/CoreData/Shaders/GLSL/Text.glsl

@@ -54,6 +54,11 @@ void PS()
         gl_FragColor.a = vColor.a * smoothstep(0.5, 0.505, distance);
         gl_FragColor.a = vColor.a * smoothstep(0.5, 0.505, distance);
     }
     }
 #else
 #else
-    gl_FragColor.a = vColor.a * texture2D(sDiffMap, vTexCoord).a;
+    // Non-SDF font will likely be monochrome, in which case the alpha channel will be on the R channel on OpenGL 3
+    #ifdef GL3
+        gl_FragColor.a = vColor.a * texture2D(sDiffMap, vTexCoord).r;
+    #else
+        gl_FragColor.a = vColor.a * texture2D(sDiffMap, vTexCoord).a;
+    #endif
 #endif
 #endif
 }
 }