summaryrefslogtreecommitdiff
path: root/progs/glsl
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2008-11-11 14:42:41 -0700
committerBrian Paul <brian.paul@tungstengraphics.com>2008-11-11 14:42:41 -0700
commit19e4222f937c9bb95d3a899dd788afb930eecaa4 (patch)
tree5bb25227f53ad93fbdb9dc889ded690dc40ad1d9 /progs/glsl
parent7f3d45758ccbbcff6428d57d26794960e3e9532c (diff)
parent90246d3ea54f54d60593dce1b89f0226058a3c56 (diff)
Merge commit 'origin/master' into gallium-0.2
Conflicts: src/mesa/shader/prog_execute.c src/mesa/shader/slang/library/slang_vertex_builtin_gc.h
Diffstat (limited to 'progs/glsl')
-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
-*/