summaryrefslogtreecommitdiffstats
path: root/progs/glsl/multitex.frag
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2010-05-21 09:32:38 -0700
committerEric Anholt <[email protected]>2010-05-21 12:20:39 -0700
commit68fc4b415e322f6744299e39864fbc377c6eff74 (patch)
tree4bafffd8b0105174f3c5c0ae327a005be9145990 /progs/glsl/multitex.frag
parente4f4489e3fc0b36d72821b55794fb843b2b7fa5f (diff)
Remove demos that have moved to git+ssh://git.freedesktop.org/git/mesa/demos.
The remaining programs are ones I've had difficulty finding a build environment for to make the build system or are unit tests that should probably live next to their code instead. Hopefully people can bring over the build for remaining pieces they care about.
Diffstat (limited to 'progs/glsl/multitex.frag')
-rw-r--r--progs/glsl/multitex.frag15
1 files changed, 0 insertions, 15 deletions
diff --git a/progs/glsl/multitex.frag b/progs/glsl/multitex.frag
deleted file mode 100644
index a2633ceba75..00000000000
--- a/progs/glsl/multitex.frag
+++ /dev/null
@@ -1,15 +0,0 @@
-// Multi-texture fragment shader
-// Brian Paul
-
-// Composite second texture over first.
-// We're assuming the 2nd texture has a meaningful alpha channel.
-
-uniform sampler2D tex1;
-uniform sampler2D tex2;
-
-void main()
-{
- vec4 t1 = texture2D(tex1, gl_TexCoord[0].xy);
- vec4 t2 = texture2D(tex2, gl_TexCoord[1].xy);
- gl_FragColor = mix(t1, t2, t2.w);
-}