Skip to content

Commit

Permalink
[vulkan-sdk-*] Update to 1.3.296
Browse files Browse the repository at this point in the history
  • Loading branch information
siukosev committed Oct 16, 2024
1 parent 9b44f14 commit a07d366
Show file tree
Hide file tree
Showing 41 changed files with 240 additions and 100 deletions.
57 changes: 0 additions & 57 deletions ports/glslang/0001-Fix-glslangValidator-installation.patch

This file was deleted.

4 changes: 1 addition & 3 deletions ports/glslang/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/glslang
REF "${VERSION}"
SHA512 ce6d09cc4d98b01d162ec5a196eec017c4a5f25eaf98c6612695d911f8d136c2f7193ff8f2c07931b2e94182d2c654833adc3b645f0c225e1d07c4e6e7abfd76
SHA512 b246c6f280891b7c9b6cd0b5e85e03ccf1fe173cdfc40e566339a5698176cbcfe23eb7aeaba277f071222d76b9f2a00376d790d4d604aedad82e6196fab7fc70
HEAD_REF master
PATCHES
0001-Fix-glslangValidator-installation.patch
)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
Expand Down
2 changes: 1 addition & 1 deletion ports/glslang/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "glslang",
"version": "14.3.0",
"version": "15.0.0",
"description": "Khronos-reference front end for GLSL/ESSL, partial front end for HLSL, and a SPIR-V generator.",
"homepage": "https://github.com/KhronosGroup/glslang",
"license": "Apache-2.0 AND BSD-3-Clause AND MIT AND GPL-3.0-or-later",
Expand Down
2 changes: 1 addition & 1 deletion ports/lunarg-vulkantools/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO LunarG/VulkanTools
REF "vulkan-sdk-${VERSION}"
SHA512 6F5081BDA20BDC79CCA89E515B5DA902884562460312FCAE6FDF4DB8029D00401B445E96BD37DA05EA8FB0CC169DE93E2821550DAC90C49CE2EBD7489593F256
SHA512 2d1f5d91aa79b206640e65bba2dadfe881524e9a5e1694df5092e6d59d00f06cd981bd026c0c12528f6b243da7564be98211ce6f6538bd1fd51698f91aa24d47
HEAD_REF main
)

