summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/mesa/mesa-demos
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-06-06 14:01:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-06-07 21:21:54 +0100
commit547b0b0943e9f6db543ef3ea172b8f37581f524f (patch)
tree588b215b2653119f0b48e0d2c0e2712627652440 /meta/recipes-graphics/mesa/mesa-demos
parentc13a21782b572038b5a6f4229882f2b992741b79 (diff)
downloadpoky-547b0b0943e9f6db543ef3ea172b8f37581f524f.tar.gz
mesa-demos: update 8.4.0 -> 8.5.0
Convert to meson, drop unsupported options. Drop autotools-specific and glew-specific patches (glew support dropped upstream). glu dependency is now x11-specific. 0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch dropped as patched files removed upstream. (From OE-Core rev: b9fc45915977c34b3a50e3d64347c2b247c49840) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/mesa/mesa-demos')
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch382
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch43
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch99
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch71
-rw-r--r--meta/recipes-graphics/mesa/mesa-demos/0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch44
5 files changed, 0 insertions, 639 deletions
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch b/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
deleted file mode 100644
index e31827d4a3..0000000000
--- a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch
+++ /dev/null
@@ -1,382 +0,0 @@
1From 779438770bedf3d53e6ad8f7cd6889b7f50daf3b Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Wed, 9 Jul 2014 14:23:41 +0200
4Subject: [PATCH] configure: Allow to disable demos which require GLEW or GLU
5
6* in some systems without X11 support we don't have GLEW, but
7 mesa-demos are still useful
8
9This isn't currently appropriate for upstream submission as glew has
10been replaced with glad there; glu situation would need to be re-assesed
11when upstream makes a new release, requested here:
12https://gitlab.freedesktop.org/mesa/demos/-/issues/22
13
14Upstream-Status: Inappropriate [see above]
15
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17
18Port to 8.3.0
19Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
20---
21 configure.ac | 49 ++++++++++++++++++++---------
22 src/Makefile.am | 18 ++++++++---
23 src/demos/Makefile.am | 73 ++++++++++++++++++++++++-------------------
24 src/egl/Makefile.am | 8 +++--
25 src/egl/opengles1/Makefile.am | 10 ++++--
26 src/egl/opengles2/Makefile.am | 29 ++++++++---------
27 6 files changed, 117 insertions(+), 70 deletions(-)
28
29diff --git a/configure.ac b/configure.ac
30index 0525b09..28834cd 100644
31--- a/configure.ac
32+++ b/configure.ac
33@@ -93,25 +93,44 @@ AC_EGREP_HEADER([glutInitContextProfile],
34 [AC_DEFINE(HAVE_FREEGLUT)],
35 [])
36
37-dnl Check for GLEW
38-PKG_CHECK_MODULES(GLEW, [glew >= 1.5.4])
39-DEMO_CFLAGS="$DEMO_CFLAGS $GLEW_CFLAGS"
40-DEMO_LIBS="$DEMO_LIBS $GLEW_LIBS"
41+AC_ARG_ENABLE([glew],
42+ [AS_HELP_STRING([--enable-glew],
43+ [build demos which require glew @<:@default=yes@:>@])],
44+ [enable_glew="$enableval"],
45+ [enable_glew=yes]
46+)
47+
48+if test "x$enable_glew" = xyes; then
49+ dnl Check for GLEW
50+ PKG_CHECK_MODULES(GLEW, [glew >= 1.5.4], [glew_enabled=yes], [glew_enabled=no])
51+ DEMO_CFLAGS="$DEMO_CFLAGS $GLEW_CFLAGS"
52+ DEMO_LIBS="$DEMO_LIBS $GLEW_LIBS"
53+fi
54
55 # LIBS was set by AC_CHECK_LIB above
56 LIBS=""
57
58-PKG_CHECK_MODULES(GLU, [glu], [],
59- [AC_CHECK_HEADER([GL/glu.h],
60- [],
61- AC_MSG_ERROR([GLU not found]))
62- AC_CHECK_LIB([GLU],
63- [gluBeginCurve],
64- [GLU_LIBS=-lGLU],
65- AC_MSG_ERROR([GLU required])) ])
66+AC_ARG_ENABLE([glu],
67+ [AS_HELP_STRING([--enable-glu],
68+ [build demos which require glu @<:@default=yes@:>@])],
69+ [enable_glu="$enableval"],
70+ [enable_glu=yes]
71+)
72
73-DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS"
74-DEMO_LIBS="$DEMO_LIBS $GLU_LIBS"
75+if test "x$enable_glu" = xyes; then
76+ PKG_CHECK_MODULES(GLU, [glu], [glu_enabled=yes],
77+ [AC_CHECK_HEADER([GL/glu.h],
78+ [],
79+ AC_MSG_ERROR([GLU not found]))
80+ AC_CHECK_LIB([GLU],
81+ [gluBeginCurve],
82+ [GLU_LIBS=-lGLU
83+ glu_enabled=yes],
84+ AC_MSG_ERROR([GLU required])) ])
85+
86+ DEMO_CFLAGS="$DEMO_CFLAGS $GLU_CFLAGS"
87+ DEMO_LIBS="$DEMO_LIBS $GLU_LIBS"
88+fi
89
90 AC_ARG_ENABLE([egl],
91 [AS_HELP_STRING([--enable-egl],
92@@ -304,6 +323,8 @@ AC_SUBST([WAYLAND_CFLAGS])
93 AC_SUBST([WAYLAND_LIBS])
94
95
96+AM_CONDITIONAL(HAVE_GLU, test "x$glu_enabled" = "xyes")
97+AM_CONDITIONAL(HAVE_GLEW, test "x$glew_enabled" = "xyes")
98 AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes")
99 AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes")
100 AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes")
101diff --git a/src/Makefile.am b/src/Makefile.am
102index 1647d64..8b89dee 100644
103--- a/src/Makefile.am
104+++ b/src/Makefile.am
105@@ -22,15 +22,19 @@
106 # Authors:
107 # Eric Anholt <eric@anholt.net>
108
109+if HAVE_GLEW
110+UTIL = util
111+endif
112+
113 SUBDIRS = \
114- util \
115+ $(UTIL) \
116 data \
117 demos \
118 egl \
119 fp \
120 fpglsl \
121 glsl \
122- gs \
123+ gs \
124 objviewer \
125 osdemos \
126 perf \
127@@ -40,8 +44,12 @@ SUBDIRS = \
128 slang \
129 tests \
130 tools \
131- trivial \
132- vp \
133- vpglsl \
134 wgl \
135 xdemos
136+
137+if HAVE_GLEW
138+SUBDIRS += \
139+ vp \
140+ vpglsl \
141+ trivial
142+endif
143diff --git a/src/demos/Makefile.am b/src/demos/Makefile.am
144index 41603fa..ab1e3ab 100644
145--- a/src/demos/Makefile.am
146+++ b/src/demos/Makefile.am
147@@ -30,91 +30,100 @@ AM_LDFLAGS = \
148 $(DEMO_LIBS) \
149 $(GLUT_LIBS)
150
151+bin_PROGRAMS =
152+
153 if HAVE_GLUT
154-bin_PROGRAMS = \
155+if HAVE_GLEW
156+bin_PROGRAMS += \
157 arbfplight \
158 arbfslight \
159 arbocclude \
160 arbocclude2 \
161- bounce \
162- clearspd \
163 copypix \
164 cubemap \
165 cuberender \
166 dinoshade \
167- dissolve \
168- drawpix \
169 engine \
170 fbo_firecube \
171 fbotexture \
172- fire \
173 fogcoord \
174 fplight \
175 fslight \
176+ gloss \
177+ isosurf \
178+ multiarb \
179+ paltex \
180+ pointblast \
181+ projtex \
182+ shadowtex \
183+ spriteblast \
184+ stex3d \
185+ textures \
186+ vao_demo \
187+ winpos
188+
189+copypix_LDADD = ../util/libutil.la
190+cubemap_LDADD = ../util/libutil.la
191+cuberender_LDADD = ../util/libutil.la
192+engine_LDADD = ../util/libutil.la
193+fbo_firecube_LDADD = ../util/libutil.la
194+gloss_LDADD = ../util/libutil.la
195+isosurf_LDADD = ../util/libutil.la
196+multiarb_LDADD = ../util/libutil.la
197+projtex_LDADD = ../util/libutil.la
198+textures_LDADD = ../util/libutil.la
199+winpos_LDADD = ../util/libutil.la
200+endif
201+
202+if HAVE_GLU
203+bin_PROGRAMS += \
204+ bounce \
205+ clearspd \
206+ dissolve \
207+ drawpix \
208+ fire \
209 gamma \
210 gearbox \
211 gears \
212 geartrain \
213 glinfo \
214- gloss \
215 gltestperf \
216 ipers \
217- isosurf \
218 lodbias \
219 morph3d \
220- multiarb \
221- paltex \
222 pixeltest \
223- pointblast \
224- projtex \
225 ray \
226 readpix \
227 reflect \
228 renormal \
229- shadowtex \
230 singlebuffer \
231 spectex \
232- spriteblast \
233- stex3d \
234 teapot \
235 terrain \
236 tessdemo \
237 texcyl \
238 texenv \
239- textures \
240 trispd \
241 tunnel2 \
242- tunnel \
243- vao_demo \
244- winpos
245-endif
246+ tunnel
247
248 tunnel_SOURCES = \
249 tunnel.c \
250 tunneldat.h
251
252-copypix_LDADD = ../util/libutil.la
253-cubemap_LDADD = ../util/libutil.la
254-cuberender_LDADD = ../util/libutil.la
255-drawpix_LDADD = ../util/libutil.la
256 dissolve_LDADD = ../util/libutil.la
257-engine_LDADD = ../util/libutil.la
258-fbo_firecube_LDADD = ../util/libutil.la
259+drawpix_LDADD = ../util/libutil.la
260 fire_LDADD = ../util/libutil.la
261-gloss_LDADD = ../util/libutil.la
262 ipers_LDADD = ../util/libutil.la
263-isosurf_LDADD = ../util/libutil.la
264 lodbias_LDADD = ../util/libutil.la
265-multiarb_LDADD = ../util/libutil.la
266-projtex_LDADD = ../util/libutil.la
267 readpix_LDADD = ../util/libutil.la
268 reflect_LDADD = ../util/libutil.la
269 teapot_LDADD = ../util/libutil.la
270 texcyl_LDADD = ../util/libutil.la
271-textures_LDADD = ../util/libutil.la
272 tunnel_LDADD = ../util/libutil.la
273 tunnel2_LDADD = ../util/libutil.la
274-winpos_LDADD = ../util/libutil.la
275+endif
276+endif
277
278 EXTRA_DIST = \
279 README
280diff --git a/src/egl/Makefile.am b/src/egl/Makefile.am
281index d64a49e..4fe1ca8 100644
282--- a/src/egl/Makefile.am
283+++ b/src/egl/Makefile.am
284@@ -24,8 +24,12 @@
285
286 SUBDIRS = \
287 eglut \
288- opengl \
289- openvg \
290 opengles1 \
291 opengles2 \
292 oes_vg
293+
294+if HAVE_GLU
295+SUBDIRS += \
296+ opengl \
297+ openvg
298+endif
299diff --git a/src/egl/opengles1/Makefile.am b/src/egl/opengles1/Makefile.am
300index fa397c2..21853e8 100644
301--- a/src/egl/opengles1/Makefile.am
302+++ b/src/egl/opengles1/Makefile.am
303@@ -36,9 +36,12 @@ AM_LDFLAGS = \
304 $(EGL_LIBS) \
305 -lm
306
307+noinst_PROGRAMS =
308+
309 if HAVE_EGL
310 if HAVE_GLESV1
311-noinst_PROGRAMS = \
312+if HAVE_X11
313+bin_PROGRAMS = \
314 bindtex \
315 clear \
316 drawtex_x11 \
317@@ -52,8 +55,6 @@ noinst_PROGRAMS = \
318 torus_x11 \
319 tri_x11 \
320 two_win
321-endif
322-endif
323
324 bindtex_LDADD = $(X11_LIBS)
325 es1_info_LDADD = $(X11_LIBS)
326@@ -76,3 +77,6 @@ drawtex_x11_LDADD = ../eglut/libeglut_x11.la
327 gears_x11_LDADD = ../eglut/libeglut_x11.la
328 torus_x11_LDADD = ../eglut/libeglut_x11.la
329 tri_x11_LDADD = ../eglut/libeglut_x11.la
330+endif
331+endif
332+endif
333diff --git a/src/egl/opengles2/Makefile.am b/src/egl/opengles2/Makefile.am
334index b80ba50..17f8d49 100644
335--- a/src/egl/opengles2/Makefile.am
336+++ b/src/egl/opengles2/Makefile.am
337@@ -33,27 +33,28 @@ AM_LDFLAGS = \
338 $(EGL_LIBS) \
339 -lm
340
341+bin_PROGRAMS =
342+
343 if HAVE_EGL
344 if HAVE_GLESV2
345-bin_PROGRAMS =
346-if HAVE_X11
347-bin_PROGRAMS += \
348- es2_info \
349- es2gears_x11 \
350- es2tri
351-endif
352 if HAVE_WAYLAND
353 bin_PROGRAMS += es2gears_wayland
354-endif
355-endif
356+
357+es2gears_wayland_SOURCES = es2gears.c
358+es2gears_wayland_LDADD = ../eglut/libeglut_wayland.la
359 endif
360
361-es2_info_LDADD = $(X11_LIBS)
362-es2tri_LDADD = $(X11_LIBS)
363+if HAVE_X11
364+bin_PROGRAMS += \
365+ es2tri \
366+ es2_info \
367+ es2gears_x11
368
369+es2_info_LDADD = $(X11_LIBS)
370 es2gears_x11_SOURCES = es2gears.c
371-
372 es2gears_x11_LDADD = ../eglut/libeglut_x11.la
373+es2tri_LDADD = $(X11_LIBS)
374+endif
375+endif
376+endif
377
378-es2gears_wayland_SOURCES = es2gears.c
379-es2gears_wayland_LDADD = ../eglut/libeglut_wayland.la
380--
3812.1.4
382
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch b/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch
deleted file mode 100644
index b27d9eafa5..0000000000
--- a/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From 2e0367a941445a862ab99c54ec85d1357d0f73c0 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 10 Jul 2014 14:30:52 +0200
4Subject: [PATCH] Install few more test programs
5
6Upstream-Status: Pending
7
8Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
9
10Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
11
12---
13 src/egl/opengl/Makefile.am | 3 +--
14 src/egl/openvg/Makefile.am | 2 +-
15 2 files changed, 2 insertions(+), 3 deletions(-)
16
17diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am
18index 6d184ff6..ab09d028 100644
19--- a/src/egl/opengl/Makefile.am
20+++ b/src/egl/opengl/Makefile.am
21@@ -57,8 +57,7 @@ endif
22
23 if HAVE_EGL
24 bin_PROGRAMS = \
25- eglinfo
26-noinst_PROGRAMS = \
27+ eglinfo \
28 peglgears \
29 $(EGL_DRM_DEMOS) \
30 $(EGL_X11_DEMOS) \
31diff --git a/src/egl/openvg/Makefile.am b/src/egl/openvg/Makefile.am
32index b0f1212f..5fd1cf83 100644
33--- a/src/egl/openvg/Makefile.am
34+++ b/src/egl/openvg/Makefile.am
35@@ -49,7 +49,7 @@ endif
36
37 if HAVE_EGL
38 if HAVE_VG
39-noinst_PROGRAMS = \
40+bin_PROGRAMS = \
41 $(EGL_X11_DEMOS)
42 endif
43 endif
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch b/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch
deleted file mode 100644
index a6d168175f..0000000000
--- a/meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch
+++ /dev/null
@@ -1,99 +0,0 @@
1From 894add34c2b5e6b4ccc78996bf681d7ec7bc9e36 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 10 Jul 2014 14:29:27 +0200
4Subject: [PATCH] glsl, perf: Add few missing .glsl, .vert, .frag files to
5 EXTRA_DATA
6
7Upstream-Status: Pending
8
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
10
11---
12 src/fpglsl/Makefile.am | 2 ++
13 src/glsl/Makefile.am | 10 ++++++++--
14 src/perf/Makefile.am | 6 ++++++
15 src/vpglsl/Makefile.am | 1 +
16 4 files changed, 17 insertions(+), 2 deletions(-)
17
18diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am
19index 47c1039f..fd43c919 100644
20--- a/src/fpglsl/Makefile.am
21+++ b/src/fpglsl/Makefile.am
22@@ -39,10 +39,12 @@ noinst_PROGRAMS = \
23 endif
24
25 EXTRA_DIST = \
26+ depth-read.glsl \
27 dowhile2.glsl \
28 dowhile.glsl \
29 forbreak.glsl \
30 for.glsl \
31+ infinite-loop.glsl \
32 mov.glsl \
33 mov-imm.glsl \
34 simpleif.glsl \
35diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
36index 4faa8dbf..079a29d8 100644
37--- a/src/glsl/Makefile.am
38+++ b/src/glsl/Makefile.am
39@@ -37,7 +37,7 @@ AM_LDFLAGS = \
40 if HAVE_GLUT
41 bin_PROGRAMS = \
42 array \
43- bezier \
44+ bezier \
45 bitmap \
46 brick \
47 bump \
48@@ -123,12 +123,16 @@ EXTRA_DIST = \
49 CH06-brick.vert \
50 CH11-bumpmap.frag \
51 CH11-bumpmap.vert \
52+ CH11-bumpmaptex.frag \
53 CH11-toyball.frag \
54 CH11-toyball.vert \
55 CH18-mandel.frag \
56 CH18-mandel.vert \
57- bezier.geom \
58+ bezier.geom \
59 brick.shtest \
60+ blinking-teapot.frag \
61+ blinking-teapot.vert \
62+ convolution.frag \
63 convolution.vert \
64 cubemap.frag \
65 mandelbrot.shtest \
66@@ -138,5 +142,7 @@ EXTRA_DIST = \
67 reflect.vert \
68 shadowtex.frag \
69 simple.vert \
70+ simplex-noise.glsl \
71 skinning.frag \
72+ skinning.vert \
73 toyball.shtest
74diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am
75index f0031fea..60069396 100644
76--- a/src/perf/Makefile.am
77+++ b/src/perf/Makefile.am
78@@ -59,3 +59,9 @@ endif
79
80 glslstateschange_LDADD = libperf.la ../util/libutil.la
81 glsl_compile_time_LDADD = ../util/libutil.la
82+
83+EXTRA_DIST = \
84+ glslstateschange1.frag \
85+ glslstateschange1.vert \
86+ glslstateschange2.frag \
87+ glslstateschange2.vert
88diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am
89index 4a85ed40..48b08f48 100644
90--- a/src/vpglsl/Makefile.am
91+++ b/src/vpglsl/Makefile.am
92@@ -44,6 +44,7 @@ EXTRA_DIST = \
93 func2.glsl \
94 ifelse.glsl \
95 if.glsl \
96+ infinite-loop.glsl \
97 mov.glsl \
98 nestedifs.glsl \
99 nestedswizzle.glsl \
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch b/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch
deleted file mode 100644
index 8a98ba60d1..0000000000
--- a/meta/recipes-graphics/mesa/mesa-demos/0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch
+++ /dev/null
@@ -1,71 +0,0 @@
1From 477ab6d90a17d8e4d3935be6ce8b8e154db0e3e5 Mon Sep 17 00:00:00 2001
2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 10 Jul 2014 14:48:12 +0200
4Subject: [PATCH] glsl, perf: Install .glsl, .vert, .frag files
5
6Upstream-Status: Pending
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8
9---
10 src/fpglsl/Makefile.am | 3 ++-
11 src/glsl/Makefile.am | 3 ++-
12 src/perf/Makefile.am | 3 ++-
13 src/vpglsl/Makefile.am | 3 ++-
14 4 files changed, 8 insertions(+), 4 deletions(-)
15
16diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am
17index fd43c919..2bf51de4 100644
18--- a/src/fpglsl/Makefile.am
19+++ b/src/fpglsl/Makefile.am
20@@ -38,7 +38,8 @@ noinst_PROGRAMS = \
21 fp-tri
22 endif
23
24-EXTRA_DIST = \
25+demosdatadir=$(datadir)/$(PACKAGE)/
26+dist_demosdata_DATA= \
27 depth-read.glsl \
28 dowhile2.glsl \
29 dowhile.glsl \
30diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
31index 079a29d8..f66ec299 100644
32--- a/src/glsl/Makefile.am
33+++ b/src/glsl/Makefile.am
34@@ -118,7 +118,8 @@ vert_or_frag_only_LDADD = ../util/libutil.la
35 vert_tex_LDADD = ../util/libutil.la
36 vsraytrace_LDADD = ../util/libutil.la
37
38-EXTRA_DIST = \
39+demosdatadir=$(datadir)/$(PACKAGE)/
40+dist_demosdata_DATA= \
41 CH06-brick.frag \
42 CH06-brick.vert \
43 CH11-bumpmap.frag \
44diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am
45index 60069396..469bdf45 100644
46--- a/src/perf/Makefile.am
47+++ b/src/perf/Makefile.am
48@@ -60,7 +60,8 @@ endif
49 glslstateschange_LDADD = libperf.la ../util/libutil.la
50 glsl_compile_time_LDADD = ../util/libutil.la
51
52-EXTRA_DIST = \
53+demosdatadir=$(datadir)/$(PACKAGE)/
54+dist_demosdata_DATA= \
55 glslstateschange1.frag \
56 glslstateschange1.vert \
57 glslstateschange2.frag \
58diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am
59index 48b08f48..55268675 100644
60--- a/src/vpglsl/Makefile.am
61+++ b/src/vpglsl/Makefile.am
62@@ -38,7 +38,8 @@ noinst_PROGRAMS = \
63 vp-tris
64 endif
65
66-EXTRA_DIST = \
67+demosdatadir=$(datadir)/$(PACKAGE)/
68+dist_demosdata_DATA= \
69 for.glsl \
70 func.glsl \
71 func2.glsl \
diff --git a/meta/recipes-graphics/mesa/mesa-demos/0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch b/meta/recipes-graphics/mesa/mesa-demos/0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch
deleted file mode 100644
index c687647407..0000000000
--- a/meta/recipes-graphics/mesa/mesa-demos/0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 3aa84c47e88a4c38446ce1323abf6f2c77389104 Mon Sep 17 00:00:00 2001
2From: Prabhu <prabhu.sundararaj@freescale.com>
3Date: Mon, 16 Nov 2015 17:09:32 -0600
4Subject: [PATCH] mesa-demos: OpenVG demos with single frame need eglSwapBuffer
5
6sp and text demos rendering single frame. to display the
7single frame rendered needed a eglSwapBuffer to diplay to window.
8Hence added eglutPostRedisplay to display the frame
9
10Upstream-Status: Pending
11
12Signed-off-by: Prabhu <prabhu.sundararaj@freescale.com>
13---
14 src/egl/openvg/sp.c | 1 +
15 src/egl/openvg/text.c | 1 +
16 2 files changed, 2 insertions(+)
17
18diff --git a/src/egl/openvg/sp.c b/src/egl/openvg/sp.c
19index a20c0a3..468e91e 100644
20--- a/src/egl/openvg/sp.c
21+++ b/src/egl/openvg/sp.c
22@@ -500,6 +500,7 @@ draw(void)
23 }
24
25 vgFlush();
26+ eglutPostRedisplay();
27 }
28
29
30diff --git a/src/egl/openvg/text.c b/src/egl/openvg/text.c
31index f5c6de8..492581c 100644
32--- a/src/egl/openvg/text.c
33+++ b/src/egl/openvg/text.c
34@@ -360,6 +360,7 @@ display(void)
35 {
36 vgClear(0, 0, width, height);
37 glyph_string_draw(10.0, 10.0);
38+ eglutPostRedisplay();
39 }
40
41
42--
432.5.1
44
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-16 12:41:38 +0000