diff options
| author | Michal Krol <michal@vmware.com> | 2009-09-04 15:38:43 +0200 |
|---|---|---|
| committer | Michal Krol <michal@vmware.com> | 2009-09-04 15:38:43 +0200 |
| commit | ecd8d638c423b71c2e09713f60274ccb389f9be1 (patch) | |
| tree | bf911cd1349bb91e1804b46b5594620e3bead4ab /progs/glsl/multitex.shtest | |
| parent | c2670f621e6ea338cef2a955cf15cea2ad0525f8 (diff) | |
| parent | 4ba872b49bf9412a4b285169381255978d2ccec5 (diff) | |
Merge branch 'master' into glsl-pp-rework-1glsl-pp-rework-1
Diffstat (limited to 'progs/glsl/multitex.shtest')
| -rw-r--r-- | 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 0000000000..4b7c3fd4a5 --- /dev/null +++ b/progs/glsl/multitex.shtest @@ -0,0 +1,6 @@ +vs multitex.vert +fs multitex.frag +texture 0 2D ../images/tile.rgb +texture 1 2D ../images/tree2.rgba +uniform tex1 GL_SAMPLER_2D 0 +uniform tex2 GL_SAMPLER_2D 1 |