Expand Down
2 changes: 1 addition & 1 deletion ports/lunarg-vulkantools/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "lunarg-vulkantools",
"version": "1.3.290.0",
"version": "1.3.296.0",
"description": "Tools to aid in Vulkan development",
"homepage": "https://github.com/LunarG/VulkanTools",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion ports/spirv-cross/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/SPIRV-Cross
REF vulkan-sdk-${VERSION}
SHA512 923ba1564aee36bc6ebd61ee30ec43d61dbc28c23b172fa9a81688f1ca899a950e221a8b07134ccef14c6d5818c0f0fc33a53b8e38f28a956e1119b3974825e7
SHA512 943453df60744fe32123df7e366b27d30d57947b22bf7c087090e70f398305b37a47826abc60cdf912f0240c4ff3190e9d0f03d1d4e85f73c13b8a6196611640
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/spirv-cross/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "spirv-cross",
"version": "1.3.290.0",
"version": "1.3.296.0",
"description": "SPIRV-Cross is a practical tool and library for performing reflection on SPIR-V and disassembling SPIR-V back to high level languages.",
"homepage": "https://github.com/KhronosGroup/SPIRV-Cross",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion ports/spirv-headers/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/SPIRV-Headers
REF "vulkan-sdk-${VERSION}"
SHA512 d3328cd4ddf87d075afacfb7ada01dbd16a3ff39b831e9ebe4ce3c32af0ff0c8822811b0e0d273a54b4acaba29b63b099efcf0150424bd9074d24d04a9974d89
SHA512 b4f975d3051eda41ef5c3a6efc832607a165adfd6f43d7af171d2c0446b227bdcb5de0017a081fa9e7a3d2710ba8583fadbc06c0a364043b2778b02818d01040
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/spirv-headers/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "spirv-headers",
"version": "1.3.290.0",
"version": "1.3.296.0",
"description": "Machine-readable files for the SPIR-V Registry",
"homepage": "https://github.com/KhronosGroup/SPIRV-Headers",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion ports/spirv-reflect/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/SPIRV-Reflect
REF "vulkan-sdk-${VERSION}"
SHA512 5de92dbd04424fb09f6c2a4c890572b2789017b737822d5bc8ab713aeede0796cdcc7ffe74e3ffe25cdd4c626e94bd60757e1cc625ede02b8fe3994b07588b44
SHA512 770d46172fed140816dcecc3155bce62ce319f5cbe99bb58e81994e07aed14ebc8f65675c6e47dde2148e2706603ba470f364ab41bcbfbc05c69e25be7c5a898
HEAD_REF main
PATCHES
export-targets.patch
Expand Down
2 changes: 1 addition & 1 deletion ports/spirv-reflect/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "spirv-reflect",
"version": "1.3.290.0",
"version": "1.3.296.0",
"description": "SPIRV-Reflect is a lightweight library that provides a C/C++ reflection API for SPIR-V shader bytecode in Vulkan applications.",
"homepage": "https://github.com/KhronosGroup/SPIRV-Reflect",
"license": "Apache-2.0",
Expand Down
2 changes: 1 addition & 1 deletion ports/spirv-tools/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/SPIRV-Tools
REF "vulkan-sdk-${VERSION}"
SHA512 d4e8440c0843fb084dde4a576b95442783ab8204670b199798bd87f754d77f3c258bb69ab1d4dd7859c1d2c681ed8813309c76c6f70b5a7d8d21b6a48ef63b67
SHA512 62f0a6034bd016aedfb8975bbd3bb134ef928bd6bafbb61d9f73c46760019597b9841b80243c86e5e5e0576824cd20255067e447590eb0d2d51593439152215e
PATCHES
cmake-config-dir.diff
spirv-tools-shared.diff
Expand Down
2 changes: 1 addition & 1 deletion ports/spirv-tools/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "spirv-tools",
"version": "1.3.290.0",
"version": "1.3.296.0",
"description": "API and commands for processing SPIR-V modules",
"homepage": "https://github.com/KhronosGroup/SPIRV-Tools",
"license": "Apache-2.0",
Expand Down
4 changes: 2 additions & 2 deletions ports/volk/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO zeux/volk
REF "${VERSION}"
SHA512 1e0b05f0a7aa9e185b4b7ef42d53c1a23ccb8511cd3c2821e8976c11130ea196a24612ca18319fc2c0ac99bc2b1d334fc62ea9863f45800007b9bc92978da665
REF "vulkan-sdk-${VERSION}"
SHA512 bc57ab2d0408fba6d66c91eb477392e217ec5b4185db1191c9ed7750f3773c513674b0bb4f3378a0ee38038d0447aa868ca79842192c6060a6e8b33ca81552f0
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/volk/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "volk",
"version": "1.3.295",
"version": "1.3.296",
"description": [
"Meta loader for Vulkan API.",
"Note that the static library target volk::volk is built without platform-specific defines.",
Expand Down
2 changes: 1 addition & 1 deletion ports/vulkan-headers/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/Vulkan-Headers
REF "vulkan-sdk-${VERSION}"
SHA512 2bba1b9f3b97e22066ad89bce48a999dd253baf47ed3c76575777e7fc03199c67b1f8b301c1e152eaf4ce63351af9901bcea3a34f2d8cdcea81c25648bfb4706
SHA512 475cd0c3249c7998e5e85390651a6652e229d65e42adf3b4d18f9f7509037d217e87de01632c9b4142d26ab295cd2272c2e88f897a5420d693a82ff7e4003157
HEAD_REF main
)

