diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-06-01 13:26:23 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-02 10:23:50 +0100 |
commit | 6bf187a6c0f9974b8fe8d5ae796d8db8004d6c04 (patch) | |
tree | 5b9ec04176ce6aa502e0a44afbc92a0d30b6523c /meta/recipes-graphics/mesa/mesa-demos/0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch | |
parent | 6560db9ddfd39a2715ede96430228306b00f53dd (diff) | |
download | poky-6bf187a6c0f9974b8fe8d5ae796d8db8004d6c04.tar.gz |
mesa-demos: update to 8.4.0
(From OE-Core rev: fa51e660345ade5256a1c566ae387914ca1c109b)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.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 | 20 |
1 files changed, 9 insertions, 11 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 index a6085754d2..a6d168175f 100644 --- 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 | |||
@@ -1,12 +1,13 @@ | |||
1 | From 0b6f95f9b8ece22e9856c150e4be29fd86eaf546 Mon Sep 17 00:00:00 2001 | 1 | From 894add34c2b5e6b4ccc78996bf681d7ec7bc9e36 Mon Sep 17 00:00:00 2001 |
2 | From: Martin Jansa <Martin.Jansa@gmail.com> | 2 | From: Martin Jansa <Martin.Jansa@gmail.com> |
3 | Date: Thu, 10 Jul 2014 14:29:27 +0200 | 3 | Date: Thu, 10 Jul 2014 14:29:27 +0200 |
4 | Subject: [PATCH 8/9] glsl, perf: Add few missing .glsl, .vert, .frag files to | 4 | Subject: [PATCH] glsl, perf: Add few missing .glsl, .vert, .frag files to |
5 | EXTRA_DATA | 5 | EXTRA_DATA |
6 | 6 | ||
7 | Upstream-Status: Pending | 7 | Upstream-Status: Pending |
8 | 8 | ||
9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | 9 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
10 | |||
10 | --- | 11 | --- |
11 | src/fpglsl/Makefile.am | 2 ++ | 12 | src/fpglsl/Makefile.am | 2 ++ |
12 | src/glsl/Makefile.am | 10 ++++++++-- | 13 | src/glsl/Makefile.am | 10 ++++++++-- |
@@ -15,7 +16,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | |||
15 | 4 files changed, 17 insertions(+), 2 deletions(-) | 16 | 4 files changed, 17 insertions(+), 2 deletions(-) |
16 | 17 | ||
17 | diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am | 18 | diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am |
18 | index 47c1039..fd43c91 100644 | 19 | index 47c1039f..fd43c919 100644 |
19 | --- a/src/fpglsl/Makefile.am | 20 | --- a/src/fpglsl/Makefile.am |
20 | +++ b/src/fpglsl/Makefile.am | 21 | +++ b/src/fpglsl/Makefile.am |
21 | @@ -39,10 +39,12 @@ noinst_PROGRAMS = \ | 22 | @@ -39,10 +39,12 @@ noinst_PROGRAMS = \ |
@@ -32,7 +33,7 @@ index 47c1039..fd43c91 100644 | |||
32 | mov-imm.glsl \ | 33 | mov-imm.glsl \ |
33 | simpleif.glsl \ | 34 | simpleif.glsl \ |
34 | diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am | 35 | diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am |
35 | index 4faa8db..079a29d 100644 | 36 | index 4faa8dbf..079a29d8 100644 |
36 | --- a/src/glsl/Makefile.am | 37 | --- a/src/glsl/Makefile.am |
37 | +++ b/src/glsl/Makefile.am | 38 | +++ b/src/glsl/Makefile.am |
38 | @@ -37,7 +37,7 @@ AM_LDFLAGS = \ | 39 | @@ -37,7 +37,7 @@ AM_LDFLAGS = \ |
@@ -71,13 +72,13 @@ index 4faa8db..079a29d 100644 | |||
71 | + skinning.vert \ | 72 | + skinning.vert \ |
72 | toyball.shtest | 73 | toyball.shtest |
73 | diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am | 74 | diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am |
74 | index 5363c58..c5cca8d 100644 | 75 | index f0031fea..60069396 100644 |
75 | --- a/src/perf/Makefile.am | 76 | --- a/src/perf/Makefile.am |
76 | +++ b/src/perf/Makefile.am | 77 | +++ b/src/perf/Makefile.am |
77 | @@ -57,3 +57,9 @@ bin_PROGRAMS = \ | 78 | @@ -59,3 +59,9 @@ endif |
78 | endif | ||
79 | 79 | ||
80 | glslstateschange_LDADD = libperf.la ../util/libutil.la | 80 | glslstateschange_LDADD = libperf.la ../util/libutil.la |
81 | glsl_compile_time_LDADD = ../util/libutil.la | ||
81 | + | 82 | + |
82 | +EXTRA_DIST = \ | 83 | +EXTRA_DIST = \ |
83 | + glslstateschange1.frag \ | 84 | + glslstateschange1.frag \ |
@@ -85,7 +86,7 @@ index 5363c58..c5cca8d 100644 | |||
85 | + glslstateschange2.frag \ | 86 | + glslstateschange2.frag \ |
86 | + glslstateschange2.vert | 87 | + glslstateschange2.vert |
87 | diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am | 88 | diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am |
88 | index 4a85ed4..48b08f4 100644 | 89 | index 4a85ed40..48b08f48 100644 |
89 | --- a/src/vpglsl/Makefile.am | 90 | --- a/src/vpglsl/Makefile.am |
90 | +++ b/src/vpglsl/Makefile.am | 91 | +++ b/src/vpglsl/Makefile.am |
91 | @@ -44,6 +44,7 @@ EXTRA_DIST = \ | 92 | @@ -44,6 +44,7 @@ EXTRA_DIST = \ |
@@ -96,6 +97,3 @@ index 4a85ed4..48b08f4 100644 | |||
96 | mov.glsl \ | 97 | mov.glsl \ |
97 | nestedifs.glsl \ | 98 | nestedifs.glsl \ |
98 | nestedswizzle.glsl \ | 99 | nestedswizzle.glsl \ |
99 | -- | ||
100 | 2.0.0 | ||
101 | |||