summaryrefslogtreecommitdiffstats
path: root/meta-agl-bsp/meta-raspberrypi/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch
blob: a6d168175ffe72f39fa87a356c4e84c27e84f905 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
From 894add34c2b5e6b4ccc78996bf681d7ec7bc9e36 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 10 Jul 2014 14:29:27 +0200
Subject: [PATCH] glsl, perf: Add few missing .glsl, .vert, .frag files to
 EXTRA_DATA

Upstream-Status: Pending

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

---
 src/fpglsl/Makefile.am |  2 ++
 src/glsl/Makefile.am   | 10 ++++++++--
 src/perf/Makefile.am   |  6 ++++++
 src/vpglsl/Makefile.am |  1 +
 4 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am
index 47c1039f..fd43c919 100644
--- a/src/fpglsl/Makefile.am
+++ b/src/fpglsl/Makefile.am
@@ -39,10 +39,12 @@ noinst_PROGRAMS = \
 endif
 
 EXTRA_DIST = \
+	depth-read.glsl \
 	dowhile2.glsl \
 	dowhile.glsl \
 	forbreak.glsl \
 	for.glsl \
+	infinite-loop.glsl \
 	mov.glsl \
 	mov-imm.glsl \
 	simpleif.glsl \
diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
index 4faa8dbf..079a29d8 100644
--- a/src/glsl/Makefile.am
+++ b/src/glsl/Makefile.am
@@ -37,7 +37,7 @@ AM_LDFLAGS = \
 if HAVE_GLUT
 bin_PROGRAMS = \
 	array \
-        bezier \
+	bezier \
 	bitmap \
 	brick \
 	bump \
@@ -123,12 +123,16 @@ EXTRA_DIST = \
 	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 \
+	bezier.geom \
 	brick.shtest \
+	blinking-teapot.frag \
+	blinking-teapot.vert \
+	convolution.frag \
 	convolution.vert \
 	cubemap.frag \
 	mandelbrot.shtest \
@@ -138,5 +142,7 @@ EXTRA_DIST = \
 	reflect.vert \
 	shadowtex.frag \
 	simple.vert \
+	simplex-noise.glsl \
 	skinning.frag \
+	skinning.vert \
 	toyball.shtest
diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am
index f0031fea..60069396 100644
--- a/src/perf/Makefile.am
+++ b/src/perf/Makefile.am
@@ -59,3 +59,9 @@ endif
 
 glslstateschange_LDADD = libperf.la ../util/libutil.la
 glsl_compile_time_LDADD = ../util/libutil.la
+
+EXTRA_DIST = \
+	glslstateschange1.frag \
+	glslstateschange1.vert \
+	glslstateschange2.frag \
+	glslstateschange2.vert
diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am
index 4a85ed40..48b08f48 100644
--- a/src/vpglsl/Makefile.am
+++ b/src/vpglsl/Makefile.am
@@ -44,6 +44,7 @@ EXTRA_DIST = \
 	func2.glsl \
 	ifelse.glsl \
 	if.glsl \
+	infinite-loop.glsl \
 	mov.glsl \
 	nestedifs.glsl \
 	nestedswizzle.glsl \