Expand Down
3 changes: 1 addition & 2 deletions ports/vulkan-headers/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "vulkan-headers",
"version": "1.3.290.0",
"port-version": 1,
"version": "1.3.296.0",
"description": "Vulkan header files and API registry",
"homepage": "https://github.com/KhronosGroup/Vulkan-Headers",
"license": "Apache-2.0 OR MIT",
Expand Down
133 changes: 133 additions & 0 deletions ports/vulkan-loader/0001-fix-comments-begin-symbol.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,133 @@
From 5226711a904f28885a2d2d42430cc29263e3e309 Mon Sep 17 00:00:00 2001
From: Nikolai Siukosev <[email protected]>
Date: Wed, 16 Oct 2024 23:36:45 +0400
Subject: [PATCH] fix comments begin symbol ('//' -> ';')

---
loader/unknown_ext_chain_marmasm.asm | 78 ++++++++++++++--------------
1 file changed, 39 insertions(+), 39 deletions(-)

diff --git a/loader/unknown_ext_chain_marmasm.asm b/loader/unknown_ext_chain_marmasm.asm
index 1bc82451b..f2f352a17 100644
--- a/loader/unknown_ext_chain_marmasm.asm
+++ b/loader/unknown_ext_chain_marmasm.asm
@@ -49,22 +49,22 @@ $label PhysDevExtTermin $num
ALIGN
EXPORT vkPhysDevExtTermin$num [FUNC]
vkPhysDevExtTermin$num FUNCTION
- ldr x9, [x0, ICD_TERM_OFFSET_PHYS_DEV_TERM] // Load the loader_icd_term* in x9
- mov x11, (DISPATCH_OFFSET_ICD_TERM + (PTR_SIZE * $num)) // Put the offset into the dispatch table in x11
- ldr x10, [x9, x11] // Load the address of the next function in the dispatch chain
- cbz x10, terminError$num // Go to the error section if the next function in the chain is NULL
- ldr x0, [x0, PHYS_DEV_OFFSET_PHYS_DEV_TERM] // Unwrap the VkPhysicalDevice in x0
- br x10 // Jump to the next function in the chain
+ ldr x9, [x0, ICD_TERM_OFFSET_PHYS_DEV_TERM] ; Load the loader_icd_term* in x9
+ mov x11, (DISPATCH_OFFSET_ICD_TERM + (PTR_SIZE * $num)) ; Put the offset into the dispatch table in x11
+ ldr x10, [x9, x11] ; Load the address of the next function in the dispatch chain
+ cbz x10, terminError$num ; Go to the error section if the next function in the chain is NULL
+ ldr x0, [x0, PHYS_DEV_OFFSET_PHYS_DEV_TERM] ; Unwrap the VkPhysicalDevice in x0
+ br x10 ; Jump to the next function in the chain
terminError$num
- mov x10, (FUNCTION_OFFSET_INSTANCE + (CHAR_PTR_SIZE * $num)) // Offset of the function name string in the instance
- ldr x11, [x9, INSTANCE_OFFSET_ICD_TERM] // Load the instance pointer
- mov x0, x11 // Vulkan instance pointer (first arg)
- mov x1, VULKAN_LOADER_ERROR_BIT // The error logging bit (second arg)
- mov x2, #0 // Zero (third arg)
- ldr x3, [x11, x10] // The function name (fourth arg)
- bl loader_log_asm_function_not_supported // Log the error message before we crash
+ mov x10, (FUNCTION_OFFSET_INSTANCE + (CHAR_PTR_SIZE * $num)) ; Offset of the function name string in the instance
+ ldr x11, [x9, INSTANCE_OFFSET_ICD_TERM] ; Load the instance pointer
+ mov x0, x11 ; Vulkan instance pointer (first arg)
+ mov x1, VULKAN_LOADER_ERROR_BIT ; The error logging bit (second arg)
+ mov x2, #0 ; Zero (third arg)
+ ldr x3, [x11, x10] ; The function name (fourth arg)
+ bl loader_log_asm_function_not_supported ; Log the error message before we crash
mov x0, #0
- br x0 // Crash intentionally by jumping to address zero
+ br x0 ; Crash intentionally by jumping to address zero
ENDFUNC
MEND

