Gitiles
Code Review Sign In
gerrit.openbmc.org / openbmc / openbmc / 9036b819caacfa5ad9abd327b6127f0a19132eac / . / poky / meta / recipes-graphics / mesa / mesa-demos / 0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch
blob: 8a98ba60d11995ecaea067b1c73f49d0f3b5b2e3 [file] [log] [blame]
Brad Bishop15ae2502019-06-18 21:44:24 -0400[diff] [blame]1From 477ab6d90a17d8e4d3935be6ce8b8e154db0e3e5 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:48:12 +0200
Brad Bishop15ae2502019-06-18 21:44:24 -0400[diff] [blame]4Subject: [PATCH] glsl, perf: Install .glsl, .vert, .frag files
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]5
6Upstream-Status: Pending
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Brad Bishop15ae2502019-06-18 21:44:24 -0400[diff] [blame]8
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]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
Brad Bishop15ae2502019-06-18 21:44:24 -0400[diff] [blame]17index fd43c919..2bf51de4 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]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
Brad Bishop15ae2502019-06-18 21:44:24 -0400[diff] [blame]31index 079a29d8..f66ec299 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]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
Brad Bishop15ae2502019-06-18 21:44:24 -0400[diff] [blame]45index 60069396..469bdf45 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]46--- a/src/perf/Makefile.am
47+++ b/src/perf/Makefile.am
Brad Bishop15ae2502019-06-18 21:44:24 -0400[diff] [blame]48@@ -60,7 +60,8 @@ endif
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]49 glslstateschange_LDADD = libperf.la ../util/libutil.la
Brad Bishop15ae2502019-06-18 21:44:24 -0400[diff] [blame]50 glsl_compile_time_LDADD = ../util/libutil.la
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]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
Brad Bishop15ae2502019-06-18 21:44:24 -0400[diff] [blame]59index 48b08f48..55268675 100644
Patrick Williamsc124f4f2015-09-15 14:41:29 -0500[diff] [blame]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 \