Mesa (master): undo accidental changes to multitex.frag shader
Brian Paul
brianp at kemper.freedesktop.org
Mon Nov 10 19:40:11 UTC 2008
Module: Mesa
Branch: master
Commit: e5359401d68fbf52e237b9f95964ad50534d974a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e5359401d68fbf52e237b9f95964ad50534d974a
Author: Brian Paul <brian.paul at tungstengraphics.com>
Date: Mon Nov 10 10:21:13 2008 -0700
undo accidental changes to multitex.frag shader
---
progs/glsl/multitex.frag | 24 ++----------------------
1 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/progs/glsl/multitex.frag b/progs/glsl/multitex.frag
index 61ef95f..a2633ce 100644
--- a/progs/glsl/multitex.frag
+++ b/progs/glsl/multitex.frag
@@ -7,29 +7,9 @@
uniform sampler2D tex1;
uniform sampler2D tex2;
-vec4 sample(sampler2D t, vec2 coord)
-{
- return texture2D(t, coord);
-}
-
-void main0()
+void main()
{
vec4 t1 = texture2D(tex1, gl_TexCoord[0].xy);
- //vec4 t1 = sample(tex1, gl_TexCoord[0].xy);
- //vec4 t2 = texture2D(tex2, gl_TexCoord[1].xy);
- vec4 t2 = sample(tex2, gl_TexCoord[0].xy);
+ vec4 t2 = texture2D(tex2, gl_TexCoord[1].xy);
gl_FragColor = mix(t1, t2, t2.w);
}
-
-void main()
-{
- vec4 t1 = sample(tex1, gl_TexCoord[0].xy);
- vec4 t2 = sample(tex2, gl_TexCoord[0].xy);
- gl_FragColor = t1 + t2;
-}
-/*
- 0: MOV SAMPLER[0].x, SAMPLER[0];
- 1: MOV TEMP[1], INPUT[4];
- 2: TEX OUTPUT[0], TEMP[1], texture[0], 2D;
- 3: END
-*/
More information about the mesa-commit
mailing list