Mesa (master): Fix silly type mismatch error in multinoise demo.
Gary Wong
gary at kemper.freedesktop.org
Sun Dec 14 03:07:56 UTC 2008
Module: Mesa
Branch: master
Commit: a42342cd90c19d8c29093e91d07d7efab5b5d25a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=a42342cd90c19d8c29093e91d07d7efab5b5d25a
Author: Gary Wong <gtw at gnu.org>
Date: Sat Dec 13 20:06:21 2008 -0700
Fix silly type mismatch error in multinoise demo.
---
progs/glsl/multinoise.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/progs/glsl/multinoise.c b/progs/glsl/multinoise.c
index 914b872..2351863 100644
--- a/progs/glsl/multinoise.c
+++ b/progs/glsl/multinoise.c
@@ -23,19 +23,23 @@ static const char *VertShaderText =
static const char *FragShaderText[ 4 ] = {
"void main()\n"
"{\n"
- " gl_FragColor = noise3( gl_TexCoord[ 0 ].w ) * 0.5 + 0.5;\n"
+ " gl_FragColor.rgb = noise3( gl_TexCoord[ 0 ].w ) * 0.5 + 0.5;\n"
+ " gl_FragColor.a = 1;\n"
"}\n",
"void main()\n"
"{\n"
- " gl_FragColor = noise3( gl_TexCoord[ 0 ].xw ) * 0.5 + 0.5;\n"
+ " gl_FragColor.rgb = noise3( gl_TexCoord[ 0 ].xw ) * 0.5 + 0.5;\n"
+ " gl_FragColor.a = 1;\n"
"}\n",
"void main()\n"
"{\n"
- " gl_FragColor = noise3( gl_TexCoord[ 0 ].xyw ) * 0.5 + 0.5;\n"
+ " gl_FragColor.rgb = noise3( gl_TexCoord[ 0 ].xyw ) * 0.5 + 0.5;\n"
+ " gl_FragColor.a = 1;\n"
"}\n",
"void main()\n"
"{\n"
- " gl_FragColor = noise3( gl_TexCoord[ 0 ].xyzw ) * 0.5 + 0.5;\n"
+ " gl_FragColor.rgb = noise3( gl_TexCoord[ 0 ].xyzw ) * 0.5 + 0.5;\n"
+ " gl_FragColor.a = 1;\n"
"}\n"
};
More information about the mesa-commit
mailing list