Mesa (master): progs/glsl: added multitex.shtest config file

Brian Paul brianp at kemper.freedesktop.org
Thu Aug 13 23:22:35 UTC 2009


Module: Mesa
Branch: master
Commit: 0c717bcd5dd1fdceb7038a2e2788ca1136a0fa3a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0c717bcd5dd1fdceb7038a2e2788ca1136a0fa3a

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Aug 13 16:03:01 2009 -0600

progs/glsl: added multitex.shtest config file

---

 progs/glsl/multitex.shtest |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/progs/glsl/multitex.shtest b/progs/glsl/multitex.shtest
new file mode 100644
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




More information about the mesa-commit mailing list