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