Mesa (mesa_7_6_branch): progs/glsl: Fix multinoise GLSL compilation errors on Mac OS.
Vinson Lee
vlee at kemper.freedesktop.org
Thu Dec 3 04:06:59 UTC 2009
Module: Mesa
Branch: mesa_7_6_branch
Commit: 8f4d3613daa5684ff8aba75158ef7585a8005ed0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8f4d3613daa5684ff8aba75158ef7585a8005ed0
Author: Vinson Lee <vlee at vmware.com>
Date: Wed Nov 18 12:49:31 2009 -0800
progs/glsl: Fix multinoise GLSL compilation errors on Mac OS.
(cherry picked from commit d4dc2e30dada1be425e95ba270920db6eb210982)
---
progs/glsl/multinoise.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/progs/glsl/multinoise.c b/progs/glsl/multinoise.c
index 06207f7..d504ba1 100644
--- a/progs/glsl/multinoise.c
+++ b/progs/glsl/multinoise.c
@@ -22,22 +22,22 @@ static const char *FragShaderText[ 4 ] = {
"void main()\n"
"{\n"
" gl_FragColor.rgb = noise3( gl_TexCoord[ 0 ].w ) * 0.5 + 0.5;\n"
- " gl_FragColor.a = 1;\n"
+ " gl_FragColor.a = 1.0;\n"
"}\n",
"void main()\n"
"{\n"
" gl_FragColor.rgb = noise3( gl_TexCoord[ 0 ].xw ) * 0.5 + 0.5;\n"
- " gl_FragColor.a = 1;\n"
+ " gl_FragColor.a = 1.0;\n"
"}\n",
"void main()\n"
"{\n"
" gl_FragColor.rgb = noise3( gl_TexCoord[ 0 ].xyw ) * 0.5 + 0.5;\n"
- " gl_FragColor.a = 1;\n"
+ " gl_FragColor.a = 1.0;\n"
"}\n",
"void main()\n"
"{\n"
" gl_FragColor.rgb = noise3( gl_TexCoord[ 0 ].xyzw ) * 0.5 + 0.5;\n"
- " gl_FragColor.a = 1;\n"
+ " gl_FragColor.a = 1.0;\n"
"}\n"
};
@@ -194,7 +194,7 @@ LoadAndCompileShader(GLuint shader, const char *text)
GLchar log[1000];
GLsizei len;
glGetShaderInfoLog(shader, 1000, &len, log);
- fprintf(stderr, "noise: problem compiling shader: %s\n", log);
+ fprintf(stderr, "multinoise: problem compiling shader: %s\n", log);
exit(1);
}
else {
More information about the mesa-commit
mailing list