Skip to content

Commit

Permalink
build: Update to header 1.3.302
Browse files Browse the repository at this point in the history
  • Loading branch information
mikes-lunarg committed Nov 21, 2024
1 parent dc252cd commit 71f4d83
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
# ~~~
cmake_minimum_required(VERSION 3.17.2)

project(VULKAN_LOADER VERSION 1.3.301 LANGUAGES C)
project(VULKAN_LOADER VERSION 1.3.302 LANGUAGES C)

option(CODE_COVERAGE "Enable Code Coverage" OFF)
if (CODE_COVERAGE)
Expand Down
1 change: 1 addition & 0 deletions loader/generated/vk_layer_dispatch_table.h
Original file line number Diff line number Diff line change
Expand Up @@ -727,6 +727,7 @@ typedef struct VkLayerDispatchTable_ {

// ---- VK_NVX_image_view_handle extension commands
PFN_vkGetImageViewHandleNVX GetImageViewHandleNVX;
PFN_vkGetImageViewHandle64NVX GetImageViewHandle64NVX;
PFN_vkGetImageViewAddressNVX GetImageViewAddressNVX;

// ---- VK_AMD_draw_indirect_count extension commands
Expand Down
20 changes: 20 additions & 0 deletions loader/generated/vk_loader_extensions.c
Original file line number Diff line number Diff line change
Expand Up @@ -765,6 +765,7 @@ VKAPI_ATTR void VKAPI_CALL loader_init_device_extension_dispatch_table(struct lo

// ---- VK_NVX_image_view_handle extension commands
table->GetImageViewHandleNVX = (PFN_vkGetImageViewHandleNVX)gdpa(dev, "vkGetImageViewHandleNVX");
table->GetImageViewHandle64NVX = (PFN_vkGetImageViewHandle64NVX)gdpa(dev, "vkGetImageViewHandle64NVX");
table->GetImageViewAddressNVX = (PFN_vkGetImageViewAddressNVX)gdpa(dev, "vkGetImageViewAddressNVX");

// ---- VK_AMD_draw_indirect_count extension commands
Expand Down Expand Up @@ -2545,6 +2546,7 @@ VKAPI_ATTR void* VKAPI_CALL loader_lookup_device_dispatch_table(const VkLayerDis

// ---- VK_NVX_image_view_handle extension commands
if (!strcmp(name, "GetImageViewHandleNVX")) return (void *)table->GetImageViewHandleNVX;
if (!strcmp(name, "GetImageViewHandle64NVX")) return (void *)table->GetImageViewHandle64NVX;
if (!strcmp(name, "GetImageViewAddressNVX")) return (void *)table->GetImageViewAddressNVX;

// ---- VK_AMD_draw_indirect_count extension commands
Expand Down Expand Up @@ -5493,6 +5495,19 @@ VKAPI_ATTR uint32_t VKAPI_CALL GetImageViewHandleNVX(
return disp->GetImageViewHandleNVX(device, pInfo);
}

VKAPI_ATTR uint64_t VKAPI_CALL GetImageViewHandle64NVX(
VkDevice device,
const VkImageViewHandleInfoNVX* pInfo) {
const VkLayerDispatchTable *disp = loader_get_dispatch(device);
if (NULL == disp) {
loader_log(NULL, VULKAN_LOADER_FATAL_ERROR_BIT | VULKAN_LOADER_ERROR_BIT | VULKAN_LOADER_VALIDATION_BIT, 0,
"vkGetImageViewHandle64NVX: Invalid device "
"[VUID-vkGetImageViewHandle64NVX-device-parameter]");
abort(); /* Intentionally fail so user can correct issue. */
}
return disp->GetImageViewHandle64NVX(device, pInfo);
}

VKAPI_ATTR VkResult VKAPI_CALL GetImageViewAddressNVX(
VkDevice device,
VkImageView imageView,
Expand Down Expand Up @@ -10820,6 +10835,10 @@ bool extension_instance_gpa(struct loader_instance *ptr_instance, const char *na
*addr = (void *)GetImageViewHandleNVX;
return true;
}
if (!strcmp("vkGetImageViewHandle64NVX", name)) {
*addr = (void *)GetImageViewHandle64NVX;
return true;
}
if (!strcmp("vkGetImageViewAddressNVX", name)) {
*addr = (void *)GetImageViewAddressNVX;
return true;
Expand Down Expand Up @@ -12685,5 +12704,6 @@ const char *const LOADER_INSTANCE_EXTENSIONS[] = {
VK_GOOGLE_SURFACELESS_QUERY_EXTENSION_NAME,
VK_LUNARG_DIRECT_DRIVER_LOADING_EXTENSION_NAME,
VK_EXT_LAYER_SETTINGS_EXTENSION_NAME,
VK_NV_DISPLAY_STEREO_EXTENSION_NAME,
NULL };
// clang-format on
4 changes: 2 additions & 2 deletions loader/loader.rc
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
#include "winres.h"

// All set through CMake
#define VER_FILE_VERSION 1, 3, 301, 0
#define VER_FILE_DESCRIPTION_STR "1.3.301.Dev Build"
#define VER_FILE_VERSION 1, 3, 302, 0
#define VER_FILE_DESCRIPTION_STR "1.3.302.Dev Build"
#define VER_FILE_VERSION_STR "Vulkan Loader - Dev Build"
#define VER_COPYRIGHT_STR "Copyright (C) 2015-2024"

Expand Down
2 changes: 1 addition & 1 deletion scripts/known_good.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"sub_dir": "Vulkan-Headers",
"build_dir": "Vulkan-Headers/build",
"install_dir": "Vulkan-Headers/build/install",
"commit": "v1.3.301"
"commit": "v1.3.302"
},
{
"name": "googletest",
Expand Down

0 comments on commit 71f4d83

Please sign in to comment.