@@ -73,9 +73,9 @@ terminError$num
ALIGN
EXPORT vkdev_ext$num [FUNC]
vkdev_ext$num FUNCTION
- ldr x9, [x0] // Load the loader_instance_dispatch_table* into x9
- mov x10, (EXT_OFFSET_DEVICE_DISPATCH + (PTR_SIZE * $num)) // Offset of the desired function in the dispatch table
- ldr x11, [x9, x10] // Load the function address
+ ldr x9, [x0] ; Load the loader_instance_dispatch_table* into x9
+ mov x10, (EXT_OFFSET_DEVICE_DISPATCH + (PTR_SIZE * $num)) ; Offset of the desired function in the dispatch table
+ ldr x11, [x9, x10] ; Load the function address
br x11
ENDFUNC
MEND
@@ -88,11 +88,11 @@ vkdev_ext$num FUNCTION
ALIGN
EXPORT vkPhysDevExtTramp$num [FUNC]
vkPhysDevExtTramp$num FUNCTION
- ldr r4, [r0] // Load the loader_instance_dispatch_table* into r4
- ldr r0, [r0, #PHYS_DEV_OFFSET_PHYS_DEV_TRAMP] // Load the unwrapped VkPhysicalDevice into r0
- mov r5, #(PHYS_DEV_OFFSET_INST_DISPATCH + (PTR_SIZE * $num)) // Put the offset of the entry in the dispatch table for the function
- ldr r6, [r4, r5] // Load the address to branch to out of the dispatch table
- bx r6 // Branch to the next member of the dispatch chain
+ ldr r4, [r0] ; Load the loader_instance_dispatch_table* into r4
+ ldr r0, [r0, #PHYS_DEV_OFFSET_PHYS_DEV_TRAMP] ; Load the unwrapped VkPhysicalDevice into r0
+ mov r5, #(PHYS_DEV_OFFSET_INST_DISPATCH + (PTR_SIZE * $num)) ; Put the offset of the entry in the dispatch table for the function
+ ldr r6, [r4, r5] ; Load the address to branch to out of the dispatch table
+ bx r6 ; Branch to the next member of the dispatch chain
ENDFUNC
MEND

@@ -101,22 +101,22 @@ $label PhysDevExtTermin $num
ALIGN
EXPORT vkPhysDevExtTermin$num [FUNC]
vkPhysDevExtTermin$num FUNCTION
- ldr r4, [r0, #ICD_TERM_OFFSET_PHYS_DEV_TERM] // Load the loader_icd_term* in r4
- mov r6, #(DISPATCH_OFFSET_ICD_TERM + (PTR_SIZE * $num)) // Put the offset into the dispatch table in r6
- ldr r5, [r4, r6] // Load the address of the next function in the dispatch chain
- cbz r5, terminError$num // Go to the error section if the next function in the chain is NULL
- ldr r0, [r0, #PHYS_DEV_OFFSET_PHYS_DEV_TERM] // Unwrap the VkPhysicalDevice in r0
- bx r5 // Jump to the next function in the chain
+ ldr r4, [r0, #ICD_TERM_OFFSET_PHYS_DEV_TERM] ; Load the loader_icd_term* in r4
+ mov r6, #(DISPATCH_OFFSET_ICD_TERM + (PTR_SIZE * $num)) ; Put the offset into the dispatch table in r6
+ ldr r5, [r4, r6] ; Load the address of the next function in the dispatch chain
+ cbz r5, terminError$num ; Go to the error section if the next function in the chain is NULL
+ ldr r0, [r0, #PHYS_DEV_OFFSET_PHYS_DEV_TERM] ; Unwrap the VkPhysicalDevice in r0
+ bx r5 ; Jump to the next function in the chain
terminError$num
- mov r5, #(FUNCTION_OFFSET_INSTANCE + (CHAR_PTR_SIZE * $num)) // Offset of the function name string in the instance
- ldr r6, [r4, #INSTANCE_OFFSET_ICD_TERM] // Load the instance pointer
- mov r0, r6 // Vulkan instance pointer (first arg)
- mov r1, #VULKAN_LOADER_ERROR_BIT // The error logging bit (second arg)
- mov r2, #0 // Zero (third arg)
- ldr r3, [r6, r5] // The function name (fourth arg)
- bl loader_log_asm_function_not_supported // Log the error message before we crash
+ mov r5, #(FUNCTION_OFFSET_INSTANCE + (CHAR_PTR_SIZE * $num)) ; Offset of the function name string in the instance
+ ldr r6, [r4, #INSTANCE_OFFSET_ICD_TERM] ; Load the instance pointer
+ mov r0, r6 ; Vulkan instance pointer (first arg)
+ mov r1, #VULKAN_LOADER_ERROR_BIT ; The error logging bit (second arg)
+ mov r2, #0 ; Zero (third arg)
+ ldr r3, [r6, r5] ; The function name (fourth arg)
+ bl loader_log_asm_function_not_supported ; Log the error message before we crash
mov r0, #0
- bx r0 // Crash intentionally by jumping to address zero
+ bx r0 ; Crash intentionally by jumping to address zero
ENDFUNC
MEND

@@ -125,9 +125,9 @@ terminError$num
ALIGN
EXPORT vkdev_ext$num [FUNC]
vkdev_ext$num FUNCTION
- ldr r4, [r0] // Load the loader_instance_dispatch_table* into r4
- mov r5, #(EXT_OFFSET_DEVICE_DISPATCH + (PTR_SIZE * $num)) // Offset of the desired function in the dispatch table
- ldr r6, [r4, r5] // Load the function address
+ ldr r4, [r0] ; Load the loader_instance_dispatch_table* into r4
+ mov r5, #(EXT_OFFSET_DEVICE_DISPATCH + (PTR_SIZE * $num)) ; Offset of the desired function in the dispatch table
+ ldr r6, [r4, r5] ; Load the function address
bx r6
ENDFUNC
MEND
--
2.46.0.windows.1

4 changes: 3 additions & 1 deletion ports/vulkan-loader/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/Vulkan-Loader
REF "vulkan-sdk-${VERSION}"
SHA512 42ecf05e498f6422cea9d6ef70df5a936536524c1ff4d8cb391b5c55dd409082a6b2fc2eee5b395306c782ca32a7344faceef3e5385b382fb5a7e6564cfce4b5
SHA512 535b7f324348e9edf44ff6a6a6e9eabe6e3a4bfad79bef789d1dc0cbbe3de36b6495a05236323d155631b081b89c18bb8668c79d1f735b59fc85ebee555aa682
HEAD_REF main
PATCHES
0001-fix-comments-begin-symbol.patch
)

vcpkg_cmake_configure(
Expand Down
2 changes: 1 addition & 1 deletion ports/vulkan-loader/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vulkan-loader",
"version": "1.3.290.0",
"version": "1.3.296.0",
"description": "Vulkan Development Tools",
"homepage": "https://github.com/KhronosGroup/Vulkan-Loader",
"license": null,
Expand Down
2 changes: 1 addition & 1 deletion ports/vulkan-sdk-components/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$comment": "Dependencies extracted from e.g. https://sdk.lunarg.com/sdk/download/1.3.290.0/windows/config.json",
"name": "vulkan-sdk-components",
"version": "1.3.290.0",
"version": "1.3.296.0",
"description": "Installs packages which are part of the Vulkan SDK.",
"license": null,
"supports": "!uwp & !xbox",
Expand Down
2 changes: 1 addition & 1 deletion ports/vulkan-tools/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KhronosGroup/Vulkan-Tools
REF "vulkan-sdk-${VERSION}"
SHA512 e5f6daa12ba2e8098f939cc06e732efd89f616fd9babf00d2fb8b9a73671143961a4c5b84879a4f9c4a7312bb393874f065222602e3619db5ad7fb9f8b868422
SHA512 66bc89272f150198cd52f2971ad67a2fd6c922ac4bafb420c0d54788ca6bab2246e8a153a09eccce15a87e1fe16fdeef16af1c6b6b13386bff79dd73858f3cae
HEAD_REF main
PATCHES
fix-parallel-config.patch
Expand Down
Loading

0 comments on commit a07d366

Please sign in to comment.