]> 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
Release: 1
[packages/vulkan-sdk.git] / system_glslang.patch
CommitLineData
862291f5
JK		 1diff -dur Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0.orig/CMakeLists.txt Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0/CMakeLists.txt
2--- Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0.orig/CMakeLists.txt 2016-02-14 02:19:50.000000000 +0100
3+++ Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0/CMakeLists.txt 2016-02-19 22:36:04.792275587 +0100
4@@ -72,7 +72,7 @@
5
6 if (BUILD_TESTS)
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})
13diff -dur Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0.orig/demos/CMakeLists.txt Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0/demos/CMakeLists.txt
14--- Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0.orig/demos/CMakeLists.txt 2016-02-14 02:19:50.000000000 +0100
15+++ Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0/demos/CMakeLists.txt 2016-02-19 22:36:04.792275587 +0100
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
78diff -dur Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0.orig/layers/CMakeLists.txt Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0/layers/CMakeLists.txt
79--- Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0.orig/layers/CMakeLists.txt 2016-02-14 02:19:50.000000000 +0100
80+++ Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0/layers/CMakeLists.txt 2016-02-19 22:37:15.242851047 +0100
81@@ -26,7 +26,7 @@
82 VkLayer_device_limits
83 )
84
85-set(VK_LAYER_RPATH /usr/lib/x86_64-linux-gnu/vulkan/layer:/usr/lib/i386-linux-gnu/vulkan/layer)
86+set(VK_LAYER_RPATH "${CMAKE_INSTALL_LIBDIR}/vulkan/layer")
87 set(CMAKE_INSTALL_RPATH ${VK_LAYER_RPATH})
88
89 if (NOT WIN32)
90@@ -79,7 +79,7 @@
91 ${CMAKE_CURRENT_SOURCE_DIR}/../loader
92 ${CMAKE_CURRENT_SOURCE_DIR}/../include/vulkan
93 ${CMAKE_CURRENT_BINARY_DIR}
94- ${PROJECT_SOURCE_DIR}/../glslang/SPIRV
95+ /usr/include/glslang/SPIRV
96 )
97
98 if (WIN32)
99diff -dur Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0.orig/tests/CMakeLists.txt Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0/tests/CMakeLists.txt
100--- Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0.orig/tests/CMakeLists.txt 2016-02-14 02:19:50.000000000 +0100
101+++ Vulkan-LoaderAndValidationLayers-windows-rt-1.0.3.0/tests/CMakeLists.txt 2016-02-19 22:36:04.792275587 +0100
102@@ -67,13 +67,13 @@
103 IMPORTED_LOCATION_DEBUG "${GLSLANG_PREFIX}/${BUILDTGT_DIR}/SPIRV/Debug/SPIRV.lib")
104 else ()
105 set_target_properties(glslang PROPERTIES
106- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libglslang.a")
107+ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libglslang.a")
108 set_target_properties(OGLCompiler PROPERTIES
109- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libOGLCompiler.a")
110+ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libOGLCompiler.a")
111 set_target_properties(OSDependent PROPERTIES
112- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libOSDependent.a")
113+ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libOSDependent.a")
114 set_target_properties(SPIRV PROPERTIES
115- IMPORTED_LOCATION "${GLSLANG_PREFIX}/build/install/lib/libSPIRV.a")
116+ IMPORTED_LOCATION "${CMAKE_INSTALL_LIBDIR}/libSPIRV.a")
117 endif()
118
119 include_directories(
LunarG Vulkan SDK
This page took 0.037042 seconds and 4 git commands to generate.