[gtk+] gsk: Don't use wildcards
- From: Benjamin Otte <otte src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] gsk: Don't use wildcards
- Date: Fri, 6 Jan 2017 15:32:22 +0000 (UTC)
commit 833607c19ed6cf3779e12f3cf3b1eae734b48425
Author: Benjamin Otte <otte redhat com>
Date: Thu Jan 5 13:37:58 2017 +0100
gsk: Don't use wildcards
Explicitly list all the shaders, so new ones get picked up properly and
cause the resource file to be regenerated (due to Makefile.am changing).
gsk/Makefile.am | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 deletions(-)
---
diff --git a/gsk/Makefile.am b/gsk/Makefile.am
index 21058c0..2a309ef 100644
--- a/gsk/Makefile.am
+++ b/gsk/Makefile.am
@@ -56,7 +56,30 @@ gsk_private_vulkan_source_c = \
gskvulkanrenderpass.c \
gskvulkanshader.c
gsk_private_vulkan_shaders = \
- resources/vulkan/*.glsl
+ resources/vulkan/blend-clip.frag.glsl \
+ resources/vulkan/blend-clip-rounded.frag.glsl \
+ resources/vulkan/blend-clip-rounded.vert.glsl \
+ resources/vulkan/blend-clip.vert.glsl \
+ resources/vulkan/blend.frag.glsl \
+ resources/vulkan/blend.vert.glsl \
+ resources/vulkan/color-clip.frag.glsl \
+ resources/vulkan/color-clip-rounded.frag.glsl \
+ resources/vulkan/color-clip-rounded.vert.glsl \
+ resources/vulkan/color-clip.vert.glsl \
+ resources/vulkan/color.frag.glsl \
+ resources/vulkan/color.vert.glsl \
+ resources/vulkan/color-matrix-clip.frag.glsl \
+ resources/vulkan/color-matrix-clip-rounded.frag.glsl \
+ resources/vulkan/color-matrix-clip-rounded.vert.glsl \
+ resources/vulkan/color-matrix-clip.vert.glsl \
+ resources/vulkan/color-matrix.frag.glsl \
+ resources/vulkan/color-matrix.vert.glsl \
+ resources/vulkan/linear-clip.frag.glsl \
+ resources/vulkan/linear-clip-rounded.frag.glsl \
+ resources/vulkan/linear-clip-rounded.vert.glsl \
+ resources/vulkan/linear-clip.vert.glsl \
+ resources/vulkan/linear.frag.glsl \
+ resources/vulkan/linear.vert.glsl
gsk_private_vulkan_compiled_shaders = \
$(gsk_private_vulkan_shaders:.glsl=.spv)
endif
@@ -84,7 +107,16 @@ gsk_private_source_h = \
gskshaderbuilderprivate.h \
gsktextureprivate.h
gsk_private_source_shaders = \
- resources/glsl/*.glsl
+ resources/glsl/blend.fs.glsl \
+ resources/glsl/blend.vs.glsl \
+ resources/glsl/blit.fs.glsl \
+ resources/glsl/blit.vs.glsl \
+ resources/glsl/es2_common.fs.glsl \
+ resources/glsl/es2_common.vs.glsl \
+ resources/glsl/gl3_common.fs.glsl \
+ resources/glsl/gl3_common.vs.glsl \
+ resources/glsl/gl_common.fs.glsl \
+ resources/glsl/gl_common.vs.glsl
gsk_public_source_c = \
gskrenderer.c \
gskrendernode.c \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]