summaryrefslogtreecommitdiff
path: root/progs/glsl
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-08-13 16:03:01 -0600
committerBrian Paul <brianp@vmware.com>2009-08-13 17:03:57 -0600
commit0c717bcd5dd1fdceb7038a2e2788ca1136a0fa3a (patch)
treead30d3338048af90f5f456fac92dc39661c52637 /progs/glsl
parent08ecd863ee12601ea95818e02889a9807fd7a62d (diff)
progs/glsl: added multitex.shtest config file
Diffstat (limited to 'progs/glsl')
-rw-r--r--progs/glsl/multitex.shtest6
1 files changed, 6 insertions, 0 deletions
diff --git a/progs/glsl/multitex.shtest b/progs/glsl/multitex.shtest
new file mode 100644
index 0000000000..5be45f6c7c
--- /dev/null
+++ b/progs/glsl/multitex.shtest
@@ -0,0 +1,6 @@
+vs multitex.vert
+fs multitex.frag
+texture 0 ../images/tile.rgb
+texture 1 ../images/tree2.rgba
+uniform tex1 GL_SAMPLER_2D 0
+uniform tex2 GL_SAMPLER_2D 1