Mesa (master): progs/glsl: update multitex.shtest for new texture syntax
Brian Paul
brianp at kemper.freedesktop.org
Thu Aug 20 20:52:07 UTC 2009
Module: Mesa
Branch: master
Commit: 8a883d165783d016923ea4b29a9e1e198b578a7a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8a883d165783d016923ea4b29a9e1e198b578a7a
Author: Brian Paul <brianp at vmware.com>
Date: Thu Aug 20 14:19:35 2009 -0600
progs/glsl: update multitex.shtest for new texture syntax
---
progs/glsl/multitex.shtest | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/progs/glsl/multitex.shtest b/progs/glsl/multitex.shtest
index 5be45f6..4b7c3fd 100644
--- a/progs/glsl/multitex.shtest
+++ b/progs/glsl/multitex.shtest
@@ -1,6 +1,6 @@
vs multitex.vert
fs multitex.frag
-texture 0 ../images/tile.rgb
-texture 1 ../images/tree2.rgba
+texture 0 2D ../images/tile.rgb
+texture 1 2D ../images/tree2.rgba
uniform tex1 GL_SAMPLER_2D 0
uniform tex2 GL_SAMPLER_2D 1
More information about the mesa-commit
mailing list