forks
/
dlangui
mirror of https://github.com/buggins/dlangui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

possible fix for #74 - undeclared gl_FragmentColor

This commit is contained in:
Vadim Lopatin 2015-03-18 12:08:09 +03:00
parent 115f409c29
commit 6cfe98a4f1
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/dlangui/graphics/glsupport.d
View File

@ -84,7 +84,7 @@ class GLProgram {
this() { this() {
} }
private void compatibilityFixes(ref char[] code) { private void compatibilityFixes(ref char[] code, GLuint type) {
if (glslversionInt < 150) if (glslversionInt < 150)
code = replace(code, " texture(", " texture2D("); code = replace(code, " texture(", " texture2D(");
} }
@ -98,7 +98,7 @@ class GLProgram {
sourceCode ~= glslversionString; sourceCode ~= glslversionString;
sourceCode ~= "\n"; sourceCode ~= "\n";
sourceCode ~= src; sourceCode ~= src;
compatibilityFixes(sourceCode); compatibilityFixes(sourceCode, type);
Log.d("compileShader glsl=", glslversion, " type:", (type == GL_VERTEX_SHADER ? "GL_VERTEX_SHADER" : (type == GL_FRAGMENT_SHADER ? "GL_FRAGMENT_SHADER" : "UNKNOWN")), " code:\n", sourceCode); Log.d("compileShader glsl=", glslversion, " type:", (type == GL_VERTEX_SHADER ? "GL_VERTEX_SHADER" : (type == GL_FRAGMENT_SHADER ? "GL_FRAGMENT_SHADER" : "UNKNOWN")), " code:\n", sourceCode);
GLuint shader = glCreateShader(type);//GL_VERTEX_SHADER GLuint shader = glCreateShader(type);//GL_VERTEX_SHADER
@ -226,9 +226,10 @@ class SolidFillProgram : GLProgram {
@property override string fragmentSource() { @property override string fragmentSource() {
return return
"in " ~ LOWP ~ " vec4 col;\n" "in " ~ LOWP ~ " vec4 col;\n"
"out " ~ LOWP ~ " vec4 outColor;\n"
"void main(void)\n" "void main(void)\n"
"{\n" "{\n"
" gl_FragColor = col;\n" " outColor = col;\n"
"}\n"; "}\n";
} }
@ -355,9 +356,10 @@ class TextureProgram : SolidFillProgram {
"uniform sampler2D texture;\n" "uniform sampler2D texture;\n"
"in " ~ LOWP ~ " vec4 col;\n" "in " ~ LOWP ~ " vec4 col;\n"
"in " ~ MEDIUMP ~ " vec4 texc;\n" "in " ~ MEDIUMP ~ " vec4 texc;\n"
"out " ~ LOWP ~ " vec4 outColor;\n"
"void main(void)\n" "void main(void)\n"
"{\n" "{\n"
" gl_FragColor = texture(texture, texc.st) * col;\n" //texture2D " outColor = texture(texture, texc.st) * col;\n" //texture2D
"}\n"; "}\n";
} }
@ -465,9 +467,10 @@ class FontProgram : SolidFillProgram {
"uniform sampler2D texture;\n" "uniform sampler2D texture;\n"
"in " ~ LOWP ~ " vec4 col;\n" "in " ~ LOWP ~ " vec4 col;\n"
"in " ~ MEDIUMP ~ " vec4 texc;\n" "in " ~ MEDIUMP ~ " vec4 texc;\n"
"out " ~ LOWP ~ " vec4 outColor;\n"
"void main(void)\n" "void main(void)\n"
"{\n" "{\n"
" gl_FragColor = texture(texture, texc.st) * col;\n"//texture2D " outColor = texture(texture, texc.st) * col;\n"//texture2D
"}\n"; "}\n";
} }