]> git.pld-linux.org Git - packages/vulkan-sdk.git/blame - system_glslang.patch
projects / packages / vulkan-sdk.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
preparing version 1.0.8
[packages/vulkan-sdk.git] / system_glslang.patch
CommitLineData
37fbe15c
JK		 1diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/CMakeLists.txt vulkan-sdk-1.0.5.0/VulkanTools/CMakeLists.txt
2--- vulkan-sdk-1.0.5.0.orig/VulkanTools/CMakeLists.txt 2016-03-12 00:47:34.000000000 +0100
3+++ vulkan-sdk-1.0.5.0/VulkanTools/CMakeLists.txt 2016-03-12 20:42:39.011470974 +0100
4@@ -90,7 +90,7 @@
862291f5 5
37fbe15c 6 if (BUILD_ICD OR BUILD_TESTS)
862291f5
JK		 7 # Hard code our glslang path for now
8- get_filename_component(GLSLANG_PREFIX ../glslang ABSOLUTE)
9+ set(GLSLANG_PREFIX /usr/include/glslang)
10
11 if(NOT EXISTS ${GLSLANG_PREFIX})
12 message(FATAL_ERROR "Necessary glslang components do not exist: " ${GLSLANG_PREFIX})
37fbe15c
JK		 13diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/demos/CMakeLists.txt vulkan-sdk-1.0.5.0/VulkanTools/demos/CMakeLists.txt
14--- vulkan-sdk-1.0.5.0.orig/VulkanTools/demos/CMakeLists.txt 2016-03-12 00:47:34.000000000 +0100
15+++ vulkan-sdk-1.0.5.0/VulkanTools/demos/CMakeLists.txt 2016-03-12 20:42:39.011470974 +0100
862291f5
JK		 16@@ -28,45 +28,45 @@
17 endif()
18
19 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
20- COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.vert
21+ COMMAND glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.vert
22 COMMAND move vert.spv ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
23- DEPENDS tri.vert ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
24+ DEPENDS tri.vert
25 )
26 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-frag.spv
27- COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.frag
28+ COMMAND glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/tri.frag
29 COMMAND move frag.spv ${CMAKE_BINARY_DIR}/demos/tri-frag.spv
30- DEPENDS tri.frag ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
31+ DEPENDS tri.frag
32 )
33 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
34- COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.vert
35+ COMMAND glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.vert
36 COMMAND move vert.spv ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
37- DEPENDS cube.vert ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
38+ DEPENDS cube.vert
39 )
40 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
41- COMMAND ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.frag
42+ COMMAND glslangValidator -s -V ${PROJECT_SOURCE_DIR}/demos/cube.frag
43 COMMAND move frag.spv ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
44- DEPENDS cube.frag ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/bin/glslangValidator
45+ DEPENDS cube.frag
46 )
47 file(COPY cube.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
48 file(COPY tri.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
49 file(COPY vulkaninfo.vcxproj.user DESTINATION ${CMAKE_BINARY_DIR}/demos)
50 else()
51 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-vert.spv
52- COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o tri-vert.spv ${PROJECT_SOURCE_DIR}/demos/tri.vert
53- DEPENDS tri.vert ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
54+ COMMAND glslangValidator -s -V -o tri-vert.spv ${PROJECT_SOURCE_DIR}/demos/tri.vert
55+ DEPENDS tri.vert
56 )
57 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/tri-frag.spv
58- COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o tri-frag.spv ${PROJECT_SOURCE_DIR}/demos/tri.frag
59- DEPENDS tri.frag ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
60+ COMMAND glslangValidator -s -V -o tri-frag.spv ${PROJECT_SOURCE_DIR}/demos/tri.frag
61+ DEPENDS tri.frag
62 )
63 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-vert.spv
64- COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o cube-vert.spv ${PROJECT_SOURCE_DIR}/demos/cube.vert
65- DEPENDS cube.vert ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
66+ COMMAND glslangValidator -s -V -o cube-vert.spv ${PROJECT_SOURCE_DIR}/demos/cube.vert
67+ DEPENDS cube.vert
68 )
69
70 add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/demos/cube-frag.spv
71- COMMAND ${GLSLANG_PREFIX}/build/install/bin/glslangValidator -s -V -o cube-frag.spv ${PROJECT_SOURCE_DIR}/demos/cube.frag
72- DEPENDS cube.frag ${GLSLANG_PREFIX}/build/install/bin/glslangValidator
73+ COMMAND glslangValidator -s -V -o cube-frag.spv ${PROJECT_SOURCE_DIR}/demos/cube.frag
74+ DEPENDS cube.frag
75 )
76 endif()
77
37fbe15c
JK		 78diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/demos/smoke/CMakeLists.txt vulkan-sdk-1.0.5.0/VulkanTools/demos/smoke/CMakeLists.txt
79--- vulkan-sdk-1.0.5.0.orig/VulkanTools/demos/smoke/CMakeLists.txt 2016-03-12 00:47:34.000000000 +0100
80+++ vulkan-sdk-1.0.5.0/VulkanTools/demos/smoke/CMakeLists.txt 2016-03-12 20:42:39.011470974 +0100
81@@ -1,4 +1,4 @@
82-set(GLSLANG_VALIDATOR ${GLSLANG_PREFIX}/build/install/bin/glslangValidator)
83+set(GLSLANG_VALIDATOR glslangValidator)
84 set (GLMINC_PREFIX ${PROJECT_SOURCE_DIR}/libs)
862291f5 85
37fbe15c
JK		 86 macro(generate_dispatch_table out)
87@@ -11,7 +11,7 @@
88 macro(glsl_to_spirv src)
89 add_custom_command(OUTPUT ${src}.h
90 COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/glsl-to-spirv ${CMAKE_CURRENT_SOURCE_DIR}/${src} ${src}.h ${GLSLANG_VALIDATOR}
91- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/glsl-to-spirv ${CMAKE_CURRENT_SOURCE_DIR}/${src} ${GLSLANG_VALIDATOR}
92+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/glsl-to-spirv ${CMAKE_CURRENT_SOURCE_DIR}/${src}
93 )
94 endmacro()
0c2b688d 95
37fbe15c
JK		 96diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/demos/smoke/glsl-to-spirv vulkan-sdk-1.0.5.0/VulkanTools/demos/smoke/glsl-to-spirv
97--- vulkan-sdk-1.0.5.0.orig/VulkanTools/demos/smoke/glsl-to-spirv 2016-03-12 00:47:34.000000000 +0100
98+++ vulkan-sdk-1.0.5.0/VulkanTools/demos/smoke/glsl-to-spirv 2016-03-12 20:42:39.011470974 +0100
99@@ -38,7 +38,7 @@
100 in_filename = sys.argv[1]
101 out_filename = sys.argv[2] if len(sys.argv) > 2 else None
102 validator = sys.argv[3] if len(sys.argv) > 3 else \
103- "../../../glslang/build/install/bin/glslangValidator"
104+ "glslangValidator"
0c2b688d 105
37fbe15c
JK		 106 def identifierize(s):
107 # translate invalid chars
108diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/icd/intel/compiler/CMakeLists.txt vulkan-sdk-1.0.5.0/VulkanTools/icd/intel/compiler/CMakeLists.txt
109--- vulkan-sdk-1.0.5.0.orig/VulkanTools/icd/intel/compiler/CMakeLists.txt 2016-03-12 00:47:34.000000000 +0100
110+++ vulkan-sdk-1.0.5.0/VulkanTools/icd/intel/compiler/CMakeLists.txt 2016-03-12 20:42:44.144824665 +0100
0c2b688d
JK		 111@@ -38,15 +38,6 @@
112 message(FATAL_ERROR "llvm-config failed: " ${LLVM_LIBS_RESULT})
113 endif()
114
115-# Expect libraries to be in either the build (release build) or dbuild (debug) directories
116-if(EXISTS ${GLSLANG_PREFIX}/${BUILDTGT_DIR}/install/lib)
117- set(GLSLANG_BUILD ${GLSLANG_PREFIX}/${BUILDTGT_DIR})
118-elseif(EXISTS ${GLSLANG_PREFIX}/dbuild/install/lib)
119- set(GLSLANG_BUILD ${GLSLANG_PREFIX}/dbuild)
120-else()
121- message(FATAL_ERROR "Necessary glslang libraries cannot be found: " ${GLSLANG_PREFIX})
122-endif()
123-
124 if(EXISTS ${LUNARGLASS_PREFIX}/${BUILDTGT_DIR}/install/lib)
125 set(LUNARGLASS_BUILD ${LUNARGLASS_PREFIX}/${BUILDTGT_DIR})
126 elseif(EXISTS ${LUNARGLASS_PREFIX}/dbuild/install/lib)
127@@ -75,7 +66,6 @@
128 COMPILE_FLAGS "${LLVM_CXX_CONFIG}")
129
130 SET(COMPILER_LINK_DIRS
131- -L${GLSLANG_BUILD}/install/lib
132 -L${LUNARGLASS_PREFIX}/Core/LLVM/llvm-3.4/${BUILDTGT_DIR}/install/usr/local/lib
133 -L${LUNARGLASS_PREFIX}/${BUILDTGT_DIR}/Core
134 -L${LUNARGLASS_PREFIX}/${BUILDTGT_DIR}/Frontends/glslang
135@@ -121,9 +111,9 @@
136 set_target_properties(SpvFrontend PROPERTIES IMPORTED_LOCATION ${LUNARGLASS_PREFIX}/${BUILDTGT_DIR}/Frontends/SPIRV/libSpvFrontend.a)
137 set_target_properties(core PROPERTIES IMPORTED_LOCATION ${LUNARGLASS_PREFIX}/${BUILDTGT_DIR}/Core/libcore.a)
138 set_target_properties(LLVMipo PROPERTIES IMPORTED_LOCATION ${LUNARGLASS_PREFIX}/Core/LLVM/llvm-3.4/${BUILDTGT_DIR}/install/usr/local/lib/libLLVMipo.a)
139-set_target_properties(glslang PROPERTIES IMPORTED_LOCATION ${GLSLANG_BUILD}/install/lib/libglslang.a)
140-set_target_properties(SPIRV PROPERTIES IMPORTED_LOCATION ${GLSLANG_BUILD}/install/lib/libSPIRV.a)
141-set_target_properties(OGLCompiler PROPERTIES IMPORTED_LOCATION ${GLSLANG_BUILD}/install/lib/libOGLCompiler.a)
142+set_target_properties(glslang PROPERTIES IMPORTED_LOCATION ${CMAKE_INSTALL_LIBDIR}/libglslang.a)
143+set_target_properties(SPIRV PROPERTIES IMPORTED_LOCATION ${CMAKE_INSTALL_LIBDIR}/libSPIRV.a)
144+set_target_properties(OGLCompiler PROPERTIES IMPORTED_LOCATION ${CMAKE_INSTALL_LIBDIR}/libOGLCompiler.a)
145
146 SET(COMPILER_INCLUDE_DIRS
147 ${GLSLANG_PREFIX}
37fbe15c
JK		 148diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/layers/CMakeLists.txt vulkan-sdk-1.0.5.0/VulkanTools/layers/CMakeLists.txt
149--- vulkan-sdk-1.0.5.0.orig/VulkanTools/layers/CMakeLists.txt 2016-03-12 00:47:34.000000000 +0100
150+++ vulkan-sdk-1.0.5.0/VulkanTools/layers/CMakeLists.txt 2016-03-12 20:42:39.011470974 +0100
151@@ -99,7 +99,7 @@
152 ${CMAKE_CURRENT_SOURCE_DIR}/../loader
153 ${CMAKE_CURRENT_SOURCE_DIR}/../include/vulkan
154 ${CMAKE_CURRENT_BINARY_DIR}
155- ${PROJECT_SOURCE_DIR}/../glslang/SPIRV
156+ /usr/include/glslang/SPIRV
157 )
158
159 if (WIN32)
160diff -dur -x '*.orig' -x '*.rej' vulkan-sdk-1.0.5.0.orig/VulkanTools/tests/CMakeLists.txt vulkan-sdk-1.0.5.0/VulkanTools/tests/CMakeLists.txt
161--- vulkan-sdk-1.0.5.0.orig/VulkanTools/tests/CMakeLists.txt 2016-03-12 00:47:34.000000000 +0100
162+++ vulkan-sdk-1.0.5.0/VulkanTools/tests/CMakeLists.txt 2016-03-12 20:42:39.014804320 +0100
0c2b688d
JK		 163@@ -78,13 +78,13 @@
164 IMPORTED_LOCATION_DEBUG "${GLSLANG_PREFIX}/${BUILDTGT_DIR}/SPIRV/Debug/SPIRV.lib")
165 else ()
166 set_target_properties(glslang PROPERTIES
167- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libglslang.a")
168+ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libglslang.a")
169 set_target_properties(OGLCompiler PROPERTIES
170- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libOGLCompiler.a")
171+ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libOGLCompiler.a")
172 set_target_properties(OSDependent PROPERTIES
173- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libOSDependent.a")
174+ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libOSDependent.a")
175 set_target_properties(SPIRV PROPERTIES
176- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libSPIRV.a")
177+ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libSPIRV.a")
178 endif()
179
37fbe15c 180 include_directories(
LunarG Vulkan SDK
This page took 0.120926 seconds and 4 git commands to generate.