Skip to content

Commit 7a07afe

Browse files
mikes-lunargcharles-lunarg
mikes-lunarg
authored and
charles-lunarg
committed
build: Update to header 1.4.337
1 parent b77d86a commit 7a07afe

File tree

6 files changed

+4
-122
lines changed

6 files changed

+4
-122
lines changed

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# ~~~
1919
cmake_minimum_required(VERSION 3.22.1)
2020

21-
project(VULKAN_LOADER VERSION 1.4.336 LANGUAGES C)
21+
project(VULKAN_LOADER VERSION 1.4.337 LANGUAGES C)
2222

2323
option(CODE_COVERAGE "Enable Code Coverage" OFF)
2424
if (CODE_COVERAGE)

‎loader/generated/vk_layer_dispatch_table.h‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1292,17 +1292,6 @@ typedef struct VkLayerDispatchTable_ {
12921292
PFN_vkUpdateIndirectExecutionSetPipelineEXT UpdateIndirectExecutionSetPipelineEXT;
12931293
PFN_vkUpdateIndirectExecutionSetShaderEXT UpdateIndirectExecutionSetShaderEXT;
12941294

1295-
// ---- VK_OHOS_native_buffer extension commands
1296-
#if defined(VK_USE_PLATFORM_OHOS)
1297-
PFN_vkGetSwapchainGrallocUsageOHOS GetSwapchainGrallocUsageOHOS;
1298-
#endif // VK_USE_PLATFORM_OHOS
1299-
#if defined(VK_USE_PLATFORM_OHOS)
1300-
PFN_vkAcquireImageOHOS AcquireImageOHOS;
1301-
#endif // VK_USE_PLATFORM_OHOS
1302-
#if defined(VK_USE_PLATFORM_OHOS)
1303-
PFN_vkQueueSignalReleaseImageOHOS QueueSignalReleaseImageOHOS;
1304-
#endif // VK_USE_PLATFORM_OHOS
1305-
13061295
// ---- VK_EXT_external_memory_metal extension commands
13071296
#if defined(VK_USE_PLATFORM_METAL_EXT)
13081297
PFN_vkGetMemoryMetalHandleEXT GetMemoryMetalHandleEXT;

‎loader/generated/vk_loader_extensions.c‎

Lines changed: 0 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1330,17 +1330,6 @@ VKAPI_ATTR void VKAPI_CALL loader_init_device_extension_dispatch_table(struct lo
13301330
table->UpdateIndirectExecutionSetPipelineEXT = (PFN_vkUpdateIndirectExecutionSetPipelineEXT)gdpa(dev, "vkUpdateIndirectExecutionSetPipelineEXT");
13311331
table->UpdateIndirectExecutionSetShaderEXT = (PFN_vkUpdateIndirectExecutionSetShaderEXT)gdpa(dev, "vkUpdateIndirectExecutionSetShaderEXT");
13321332

1333-
// ---- VK_OHOS_native_buffer extension commands
1334-
#if defined(VK_USE_PLATFORM_OHOS)
1335-
table->GetSwapchainGrallocUsageOHOS = (PFN_vkGetSwapchainGrallocUsageOHOS)gdpa(dev, "vkGetSwapchainGrallocUsageOHOS");
1336-
#endif // VK_USE_PLATFORM_OHOS
1337-
#if defined(VK_USE_PLATFORM_OHOS)
1338-
table->AcquireImageOHOS = (PFN_vkAcquireImageOHOS)gdpa(dev, "vkAcquireImageOHOS");
1339-
#endif // VK_USE_PLATFORM_OHOS
1340-
#if defined(VK_USE_PLATFORM_OHOS)
1341-
table->QueueSignalReleaseImageOHOS = (PFN_vkQueueSignalReleaseImageOHOS)gdpa(dev, "vkQueueSignalReleaseImageOHOS");
1342-
#endif // VK_USE_PLATFORM_OHOS
1343-
13441333
// ---- VK_EXT_external_memory_metal extension commands
13451334
#if defined(VK_USE_PLATFORM_METAL_EXT)
13461335
table->GetMemoryMetalHandleEXT = (PFN_vkGetMemoryMetalHandleEXT)gdpa(dev, "vkGetMemoryMetalHandleEXT");
@@ -3337,17 +3326,6 @@ VKAPI_ATTR void* VKAPI_CALL loader_lookup_device_dispatch_table(const VkLayerDis
33373326
if (!strcmp(name, "UpdateIndirectExecutionSetPipelineEXT")) return (void *)table->UpdateIndirectExecutionSetPipelineEXT;
33383327
if (!strcmp(name, "UpdateIndirectExecutionSetShaderEXT")) return (void *)table->UpdateIndirectExecutionSetShaderEXT;
33393328

3340-
// ---- VK_OHOS_native_buffer extension commands
3341-
#if defined(VK_USE_PLATFORM_OHOS)
3342-
if (!strcmp(name, "GetSwapchainGrallocUsageOHOS")) return (void *)table->GetSwapchainGrallocUsageOHOS;
3343-
#endif // VK_USE_PLATFORM_OHOS
3344-
#if defined(VK_USE_PLATFORM_OHOS)
3345-
if (!strcmp(name, "AcquireImageOHOS")) return (void *)table->AcquireImageOHOS;
3346-
#endif // VK_USE_PLATFORM_OHOS
3347-
#if defined(VK_USE_PLATFORM_OHOS)
3348-
if (!strcmp(name, "QueueSignalReleaseImageOHOS")) return (void *)table->QueueSignalReleaseImageOHOS;
3349-
#endif // VK_USE_PLATFORM_OHOS
3350-
33513329
// ---- VK_EXT_external_memory_metal extension commands
33523330
#if defined(VK_USE_PLATFORM_METAL_EXT)
33533331
if (!strcmp(name, "GetMemoryMetalHandleEXT")) return (void *)table->GetMemoryMetalHandleEXT;
@@ -10967,62 +10945,6 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_CreateSurfaceOHOS(
1096710945

1096810946
#endif // VK_USE_PLATFORM_OHOS
1096910947

10970-
// ---- VK_OHOS_native_buffer extension trampoline/terminators
10971-
10972-
#if defined(VK_USE_PLATFORM_OHOS)
10973-
VKAPI_ATTR VkResult VKAPI_CALL GetSwapchainGrallocUsageOHOS(
10974-
VkDevice device,
10975-
VkFormat format,
10976-
VkImageUsageFlags imageUsage,
10977-
uint64_t* grallocUsage) {
10978-
const VkLayerDispatchTable *disp = loader_get_dispatch(device);
10979-
if (NULL == disp) {
10980-
loader_log(NULL, VULKAN_LOADER_FATAL_ERROR_BIT | VULKAN_LOADER_ERROR_BIT | VULKAN_LOADER_VALIDATION_BIT, 0,
10981-
"vkGetSwapchainGrallocUsageOHOS: Invalid device "
10982-
"[VUID-vkGetSwapchainGrallocUsageOHOS-device-parameter]");
10983-
abort(); /* Intentionally fail so user can correct issue. */
10984-
}
10985-
return disp->GetSwapchainGrallocUsageOHOS(device, format, imageUsage, grallocUsage);
10986-
}
10987-
10988-
#endif // VK_USE_PLATFORM_OHOS
10989-
#if defined(VK_USE_PLATFORM_OHOS)
10990-
VKAPI_ATTR VkResult VKAPI_CALL AcquireImageOHOS(
10991-
VkDevice device,
10992-
VkImage image,
10993-
int32_t nativeFenceFd,
10994-
VkSemaphore semaphore,
10995-
VkFence fence) {
10996-
const VkLayerDispatchTable *disp = loader_get_dispatch(device);
10997-
if (NULL == disp) {
10998-
loader_log(NULL, VULKAN_LOADER_FATAL_ERROR_BIT | VULKAN_LOADER_ERROR_BIT | VULKAN_LOADER_VALIDATION_BIT, 0,
10999-
"vkAcquireImageOHOS: Invalid device "
11000-
"[VUID-vkAcquireImageOHOS-device-parameter]");
11001-
abort(); /* Intentionally fail so user can correct issue. */
11002-
}
11003-
return disp->AcquireImageOHOS(device, image, nativeFenceFd, semaphore, fence);
11004-
}
11005-
11006-
#endif // VK_USE_PLATFORM_OHOS
11007-
#if defined(VK_USE_PLATFORM_OHOS)
11008-
VKAPI_ATTR VkResult VKAPI_CALL QueueSignalReleaseImageOHOS(
11009-
VkQueue queue,
11010-
uint32_t waitSemaphoreCount,
11011-
const VkSemaphore* pWaitSemaphores,
11012-
VkImage image,
11013-
int32_t* pNativeFenceFd) {
11014-
const VkLayerDispatchTable *disp = loader_get_dispatch(queue);
11015-
if (NULL == disp) {
11016-
loader_log(NULL, VULKAN_LOADER_FATAL_ERROR_BIT | VULKAN_LOADER_ERROR_BIT | VULKAN_LOADER_VALIDATION_BIT, 0,
11017-
"vkQueueSignalReleaseImageOHOS: Invalid queue "
11018-
"[VUID-vkQueueSignalReleaseImageOHOS-queue-parameter]");
11019-
abort(); /* Intentionally fail so user can correct issue. */
11020-
}
11021-
return disp->QueueSignalReleaseImageOHOS(queue, waitSemaphoreCount, pWaitSemaphores, image, pNativeFenceFd);
11022-
}
11023-
11024-
#endif // VK_USE_PLATFORM_OHOS
11025-
1102610948
// ---- VK_NV_cooperative_matrix2 extension trampoline/terminators
1102710949

1102810950
VKAPI_ATTR VkResult VKAPI_CALL GetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV(
@@ -13816,26 +13738,6 @@ bool extension_instance_gpa(struct loader_instance *ptr_instance, const char *na
1381613738
}
1381713739
#endif // VK_USE_PLATFORM_OHOS
1381813740

13819-
// ---- VK_OHOS_native_buffer extension commands
13820-
#if defined(VK_USE_PLATFORM_OHOS)
13821-
if (!strcmp("vkGetSwapchainGrallocUsageOHOS", name)) {
13822-
*addr = (void *)GetSwapchainGrallocUsageOHOS;
13823-
return true;
13824-
}
13825-
#endif // VK_USE_PLATFORM_OHOS
13826-
#if defined(VK_USE_PLATFORM_OHOS)
13827-
if (!strcmp("vkAcquireImageOHOS", name)) {
13828-
*addr = (void *)AcquireImageOHOS;
13829-
return true;
13830-
}
13831-
#endif // VK_USE_PLATFORM_OHOS
13832-
#if defined(VK_USE_PLATFORM_OHOS)
13833-
if (!strcmp("vkQueueSignalReleaseImageOHOS", name)) {
13834-
*addr = (void *)QueueSignalReleaseImageOHOS;
13835-
return true;
13836-
}
13837-
#endif // VK_USE_PLATFORM_OHOS
13838-
1383913741
// ---- VK_NV_cooperative_matrix2 extension commands
1384013742
if (!strcmp("vkGetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV", name)) {
1384113743
*addr = (void *)GetPhysicalDeviceCooperativeMatrixFlexibleDimensionsPropertiesNV;

‎loader/loader.rc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
#include "winres.h"
2323

2424
// All set through CMake
25-
#define VER_FILE_VERSION 1, 4, 336, 0
26-
#define VER_FILE_DESCRIPTION_STR "1.4.336.Dev Build"
25+
#define VER_FILE_VERSION 1, 4, 337, 0
26+
#define VER_FILE_DESCRIPTION_STR "1.4.337.Dev Build"
2727
#define VER_FILE_VERSION_STR "Vulkan Loader - Dev Build"
2828
#define VER_COPYRIGHT_STR "Copyright (C) 2015-2025"
2929

‎scripts/known_good.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"sub_dir": "Vulkan-Headers",
88
"build_dir": "Vulkan-Headers/build",
99
"install_dir": "Vulkan-Headers/build/install",
10-
"commit": "v1.4.336"
10+
"commit": "v1.4.337"
1111
},
1212
{
1313
"name": "googletest",

‎tests/framework/layer/generated/vk_dispatch_table_helper.h‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -739,15 +739,6 @@ static inline void layer_init_device_dispatch_table(VkDevice device, VkLayerDisp
739739
table->DestroyIndirectExecutionSetEXT = (PFN_vkDestroyIndirectExecutionSetEXT)gpa(device, "vkDestroyIndirectExecutionSetEXT");
740740
table->UpdateIndirectExecutionSetPipelineEXT = (PFN_vkUpdateIndirectExecutionSetPipelineEXT)gpa(device, "vkUpdateIndirectExecutionSetPipelineEXT");
741741
table->UpdateIndirectExecutionSetShaderEXT = (PFN_vkUpdateIndirectExecutionSetShaderEXT)gpa(device, "vkUpdateIndirectExecutionSetShaderEXT");
742-
#if defined(VK_USE_PLATFORM_OHOS)
743-
table->GetSwapchainGrallocUsageOHOS = (PFN_vkGetSwapchainGrallocUsageOHOS)gpa(device, "vkGetSwapchainGrallocUsageOHOS");
744-
#endif // VK_USE_PLATFORM_OHOS
745-
#if defined(VK_USE_PLATFORM_OHOS)
746-
table->AcquireImageOHOS = (PFN_vkAcquireImageOHOS)gpa(device, "vkAcquireImageOHOS");
747-
#endif // VK_USE_PLATFORM_OHOS
748-
#if defined(VK_USE_PLATFORM_OHOS)
749-
table->QueueSignalReleaseImageOHOS = (PFN_vkQueueSignalReleaseImageOHOS)gpa(device, "vkQueueSignalReleaseImageOHOS");
750-
#endif // VK_USE_PLATFORM_OHOS
751742
#if defined(VK_USE_PLATFORM_METAL_EXT)
752743
table->GetMemoryMetalHandleEXT = (PFN_vkGetMemoryMetalHandleEXT)gpa(device, "vkGetMemoryMetalHandleEXT");
753744
#endif // VK_USE_PLATFORM_METAL_EXT

0 commit comments

Comments
 (0)