summaryrefslogtreecommitdiff
path: root/progs
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-11-10 10:21:13 -0700
committerBrian Paul <brian.paul@tungstengraphics.com>2008-11-10 12:39:36 -0700
commite5359401d68fbf52e237b9f95964ad50534d974a (patch)
tree6ed25564943faaf2b25d4881515d8606c7a7f92a /progs
parentf1c9016af16aefc08a3e4e859a897009652dac23 (diff)
undo accidental changes to multitex.frag shader
Diffstat (limited to 'progs')
-rw-r--r--progs/glsl/multitex.frag24
1 files changed, 2 insertions, 22 deletions
diff --git a/progs/glsl/multitex.frag b/progs/glsl/multitex.frag
index 61ef95f3fe..a2633ceba7 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
-*/