diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2022-06-06 14:01:10 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-06-07 21:21:54 +0100 |
commit | 547b0b0943e9f6db543ef3ea172b8f37581f524f (patch) | |
tree | 588b215b2653119f0b48e0d2c0e2712627652440 /meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch | |
parent | c13a21782b572038b5a6f4229882f2b992741b79 (diff) | |
download | poky-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/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch')
-rw-r--r-- | meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch | 99 |
1 files changed, 0 insertions, 99 deletions
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 @@ | |||
1 | From 894add34c2b5e6b4ccc78996bf681d7ec7bc9e36 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | ||
3 | Date: Thu, 10 Jul 2014 14:29:27 +0200 | ||
4 | Subject: [PATCH] glsl, perf: Add few missing .glsl, .vert, .frag files to | ||
5 | EXTRA_DATA | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Signed-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 | |||
18 | diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am | ||
19 | index 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 \ | ||
35 | diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am | ||
36 | index 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 | ||
74 | diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am | ||
75 | index 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 | ||
88 | diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am | ||
89 | index 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 \ | ||