code.ossystems Code Review - openembedded-core.git/blob

   1 From 0b6f95f9b8ece22e9856c150e4be29fd86eaf546 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 8/9] 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  src/fpglsl/Makefile.am |  2 ++
  12  src/glsl/Makefile.am   | 10 ++++++++--
  13  src/perf/Makefile.am   |  6 ++++++
  14  src/vpglsl/Makefile.am |  1 +
  15  4 files changed, 17 insertions(+), 2 deletions(-)
  16
  17 diff --git a/src/fpglsl/Makefile.am b/src/fpglsl/Makefile.am
  18 index 47c1039..fd43c91 100644
  19 --- a/src/fpglsl/Makefile.am
  20 +++ b/src/fpglsl/Makefile.am
  21 @@ -39,10 +39,12 @@ noinst_PROGRAMS = \
  22  endif
  23
  24  EXTRA_DIST = \
  25 +       depth-read.glsl \
  26         dowhile2.glsl \
  27         dowhile.glsl \
  28         forbreak.glsl \
  29         for.glsl \
  30 +       infinite-loop.glsl \
  31         mov.glsl \
  32         mov-imm.glsl \
  33         simpleif.glsl \
  34 diff --git a/src/glsl/Makefile.am b/src/glsl/Makefile.am
  35 index 4faa8db..079a29d 100644
  36 --- a/src/glsl/Makefile.am
  37 +++ b/src/glsl/Makefile.am
  38 @@ -37,7 +37,7 @@ AM_LDFLAGS = \
  39  if HAVE_GLUT
  40  bin_PROGRAMS = \
  41         array \
  42 -        bezier \
  43 +       bezier \
  44         bitmap \
  45         brick \
  46         bump \
  47 @@ -123,12 +123,16 @@ EXTRA_DIST = \
  48         CH06-brick.vert \
  49         CH11-bumpmap.frag \
  50         CH11-bumpmap.vert \
  51 +       CH11-bumpmaptex.frag \
  52         CH11-toyball.frag \
  53         CH11-toyball.vert \
  54         CH18-mandel.frag \
  55         CH18-mandel.vert \
  56 -        bezier.geom \
  57 +       bezier.geom \
  58         brick.shtest \
  59 +       blinking-teapot.frag \
  60 +       blinking-teapot.vert \
  61 +       convolution.frag \
  62         convolution.vert \
  63         cubemap.frag \
  64         mandelbrot.shtest \
  65 @@ -138,5 +142,7 @@ EXTRA_DIST = \
  66         reflect.vert \
  67         shadowtex.frag \
  68         simple.vert \
  69 +       simplex-noise.glsl \
  70         skinning.frag \
  71 +       skinning.vert \
  72         toyball.shtest
  73 diff --git a/src/perf/Makefile.am b/src/perf/Makefile.am
  74 index 5363c58..c5cca8d 100644
  75 --- a/src/perf/Makefile.am
  76 +++ b/src/perf/Makefile.am
  77 @@ -57,3 +57,9 @@ bin_PROGRAMS = \
  78  endif
  79
  80  glslstateschange_LDADD = libperf.la ../util/libutil.la
  81 +
  82 +EXTRA_DIST = \
  83 +       glslstateschange1.frag \
  84 +       glslstateschange1.vert \
  85 +       glslstateschange2.frag \
  86 +       glslstateschange2.vert
  87 diff --git a/src/vpglsl/Makefile.am b/src/vpglsl/Makefile.am
  88 index 4a85ed4..48b08f4 100644
  89 --- a/src/vpglsl/Makefile.am
  90 +++ b/src/vpglsl/Makefile.am
  91 @@ -44,6 +44,7 @@ EXTRA_DIST = \
  92         func2.glsl \
  93         ifelse.glsl \
  94         if.glsl \
  95 +       infinite-loop.glsl \
  96         mov.glsl \
  97         nestedifs.glsl \
  98         nestedswizzle.glsl \
  99 --
 100 2.0.0
 101