summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorGary Wong <gtw@gnu.org>2008-12-13 20:06:21 -0700
committerGary Wong <gtw@gnu.org>2008-12-13 20:07:21 -0700
commit77a8e26bf824b45c1244f5699d7cbfca0fe0a48a (patch)
treefa4e1af8f4f3c3d7f15f183f1d206c01d313efb6 /progs
parent9467a577e1ea6bbb9d9c9ab919b6f116569a7ea0 (diff)
Fix silly type mismatch error in multinoise demo.mesa_7_0_branch
(cherry picked from commit a42342cd90c19d8c29093e91d07d7efab5b5d25a)
Diffstat (limited to 'progs')
-rw-r--r--progs/glsl/multinoise.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/progs/glsl/multinoise.c b/progs/glsl/multinoise.c
index 914b872f44..2351863aff 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"
};