From 0c717bcd5dd1fdceb7038a2e2788ca1136a0fa3a Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 13 Aug 2009 16:03:01 -0600 Subject: progs/glsl: added multitex.shtest config file --- progs/glsl/multitex.shtest | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 progs/glsl/multitex.shtest (limited to 'progs/glsl/multitex.shtest') 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 -- cgit v1.2.3 From 8a883d165783d016923ea4b29a9e1e198b578a7a Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 20 Aug 2009 14:19:35 -0600 Subject: progs/glsl: update multitex.shtest for new texture syntax --- progs/glsl/multitex.shtest | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'progs/glsl/multitex.shtest') diff --git a/progs/glsl/multitex.shtest b/progs/glsl/multitex.shtest index 5be45f6c7c..4b7c3fd4a5 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 -- cgit v1.2.3