diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -62,19 +62,30 @@ libVkLayer_utils.so:FormatIsUScaled libVkLayer_utils.so:FormatPlaneCount libVkLayer_utils.so:FormatSize +libVkLayer_utils.so:GetLayerOptionFlags +libVkLayer_utils.so:PrintMessageFlags +libVkLayer_utils.so:PrintMessageSeverity +libVkLayer_utils.so:PrintMessageType libVkLayer_utils.so:SafeModulo -libVkLayer_utils.so:layer_debug_actions +libVkLayer_utils.so:getLayerLogOutput +libVkLayer_utils.so:getLayerOption +libVkLayer_utils.so:layer_debug_messenger_actions +libVkLayer_utils.so:layer_debug_report_actions +libVkLayer_utils.so:setLayerOption libVkLayer_utils.so:util_GetExtensionProperties libVkLayer_utils.so:util_GetLayerProperties libVkLayer_utils.so:vk_string_validate libVkLayer_utils.so:white_list +libvulkan.so.1:vkAcquireNextImage2KHR libvulkan.so.1:vkAcquireNextImageKHR libvulkan.so.1:vkAllocateCommandBuffers libvulkan.so.1:vkAllocateDescriptorSets libvulkan.so.1:vkAllocateMemory libvulkan.so.1:vkBeginCommandBuffer libvulkan.so.1:vkBindBufferMemory +libvulkan.so.1:vkBindBufferMemory2 libvulkan.so.1:vkBindImageMemory +libvulkan.so.1:vkBindImageMemory2 libvulkan.so.1:vkCmdBeginQuery libvulkan.so.1:vkCmdBeginRenderPass libvulkan.so.1:vkCmdBindDescriptorSets @@ -91,6 +102,7 @@ libvulkan.so.1:vkCmdCopyImageToBuffer libvulkan.so.1:vkCmdCopyQueryPoolResults libvulkan.so.1:vkCmdDispatch +libvulkan.so.1:vkCmdDispatchBase libvulkan.so.1:vkCmdDispatchIndirect libvulkan.so.1:vkCmdDraw libvulkan.so.1:vkCmdDrawIndexed @@ -109,6 +121,7 @@ libvulkan.so.1:vkCmdSetBlendConstants libvulkan.so.1:vkCmdSetDepthBias libvulkan.so.1:vkCmdSetDepthBounds +libvulkan.so.1:vkCmdSetDeviceMask libvulkan.so.1:vkCmdSetEvent libvulkan.so.1:vkCmdSetLineWidth libvulkan.so.1:vkCmdSetScissor @@ -140,6 +153,7 @@ libvulkan.so.1:vkCreateQueryPool libvulkan.so.1:vkCreateRenderPass libvulkan.so.1:vkCreateSampler +libvulkan.so.1:vkCreateSamplerYcbcrConversion libvulkan.so.1:vkCreateSemaphore libvulkan.so.1:vkCreateShaderModule libvulkan.so.1:vkCreateSharedSwapchainsKHR @@ -165,6 +179,7 @@ libvulkan.so.1:vkDestroyQueryPool libvulkan.so.1:vkDestroyRenderPass libvulkan.so.1:vkDestroySampler +libvulkan.so.1:vkDestroySamplerYcbcrConversion libvulkan.so.1:vkDestroySemaphore libvulkan.so.1:vkDestroyShaderModule libvulkan.so.1:vkDestroySurfaceKHR @@ -175,33 +190,54 @@ libvulkan.so.1:vkEnumerateDeviceLayerProperties libvulkan.so.1:vkEnumerateInstanceExtensionProperties libvulkan.so.1:vkEnumerateInstanceLayerProperties +libvulkan.so.1:vkEnumerateInstanceVersion +libvulkan.so.1:vkEnumeratePhysicalDeviceGroups libvulkan.so.1:vkEnumeratePhysicalDevices libvulkan.so.1:vkFlushMappedMemoryRanges libvulkan.so.1:vkFreeCommandBuffers libvulkan.so.1:vkFreeDescriptorSets libvulkan.so.1:vkFreeMemory libvulkan.so.1:vkGetBufferMemoryRequirements +libvulkan.so.1:vkGetBufferMemoryRequirements2 +libvulkan.so.1:vkGetDescriptorSetLayoutSupport +libvulkan.so.1:vkGetDeviceGroupPeerMemoryFeatures +libvulkan.so.1:vkGetDeviceGroupPresentCapabilitiesKHR +libvulkan.so.1:vkGetDeviceGroupSurfacePresentModesKHR libvulkan.so.1:vkGetDeviceMemoryCommitment libvulkan.so.1:vkGetDeviceProcAddr libvulkan.so.1:vkGetDeviceQueue +libvulkan.so.1:vkGetDeviceQueue2 libvulkan.so.1:vkGetDisplayModePropertiesKHR libvulkan.so.1:vkGetDisplayPlaneCapabilitiesKHR libvulkan.so.1:vkGetDisplayPlaneSupportedDisplaysKHR libvulkan.so.1:vkGetEventStatus libvulkan.so.1:vkGetFenceStatus libvulkan.so.1:vkGetImageMemoryRequirements +libvulkan.so.1:vkGetImageMemoryRequirements2 libvulkan.so.1:vkGetImageSparseMemoryRequirements +libvulkan.so.1:vkGetImageSparseMemoryRequirements2 libvulkan.so.1:vkGetImageSubresourceLayout libvulkan.so.1:vkGetInstanceProcAddr libvulkan.so.1:vkGetPhysicalDeviceDisplayPlanePropertiesKHR libvulkan.so.1:vkGetPhysicalDeviceDisplayPropertiesKHR +libvulkan.so.1:vkGetPhysicalDeviceExternalBufferProperties +libvulkan.so.1:vkGetPhysicalDeviceExternalFenceProperties +libvulkan.so.1:vkGetPhysicalDeviceExternalSemaphoreProperties libvulkan.so.1:vkGetPhysicalDeviceFeatures +libvulkan.so.1:vkGetPhysicalDeviceFeatures2 libvulkan.so.1:vkGetPhysicalDeviceFormatProperties +libvulkan.so.1:vkGetPhysicalDeviceFormatProperties2 libvulkan.so.1:vkGetPhysicalDeviceImageFormatProperties +libvulkan.so.1:vkGetPhysicalDeviceImageFormatProperties2 libvulkan.so.1:vkGetPhysicalDeviceMemoryProperties +libvulkan.so.1:vkGetPhysicalDeviceMemoryProperties2 +libvulkan.so.1:vkGetPhysicalDevicePresentRectanglesKHR libvulkan.so.1:vkGetPhysicalDeviceProperties +libvulkan.so.1:vkGetPhysicalDeviceProperties2 libvulkan.so.1:vkGetPhysicalDeviceQueueFamilyProperties +libvulkan.so.1:vkGetPhysicalDeviceQueueFamilyProperties2 libvulkan.so.1:vkGetPhysicalDeviceSparseImageFormatProperties +libvulkan.so.1:vkGetPhysicalDeviceSparseImageFormatProperties2 libvulkan.so.1:vkGetPhysicalDeviceSurfaceCapabilitiesKHR libvulkan.so.1:vkGetPhysicalDeviceSurfaceFormatsKHR libvulkan.so.1:vkGetPhysicalDeviceSurfacePresentModesKHR @@ -726,6 +762,7 @@ libvulkan.so.1:vkResetEvent libvulkan.so.1:vkResetFences libvulkan.so.1:vkSetEvent +libvulkan.so.1:vkTrimCommandPool libvulkan.so.1:vkUnmapMemory libvulkan.so.1:vkUpdateDescriptorSets libvulkan.so.1:vkWaitForFences diff --git a/abi_symbols32 b/abi_symbols32 --- a/abi_symbols32 +++ b/abi_symbols32 @@ -62,19 +62,30 @@ libVkLayer_utils.so:FormatIsUScaled libVkLayer_utils.so:FormatPlaneCount libVkLayer_utils.so:FormatSize +libVkLayer_utils.so:GetLayerOptionFlags +libVkLayer_utils.so:PrintMessageFlags +libVkLayer_utils.so:PrintMessageSeverity +libVkLayer_utils.so:PrintMessageType libVkLayer_utils.so:SafeModulo -libVkLayer_utils.so:layer_debug_actions +libVkLayer_utils.so:getLayerLogOutput +libVkLayer_utils.so:getLayerOption +libVkLayer_utils.so:layer_debug_messenger_actions +libVkLayer_utils.so:layer_debug_report_actions +libVkLayer_utils.so:setLayerOption libVkLayer_utils.so:util_GetExtensionProperties libVkLayer_utils.so:util_GetLayerProperties libVkLayer_utils.so:vk_string_validate libVkLayer_utils.so:white_list +libvulkan.so.1:vkAcquireNextImage2KHR libvulkan.so.1:vkAcquireNextImageKHR libvulkan.so.1:vkAllocateCommandBuffers libvulkan.so.1:vkAllocateDescriptorSets libvulkan.so.1:vkAllocateMemory libvulkan.so.1:vkBeginCommandBuffer libvulkan.so.1:vkBindBufferMemory +libvulkan.so.1:vkBindBufferMemory2 libvulkan.so.1:vkBindImageMemory +libvulkan.so.1:vkBindImageMemory2 libvulkan.so.1:vkCmdBeginQuery libvulkan.so.1:vkCmdBeginRenderPass libvulkan.so.1:vkCmdBindDescriptorSets @@ -91,6 +102,7 @@ libvulkan.so.1:vkCmdCopyImageToBuffer libvulkan.so.1:vkCmdCopyQueryPoolResults libvulkan.so.1:vkCmdDispatch +libvulkan.so.1:vkCmdDispatchBase libvulkan.so.1:vkCmdDispatchIndirect libvulkan.so.1:vkCmdDraw libvulkan.so.1:vkCmdDrawIndexed @@ -109,6 +121,7 @@ libvulkan.so.1:vkCmdSetBlendConstants libvulkan.so.1:vkCmdSetDepthBias libvulkan.so.1:vkCmdSetDepthBounds +libvulkan.so.1:vkCmdSetDeviceMask libvulkan.so.1:vkCmdSetEvent libvulkan.so.1:vkCmdSetLineWidth libvulkan.so.1:vkCmdSetScissor @@ -140,6 +153,7 @@ libvulkan.so.1:vkCreateQueryPool libvulkan.so.1:vkCreateRenderPass libvulkan.so.1:vkCreateSampler +libvulkan.so.1:vkCreateSamplerYcbcrConversion libvulkan.so.1:vkCreateSemaphore libvulkan.so.1:vkCreateShaderModule libvulkan.so.1:vkCreateSharedSwapchainsKHR @@ -165,6 +179,7 @@ libvulkan.so.1:vkDestroyQueryPool libvulkan.so.1:vkDestroyRenderPass libvulkan.so.1:vkDestroySampler +libvulkan.so.1:vkDestroySamplerYcbcrConversion libvulkan.so.1:vkDestroySemaphore libvulkan.so.1:vkDestroyShaderModule libvulkan.so.1:vkDestroySurfaceKHR @@ -175,33 +190,54 @@ libvulkan.so.1:vkEnumerateDeviceLayerProperties libvulkan.so.1:vkEnumerateInstanceExtensionProperties libvulkan.so.1:vkEnumerateInstanceLayerProperties +libvulkan.so.1:vkEnumerateInstanceVersion +libvulkan.so.1:vkEnumeratePhysicalDeviceGroups libvulkan.so.1:vkEnumeratePhysicalDevices libvulkan.so.1:vkFlushMappedMemoryRanges libvulkan.so.1:vkFreeCommandBuffers libvulkan.so.1:vkFreeDescriptorSets libvulkan.so.1:vkFreeMemory libvulkan.so.1:vkGetBufferMemoryRequirements +libvulkan.so.1:vkGetBufferMemoryRequirements2 +libvulkan.so.1:vkGetDescriptorSetLayoutSupport +libvulkan.so.1:vkGetDeviceGroupPeerMemoryFeatures +libvulkan.so.1:vkGetDeviceGroupPresentCapabilitiesKHR +libvulkan.so.1:vkGetDeviceGroupSurfacePresentModesKHR libvulkan.so.1:vkGetDeviceMemoryCommitment libvulkan.so.1:vkGetDeviceProcAddr libvulkan.so.1:vkGetDeviceQueue +libvulkan.so.1:vkGetDeviceQueue2 libvulkan.so.1:vkGetDisplayModePropertiesKHR libvulkan.so.1:vkGetDisplayPlaneCapabilitiesKHR libvulkan.so.1:vkGetDisplayPlaneSupportedDisplaysKHR libvulkan.so.1:vkGetEventStatus libvulkan.so.1:vkGetFenceStatus libvulkan.so.1:vkGetImageMemoryRequirements +libvulkan.so.1:vkGetImageMemoryRequirements2 libvulkan.so.1:vkGetImageSparseMemoryRequirements +libvulkan.so.1:vkGetImageSparseMemoryRequirements2 libvulkan.so.1:vkGetImageSubresourceLayout libvulkan.so.1:vkGetInstanceProcAddr libvulkan.so.1:vkGetPhysicalDeviceDisplayPlanePropertiesKHR libvulkan.so.1:vkGetPhysicalDeviceDisplayPropertiesKHR +libvulkan.so.1:vkGetPhysicalDeviceExternalBufferProperties +libvulkan.so.1:vkGetPhysicalDeviceExternalFenceProperties +libvulkan.so.1:vkGetPhysicalDeviceExternalSemaphoreProperties libvulkan.so.1:vkGetPhysicalDeviceFeatures +libvulkan.so.1:vkGetPhysicalDeviceFeatures2 libvulkan.so.1:vkGetPhysicalDeviceFormatProperties +libvulkan.so.1:vkGetPhysicalDeviceFormatProperties2 libvulkan.so.1:vkGetPhysicalDeviceImageFormatProperties +libvulkan.so.1:vkGetPhysicalDeviceImageFormatProperties2 libvulkan.so.1:vkGetPhysicalDeviceMemoryProperties +libvulkan.so.1:vkGetPhysicalDeviceMemoryProperties2 +libvulkan.so.1:vkGetPhysicalDevicePresentRectanglesKHR libvulkan.so.1:vkGetPhysicalDeviceProperties +libvulkan.so.1:vkGetPhysicalDeviceProperties2 libvulkan.so.1:vkGetPhysicalDeviceQueueFamilyProperties +libvulkan.so.1:vkGetPhysicalDeviceQueueFamilyProperties2 libvulkan.so.1:vkGetPhysicalDeviceSparseImageFormatProperties +libvulkan.so.1:vkGetPhysicalDeviceSparseImageFormatProperties2 libvulkan.so.1:vkGetPhysicalDeviceSurfaceCapabilitiesKHR libvulkan.so.1:vkGetPhysicalDeviceSurfaceFormatsKHR libvulkan.so.1:vkGetPhysicalDeviceSurfacePresentModesKHR @@ -726,6 +762,7 @@ libvulkan.so.1:vkResetEvent libvulkan.so.1:vkResetFences libvulkan.so.1:vkSetEvent +libvulkan.so.1:vkTrimCommandPool libvulkan.so.1:vkUnmapMemory libvulkan.so.1:vkUpdateDescriptorSets libvulkan.so.1:vkWaitForFences diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,59 +1,52 @@ name : vulkan -version : 1.0.65.2 -release : 8 +version : 1.1.70 +release : 9 source : - - git|https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git : 6d71c6473925e03deab5b3396112cf31e95f1249 + - https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-1.1.70.0.tar.gz : bd30ffe25a0723775ea8427d65e96bbad6f5130674ac6577ec639b54ce811397 license : Apache-2.0 component : xorg.graphics +libsplit : no +emul32 : yes summary : Khronos Vulkan ICD loader description: | Vulkan is an Explicit API, enabling direct control over how GPUs actually work. No (or very little) validation or error checking is done inside a Vulkan driver. Applications have full control and responsibility. Any errors in how Vulkan is used often result in a crash. This project provides standard validation layers that can be enabled to ease development by helping developers verify their applications correctly use the Vulkan API. Vulkan supports multiple GPUs and multiple global contexts (VkInstance). The ICD loader is necessary to support multiple GPUs and the VkInstance level Vulkan commands. Additionally, the loader manages inserting Vulkan layer libraries, including validation layers between the application and the ICD. builddeps : - pkgconfig32(gl) + - pkgconfig32(SPIRV-Tools) + - pkgconfig32(wayland-client) - pkgconfig32(x11) - pkgconfig32(xcb) - pkgconfig32(xrandr) - - pkgconfig32(wayland-client) - - glslang-devel - glslang-32bit-devel - - pkgconfig32(SPIRV-Tools) - spirv-headers -libsplit : no -emul32 : yes setup : | %patch -p1 < $pkgfiles/external-spirv.patch - mkdir build && pushd build + mkdir solusBuildDir && cd solusBuildDir echo "#pragma once" >> spirv_tools_commit_id.h - echo "#define SPIRV_TOOLS_COMMIT_ID \"6018de81de5114e906a0098ac04a7cbc95aff500\"" >> spirv_tools_commit_id.h - - # assembler gets awfully unhappy. - EXTRA32="" - if [[ ! -z "${EMUL32BUILD}" ]]; then - export ASFLAGS=--32 - export EXTRA32="-DCMAKE_INSTALL_LIBDIR=lib32" - fi + echo "#define SPIRV_TOOLS_COMMIT_ID \"01f32ee001409893773219d1a0cc8e696287628e\"" >> spirv_tools_commit_id.h + + export ASFLAGS=--%LIBSUFFIX% + %cmake -DBUILD_WSI_MIR_SUPPORT=OFF \ -DBUILD_WSI_WAYLAND_SUPPORT=ON \ -DBUILD_WSI_XCB_SUPPORT=ON \ -DBUILD_WSI_XLIB_SUPPORT=ON \ -DGLSLANG_SPIRV_INCLUDE_DIR=/usr/include/spirv-tools \ -DBUILD_TESTS=OFF \ - $EXTRA32 \ -DBUILD_LAYERS=ON \ -DCMAKE_SKIP_RPATH=True \ -DCUSTOM_GLSLANG_BIN_ROOT=/usr/bin \ -DCUSTOM_SPIRV_TOOLS_BIN_ROOT=/usr/bin \ - -DCMAKE_INSTALL_DATADIR=/share \ - .. + -DCMAKE_INSTALL_SYSCONFDIR=/usr/share \ + -DCMAKE_INSTALL_LIBDIR=%libdir% \ + -GNinja .. build : | - %make -C build + %meson_build install : | - %make_install -C build - - # vulkan packaging is cranky to say the least. - mv $installdir/usr/etc $installdir/usr/share + %meson_install # Nuke dummy icd loader - rm -rf $installdir/usr/share/vulkan/icd.d + #rm -rf $installdir/usr/share/vulkan/icd.d + diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -2,8 +2,8 @@ vulkan - Ikey Doherty - ikey@solus-project.com + Pierre-Yves + pyu@riseup.net Apache-2.0 xorg.graphics @@ -24,12 +24,6 @@ /usr/bin /usr/lib64/lib*.so /usr/lib64/lib*.so.* - /usr/share/etc/vulkan/explicit_layer.d/VkLayer_core_validation.json - /usr/share/etc/vulkan/explicit_layer.d/VkLayer_object_tracker.json - /usr/share/etc/vulkan/explicit_layer.d/VkLayer_parameter_validation.json - /usr/share/etc/vulkan/explicit_layer.d/VkLayer_standard_validation.json - /usr/share/etc/vulkan/explicit_layer.d/VkLayer_threading.json - /usr/share/etc/vulkan/explicit_layer.d/VkLayer_unique_objects.json /usr/share/vulkan @@ -41,7 +35,7 @@ emul32 - vulkan + vulkan /usr/lib32/lib*.so @@ -56,8 +50,8 @@ programming.devel - vulkan-devel - vulkan-32bit + vulkan-devel + vulkan-32bit /usr/lib32/pkgconfig/*.pc @@ -71,7 +65,7 @@ programming.devel - vulkan + vulkan /usr/include/ @@ -79,12 +73,12 @@ - - 2018-01-29 - 1.0.65.2 + + 2018-03-07 + 1.1.70 Packaging update - Ikey Doherty - ikey@solus-project.com + Pierre-Yves + pyu@riseup.net \ No newline at end of file