1*4882a593SmuzhiyunFrom 894add34c2b5e6b4ccc78996bf681d7ec7bc9e36 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Martin Jansa <Martin.Jansa@gmail.com> 3*4882a593SmuzhiyunDate: Thu, 10 Jul 2014 14:29:27 +0200 4*4882a593SmuzhiyunSubject: [PATCH] glsl, perf: Add few missing .glsl, .vert, .frag files to 5*4882a593Smuzhiyun EXTRA_DATA 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunUpstream-Status: Pending 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Martin Jansa <Martin.Jansa@gmail.com> 10*4882a593Smuzhiyun 11*4882a593Smuzhiyun--- 12*4882a593Smuzhiyun src/fpglsl/Makefile.am | 2 ++ 13*4882a593Smuzhiyun src/glsl/Makefile.am | 10 ++++++++-- 14*4882a593Smuzhiyun src/perf/Makefile.am | 6 ++++++ 15*4882a593Smuzhiyun src/vpglsl/Makefile.am | 1 + 16*4882a593Smuzhiyun 4 files changed, 17 insertions(+), 2 deletions(-) 17*4882a593Smuzhiyun 18*4882a593Smuzhiyundiff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am 19*4882a593Smuzhiyunindex 47c1039f..fd43c919 100644 20*4882a593Smuzhiyun--- a/src/fpglsl/Makefile.am 21*4882a593Smuzhiyun+++ b/src/fpglsl/Makefile.am 22*4882a593Smuzhiyun@@ -39,10 +39,12 @@ noinst_PROGRAMS = \ 23*4882a593Smuzhiyun endif 24*4882a593Smuzhiyun 25*4882a593Smuzhiyun EXTRA_DIST = \ 26*4882a593Smuzhiyun+ depth-read.glsl \ 27*4882a593Smuzhiyun dowhile2.glsl \ 28*4882a593Smuzhiyun dowhile.glsl \ 29*4882a593Smuzhiyun forbreak.glsl \ 30*4882a593Smuzhiyun for.glsl \ 31*4882a593Smuzhiyun+ infinite-loop.glsl \ 32*4882a593Smuzhiyun mov.glsl \ 33*4882a593Smuzhiyun mov-imm.glsl \ 34*4882a593Smuzhiyun simpleif.glsl \ 35*4882a593Smuzhiyundiff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am 36*4882a593Smuzhiyunindex 4faa8dbf..079a29d8 100644 37*4882a593Smuzhiyun--- a/src/glsl/Makefile.am 38*4882a593Smuzhiyun+++ b/src/glsl/Makefile.am 39*4882a593Smuzhiyun@@ -37,7 +37,7 @@ AM_LDFLAGS = \ 40*4882a593Smuzhiyun if HAVE_GLUT 41*4882a593Smuzhiyun bin_PROGRAMS = \ 42*4882a593Smuzhiyun array \ 43*4882a593Smuzhiyun- bezier \ 44*4882a593Smuzhiyun+ bezier \ 45*4882a593Smuzhiyun bitmap \ 46*4882a593Smuzhiyun brick \ 47*4882a593Smuzhiyun bump \ 48*4882a593Smuzhiyun@@ -123,12 +123,16 @@ EXTRA_DIST = \ 49*4882a593Smuzhiyun CH06-brick.vert \ 50*4882a593Smuzhiyun CH11-bumpmap.frag \ 51*4882a593Smuzhiyun CH11-bumpmap.vert \ 52*4882a593Smuzhiyun+ CH11-bumpmaptex.frag \ 53*4882a593Smuzhiyun CH11-toyball.frag \ 54*4882a593Smuzhiyun CH11-toyball.vert \ 55*4882a593Smuzhiyun CH18-mandel.frag \ 56*4882a593Smuzhiyun CH18-mandel.vert \ 57*4882a593Smuzhiyun- bezier.geom \ 58*4882a593Smuzhiyun+ bezier.geom \ 59*4882a593Smuzhiyun brick.shtest \ 60*4882a593Smuzhiyun+ blinking-teapot.frag \ 61*4882a593Smuzhiyun+ blinking-teapot.vert \ 62*4882a593Smuzhiyun+ convolution.frag \ 63*4882a593Smuzhiyun convolution.vert \ 64*4882a593Smuzhiyun cubemap.frag \ 65*4882a593Smuzhiyun mandelbrot.shtest \ 66*4882a593Smuzhiyun@@ -138,5 +142,7 @@ EXTRA_DIST = \ 67*4882a593Smuzhiyun reflect.vert \ 68*4882a593Smuzhiyun shadowtex.frag \ 69*4882a593Smuzhiyun simple.vert \ 70*4882a593Smuzhiyun+ simplex-noise.glsl \ 71*4882a593Smuzhiyun skinning.frag \ 72*4882a593Smuzhiyun+ skinning.vert \ 73*4882a593Smuzhiyun toyball.shtest 74*4882a593Smuzhiyundiff --git a/src/perf/Makefile.am b/src/perf/Makefile.am 75*4882a593Smuzhiyunindex f0031fea..60069396 100644 76*4882a593Smuzhiyun--- a/src/perf/Makefile.am 77*4882a593Smuzhiyun+++ b/src/perf/Makefile.am 78*4882a593Smuzhiyun@@ -59,3 +59,9 @@ endif 79*4882a593Smuzhiyun 80*4882a593Smuzhiyun glslstateschange_LDADD = libperf.la ../util/libutil.la 81*4882a593Smuzhiyun glsl_compile_time_LDADD = ../util/libutil.la 82*4882a593Smuzhiyun+ 83*4882a593Smuzhiyun+EXTRA_DIST = \ 84*4882a593Smuzhiyun+ glslstateschange1.frag \ 85*4882a593Smuzhiyun+ glslstateschange1.vert \ 86*4882a593Smuzhiyun+ glslstateschange2.frag \ 87*4882a593Smuzhiyun+ glslstateschange2.vert 88*4882a593Smuzhiyundiff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am 89*4882a593Smuzhiyunindex 4a85ed40..48b08f48 100644 90*4882a593Smuzhiyun--- a/src/vpglsl/Makefile.am 91*4882a593Smuzhiyun+++ b/src/vpglsl/Makefile.am 92*4882a593Smuzhiyun@@ -44,6 +44,7 @@ EXTRA_DIST = \ 93*4882a593Smuzhiyun func2.glsl \ 94*4882a593Smuzhiyun ifelse.glsl \ 95*4882a593Smuzhiyun if.glsl \ 96*4882a593Smuzhiyun+ infinite-loop.glsl \ 97*4882a593Smuzhiyun mov.glsl \ 98*4882a593Smuzhiyun nestedifs.glsl \ 99*4882a593Smuzhiyun nestedswizzle.glsl \ 100