--- origsrc/mesa-demos-8.3.0/src/glsl/Makefile.am 2015-12-09 15:18:36.000000000 -0600 +++ src/mesa-demos-8.3.0/src/glsl/Makefile.am 2016-07-21 21:42:31.266300700 -0500 @@ -118,25 +118,34 @@ vert_or_frag_only_LDADD = ../util/libuti vert_tex_LDADD = ../util/libutil.la vsraytrace_LDADD = ../util/libutil.la -EXTRA_DIST = \ +demosdatadir=$(datadir)/$(PACKAGE)/ +dist_demosdata_DATA= \ CH06-brick.frag \ CH06-brick.vert \ CH11-bumpmap.frag \ CH11-bumpmap.vert \ + CH11-bumpmaptex.frag \ CH11-toyball.frag \ CH11-toyball.vert \ CH18-mandel.frag \ CH18-mandel.vert \ bezier.geom \ - brick.shtest \ + blinking-teapot.frag \ + blinking-teapot.vert \ + convolution.frag \ convolution.vert \ cubemap.frag \ - mandelbrot.shtest \ multitex.frag \ - multitex.shtest \ multitex.vert \ reflect.vert \ shadowtex.frag \ simple.vert \ + simplex-noise.glsl \ skinning.frag \ + skinning.vert + +EXTRA_DIST = \ + brick.shtest \ + mandelbrot.shtest \ + multitex.shtest \ toyball.shtest --- origsrc/mesa-demos-8.3.0/src/glsl/bezier.c 2015-12-09 15:18:36.000000000 -0600 +++ src/mesa-demos-8.3.0/src/glsl/bezier.c 2016-07-21 21:42:31.281995400 -0500 @@ -13,7 +13,7 @@ #include "glut_wrap.h" #include "shaderutil.h" -static const char *filename = "bezier.geom"; +static const char *filename = DEMOS_DATA_DIR "bezier.geom"; static GLuint fragShader; static GLuint vertShader; --- origsrc/mesa-demos-8.3.0/src/glsl/blinking-teapot.c 2015-12-09 15:18:36.000000000 -0600 +++ src/mesa-demos-8.3.0/src/glsl/blinking-teapot.c 2016-07-21 21:42:31.281995400 -0500 @@ -63,8 +63,8 @@ init_opengl (void) exit(1); } - vshad_id = CompileShaderFile (GL_VERTEX_SHADER, "blinking-teapot.vert"); - fshad_id = CompileShaderFile (GL_FRAGMENT_SHADER, "blinking-teapot.frag"); + vshad_id = CompileShaderFile (GL_VERTEX_SHADER, DEMOS_DATA_DIR "blinking-teapot.vert"); + fshad_id = CompileShaderFile (GL_FRAGMENT_SHADER, DEMOS_DATA_DIR "blinking-teapot.frag"); prog_id = LinkShaders (vshad_id, fshad_id); UseProgram (prog_id); --- origsrc/mesa-demos-8.3.0/src/glsl/brick.c 2015-12-09 15:18:36.000000000 -0600 +++ src/mesa-demos-8.3.0/src/glsl/brick.c 2016-07-21 21:42:31.297625000 -0500 @@ -14,8 +14,8 @@ #include "shaderutil.h" -static char *FragProgFile = "CH06-brick.frag"; -static char *VertProgFile = "CH06-brick.vert"; +static char *FragProgFile = DEMOS_DATA_DIR "CH06-brick.frag"; +static char *VertProgFile = DEMOS_DATA_DIR "CH06-brick.vert"; /* program/shader objects */ static GLuint fragShader; --- origsrc/mesa-demos-8.3.0/src/glsl/bump.c 2015-12-09 15:18:36.000000000 -0600 +++ src/mesa-demos-8.3.0/src/glsl/bump.c 2016-07-21 21:42:31.297625000 -0500 @@ -15,9 +15,9 @@ #include "readtex.h" -static char *FragProgFile = "CH11-bumpmap.frag"; -static char *FragTexProgFile = "CH11-bumpmaptex.frag"; -static char *VertProgFile = "CH11-bumpmap.vert"; +static char *FragProgFile = DEMOS_DATA_DIR "CH11-bumpmap.frag"; +static char *FragTexProgFile = DEMOS_DATA_DIR "CH11-bumpmaptex.frag"; +static char *VertProgFile = DEMOS_DATA_DIR "CH11-bumpmap.vert"; static char *TextureFile = DEMOS_DATA_DIR "tile.rgb"; /* program/shader objects */ --- origsrc/mesa-demos-8.3.0/src/glsl/convolutions.c 2015-12-09 15:18:36.000000000 -0600 +++ src/mesa-demos-8.3.0/src/glsl/convolutions.c 2016-07-21 21:42:31.313246500 -0500 @@ -340,7 +340,7 @@ static void init(void) menuInit(); readTexture(textureLocation); - createProgram("convolution.vert", "convolution.frag"); + createProgram(DEMOS_DATA_DIR "convolution.vert", DEMOS_DATA_DIR "convolution.frag"); glEnable(GL_TEXTURE_2D); glClearColor(1.0, 1.0, 1.0, 1.0); --- origsrc/mesa-demos-8.3.0/src/glsl/mandelbrot.c 2015-12-09 15:18:36.000000000 -0600 +++ src/mesa-demos-8.3.0/src/glsl/mandelbrot.c 2016-07-21 21:42:31.313246500 -0500 @@ -14,8 +14,8 @@ #include "shaderutil.h" -static char *FragProgFile = "CH18-mandel.frag"; -static char *VertProgFile = "CH18-mandel.vert"; +static char *FragProgFile = DEMOS_DATA_DIR "CH18-mandel.frag"; +static char *VertProgFile = DEMOS_DATA_DIR "CH18-mandel.vert"; /* program/shader objects */ static GLuint fragShader; --- origsrc/mesa-demos-8.3.0/src/glsl/multitex.c 2015-12-09 15:18:36.000000000 -0600 +++ src/mesa-demos-8.3.0/src/glsl/multitex.c 2016-07-21 21:42:31.328872300 -0500 @@ -35,8 +35,8 @@ static const char *Demo = "multitex"; -static const char *VertFile = "multitex.vert"; -static const char *FragFile = "multitex.frag"; +static const char *VertFile = DEMOS_DATA_DIR "multitex.vert"; +static const char *FragFile = DEMOS_DATA_DIR "multitex.frag"; static const char *TexFiles[2] = { --- origsrc/mesa-demos-8.3.0/src/glsl/simplex-noise.c 2015-12-09 15:18:36.000000000 -0600 +++ src/mesa-demos-8.3.0/src/glsl/simplex-noise.c 2016-07-21 21:42:31.328872300 -0500 @@ -169,7 +169,7 @@ SpecialKey(int key, int x, int y) static void Init(void) { - const char *filename = "simplex-noise.glsl"; + const char *filename = DEMOS_DATA_DIR "simplex-noise.glsl"; char noiseText[10000]; FILE *f; int len; --- origsrc/mesa-demos-8.3.0/src/glsl/skinning.c 2015-12-09 15:18:36.000000000 -0600 +++ src/mesa-demos-8.3.0/src/glsl/skinning.c 2016-07-21 21:42:31.328872300 -0500 @@ -20,8 +20,8 @@ #define M_PI 3.1415926535 #endif -static char *FragProgFile = "skinning.frag"; -static char *VertProgFile = "skinning.vert"; +static char *FragProgFile = DEMOS_DATA_DIR "skinning.frag"; +static char *VertProgFile = DEMOS_DATA_DIR "skinning.vert"; /* program/shader objects */ static GLuint fragShader; --- origsrc/mesa-demos-8.3.0/src/glsl/texdemo1.c 2015-12-09 15:18:36.000000000 -0600 +++ src/mesa-demos-8.3.0/src/glsl/texdemo1.c 2016-07-21 21:42:31.344498300 -0500 @@ -35,11 +35,11 @@ static const char *Demo = "texdemo1"; -static const char *ReflectVertFile = "reflect.vert"; -static const char *CubeFragFile = "cubemap.frag"; +static const char *ReflectVertFile = DEMOS_DATA_DIR "reflect.vert"; +static const char *CubeFragFile = DEMOS_DATA_DIR "cubemap.frag"; -static const char *SimpleVertFile = "simple.vert"; -static const char *SimpleTexFragFile = "shadowtex.frag"; +static const char *SimpleVertFile = DEMOS_DATA_DIR "simple.vert"; +static const char *SimpleTexFragFile = DEMOS_DATA_DIR "shadowtex.frag"; static const char *GroundImage = DEMOS_DATA_DIR "tile.rgb"; --- origsrc/mesa-demos-8.3.0/src/glsl/toyball.c 2015-12-09 15:18:36.000000000 -0600 +++ src/mesa-demos-8.3.0/src/glsl/toyball.c 2016-07-21 21:42:31.360633600 -0500 @@ -14,8 +14,8 @@ #include "shaderutil.h" -static char *FragProgFile = "CH11-toyball.frag"; -static char *VertProgFile = "CH11-toyball.vert"; +static char *FragProgFile = DEMOS_DATA_DIR "CH11-toyball.frag"; +static char *VertProgFile = DEMOS_DATA_DIR "CH11-toyball.vert"; /* program/shader objects */ static GLuint fragShader; --- origsrc/mesa-demos-8.3.0/src/perf/Makefile.am 2015-12-09 15:18:36.000000000 -0600 +++ src/mesa-demos-8.3.0/src/perf/Makefile.am 2016-07-21 21:42:31.366634100 -0500 @@ -59,3 +59,10 @@ bin_PROGRAMS = \ glslstateschange_LDADD = libperf.la ../util/libutil.la glsl_compile_time_LDADD = ../util/libutil.la + +demosdatadir = $(datadir)/$(PACKAGE)/ +dist_demosdata_DATA = \ + glslstateschange1.frag \ + glslstateschange1.vert \ + glslstateschange2.frag \ + glslstateschange2.vert --- origsrc/mesa-demos-8.3.0/src/perf/glslstateschange.c 2015-12-09 15:18:36.000000000 -0600 +++ src/mesa-demos-8.3.0/src/perf/glslstateschange.c 2016-07-21 21:42:31.366634100 -0500 @@ -33,10 +33,10 @@ #include "glmain.h" #include "common.h" -static const char *VertFile1 = "glslstateschange1.vert"; -static const char *FragFile1 = "glslstateschange1.frag"; -static const char *VertFile2 = "glslstateschange2.vert"; -static const char *FragFile2 = "glslstateschange2.frag"; +static const char *VertFile1 = DEMOS_DATA_DIR "glslstateschange1.vert"; +static const char *FragFile1 = DEMOS_DATA_DIR "glslstateschange1.frag"; +static const char *VertFile2 = DEMOS_DATA_DIR "glslstateschange2.vert"; +static const char *FragFile2 = DEMOS_DATA_DIR "glslstateschange2.frag"; static struct uniform_info Uniforms1[] = { { "tex1", 1, GL_SAMPLER_2D, { 0, 0, 0, 0 }, -1 }, { "tex2", 1, GL_SAMPLER_2D, { 1, 0, 0, 0 }, -1 },