projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 08ecd86)
progs/glsl: added multitex.shtest config file
authorBrian Paul <brianp@vmware.com>
Thu, 13 Aug 2009 22:03:01 +0000 (16:03 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 13 Aug 2009 23:03:57 +0000 (17:03 -0600)
progs/glsl/multitex.shtest [new file with mode: 0644] patch | blob

diff --git a/progs/glsl/multitex.shtest b/progs/glsl/multitex.shtest
new file mode 100644 (file)
index 0000000..5be45f6
--- /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