Demos (master): Update a few missing images -> data renames.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Thu Feb 10 10:03:42 UTC 2011
Module: Demos
Branch: master
Commit: 0d895d3fd8ceb578e463f63e41e18d0ba6ad7634
URL: http://cgit.freedesktop.org/mesa/demos/commit/?id=0d895d3fd8ceb578e463f63e41e18d0ba6ad7634
Author: José Fonseca <jfonseca at vmware.com>
Date: Thu Feb 10 10:03:01 2011 +0000
Update a few missing images -> data renames.
---
src/data/CMakeLists.txt | 2 +-
src/glsl/multitex.shtest | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/data/CMakeLists.txt b/src/data/CMakeLists.txt
index a21cc0b..971fa19 100644
--- a/src/data/CMakeLists.txt
+++ b/src/data/CMakeLists.txt
@@ -1,3 +1,3 @@
file (GLOB data *.rgb *.rgba *.dat)
-install (FILES ${data} DESTINATION images)
+install (FILES ${data} DESTINATION data)
diff --git a/src/glsl/multitex.shtest b/src/glsl/multitex.shtest
index 4b7c3fd..4eb3821 100644
--- a/src/glsl/multitex.shtest
+++ b/src/glsl/multitex.shtest
@@ -1,6 +1,6 @@
vs multitex.vert
fs multitex.frag
-texture 0 2D ../images/tile.rgb
-texture 1 2D ../images/tree2.rgba
+texture 0 2D ../data/tile.rgb
+texture 1 2D ../data/tree2.rgba
uniform tex1 GL_SAMPLER_2D 0
uniform tex2 GL_SAMPLER_2D 1
More information about the mesa-commit
mailing list