projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0062bd6)
progs/glsl: update multitex.shtest for new texture syntax
authorBrian Paul <brianp@vmware.com>
Thu, 20 Aug 2009 20:19:35 +0000 (14:19 -0600)
committerBrian Paul <brianp@vmware.com>
Thu, 20 Aug 2009 20:43:32 +0000 (14:43 -0600)
progs/glsl/multitex.shtest patch | blob | history

diff --git a/progs/glsl/multitex.shtest b/progs/glsl/multitex.shtest
index 5be45f6c7cb9f4ed1d658ce4a99b2309d2ec061b..4b7c3fd4a5f83a6ea3565cc4f21462898799679b 100644 (file)
--- 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