Gitiles
Code Review Sign In
gerrit.openbmc.org / mdmillerii / openbmc / cf71ae0b18d0526b54d167139d6ea092655d2dd4 / . / poky / meta / recipes-graphics / mesa / mesa-demos / 0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch
blob: a6d168175ffe72f39fa87a356c4e84c27e84f905 [file] [log] [blame]
Brad Bishop15ae2502019-06-18 21:44:24 -0400[diff] [blame]1From 894add34c2b5e6b4ccc78996bf681d7ec7bc9e36 Mon Sep 17 00:00:00 2001
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]2From: Martin Jansa <Martin.Jansa@gmail.com>
3Date: Thu, 10 Jul 2014 14:29:27 +0200
Brad Bishop15ae2502019-06-18 21:44:24 -0400[diff] [blame]4Subject: [PATCH] glsl, perf: Add few missing .glsl, .vert, .frag files to
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]5 EXTRA_DATA
6
7Upstream-Status: Pending
8
9Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Brad Bishop15ae2502019-06-18 21:44:24 -0400[diff] [blame]10
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]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
Brad Bishop15ae2502019-06-18 21:44:24 -0400[diff] [blame]19index 47c1039f..fd43c919 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]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
Brad Bishop15ae2502019-06-18 21:44:24 -0400[diff] [blame]36index 4faa8dbf..079a29d8 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]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
Brad Bishop15ae2502019-06-18 21:44:24 -0400[diff] [blame]75index f0031fea..60069396 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]76--- a/src/perf/Makefile.am
77+++ b/src/perf/Makefile.am
Brad Bishop15ae2502019-06-18 21:44:24 -0400[diff] [blame]78@@ -59,3 +59,9 @@ endif
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]79
80 glslstateschange_LDADD = libperf.la ../util/libutil.la
Brad Bishop15ae2502019-06-18 21:44:24 -0400[diff] [blame]81 glsl_compile_time_LDADD = ../util/libutil.la
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]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
Brad Bishop15ae2502019-06-18 21:44:24 -0400[diff] [blame]89index 4a85ed40..48b08f48 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]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 \