eden-emu/Vulkan-Utility-Libraries
14
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Utility-Libraries.git synced 2025-05-14 16:58:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: Update to header 1.3.272

Browse source 
- Update known-good
- Generate source
- Remove vk_layer_settings_ext.h
- Change all usage of VkLayerSettingEXT::count to use the new name
  valueCount from the public header.
This commit is contained in:
Mike Schuchardt 2023-12-01 10:45:34 -08:00 • committed by Christophe
parent 640fcfeb4c
commit 2feac58733
12 changed files with 104 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

1
BUILD.gn
View file

@ -14,7 +14,6 @@ static_library("vulkan_layer_settings") {
sources = [
"include/vulkan/layer/vk_layer_settings.h",
"include/vulkan/layer/vk_layer_settings.hpp",
"include/vulkan/layer/vk_layer_settings_ext.h",
"include/vulkan/utility/vk_dispatch_table.h",
"include/vulkan/utility/vk_format_utils.h",
"include/vulkan/utility/vk_struct_helper.hpp",

1
include/CMakeLists.txt
View file

@ -8,7 +8,6 @@ target_include_directories(VulkanLayerSettings PUBLIC $<BUILD_INTERFACE:${CMAKE_
target_sources(VulkanLayerSettings PRIVATE
vulkan/layer/vk_layer_settings.h
vulkan/layer/vk_layer_settings.hpp
vulkan/layer/vk_layer_settings_ext.h
)
set(CMAKE_FOLDER "${CMAKE_FOLDER}/VulkanUtilityHeaders")

2
include/vulkan/layer/vk_layer_settings.h
View file

@ -13,7 +13,7 @@
extern "C" {
#endif
#include "vk_layer_settings_ext.h"
#include <vulkan/vulkan.h>
typedef enum VkuLayerSettingType {
VKU_LAYER_SETTING_TYPE_BOOL32 = VK_LAYER_SETTING_TYPE_BOOL32_EXT,

54
include/vulkan/layer/vk_layer_settings_ext.h
View file

@ -1,54 +0,0 @@
// Copyright 2023 The Khronos Group Inc.
// Copyright 2023 Valve Corporation
// Copyright 2023 LunarG, Inc.
//
// SPDX-License-Identifier: Apache-2.0
//
// Author(s):
// - Christophe Riccio <christophe@lunarg.com>
#pragma once
#ifdef __cplusplus
extern "C" {
#endif
#include <vulkan/vk_layer.h>
#define VK_EXT_layer_settings 1
#define VK_EXT_LAYER_SETTINGS_SPEC_VERSION 1
#define VK_EXT_LAYER_SETTINGS_EXTENSION_NAME "VK_EXT_layer_settings"
//
// NOTE: VK_STRUCTURE_TYPE_MAX_ENUM - 1 is used by the intel driver.
// NOTE: VK_STRUCTURE_TYPE_MAX_ENUM - 42 is used by the validation layers
#define VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT ((VkStructureType)(VK_STRUCTURE_TYPE_MAX_ENUM - 44))
typedef enum VkLayerSettingTypeEXT {
VK_LAYER_SETTING_TYPE_BOOL32_EXT = 0,
VK_LAYER_SETTING_TYPE_INT32_EXT,
VK_LAYER_SETTING_TYPE_INT64_EXT,
VK_LAYER_SETTING_TYPE_UINT32_EXT,
VK_LAYER_SETTING_TYPE_UINT64_EXT,
VK_LAYER_SETTING_TYPE_FLOAT32_EXT,
VK_LAYER_SETTING_TYPE_FLOAT64_EXT,
VK_LAYER_SETTING_TYPE_STRING_EXT
} VkLayerSettingTypeEXT;
typedef struct VkLayerSettingEXT {
const char *pLayerName;
const char *pSettingName;
VkLayerSettingTypeEXT type;
uint32_t count;
const void *pValues;
} VkLayerSettingEXT;
typedef struct VkLayerSettingsCreateInfoEXT {
VkStructureType sType;
const void *pNext;
uint32_t settingCount;
const VkLayerSettingEXT *pSettings;
} VkLayerSettingsCreateInfoEXT;
#ifdef __cplusplus
}
#endif

7
include/vulkan/utility/vk_struct_helper.hpp
View file

@ -802,6 +802,7 @@ template <> inline VkStructureType GetSType<VkAccelerationStructureTrianglesDisp
#endif // VK_ENABLE_BETA_EXTENSIONS
template <> inline VkStructureType GetSType<VkPhysicalDeviceClusterCullingShaderFeaturesHUAWEI>() { return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_FEATURES_HUAWEI; }
template <> inline VkStructureType GetSType<VkPhysicalDeviceClusterCullingShaderPropertiesHUAWEI>() { return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_PROPERTIES_HUAWEI; }
template <> inline VkStructureType GetSType<VkPhysicalDeviceClusterCullingShaderVrsFeaturesHUAWEI>() { return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_VRS_FEATURES_HUAWEI; }
template <> inline VkStructureType GetSType<VkPhysicalDeviceBorderColorSwizzleFeaturesEXT>() { return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT; }
template <> inline VkStructureType GetSType<VkSamplerBorderColorComponentMappingCreateInfoEXT>() { return VK_STRUCTURE_TYPE_SAMPLER_BORDER_COLOR_COMPONENT_MAPPING_CREATE_INFO_EXT; }
template <> inline VkStructureType GetSType<VkPhysicalDevicePageableDeviceLocalMemoryFeaturesEXT>() { return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PAGEABLE_DEVICE_LOCAL_MEMORY_FEATURES_EXT; }
@ -816,6 +817,11 @@ template <> inline VkStructureType GetSType<VkDescriptorSetBindingReferenceVALVE
template <> inline VkStructureType GetSType<VkDescriptorSetLayoutHostMappingInfoVALVE>() { return VK_STRUCTURE_TYPE_DESCRIPTOR_SET_LAYOUT_HOST_MAPPING_INFO_VALVE; }
template <> inline VkStructureType GetSType<VkPhysicalDeviceDepthClampZeroOneFeaturesEXT>() { return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_ZERO_ONE_FEATURES_EXT; }
template <> inline VkStructureType GetSType<VkPhysicalDeviceNonSeamlessCubeMapFeaturesEXT>() { return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NON_SEAMLESS_CUBE_MAP_FEATURES_EXT; }
template <> inline VkStructureType GetSType<VkPhysicalDeviceRenderPassStripedFeaturesARM>() { return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_FEATURES_ARM; }
template <> inline VkStructureType GetSType<VkPhysicalDeviceRenderPassStripedPropertiesARM>() { return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_PROPERTIES_ARM; }
template <> inline VkStructureType GetSType<VkRenderPassStripeInfoARM>() { return VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_INFO_ARM; }
template <> inline VkStructureType GetSType<VkRenderPassStripeBeginInfoARM>() { return VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_BEGIN_INFO_ARM; }
template <> inline VkStructureType GetSType<VkRenderPassStripeSubmitInfoARM>() { return VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_SUBMIT_INFO_ARM; }
template <> inline VkStructureType GetSType<VkPhysicalDeviceFragmentDensityMapOffsetFeaturesQCOM>() { return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM; }
template <> inline VkStructureType GetSType<VkPhysicalDeviceFragmentDensityMapOffsetPropertiesQCOM>() { return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM; }
template <> inline VkStructureType GetSType<VkSubpassFragmentDensityMapOffsetEndInfoQCOM>() { return VK_STRUCTURE_TYPE_SUBPASS_FRAGMENT_DENSITY_MAP_OFFSET_END_INFO_QCOM; }
@ -872,6 +878,7 @@ template <> inline VkStructureType GetSType<VkPhysicalDeviceRayTracingInvocation
template <> inline VkStructureType GetSType<VkPhysicalDeviceRayTracingInvocationReorderFeaturesNV>() { return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RAY_TRACING_INVOCATION_REORDER_FEATURES_NV; }
template <> inline VkStructureType GetSType<VkPhysicalDeviceExtendedSparseAddressSpaceFeaturesNV>() { return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_FEATURES_NV; }
template <> inline VkStructureType GetSType<VkPhysicalDeviceExtendedSparseAddressSpacePropertiesNV>() { return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_EXTENDED_SPARSE_ADDRESS_SPACE_PROPERTIES_NV; }
template <> inline VkStructureType GetSType<VkLayerSettingsCreateInfoEXT>() { return VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT; }
template <> inline VkStructureType GetSType<VkPhysicalDeviceShaderCoreBuiltinsFeaturesARM>() { return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_FEATURES_ARM; }
template <> inline VkStructureType GetSType<VkPhysicalDeviceShaderCoreBuiltinsPropertiesARM>() { return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_PROPERTIES_ARM; }
template <> inline VkStructureType GetSType<VkPhysicalDevicePipelineLibraryGroupHandlesFeaturesEXT>() { return VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_PIPELINE_LIBRARY_GROUP_HANDLES_FEATURES_EXT; }

36
include/vulkan/vk_enum_string_helper.h
View file

@ -1608,6 +1608,8 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_FEATURES_HUAWEI";
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_PROPERTIES_HUAWEI:
return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_PROPERTIES_HUAWEI";
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_VRS_FEATURES_HUAWEI:
return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_CLUSTER_CULLING_SHADER_VRS_FEATURES_HUAWEI";
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT:
return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_BORDER_COLOR_SWIZZLE_FEATURES_EXT";
case VK_STRUCTURE_TYPE_SAMPLER_BORDER_COLOR_COMPONENT_MAPPING_CREATE_INFO_EXT:
@ -1636,6 +1638,16 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DEPTH_CLAMP_ZERO_ONE_FEATURES_EXT";
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NON_SEAMLESS_CUBE_MAP_FEATURES_EXT:
return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_NON_SEAMLESS_CUBE_MAP_FEATURES_EXT";
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_FEATURES_ARM:
return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_FEATURES_ARM";
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_PROPERTIES_ARM:
return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_RENDER_PASS_STRIPED_PROPERTIES_ARM";
case VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_BEGIN_INFO_ARM:
return "VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_BEGIN_INFO_ARM";
case VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_INFO_ARM:
return "VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_INFO_ARM";
case VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_SUBMIT_INFO_ARM:
return "VK_STRUCTURE_TYPE_RENDER_PASS_STRIPE_SUBMIT_INFO_ARM";
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM:
return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_FEATURES_QCOM";
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FRAGMENT_DENSITY_MAP_OFFSET_PROPERTIES_QCOM:
@ -1768,6 +1780,8 @@ static inline const char* string_VkStructureType(VkStructureType input_value) {
return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_MUTABLE_DESCRIPTOR_TYPE_FEATURES_EXT";
case VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT:
return "VK_STRUCTURE_TYPE_MUTABLE_DESCRIPTOR_TYPE_CREATE_INFO_EXT";
case VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT:
return "VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT";
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_FEATURES_ARM:
return "VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_FEATURES_ARM";
case VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SHADER_CORE_BUILTINS_PROPERTIES_ARM:
@ -4590,6 +4604,28 @@ static inline const char* string_VkRayTracingInvocationReorderModeNV(VkRayTracin
return "Unhandled VkRayTracingInvocationReorderModeNV";
}
}
static inline const char* string_VkLayerSettingTypeEXT(VkLayerSettingTypeEXT input_value) {
switch (input_value) {
case VK_LAYER_SETTING_TYPE_BOOL32_EXT:
return "VK_LAYER_SETTING_TYPE_BOOL32_EXT";
case VK_LAYER_SETTING_TYPE_INT32_EXT:
return "VK_LAYER_SETTING_TYPE_INT32_EXT";
case VK_LAYER_SETTING_TYPE_INT64_EXT:
return "VK_LAYER_SETTING_TYPE_INT64_EXT";
case VK_LAYER_SETTING_TYPE_UINT32_EXT:
return "VK_LAYER_SETTING_TYPE_UINT32_EXT";
case VK_LAYER_SETTING_TYPE_UINT64_EXT:
return "VK_LAYER_SETTING_TYPE_UINT64_EXT";
case VK_LAYER_SETTING_TYPE_FLOAT32_EXT:
return "VK_LAYER_SETTING_TYPE_FLOAT32_EXT";
case VK_LAYER_SETTING_TYPE_FLOAT64_EXT:
return "VK_LAYER_SETTING_TYPE_FLOAT64_EXT";
case VK_LAYER_SETTING_TYPE_STRING_EXT:
return "VK_LAYER_SETTING_TYPE_STRING_EXT";
default:
return "Unhandled VkLayerSettingTypeEXT";
}
}
static inline const char* string_VkLatencyMarkerNV(VkLatencyMarkerNV input_value) {
switch (input_value) {
case VK_LATENCY_MARKER_SIMULATION_START_NV:

1
scripts/gn/stub.cpp
View file

@ -8,7 +8,6 @@
#include <vulkan/layer/vk_layer_settings.h>
#include <vulkan/layer/vk_layer_settings.hpp>
#include <vulkan/layer/vk_layer_settings_ext.h>
#include <vulkan/utility/vk_dispatch_table.h>
#include <vulkan/utility/vk_format_utils.h>
#include <vulkan/utility/vk_struct_helper.hpp>

2
scripts/known_good.json
View file

@ -7,7 +7,7 @@
"sub_dir": "Vulkan-Headers",
"build_dir": "Vulkan-Headers/build",
"install_dir": "Vulkan-Headers/build/install",
"commit": "v1.3.271"
"commit": "v1.3.272"
},
{
"name": "googletest",

52
src/layer/vk_layer_settings.cpp
View file

@ -147,14 +147,14 @@ VkResult vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char
if (static_cast<VkuLayerSettingType>(api_setting->type) != type) {
result = VK_ERROR_FORMAT_NOT_SUPPORTED;
} else if (copy_values) {
if (*pValueCount < api_setting->count) {
if (*pValueCount < api_setting->valueCount) {
result = VK_INCOMPLETE;
}
const std::uint32_t size = std::min(*pValueCount, api_setting->count);
const std::uint32_t size = std::min(*pValueCount, api_setting->valueCount);
const VkBool32 *data = static_cast<const VkBool32 *>(api_setting->pValues);
values.assign(data, data + size);
} else {
*pValueCount = api_setting->count;
*pValueCount = api_setting->valueCount;
}
}
@ -192,14 +192,14 @@ VkResult vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char
if (static_cast<VkuLayerSettingType>(api_setting->type) != type) {
result = VK_ERROR_FORMAT_NOT_SUPPORTED;
} else if (copy_values) {
if (*pValueCount < api_setting->count) {
if (*pValueCount < api_setting->valueCount) {
result = VK_INCOMPLETE;
}
const std::uint32_t size = std::min(*pValueCount, api_setting->count);
const std::uint32_t size = std::min(*pValueCount, api_setting->valueCount);
const int32_t *data = static_cast<const int32_t *>(api_setting->pValues);
values.assign(data, data + size);
} else {
*pValueCount = api_setting->count;
*pValueCount = api_setting->valueCount;
}
}
@ -246,14 +246,14 @@ VkResult vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char
if (static_cast<VkuLayerSettingType>(api_setting->type) != type) {
result = VK_ERROR_FORMAT_NOT_SUPPORTED;
} else if (copy_values) {
if (*pValueCount < api_setting->count) {
if (*pValueCount < api_setting->valueCount) {
result = VK_INCOMPLETE;
}
const std::uint32_t size = std::min(*pValueCount, api_setting->count);
const std::uint32_t size = std::min(*pValueCount, api_setting->valueCount);
const int64_t *data = static_cast<const int64_t *>(api_setting->pValues);
values.assign(data, data + size);
} else {
*pValueCount = api_setting->count;
*pValueCount = api_setting->valueCount;
}
}
@ -300,14 +300,14 @@ VkResult vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char
if (static_cast<VkuLayerSettingType>(api_setting->type) != type) {
result = VK_ERROR_FORMAT_NOT_SUPPORTED;
} else if (copy_values) {
if (*pValueCount < api_setting->count) {
if (*pValueCount < api_setting->valueCount) {
result = VK_INCOMPLETE;
}
const uint32_t size = std::min(*pValueCount, api_setting->count);
const uint32_t size = std::min(*pValueCount, api_setting->valueCount);
const uint32_t *data = static_cast<const uint32_t *>(api_setting->pValues);
values.assign(data, data + size);
} else {
*pValueCount = api_setting->count;
*pValueCount = api_setting->valueCount;
}
}
@ -354,14 +354,14 @@ VkResult vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char
if (static_cast<VkuLayerSettingType>(api_setting->type) != type) {
result = VK_ERROR_FORMAT_NOT_SUPPORTED;
} else if (copy_values) {
if (*pValueCount < api_setting->count) {
if (*pValueCount < api_setting->valueCount) {
result = VK_INCOMPLETE;
}
const std::uint32_t size = std::min(*pValueCount, api_setting->count);
const std::uint32_t size = std::min(*pValueCount, api_setting->valueCount);
const uint64_t *data = static_cast<const uint64_t *>(api_setting->pValues);
values.assign(data, data + size);
} else {
*pValueCount = api_setting->count;
*pValueCount = api_setting->valueCount;
}
}
@ -399,14 +399,14 @@ VkResult vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char
if (static_cast<VkuLayerSettingType>(api_setting->type) != type) {
result = VK_ERROR_FORMAT_NOT_SUPPORTED;
} else if (copy_values) {
if (*pValueCount < api_setting->count) {
if (*pValueCount < api_setting->valueCount) {
result = VK_INCOMPLETE;
}
const std::uint32_t size = std::min(*pValueCount, api_setting->count);
const std::uint32_t size = std::min(*pValueCount, api_setting->valueCount);
const float *data = static_cast<const float *>(api_setting->pValues);
values.assign(data, data + size);
} else {
*pValueCount = api_setting->count;
*pValueCount = api_setting->valueCount;
}
}
@ -444,14 +444,14 @@ VkResult vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char
if (static_cast<VkuLayerSettingType>(api_setting->type) != type) {
result = VK_ERROR_FORMAT_NOT_SUPPORTED;
} else if (copy_values) {
if (*pValueCount < api_setting->count) {
if (*pValueCount < api_setting->valueCount) {
result = VK_INCOMPLETE;
}
const std::uint32_t size = std::min(*pValueCount, api_setting->count);
const std::uint32_t size = std::min(*pValueCount, api_setting->valueCount);
const double *data = static_cast<const double *>(api_setting->pValues);
values.assign(data, data + size);
} else {
*pValueCount = api_setting->count;
*pValueCount = api_setting->valueCount;
}
}
@ -487,7 +487,7 @@ VkResult vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char
}
} else if (api_setting != nullptr) { // From Vulkan Layer Setting API
const uint32_t frameset_count =
static_cast<uint32_t>(api_setting->count / (sizeof(VkuFrameset) / sizeof(VkuFrameset::count)));
static_cast<uint32_t>(api_setting->valueCount / (sizeof(VkuFrameset) / sizeof(VkuFrameset::count)));
if (api_setting->type != VK_LAYER_SETTING_TYPE_UINT32_EXT) {
result = VK_ERROR_FORMAT_NOT_SUPPORTED;
} else if (copy_values) {
@ -525,10 +525,10 @@ VkResult vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char
}
} else if (api_setting != nullptr) { // From Vulkan Layer Setting API
if (copy_values) {
if (*pValueCount < api_setting->count) {
if (*pValueCount < api_setting->valueCount) {
result = VK_INCOMPLETE;
}
const std::uint32_t size = std::min(*pValueCount, api_setting->count);
const std::uint32_t size = std::min(*pValueCount, api_setting->valueCount);
settings_cache.resize(size);
switch (api_setting->type) {
@ -579,7 +579,7 @@ VkResult vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char
break;
}
} else {
*pValueCount = api_setting->count;
*pValueCount = api_setting->valueCount;
}
}
@ -608,7 +608,7 @@ VkResult vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char
}
} else if (api_setting != nullptr) { // From Vulkan Layer Setting API
const std::uint32_t frameset_count =
static_cast<uint32_t>(api_setting->count / (sizeof(VkuFrameset) / sizeof(VkuFrameset::count)));
static_cast<uint32_t>(api_setting->valueCount / (sizeof(VkuFrameset) / sizeof(VkuFrameset::count)));
if (copy_values) {
if (*pValueCount < frameset_count) {

18
tests/test_setting_api.cpp
View file

@ -27,7 +27,7 @@ TEST(test_layer_setting_api, vkuHasLayerSetting_Found_SingleCreateInfo) {
my_setting.pLayerName = "VK_LAYER_LUNARG_test";
my_setting.pSettingName = "my_setting";
my_setting.type = VK_LAYER_SETTING_TYPE_INT32_EXT;
my_setting.count = 1;
my_setting.valueCount = 1;
my_setting.pValues = &pValues;
std::vector<VkLayerSettingEXT> settings;
@ -96,7 +96,7 @@ TEST(test_layer_setting_api, vkuHasLayerSetting) {
setting_bool_value.pSettingName = "bool_value";
setting_bool_value.type = VK_LAYER_SETTING_TYPE_BOOL32_EXT;
setting_bool_value.pValues = &value_bool;
setting_bool_value.count = 1;
setting_bool_value.valueCount = 1;
settings.push_back(setting_bool_value);
std::int32_t value_int32 = 76;
@ -105,7 +105,7 @@ TEST(test_layer_setting_api, vkuHasLayerSetting) {
setting_int32_value.pSettingName = "int32_value";
setting_int32_value.type = VK_LAYER_SETTING_TYPE_INT32_EXT;
setting_int32_value.pValues = &value_int32;
setting_int32_value.count = 1;
setting_int32_value.valueCount = 1;
settings.push_back(setting_int32_value);
std::int64_t value_int64 = static_cast<int64_t>(1) << static_cast<int64_t>(40);
@ -114,7 +114,7 @@ TEST(test_layer_setting_api, vkuHasLayerSetting) {
setting_int64_value.pSettingName = "int64_value";
setting_int64_value.type = VK_LAYER_SETTING_TYPE_INT64_EXT;
setting_int64_value.pValues = &value_int64;
setting_int64_value.count = 1;
setting_int64_value.valueCount = 1;
settings.push_back(setting_int64_value);
std::uint32_t value_uint32 = 76u;
@ -123,7 +123,7 @@ TEST(test_layer_setting_api, vkuHasLayerSetting) {
setting_uint32_value.pSettingName = "uint32_value";
setting_uint32_value.type = VK_LAYER_SETTING_TYPE_UINT32_EXT;
setting_uint32_value.pValues = &value_uint32;
setting_uint32_value.count = 1;
setting_uint32_value.valueCount = 1;
settings.push_back(setting_uint32_value);
std::uint64_t value_uint64 = static_cast<uint64_t>(1) << static_cast<uint64_t>(40);
@ -132,7 +132,7 @@ TEST(test_layer_setting_api, vkuHasLayerSetting) {
setting_uint64_value.pSettingName = "uint64_value";
setting_uint64_value.type = VK_LAYER_SETTING_TYPE_UINT64_EXT;
setting_uint64_value.pValues = &value_uint64;
setting_uint64_value.count = 1;
setting_uint64_value.valueCount = 1;
settings.push_back(setting_uint64_value);
float value_float = 76.1f;
@ -141,7 +141,7 @@ TEST(test_layer_setting_api, vkuHasLayerSetting) {
setting_float_value.pSettingName = "float_value";
setting_float_value.type = VK_LAYER_SETTING_TYPE_FLOAT32_EXT;
setting_float_value.pValues = &value_float;
setting_float_value.count = 1;
setting_float_value.valueCount = 1;
settings.push_back(setting_float_value);
double value_double = 76.1;
@ -150,7 +150,7 @@ TEST(test_layer_setting_api, vkuHasLayerSetting) {
setting_double_value.pSettingName = "double_value";
setting_double_value.type = VK_LAYER_SETTING_TYPE_FLOAT64_EXT;
setting_double_value.pValues = &value_double;
setting_double_value.count = 1;
setting_double_value.valueCount = 1;
settings.push_back(setting_double_value);
VkuFrameset value_frameset{76, 100, 10};
@ -159,7 +159,7 @@ TEST(test_layer_setting_api, vkuHasLayerSetting) {
setting_frameset_value.pSettingName = "frameset_value";
setting_frameset_value.type = VK_LAYER_SETTING_TYPE_UINT32_EXT;
setting_frameset_value.pValues = &value_frameset;
setting_frameset_value.count = sizeof(VkuFrameset) / sizeof(VkuFrameset::count);
setting_frameset_value.valueCount = sizeof(VkuFrameset) / sizeof(VkuFrameset::count);
settings.push_back(setting_frameset_value);
VkLayerSettingsCreateInfoEXT layer_settings_create_info;

16
tests/test_setting_cpp.cpp
View file

@ -493,7 +493,7 @@ TEST(test_layer_setting_cpp, vkuGetUnknownSettings) {
setting_bool_value.pSettingName = "bool_value";
setting_bool_value.type = VK_LAYER_SETTING_TYPE_BOOL32_EXT;
setting_bool_value.pValues = &value_bool;
setting_bool_value.count = 1;
setting_bool_value.valueCount = 1;
settings.push_back(setting_bool_value);
std::int32_t value_int32 = 76;
@ -502,7 +502,7 @@ TEST(test_layer_setting_cpp, vkuGetUnknownSettings) {
setting_int32_value.pSettingName = "int32_value";
setting_int32_value.type = VK_LAYER_SETTING_TYPE_INT32_EXT;
setting_int32_value.pValues = &value_int32;
setting_int32_value.count = 1;
setting_int32_value.valueCount = 1;
settings.push_back(setting_int32_value);
std::int64_t value_int64 = static_cast<int64_t>(1) << static_cast<int64_t>(40);
@ -511,7 +511,7 @@ TEST(test_layer_setting_cpp, vkuGetUnknownSettings) {
setting_int64_value.pSettingName = "int64_value";
setting_int64_value.type = VK_LAYER_SETTING_TYPE_INT64_EXT;
setting_int64_value.pValues = &value_int64;
setting_int64_value.count = 1;
setting_int64_value.valueCount = 1;
settings.push_back(setting_int64_value);
std::uint32_t value_uint32 = 76u;
@ -520,7 +520,7 @@ TEST(test_layer_setting_cpp, vkuGetUnknownSettings) {
setting_uint32_value.pSettingName = "uint32_value";
setting_uint32_value.type = VK_LAYER_SETTING_TYPE_UINT32_EXT;
setting_uint32_value.pValues = &value_uint32;
setting_uint32_value.count = 1;
setting_uint32_value.valueCount = 1;
settings.push_back(setting_uint32_value);
std::uint64_t value_uint64 = static_cast<uint64_t>(1) << static_cast<uint64_t>(40);
@ -529,7 +529,7 @@ TEST(test_layer_setting_cpp, vkuGetUnknownSettings) {
setting_uint64_value.pSettingName = "uint64_value";
setting_uint64_value.type = VK_LAYER_SETTING_TYPE_UINT64_EXT;
setting_uint64_value.pValues = &value_uint64;
setting_uint64_value.count = 1;
setting_uint64_value.valueCount = 1;
settings.push_back(setting_uint64_value);
float value_float = 76.1f;
@ -538,7 +538,7 @@ TEST(test_layer_setting_cpp, vkuGetUnknownSettings) {
setting_float_value.pSettingName = "float_value";
setting_float_value.type = VK_LAYER_SETTING_TYPE_FLOAT32_EXT;
setting_float_value.pValues = &value_float;
setting_float_value.count = 1;
setting_float_value.valueCount = 1;
settings.push_back(setting_float_value);
double value_double = 76.1;
@ -547,7 +547,7 @@ TEST(test_layer_setting_cpp, vkuGetUnknownSettings) {
setting_double_value.pSettingName = "double_value";
setting_double_value.type = VK_LAYER_SETTING_TYPE_FLOAT64_EXT;
setting_double_value.pValues = &value_double;
setting_double_value.count = 1;
setting_double_value.valueCount = 1;
settings.push_back(setting_double_value);
VkuFrameset value_frameset{76, 100, 10};
@ -556,7 +556,7 @@ TEST(test_layer_setting_cpp, vkuGetUnknownSettings) {
setting_frameset_value.pSettingName = "frameset_value";
setting_frameset_value.type = VK_LAYER_SETTING_TYPE_UINT32_EXT;
setting_frameset_value.pValues = &value_frameset;
setting_frameset_value.count = sizeof(VkuFrameset) / sizeof(VkuFrameset::count);
setting_frameset_value.valueCount = sizeof(VkuFrameset) / sizeof(VkuFrameset::count);
settings.push_back(setting_frameset_value);
VkLayerSettingsCreateInfoEXT layer_settings_create_info;

32
tests/test_setting_util.cpp
View file

@ -587,7 +587,7 @@ TEST(test_layer_settings_util, vkuGetUnknownSettings_SingleCreateInfo) {
setting_bool_value.pSettingName = "bool_value";
setting_bool_value.type = VK_LAYER_SETTING_TYPE_BOOL32_EXT;
setting_bool_value.pValues = &value_bool;
setting_bool_value.count = 1;
setting_bool_value.valueCount = 1;
settings.push_back(setting_bool_value);
std::int32_t value_int32 = 76;
@ -596,7 +596,7 @@ TEST(test_layer_settings_util, vkuGetUnknownSettings_SingleCreateInfo) {
setting_int32_value.pSettingName = "int32_value";
setting_int32_value.type = VK_LAYER_SETTING_TYPE_INT32_EXT;
setting_int32_value.pValues = &value_int32;
setting_int32_value.count = 1;
setting_int32_value.valueCount = 1;
settings.push_back(setting_int32_value);
std::int64_t value_int64 = static_cast<int64_t>(1) << static_cast<int64_t>(40);
@ -605,7 +605,7 @@ TEST(test_layer_settings_util, vkuGetUnknownSettings_SingleCreateInfo) {
setting_int64_value.pSettingName = "int64_value";
setting_int64_value.type = VK_LAYER_SETTING_TYPE_INT64_EXT;
setting_int64_value.pValues = &value_int64;
setting_int64_value.count = 1;
setting_int64_value.valueCount = 1;
settings.push_back(setting_int64_value);
std::uint32_t value_uint32 = 76u;
@ -614,7 +614,7 @@ TEST(test_layer_settings_util, vkuGetUnknownSettings_SingleCreateInfo) {
setting_uint32_value.pSettingName = "uint32_value";
setting_uint32_value.type = VK_LAYER_SETTING_TYPE_UINT32_EXT;
setting_uint32_value.pValues = &value_uint32;
setting_uint32_value.count = 1;
setting_uint32_value.valueCount = 1;
settings.push_back(setting_uint32_value);
std::uint64_t value_uint64 = static_cast<uint64_t>(1) << static_cast<uint64_t>(40);
@ -623,7 +623,7 @@ TEST(test_layer_settings_util, vkuGetUnknownSettings_SingleCreateInfo) {
setting_uint64_value.pSettingName = "uint64_value";
setting_uint64_value.type = VK_LAYER_SETTING_TYPE_UINT64_EXT;
setting_uint64_value.pValues = &value_uint64;
setting_uint64_value.count = 1;
setting_uint64_value.valueCount = 1;
settings.push_back(setting_uint64_value);
float value_float = 76.1f;
@ -632,7 +632,7 @@ TEST(test_layer_settings_util, vkuGetUnknownSettings_SingleCreateInfo) {
setting_float_value.pSettingName = "float_value";
setting_float_value.type = VK_LAYER_SETTING_TYPE_FLOAT32_EXT;
setting_float_value.pValues = &value_float;
setting_float_value.count = 1;
setting_float_value.valueCount = 1;
settings.push_back(setting_float_value);
double value_double = 76.1;
@ -641,7 +641,7 @@ TEST(test_layer_settings_util, vkuGetUnknownSettings_SingleCreateInfo) {
setting_double_value.pSettingName = "double_value";
setting_double_value.type = VK_LAYER_SETTING_TYPE_FLOAT64_EXT;
setting_double_value.pValues = &value_double;
setting_double_value.count = 1;
setting_double_value.valueCount = 1;
settings.push_back(setting_double_value);
VkuFrameset value_frameset{76, 100, 10};
@ -650,7 +650,7 @@ TEST(test_layer_settings_util, vkuGetUnknownSettings_SingleCreateInfo) {
setting_frameset_value.pSettingName = "frameset_value";
setting_frameset_value.type = VK_LAYER_SETTING_TYPE_UINT32_EXT;
setting_frameset_value.pValues = &value_frameset;
setting_frameset_value.count = sizeof(VkuFrameset) / sizeof(VkuFrameset::count);
setting_frameset_value.valueCount = sizeof(VkuFrameset) / sizeof(VkuFrameset::count);
settings.push_back(setting_frameset_value);
VkLayerSettingsCreateInfoEXT create_info;
@ -689,7 +689,7 @@ TEST(test_layer_settings_util, vlGetUnknownSettings_MultipleCreateInfo) {
setting_bool_value.pSettingName = "bool_value";
setting_bool_value.type = VK_LAYER_SETTING_TYPE_BOOL32_EXT;
setting_bool_value.pValues = &value_bool;
setting_bool_value.count = 1;
setting_bool_value.valueCount = 1;
settingsA.push_back(setting_bool_value);
std::int32_t value_int32 = 76;
@ -698,7 +698,7 @@ TEST(test_layer_settings_util, vlGetUnknownSettings_MultipleCreateInfo) {
setting_int32_value.pSettingName = "int32_value";
setting_int32_value.type = VK_LAYER_SETTING_TYPE_INT32_EXT;
setting_int32_value.pValues = &value_int32;
setting_int32_value.count = 1;
setting_int32_value.valueCount = 1;
settingsA.push_back(setting_int32_value);
std::int64_t value_int64 = static_cast<int64_t>(1) << static_cast<int64_t>(40);
@ -707,7 +707,7 @@ TEST(test_layer_settings_util, vlGetUnknownSettings_MultipleCreateInfo) {
setting_int64_value.pSettingName = "int64_value";
setting_int64_value.type = VK_LAYER_SETTING_TYPE_INT64_EXT;
setting_int64_value.pValues = &value_int64;
setting_int64_value.count = 1;
setting_int64_value.valueCount = 1;
settingsA.push_back(setting_int64_value);
std::uint32_t value_uint32 = 76u;
@ -716,7 +716,7 @@ TEST(test_layer_settings_util, vlGetUnknownSettings_MultipleCreateInfo) {
setting_uint32_value.pSettingName = "uint32_value";
setting_uint32_value.type = VK_LAYER_SETTING_TYPE_UINT32_EXT;
setting_uint32_value.pValues = &value_uint32;
setting_uint32_value.count = 1;
setting_uint32_value.valueCount = 1;
settingsA.push_back(setting_uint32_value);
std::uint64_t value_uint64 = static_cast<uint64_t>(1) << static_cast<uint64_t>(40);
@ -725,7 +725,7 @@ TEST(test_layer_settings_util, vlGetUnknownSettings_MultipleCreateInfo) {
setting_uint64_value.pSettingName = "uint64_value";
setting_uint64_value.type = VK_LAYER_SETTING_TYPE_UINT64_EXT;
setting_uint64_value.pValues = &value_uint64;
setting_uint64_value.count = 1;
setting_uint64_value.valueCount = 1;
settingsA.push_back(setting_uint64_value);
VkLayerSettingsCreateInfoEXT create_infoA;
@ -742,7 +742,7 @@ TEST(test_layer_settings_util, vlGetUnknownSettings_MultipleCreateInfo) {
setting_float_value.pSettingName = "float_value";
setting_float_value.type = VK_LAYER_SETTING_TYPE_FLOAT32_EXT;
setting_float_value.pValues = &value_float;
setting_float_value.count = 1;
setting_float_value.valueCount = 1;
settingsB.push_back(setting_float_value);
double value_double = 76.1;
@ -751,7 +751,7 @@ TEST(test_layer_settings_util, vlGetUnknownSettings_MultipleCreateInfo) {
setting_double_value.pSettingName = "double_value";
setting_double_value.type = VK_LAYER_SETTING_TYPE_FLOAT64_EXT;
setting_double_value.pValues = &value_double;
setting_double_value.count = 1;
setting_double_value.valueCount = 1;
settingsB.push_back(setting_double_value);
VkuFrameset value_frameset{76, 100, 10};
@ -760,7 +760,7 @@ TEST(test_layer_settings_util, vlGetUnknownSettings_MultipleCreateInfo) {
setting_frameset_value.pSettingName = "frameset_value";
setting_frameset_value.type = VK_LAYER_SETTING_TYPE_UINT32_EXT;
setting_frameset_value.pValues = &value_frameset;
setting_frameset_value.count = sizeof(VkuFrameset) / sizeof(VkuFrameset::count);
setting_frameset_value.valueCount = sizeof(VkuFrameset) / sizeof(VkuFrameset::count);
settingsB.push_back(setting_frameset_value);
VkLayerSettingsCreateInfoEXT create_infoB;