From e068e7c22707273fd08971e1e16f5415f6d742b5 Mon Sep 17 00:00:00 2001 From: leigh123linux Date: Dec 02 2016 15:26:26 +0000 Subject: Update to latest git --- diff --git a/.gitignore b/.gitignore index 21aca76..58a0379 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /SPIRV-Tools-*.tar.gz /Vulkan-LoaderAndValidationLayers-sdk-*.tar.gz /vulkan-*.src.rpm +/Vulkan-LoaderAndValidationLayers-d4cd34fd49caa759cf01cafa5fa271401b17c3b9.tar.gz diff --git a/0004-layers-Install-to-CMAKE_INSTALL_LIBDIR.patch b/0004-layers-Install-to-CMAKE_INSTALL_LIBDIR.patch deleted file mode 100644 index 3007686..0000000 --- a/0004-layers-Install-to-CMAKE_INSTALL_LIBDIR.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/layers/CMakeLists.txt -+++ b/layers/CMakeLists.txt -@@ -91,7 +91,7 @@ - target_link_Libraries(VkLayer_${target} VkLayer_utils) - add_dependencies(VkLayer_${target} generate_dispatch_table_helper generate_vk_layer_helpers generate_enum_string_helper VkLayer_utils) - set_target_properties(VkLayer_${target} PROPERTIES LINK_FLAGS "-Wl,-Bsymbolic,--exclude-libs,ALL") -- install(TARGETS VkLayer_${target} DESTINATION lib) -+ install(TARGETS VkLayer_${target} DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endmacro() - endif() - -@@ -184,7 +184,7 @@ - add_library(VkLayer_utils STATIC vk_layer_config.cpp vk_layer_extension_utils.cpp vk_layer_utils.cpp) - else() - add_library(VkLayer_utils SHARED vk_layer_config.cpp vk_layer_extension_utils.cpp vk_layer_utils.cpp) -- install(TARGETS VkLayer_utils DESTINATION lib) -+ install(TARGETS VkLayer_utils DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - - add_vk_layer(core_validation core_validation.cpp vk_layer_table.cpp vk_safe_struct.cpp descriptor_sets.cpp) - diff --git a/0005-loader-Add-install-rule.patch b/0005-loader-Add-install-rule.patch deleted file mode 100644 index f1e10e3..0000000 --- a/0005-loader-Add-install-rule.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/loader/CMakeLists.txt -+++ b/loader/CMakeLists.txt -@@ -85,5 +85,5 @@ - add_library(vulkan SHARED ${LOADER_SRCS}) - set_target_properties(vulkan PROPERTIES SOVERSION "1" VERSION "1.0.30") - target_link_libraries(vulkan -ldl -lpthread -lm) -- install(TARGETS vulkan LIBRARY DESTINATION lib) -+ install(TARGETS vulkan LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) - endif() - diff --git a/0007-demos-Read-from-installed-paths.patch b/0007-demos-Read-from-installed-paths.patch deleted file mode 100644 index a1fa8c1..0000000 --- a/0007-demos-Read-from-installed-paths.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/demos/cube.c -+++ b/demos/cube.c -@@ -129,7 +129,7 @@ - int32_t tex_width, tex_height; - }; - --static char *tex_files[] = {"lunarg.ppm"}; -+static char *tex_files[] = {"/usr/share/vulkan/cube.ppm"}; - - static int validation_error = 0; - -@@ -1536,7 +1536,7 @@ - void *vertShaderCode; - size_t size; - -- vertShaderCode = demo_read_spv("cube-vert.spv", &size); -+ vertShaderCode = demo_read_spv("/usr/share/vulkan/cube-vert.spv", &size); - - demo->vert_shader_module = - demo_prepare_shader_module(demo, vertShaderCode, size); -@@ -1561,7 +1561,7 @@ - void *fragShaderCode; - size_t size; - -- fragShaderCode = demo_read_spv("cube-frag.spv", &size); -+ fragShaderCode = demo_read_spv("/usr/share/vulkan/cube-frag.spv", &size); - - demo->frag_shader_module = - demo_prepare_shader_module(demo, fragShaderCode, size); - ---- a/demos/tri.c -+++ b/demos/tri.c -@@ -1302,7 +1302,7 @@ - void *vertShaderCode; - size_t size = 0; - -- vertShaderCode = demo_read_spv("tri-vert.spv", &size); -+ vertShaderCode = demo_read_spv("/usr/share/vulkan/tri-vert.spv", &size); - - demo->vert_shader_module = - demo_prepare_shader_module(demo, vertShaderCode, size); -@@ -1327,7 +1327,7 @@ - void *fragShaderCode; - size_t size; - -- fragShaderCode = demo_read_spv("tri-frag.spv", &size); -+ fragShaderCode = demo_read_spv("/usr/share/vulkan/tri-frag.spv", &size); - - demo->frag_shader_module = - demo_prepare_shader_module(demo, fragShaderCode, size); - diff --git a/0008-demos-Don-t-build-tri-or-cube.patch b/0008-demos-Don-t-build-tri-or-cube.patch index d389795..79ce95b 100644 --- a/0008-demos-Don-t-build-tri-or-cube.patch +++ b/0008-demos-Don-t-build-tri-or-cube.patch @@ -2,7 +2,7 @@ +++ b/demos/CMakeLists.txt @@ -23,47 +23,6 @@ elseif(UNIX) - set (LIBRARIES "vulkan") + set (LIBRARIES "${API_LOWERCASE}") else() -endif() - @@ -48,9 +48,9 @@ endif() if(NOT WIN32) -@@ -95,41 +54,6 @@ - add_executable(vulkaninfo vulkaninfo.c) - target_link_libraries(vulkaninfo ${LIBRARIES}) +@@ -95,44 +54,6 @@ + add_executable(${API_LOWERCASE}info vulkaninfo.c) + target_link_libraries(${API_LOWERCASE}info ${LIBRARIES}) -if(NOT WIN32) - if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}) @@ -84,10 +84,13 @@ - target_link_libraries(cubepp ${LIBRARIES}) -endif() - --if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR}) -- add_subdirectory(smoke) +-if ((${CMAKE_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_HOST_SYSTEM_PROCESSOR})) +- if (BUILD_WSI_XCB_SUPPORT OR BUILD_WSI_WAYLAND_SUPPORT OR WIN32 OR (CMAKE_SYSTEM_NAME STREQUAL "Android")) +- add_subdirectory(smoke) +- endif() -endif() - +- if(UNIX) - install(TARGETS vulkaninfo DESTINATION bin) + install(TARGETS ${API_LOWERCASE}info DESTINATION ${CMAKE_INSTALL_BINDIR}) + endif() diff --git a/5338f69a0a3dcc8527d81ca5f936b0e066a3d7f7.patch b/5338f69a0a3dcc8527d81ca5f936b0e066a3d7f7.patch deleted file mode 100644 index b81cac1..0000000 --- a/5338f69a0a3dcc8527d81ca5f936b0e066a3d7f7.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 5338f69a0a3dcc8527d81ca5f936b0e066a3d7f7 Mon Sep 17 00:00:00 2001 -From: Karl Schultz -Date: Thu, 3 Nov 2016 12:31:41 -0600 -Subject: [PATCH] layers: GH1115 Add missing VK_LAYER_EXPORT decorations - -Functions in the vk_layer_extension_utils file were -not getting exported correctly. - -Change-Id: If1bf6456cb8e79a1b6292ea76bd72e3e89a2b430 ---- - layers/vk_layer_extension_utils.cpp | 8 ++++---- - layers/vk_layer_extension_utils.h | 8 ++++---- - 2 files changed, 8 insertions(+), 8 deletions(-) - -diff --git a/layers/vk_layer_extension_utils.cpp b/layers/vk_layer_extension_utils.cpp -index bd778e9..4c1e396 100644 ---- a/layers/vk_layer_extension_utils.cpp -+++ b/layers/vk_layer_extension_utils.cpp -@@ -27,8 +27,8 @@ - * This file contains utility functions for layers - */ - --VkResult util_GetExtensionProperties(const uint32_t count, const VkExtensionProperties *layer_extensions, uint32_t *pCount, -- VkExtensionProperties *pProperties) { -+VK_LAYER_EXPORT VkResult util_GetExtensionProperties(const uint32_t count, const VkExtensionProperties *layer_extensions, -+ uint32_t *pCount, VkExtensionProperties *pProperties) { - uint32_t copy_size; - - if (pProperties == NULL || layer_extensions == NULL) { -@@ -46,8 +46,8 @@ VkResult util_GetExtensionProperties(const uint32_t count, const VkExtensionProp - return VK_SUCCESS; - } - --VkResult util_GetLayerProperties(const uint32_t count, const VkLayerProperties *layer_properties, uint32_t *pCount, -- VkLayerProperties *pProperties) { -+VK_LAYER_EXPORT VkResult util_GetLayerProperties(const uint32_t count, const VkLayerProperties *layer_properties, uint32_t *pCount, -+ VkLayerProperties *pProperties) { - uint32_t copy_size; - - if (pProperties == NULL || layer_properties == NULL) { -diff --git a/layers/vk_layer_extension_utils.h b/layers/vk_layer_extension_utils.h -index 0f249b7..b593768 100644 ---- a/layers/vk_layer_extension_utils.h -+++ b/layers/vk_layer_extension_utils.h -@@ -30,11 +30,11 @@ - */ - extern "C" { - --VkResult util_GetExtensionProperties(const uint32_t count, const VkExtensionProperties *layer_extensions, uint32_t *pCount, -- VkExtensionProperties *pProperties); -+VK_LAYER_EXPORT VkResult util_GetExtensionProperties(const uint32_t count, const VkExtensionProperties *layer_extensions, -+ uint32_t *pCount, VkExtensionProperties *pProperties); - --VkResult util_GetLayerProperties(const uint32_t count, const VkLayerProperties *layer_properties, uint32_t *pCount, -- VkLayerProperties *pProperties); -+VK_LAYER_EXPORT VkResult util_GetLayerProperties(const uint32_t count, const VkLayerProperties *layer_properties, uint32_t *pCount, -+ VkLayerProperties *pProperties); - - } // extern "C" - #endif // LAYER_EXTENSION_UTILS_H diff --git a/demos-add-install-rule.patch b/demos-add-install-rule.patch deleted file mode 100644 index d6da289..0000000 --- a/demos-add-install-rule.patch +++ /dev/null @@ -1,9 +0,0 @@ -Description: Add an install rule for vulkaninfo ---- a/demos/CMakeLists.txt -+++ b/demos/CMakeLists.txt -@@ -114,4 +114,5 @@ endif() - - add_executable(vulkaninfo vulkaninfo.c) - target_link_libraries(vulkaninfo ${LIBRARIES}) -+install(TARGETS vulkaninfo RUNTIME DESTINATION /usr/bin) - diff --git a/sources b/sources index 01c5579..bc11cd5 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -3c9f46d7f76e530adaa1a8da726cb80b glslang-81cd764b5ffc475bc73f1fb35f75fd1171bb2343.tar.gz -eed9e175ef87f11f0927aaf52318451a SPIRV-Headers-33d41376d378761ed3a4c791fc4b647761897f26.tar.gz -9af023a8f541ab2d5a18c26552645bfb SPIRV-Tools-923a4596b44831a07060df45caacb522613730c9.tar.gz -536dc586395a1732c856e2bc4c9422da Vulkan-LoaderAndValidationLayers-sdk-1.0.30.0.tar.gz +8e3a8880f348e49854cff3c352c7f689 glslang-1c573fbcfba6b3d631008b1babc838501ca925d3.tar.gz +73b64fcfb897e1b3c192602b59161360 SPIRV-Headers-bd47a9abaefac00be692eae677daed1b977e625c.tar.gz +e36291fffdfa8a498f3929cd7a422d38 SPIRV-Tools-6fa6a3f64703745425bab6bf51da984f765656e2.tar.gz +bc819eaefdd732267ce4e96093bc102c Vulkan-LoaderAndValidationLayers-d4cd34fd49caa759cf01cafa5fa271401b17c3b9.tar.gz diff --git a/vulkan.spec b/vulkan.spec index 28883ee..56760f5 100644 --- a/vulkan.spec +++ b/vulkan.spec @@ -1,31 +1,31 @@ -%global use_git 0 +%global use_git 1 %if 0%{?fedora} %global use_layers 1 %else %global use_layers 0 %endif -%global commit fbb866778e513752444f1bfd6a3fea3e3f4158b1 +%global commit d4cd34fd49caa759cf01cafa5fa271401b17c3b9 %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global srcname Vulkan-LoaderAndValidationLayers %if 0%{?use_layers} -%global commit1 81cd764b5ffc475bc73f1fb35f75fd1171bb2343 +%global commit1 1c573fbcfba6b3d631008b1babc838501ca925d3 %global srcname1 glslang -%global commit2 923a4596b44831a07060df45caacb522613730c9 +%global commit2 6fa6a3f64703745425bab6bf51da984f765656e2 %global srcname2 SPIRV-Tools -%global commit3 33d41376d378761ed3a4c791fc4b647761897f26 +%global commit3 bd47a9abaefac00be692eae677daed1b977e625c %global srcname3 SPIRV-Headers %endif Name: vulkan -Version: 1.0.30.0 +Version: 1.0.34.0 %if 0%{?use_git} -Release: 0.2.git%{shortcommit}%{?dist} +Release: 0.1.git%{shortcommit}%{?dist} %else -Release: 2%{?dist} +Release: 1%{?dist} %endif Summary: Vulkan loader and validation layers @@ -47,12 +47,7 @@ Source4: https://raw.githubusercontent.com/KhronosGroup/glslang/master/SP # All patches taken from ajax's repo # https://github.com/nwnk/Vulkan-LoaderAndValidationLayers/tree/sdk-1.0.3-fedora Patch0: 0003-layers-Don-t-set-an-rpath.patch -Patch1: 0004-layers-Install-to-CMAKE_INSTALL_LIBDIR.patch -Patch2: 0005-loader-Add-install-rule.patch -Patch3: 0008-demos-Don-t-build-tri-or-cube.patch - -# Upstream patches -Patch4: 5338f69a0a3dcc8527d81ca5f936b0e066a3d7f7.patch +Patch1: 0008-demos-Don-t-build-tri-or-cube.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -119,7 +114,7 @@ cp %{SOURCE4} . sed -i 's/\r//' README.md # sigh inttypes -sed -i 's/inttypes.h/cinttypes/' layers/*.{cpp,h} *.py +sed -i 's/inttypes.h/cinttypes/' layers/*.{cpp,h} %build %if 0%{?use_layers} @@ -137,11 +132,11 @@ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON .. popd %endif pushd build/ -%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCMAKE_BUILD_TYPE=Release \ +%cmake -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_INSTALL_RPATH:BOOL=yes \ -DCMAKE_SKIP_RPATH:BOOL=yes \ -DBUILD_VKJSON=OFF \ + -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \ %if 0%{?fedora} -DBUILD_WSI_WAYLAND_SUPPORT=ON \ %endif @@ -160,7 +155,6 @@ pushd build/ %{make_install} popd -mkdir -p %{buildroot}%{_includedir} %if 0%{?use_layers} mkdir -p %{buildroot}%{_datadir}/vulkan/implicit_layer.d mv %{buildroot}%{_sysconfdir}/vulkan/explicit_layer.d/ %{buildroot}%{_datadir}/vulkan/ @@ -169,8 +163,6 @@ mv %{buildroot}%{_sysconfdir}/vulkan/explicit_layer.d/ %{buildroot}%{_datadir}/v # remove RPATH chrpath -d %{buildroot}%{_bindir}/vulkaninfo -cp -ai include/vulkan %{buildroot}%{_includedir} - mkdir -p %{buildroot}%{_sysconfdir}/vulkan/icd.d %post -p /sbin/ldconfig @@ -200,6 +192,9 @@ mkdir -p %{buildroot}%{_sysconfdir}/vulkan/icd.d %endif %changelog +* Fri Dec 02 2016 leigh scott - 1.0.34.0-0.1.gitd4cd34f +- Update to latest git + * Thu Dec 01 2016 leigh scott - 1.0.30.0-2 - Fix VkLayer undefined symbol: util_GetExtensionProperties