ci: Add clang-format to CI

This also removes the extra .clang-format in the include directory

closes #78
This commit is contained in:
Juan Ramos 2023-11-10 13:17:53 -07:00 committed by Juan Ramos
parent daeab89bb9
commit 678ce607a0
26 changed files with 305 additions and 314 deletions

34
.github/workflows/format.yml vendored Normal file
View file

@ -0,0 +1,34 @@
# Copyright 2023 Valve Corporation
# Copyright 2023 LunarG, Inc.
#
# SPDX-License-Identifier: Apache-2.0
name: format
on:
push:
pull_request:
branches:
- main
permissions:
contents: read
jobs:
clang-format:
name: clang-format
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
path:
- 'include'
- 'src'
- 'tests'
steps:
- uses: actions/checkout@v4
- name: Run clang-format
uses: jidicula/clang-format-action@v4.11.0
with:
clang-format-version: '14'
check-path: ${{ matrix.path }}

View file

@ -42,7 +42,6 @@ if (VUL_IS_TOP_LEVEL)
install( install(
DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/${API_TYPE}/" DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/${API_TYPE}/"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/vulkan" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/vulkan"
PATTERN ".clang-format" EXCLUDE
) )
set_target_properties(VulkanLayerSettings PROPERTIES EXPORT_NAME "LayerSettings") set_target_properties(VulkanLayerSettings PROPERTIES EXPORT_NAME "LayerSettings")

View file

@ -60,4 +60,3 @@ void vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char *pS
// Return the list of Unknown setting in all VkLayerSettingsCreateInfoEXT // Return the list of Unknown setting in all VkLayerSettingsCreateInfoEXT
VkResult vkuGetUnknownSettings(const VkLayerSettingsCreateInfoEXT *pFirstCreateInfo, uint32_t settingsCount, const char **pSettings, VkResult vkuGetUnknownSettings(const VkLayerSettingsCreateInfoEXT *pFirstCreateInfo, uint32_t settingsCount, const char **pSettings,
std::vector<const char *> &unknownSettings); std::vector<const char *> &unknownSettings);

View file

@ -1,16 +0,0 @@
# Copyright 2023 The Khronos Group Inc.
# Copyright 2023 Valve Corporation
# Copyright 2023 LunarG, Inc.
#
# SPDX-License-Identifier: Apache-2.0
---
# Use defaults from the Google style with the following exceptions:
BasedOnStyle: Google
IndentWidth: 4
AccessModifierOffset: -2
# Modify Disable column limit in generated code
ColumnLimit: 0
SortIncludes: false
...

View file

@ -12,6 +12,8 @@
#include <string.h> #include <string.h>
// clang-format off
typedef PFN_vkVoidFunction(VKAPI_PTR *PFN_GetPhysicalDeviceProcAddr)(VkInstance instance, const char *pName); typedef PFN_vkVoidFunction(VKAPI_PTR *PFN_GetPhysicalDeviceProcAddr)(VkInstance instance, const char *pName);
// Instance function pointer dispatch table // Instance function pointer dispatch table
@ -1479,3 +1481,4 @@ static inline void vkuInitInstanceDispatchTable(VkInstance instance, VkuInstance
#endif // VK_USE_PLATFORM_SCREEN_QNX #endif // VK_USE_PLATFORM_SCREEN_QNX
table->GetPhysicalDeviceOpticalFlowImageFormatsNV = (PFN_vkGetPhysicalDeviceOpticalFlowImageFormatsNV)gipa(instance, "vkGetPhysicalDeviceOpticalFlowImageFormatsNV"); table->GetPhysicalDeviceOpticalFlowImageFormatsNV = (PFN_vkGetPhysicalDeviceOpticalFlowImageFormatsNV)gipa(instance, "vkGetPhysicalDeviceOpticalFlowImageFormatsNV");
} }
// clang-format on

View file

@ -8,6 +8,8 @@
#pragma once #pragma once
// clang-format off
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -348,7 +350,6 @@ struct VKU_FORMAT_INFO {
uint32_t component_count; uint32_t component_count;
struct VKU_FORMAT_COMPONENT_INFO components[VKU_FORMAT_MAX_COMPONENTS]; struct VKU_FORMAT_COMPONENT_INFO components[VKU_FORMAT_MAX_COMPONENTS];
}; };
// clang-format off
inline const struct VKU_FORMAT_INFO vkuGetFormatInfo(VkFormat format) { inline const struct VKU_FORMAT_INFO vkuGetFormatInfo(VkFormat format) {
switch (format) { switch (format) {
case VK_FORMAT_R4G4_UNORM_PACK8: { case VK_FORMAT_R4G4_UNORM_PACK8: {
@ -1106,7 +1107,6 @@ inline const struct VKU_FORMAT_INFO vkuGetFormatInfo(VkFormat format) {
} }
}; };
} }
// clang-format on
struct VKU_FORMAT_PER_PLANE_COMPATIBILITY { struct VKU_FORMAT_PER_PLANE_COMPATIBILITY {
uint32_t width_divisor; uint32_t width_divisor;
@ -1120,7 +1120,6 @@ struct VKU_FORMAT_MULTIPLANE_COMPATIBILITY {
}; };
// Source: Vulkan spec Table 47. Plane Format Compatibility Table // Source: Vulkan spec Table 47. Plane Format Compatibility Table
// clang-format off
inline const struct VKU_FORMAT_MULTIPLANE_COMPATIBILITY vkuGetFormatCompatibility(VkFormat format) { inline const struct VKU_FORMAT_MULTIPLANE_COMPATIBILITY vkuGetFormatCompatibility(VkFormat format) {
switch (format) { switch (format) {
case VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM: { case VK_FORMAT_G8_B8_R8_3PLANE_420_UNORM: {
@ -1200,7 +1199,6 @@ inline const struct VKU_FORMAT_MULTIPLANE_COMPATIBILITY vkuGetFormatCompatibilit
return out; } return out; }
}; };
} }
// clang-format on
// Return true if all components in a format are an SFLOAT // Return true if all components in a format are an SFLOAT
bool vkuFormatIsSFLOAT(VkFormat format) { bool vkuFormatIsSFLOAT(VkFormat format) {
@ -1666,8 +1664,6 @@ bool vkuFormatIsCompressed_PVRTC(VkFormat format) {
return false; return false;
} }
} }
// clang-format off
// Return true if a format is any compressed image format // Return true if a format is any compressed image format
bool vkuFormatIsCompressed(VkFormat format) { bool vkuFormatIsCompressed(VkFormat format) {
return return
@ -1678,7 +1674,6 @@ bool vkuFormatIsCompressed(VkFormat format) {
vkuFormatIsCompressed_ETC2(format) || vkuFormatIsCompressed_ETC2(format) ||
vkuFormatIsCompressed_PVRTC(format); vkuFormatIsCompressed_PVRTC(format);
} }
// clang-format on
// Return true if format is a depth OR stencil format // Return true if format is a depth OR stencil format
bool vkuFormatIsDepthOrStencil(VkFormat format) { bool vkuFormatIsDepthOrStencil(VkFormat format) {
@ -2262,3 +2257,5 @@ inline uint32_t vkuGetPlaneIndex(VkImageAspectFlagBits aspect) {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
// clang-format off

View file

@ -9,6 +9,8 @@
#pragma once #pragma once
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
// clang-format off
namespace vku { namespace vku {
template <typename T> template <typename T>
@ -1057,4 +1059,4 @@ template<> inline VkObjectType GetObjectType<VkShaderEXT>() { return VK_OBJECT_T
#endif // VK_USE_64_BIT_PTR_DEFINES == 1 #endif // VK_USE_64_BIT_PTR_DEFINES == 1
} // namespace vku } // namespace vku
// NOLINTEND // NOLINTEND// clang-format on

View file

@ -7,6 +7,9 @@
// SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: Apache-2.0
#pragma once #pragma once
// clang-format off
#ifdef __cplusplus #ifdef __cplusplus
#include <string> #include <string>
#endif #endif
@ -9222,4 +9225,4 @@ static inline std::string string_VkAccelerationStructureCreateFlagsKHR(VkAcceler
return ret; return ret;
} }
#endif // __cplusplus #endif // __cplusplus
// clang-format on

View file

@ -32,6 +32,8 @@ class DispatchTableOutputGenerator(BaseGenerator):
#include <string.h> #include <string.h>
// clang-format off
typedef PFN_vkVoidFunction(VKAPI_PTR *PFN_GetPhysicalDeviceProcAddr)(VkInstance instance, const char *pName); typedef PFN_vkVoidFunction(VKAPI_PTR *PFN_GetPhysicalDeviceProcAddr)(VkInstance instance, const char *pName);
''') ''')
out.append(''' out.append('''
@ -90,6 +92,8 @@ static inline void vkuInitInstanceDispatchTable(VkInstance instance, VkuInstance
out.extend(guard_helper.addGuard(command.protect)) out.extend(guard_helper.addGuard(command.protect))
out.append(f' table->{command.name[2:]} = (PFN_{command.name})gipa(instance, "{command.name}");\n') out.append(f' table->{command.name[2:]} = (PFN_{command.name})gipa(instance, "{command.name}");\n')
out.extend(guard_helper.addGuard(None)) out.extend(guard_helper.addGuard(None))
out.append('}') out.append('}\n')
out.append('// clang-format on')
self.write("".join(out)) self.write("".join(out))

View file

@ -26,6 +26,9 @@ class EnumStringHelperOutputGenerator(BaseGenerator):
''') ''')
out.append(''' out.append('''
#pragma once #pragma once
// clang-format off
#ifdef __cplusplus #ifdef __cplusplus
#include <string> #include <string>
#endif #endif
@ -108,4 +111,5 @@ static inline std::string string_{bitmask.flagName}({bitmask.flagName} input_val
}}\n''') }}\n''')
out.append('#endif // __cplusplus\n') out.append('#endif // __cplusplus\n')
out.extend(guard_helper.addGuard(None)) out.extend(guard_helper.addGuard(None))
out.append('// clang-format on')
self.write("".join(out)) self.write("".join(out))

View file

@ -81,6 +81,8 @@ class FormatUtilsOutputGenerator(BaseGenerator):
out.append(''' out.append('''
#pragma once #pragma once
// clang-format off
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@ -293,7 +295,6 @@ struct VKU_FORMAT_INFO {
struct VKU_FORMAT_COMPONENT_INFO components[VKU_FORMAT_MAX_COMPONENTS]; struct VKU_FORMAT_COMPONENT_INFO components[VKU_FORMAT_MAX_COMPONENTS];
}; };
''') ''')
out.append('// clang-format off\n')
out.append('inline const struct VKU_FORMAT_INFO vkuGetFormatInfo(VkFormat format) {\n') out.append('inline const struct VKU_FORMAT_INFO vkuGetFormatInfo(VkFormat format) {\n')
out.append(' switch (format) {\n') out.append(' switch (format) {\n')
for f in self.vk.formats.values(): for f in self.vk.formats.values():
@ -316,7 +317,6 @@ struct VKU_FORMAT_INFO {
} }
}; };
} }
// clang-format on
struct VKU_FORMAT_PER_PLANE_COMPATIBILITY { struct VKU_FORMAT_PER_PLANE_COMPATIBILITY {
uint32_t width_divisor; uint32_t width_divisor;
@ -331,7 +331,6 @@ struct VKU_FORMAT_MULTIPLANE_COMPATIBILITY {
''') ''')
out.append('// Source: Vulkan spec Table 47. Plane Format Compatibility Table\n') out.append('// Source: Vulkan spec Table 47. Plane Format Compatibility Table\n')
out.append('// clang-format off\n')
out.append('inline const struct VKU_FORMAT_MULTIPLANE_COMPATIBILITY vkuGetFormatCompatibility(VkFormat format) {\n') out.append('inline const struct VKU_FORMAT_MULTIPLANE_COMPATIBILITY vkuGetFormatCompatibility(VkFormat format) {\n')
out.append(' switch (format) {\n') out.append(' switch (format) {\n')
for format in [x for x in self.vk.formats.values() if x.planes]: for format in [x for x in self.vk.formats.values() if x.planes]:
@ -356,7 +355,6 @@ struct VKU_FORMAT_MULTIPLANE_COMPATIBILITY {
out.append(' return out; }\n') out.append(' return out; }\n')
out.append(' };\n') out.append(' };\n')
out.append('}\n') out.append('}\n')
out.append('// clang-format on\n')
for numericFormat in sorted(self.numericFormats): for numericFormat in sorted(self.numericFormats):
out.append(f'\n// Return true if all components in a format are an {numericFormat}\n') out.append(f'\n// Return true if all components in a format are an {numericFormat}\n')
@ -383,7 +381,6 @@ inline bool vkuFormatIsSampledFloat(VkFormat format) {
out.append(f' case {f}:\n') out.append(f' case {f}:\n')
out.append(self.commonBoolSwitch) out.append(self.commonBoolSwitch)
out.append('\n// clang-format off\n')
out.append('// Return true if a format is any compressed image format\n') out.append('// Return true if a format is any compressed image format\n')
out.append('bool vkuFormatIsCompressed(VkFormat format) {\n') out.append('bool vkuFormatIsCompressed(VkFormat format) {\n')
out.append(' return\n') out.append(' return\n')
@ -393,7 +390,6 @@ inline bool vkuFormatIsSampledFloat(VkFormat format) {
out.append(' ||\n') out.append(' ||\n')
out.append(';\n') out.append(';\n')
out.append('}\n') out.append('}\n')
out.append('// clang-format on\n')
out.append('\n// Return true if format is a depth OR stencil format\n') out.append('\n// Return true if format is a depth OR stencil format\n')
out.append('bool vkuFormatIsDepthOrStencil(VkFormat format) {\n') out.append('bool vkuFormatIsDepthOrStencil(VkFormat format) {\n')
@ -656,7 +652,9 @@ inline uint32_t vkuGetPlaneIndex(VkImageAspectFlagBits aspect) {
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif''') #endif
// clang-format off''')
self.write("".join(out)) self.write("".join(out))

View file

@ -41,6 +41,8 @@ class StructHelperOutputGenerator(BaseGenerator):
#pragma once #pragma once
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
// clang-format off
namespace vku { namespace vku {
template <typename T> template <typename T>
@ -139,4 +141,5 @@ template<typename T> VkObjectType GetObjectType() {
\n''') \n''')
out.append('// NOLINTEND') # Wrap for clang-tidy to ignore out.append('// NOLINTEND') # Wrap for clang-tidy to ignore
out.append('// clang-format on')
self.write("".join(out)) self.write("".join(out))

View file

@ -112,9 +112,7 @@ namespace vl {
LayerSettings::LayerSettings(const char *pLayerName, const VkLayerSettingsCreateInfoEXT *pFirstCreateInfo, LayerSettings::LayerSettings(const char *pLayerName, const VkLayerSettingsCreateInfoEXT *pFirstCreateInfo,
const VkAllocationCallbacks *pAllocator, VkuLayerSettingLogCallback pCallback) const VkAllocationCallbacks *pAllocator, VkuLayerSettingLogCallback pCallback)
: layer_name(pLayerName) : layer_name(pLayerName), first_create_info(pFirstCreateInfo), pCallback(pCallback) {
, first_create_info(pFirstCreateInfo)
, pCallback(pCallback) {
(void)pAllocator; (void)pAllocator;
assert(pLayerName != nullptr); assert(pLayerName != nullptr);
@ -255,7 +253,7 @@ const VkLayerSettingEXT *LayerSettings::FindLayerSettingValue(const char *pSetti
return nullptr; return nullptr;
} }
void LayerSettings::Log(const char *pSettingName, const char * pMessage) { void LayerSettings::Log(const char *pSettingName, const char *pMessage) {
this->last_log_setting = pSettingName; this->last_log_setting = pSettingName;
this->last_log_message = pMessage; this->last_log_message = pMessage;
@ -301,7 +299,7 @@ std::string LayerSettings::GetEnvSetting(const char *pSettingName) {
::AddWorkaroundLayerNames(layer_names); ::AddWorkaroundLayerNames(layer_names);
for (std::size_t layer_index = 0, layer_count = layer_names.size(); layer_index < layer_count; ++layer_index) { for (std::size_t layer_index = 0, layer_count = layer_names.size(); layer_index < layer_count; ++layer_index) {
const char* cur_layer_name = layer_names[layer_index].c_str(); const char *cur_layer_name = layer_names[layer_index].c_str();
if (!this->prefix.empty()) { if (!this->prefix.empty()) {
const std::string &env_name = GetEnvSettingName(cur_layer_name, this->prefix.c_str(), pSettingName, TRIM_NAMESPACE); const std::string &env_name = GetEnvSettingName(cur_layer_name, this->prefix.c_str(), pSettingName, TRIM_NAMESPACE);
@ -312,7 +310,8 @@ std::string LayerSettings::GetEnvSetting(const char *pSettingName) {
} }
for (int trim_index = TRIM_FIRST; trim_index <= TRIM_LAST; ++trim_index) { for (int trim_index = TRIM_FIRST; trim_index <= TRIM_LAST; ++trim_index) {
const std::string &env_name = GetEnvSettingName(cur_layer_name, this->prefix.c_str(), pSettingName, static_cast<TrimMode>(trim_index)); const std::string &env_name =
GetEnvSettingName(cur_layer_name, this->prefix.c_str(), pSettingName, static_cast<TrimMode>(trim_index));
std::string result = GetEnvironment(env_name.c_str()); std::string result = GetEnvironment(env_name.c_str());
if (!result.empty()) { if (!result.empty()) {
return result; return result;

View file

@ -16,7 +16,7 @@
#include <filesystem> #include <filesystem>
namespace vl { namespace vl {
class LayerSettings { class LayerSettings {
public: public:
LayerSettings(const char *pLayerName, const VkLayerSettingsCreateInfoEXT *pFirstCreateInfo, LayerSettings(const char *pLayerName, const VkLayerSettingsCreateInfoEXT *pFirstCreateInfo,
const VkAllocationCallbacks *pAllocator, VkuLayerSettingLogCallback pCallback); const VkAllocationCallbacks *pAllocator, VkuLayerSettingLogCallback pCallback);
@ -34,7 +34,7 @@ namespace vl {
std::string GetFileSetting(const char *pSettingName); std::string GetFileSetting(const char *pSettingName);
void SetFileSetting(const char *pSettingName, const std::string& pValues); void SetFileSetting(const char *pSettingName, const std::string &pValues);
const VkLayerSettingEXT *GetAPISetting(const char *pSettingName); const VkLayerSettingEXT *GetAPISetting(const char *pSettingName);
@ -59,6 +59,5 @@ namespace vl {
const VkLayerSettingsCreateInfoEXT *first_create_info{nullptr}; const VkLayerSettingsCreateInfoEXT *first_create_info{nullptr};
VkuLayerSettingLogCallback pCallback{nullptr}; VkuLayerSettingLogCallback pCallback{nullptr};
}; };
}// namespace vl } // namespace vl

View file

@ -106,7 +106,7 @@ char GetEnvDelimiter() {
#endif #endif
} }
char FindDelimiter(const std::string& s) { char FindDelimiter(const std::string &s) {
if (s.find(',') != std::string::npos) { if (s.find(',') != std::string::npos) {
return ','; return ',';
} else if (s.find(GetEnvDelimiter()) != std::string::npos) { } else if (s.find(GetEnvDelimiter()) != std::string::npos) {

View file

@ -16,60 +16,57 @@
#include <cstdarg> #include <cstdarg>
namespace vl { namespace vl {
const VkLayerSettingsCreateInfoEXT *FindSettingsInChain( const VkLayerSettingsCreateInfoEXT *FindSettingsInChain(const void *next);
const void *next);
std::vector<std::string> Split( std::vector<std::string> Split(const std::string &pValues, char delimiter);
const std::string &pValues, char delimiter);
enum TrimMode { enum TrimMode {
TRIM_NONE, TRIM_NONE,
TRIM_VENDOR, TRIM_VENDOR,
TRIM_NAMESPACE, TRIM_NAMESPACE,
TRIM_FIRST = TRIM_NONE, TRIM_FIRST = TRIM_NONE,
TRIM_LAST = TRIM_NAMESPACE, TRIM_LAST = TRIM_NAMESPACE,
}; };
std::string GetEnvSettingName(const char *layer_key, const char* prefix, const char *setting_key, TrimMode trim_mode); std::string GetEnvSettingName(const char *layer_key, const char *prefix, const char *setting_key, TrimMode trim_mode);
std::string GetFileSettingName(const char *layer_key, const char *setting_key); std::string GetFileSettingName(const char *layer_key, const char *setting_key);
// Find the delimiter (, ; :) in a string made of tokens. Return ',' by default // Find the delimiter (, ; :) in a string made of tokens. Return ',' by default
char FindDelimiter(const std::string &s); char FindDelimiter(const std::string &s);
// ';' on WIN32 and ':' on Unix // ';' on WIN32 and ':' on Unix
char GetEnvDelimiter(); char GetEnvDelimiter();
// Remove whitespaces at the beginning of the end // Remove whitespaces at the beginning of the end
std::string TrimWhitespace(const std::string &s); std::string TrimWhitespace(const std::string &s);
std::string TrimPrefix(const std::string &layer_name); std::string TrimPrefix(const std::string &layer_name);
std::string TrimVendor(const std::string &layer_name); std::string TrimVendor(const std::string &layer_name);
std::string ToLower(const std::string &s); std::string ToLower(const std::string &s);
std::string ToUpper(const std::string &s); std::string ToUpper(const std::string &s);
uint32_t ToUint32(const std::string &token); uint32_t ToUint32(const std::string &token);
uint64_t ToUint64(const std::string &token); uint64_t ToUint64(const std::string &token);
int32_t ToInt32(const std::string &token); int32_t ToInt32(const std::string &token);
int64_t ToInt64(const std::string &token); int64_t ToInt64(const std::string &token);
bool IsFrameSets(const std::string &s); bool IsFrameSets(const std::string &s);
VkuFrameset ToFrameSet(const std::string &s); VkuFrameset ToFrameSet(const std::string &s);
std::vector<VkuFrameset> ToFrameSets(const std::string &s); std::vector<VkuFrameset> ToFrameSets(const std::string &s);
bool IsInteger(const std::string &s); bool IsInteger(const std::string &s);
bool IsFloat(const std::string &s); bool IsFloat(const std::string &s);
std::string FormatString(const char *message, ...); std::string FormatString(const char *message, ...);
} // namespace vl } // namespace vl

View file

@ -45,7 +45,7 @@ VkResult vkuCreateLayerSettingSet(const char *pLayerName, const VkLayerSettingsC
void vkuDestroyLayerSettingSet(VkuLayerSettingSet layerSettingSet, const VkAllocationCallbacks *pAllocator) { void vkuDestroyLayerSettingSet(VkuLayerSettingSet layerSettingSet, const VkAllocationCallbacks *pAllocator) {
(void)pAllocator; (void)pAllocator;
vl::LayerSettings *layer_setting_set = (vl::LayerSettings*)layerSettingSet; vl::LayerSettings *layer_setting_set = (vl::LayerSettings *)layerSettingSet;
delete layer_setting_set; delete layer_setting_set;
} }
@ -486,7 +486,8 @@ VkResult vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char
*pValueCount = static_cast<std::uint32_t>(settings.size()); *pValueCount = static_cast<std::uint32_t>(settings.size());
} }
} else if (api_setting != nullptr) { // From Vulkan Layer Setting API } 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))); const uint32_t frameset_count =
static_cast<uint32_t>(api_setting->count / (sizeof(VkuFrameset) / sizeof(VkuFrameset::count)));
if (api_setting->type != VK_LAYER_SETTING_TYPE_UINT32_EXT) { if (api_setting->type != VK_LAYER_SETTING_TYPE_UINT32_EXT) {
result = VK_ERROR_FORMAT_NOT_SUPPORTED; result = VK_ERROR_FORMAT_NOT_SUPPORTED;
} else if (copy_values) { } else if (copy_values) {
@ -533,7 +534,7 @@ VkResult vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char
switch (api_setting->type) { switch (api_setting->type) {
case VK_LAYER_SETTING_TYPE_STRING_EXT: case VK_LAYER_SETTING_TYPE_STRING_EXT:
for (std::size_t i = 0, n = settings_cache.size(); i < n; ++i) { for (std::size_t i = 0, n = settings_cache.size(); i < n; ++i) {
settings_cache[i] = reinterpret_cast<const char * const *>(api_setting->pValues)[i]; settings_cache[i] = reinterpret_cast<const char *const *>(api_setting->pValues)[i];
} }
break; break;
case VK_LAYER_SETTING_TYPE_BOOL32_EXT: case VK_LAYER_SETTING_TYPE_BOOL32_EXT:
@ -559,7 +560,8 @@ VkResult vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char
break; break;
case VK_LAYER_SETTING_TYPE_UINT64_EXT: case VK_LAYER_SETTING_TYPE_UINT64_EXT:
for (std::size_t i = 0, n = settings_cache.size(); i < n; ++i) { for (std::size_t i = 0, n = settings_cache.size(); i < n; ++i) {
settings_cache[i] = vl::FormatString("%llu", static_cast<const uint64_t *>(api_setting->pValues)[i]); settings_cache[i] =
vl::FormatString("%llu", static_cast<const uint64_t *>(api_setting->pValues)[i]);
} }
break; break;
case VK_LAYER_SETTING_TYPE_FLOAT32_EXT: case VK_LAYER_SETTING_TYPE_FLOAT32_EXT:
@ -624,8 +626,8 @@ VkResult vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char
case VK_LAYER_SETTING_TYPE_UINT32_EXT: case VK_LAYER_SETTING_TYPE_UINT32_EXT:
for (std::size_t i = 0, n = settings_cache.size(); i < n; ++i) { for (std::size_t i = 0, n = settings_cache.size(); i < n; ++i) {
const VkuFrameset *asFramesets = static_cast<const VkuFrameset *>(api_setting->pValues); const VkuFrameset *asFramesets = static_cast<const VkuFrameset *>(api_setting->pValues);
settings_cache[i] = vl::FormatString("%d-%d-%d", settings_cache[i] =
asFramesets[i].first, asFramesets[i].count, asFramesets[i].step); vl::FormatString("%d-%d-%d", asFramesets[i].first, asFramesets[i].count, asFramesets[i].step);
} }
break; break;
default: default:
@ -676,7 +678,7 @@ const VkLayerSettingsCreateInfoEXT *vkuNextLayerSettingsCreateInfo(const VkLayer
return found; return found;
} }
static bool vkuHasSetting(uint32_t settingsCount, const char **pSettings, const char* searchedSettings) { static bool vkuHasSetting(uint32_t settingsCount, const char **pSettings, const char *searchedSettings) {
for (uint32_t setting_index = 0; setting_index < settingsCount; ++setting_index) { for (uint32_t setting_index = 0; setting_index < settingsCount; ++setting_index) {
if (std::strcmp(pSettings[setting_index], searchedSettings) == 0) { if (std::strcmp(pSettings[setting_index], searchedSettings) == 0) {
return true; return true;
@ -686,8 +688,8 @@ static bool vkuHasSetting(uint32_t settingsCount, const char **pSettings, const
return false; return false;
} }
VkResult vkuGetUnknownSettings(const VkLayerSettingsCreateInfoEXT* pCreateInfo, uint32_t settingsCount, const char** pSettings, VkResult vkuGetUnknownSettings(const VkLayerSettingsCreateInfoEXT *pCreateInfo, uint32_t settingsCount, const char **pSettings,
uint32_t* pUnknownSettingCount, const char** pUnknownSettings) { uint32_t *pUnknownSettingCount, const char **pUnknownSettings) {
assert(pUnknownSettingCount != nullptr); assert(pUnknownSettingCount != nullptr);
const VkLayerSettingsCreateInfoEXT *current_create_info = pCreateInfo; const VkLayerSettingsCreateInfoEXT *current_create_info = pCreateInfo;
@ -717,4 +719,3 @@ VkResult vkuGetUnknownSettings(const VkLayerSettingsCreateInfoEXT* pCreateInfo,
return VK_SUCCESS; return VK_SUCCESS;
} }

View file

@ -130,7 +130,8 @@ void vkuGetLayerSettingValue(VkuLayerSettingSet layerSettingSet, const char *pSe
settingValue = Merge(values); settingValue = Merge(values);
} }
void vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char *pSettingName, std::vector<std::string> &settingValues) { void vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char *pSettingName,
std::vector<std::string> &settingValues) {
uint32_t value_count = 0; uint32_t value_count = 0;
vkuGetLayerSettingValues(layerSettingSet, pSettingName, VKU_LAYER_SETTING_TYPE_STRING, &value_count, nullptr); vkuGetLayerSettingValues(layerSettingSet, pSettingName, VKU_LAYER_SETTING_TYPE_STRING, &value_count, nullptr);
if (value_count > 0) { if (value_count > 0) {
@ -140,12 +141,13 @@ void vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char *pS
} }
} }
void vkuGetLayerSettingValue(VkuLayerSettingSet layerSettingSet, const char* pSettingName, VkuFrameset& settingValue) { void vkuGetLayerSettingValue(VkuLayerSettingSet layerSettingSet, const char *pSettingName, VkuFrameset &settingValue) {
uint32_t value_count = sizeof(VkuFrameset) / sizeof(VkuFrameset::count); uint32_t value_count = sizeof(VkuFrameset) / sizeof(VkuFrameset::count);
vkuGetLayerSettingValues(layerSettingSet, pSettingName, VKU_LAYER_SETTING_TYPE_UINT32, &value_count, &settingValue); vkuGetLayerSettingValues(layerSettingSet, pSettingName, VKU_LAYER_SETTING_TYPE_UINT32, &value_count, &settingValue);
} }
void vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char *pSettingName, std::vector<VkuFrameset> &settingValues) { void vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char *pSettingName,
std::vector<VkuFrameset> &settingValues) {
uint32_t value_count = 0; uint32_t value_count = 0;
vkuGetLayerSettingValues(layerSettingSet, pSettingName, VKU_LAYER_SETTING_TYPE_UINT32, &value_count, nullptr); vkuGetLayerSettingValues(layerSettingSet, pSettingName, VKU_LAYER_SETTING_TYPE_UINT32, &value_count, nullptr);
if (value_count > 0) { if (value_count > 0) {
@ -164,7 +166,7 @@ static uint32_t TokenToUint(const std::string &token) {
return int_id; return int_id;
} }
static void SetCustomStypeInfo(std::vector<const char *> raw_id_list, std::vector<VkuCustomSTypeInfo>& custom_stype_info) { static void SetCustomStypeInfo(std::vector<const char *> raw_id_list, std::vector<VkuCustomSTypeInfo> &custom_stype_info) {
// List format is a list of integer pairs // List format is a list of integer pairs
for (std::size_t i = 0, n = raw_id_list.size(); i < n; i += 2) { for (std::size_t i = 0, n = raw_id_list.size(); i < n; i += 2) {
uint32_t stype_id = TokenToUint(raw_id_list[i + 0]); uint32_t stype_id = TokenToUint(raw_id_list[i + 0]);
@ -184,7 +186,8 @@ static void SetCustomStypeInfo(std::vector<const char *> raw_id_list, std::vecto
} }
} }
void vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char *pSettingName, std::vector<VkuCustomSTypeInfo> &settingValues) { void vkuGetLayerSettingValues(VkuLayerSettingSet layerSettingSet, const char *pSettingName,
std::vector<VkuCustomSTypeInfo> &settingValues) {
uint32_t value_count = 0; uint32_t value_count = 0;
vkuGetLayerSettingValues(layerSettingSet, pSettingName, VKU_LAYER_SETTING_TYPE_STRING, &value_count, nullptr); vkuGetLayerSettingValues(layerSettingSet, pSettingName, VKU_LAYER_SETTING_TYPE_STRING, &value_count, nullptr);
if (value_count > 0) { if (value_count > 0) {

View file

@ -33,8 +33,8 @@ TEST(test_layer_setting_api, vkuHasLayerSetting_Found_SingleCreateInfo) {
std::vector<VkLayerSettingEXT> settings; std::vector<VkLayerSettingEXT> settings;
settings.push_back(my_setting); settings.push_back(my_setting);
VkLayerSettingsCreateInfoEXT layer_settings_create_info{ VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<uint32_t>(settings.size()), &settings[0]}; static_cast<uint32_t>(settings.size()), &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -48,26 +48,19 @@ TEST(test_layer_setting_api, vkuHasLayerSetting_Found_MultipleCreateInfo) {
const std::int32_t valueA = 76; const std::int32_t valueA = 76;
const std::int32_t valueC1 = 77; const std::int32_t valueC1 = 77;
const VkLayerSettingEXT settingsA[] = { const VkLayerSettingEXT settingsA[] = {{"VK_LAYER_LUNARG_test", "my_settingA", VK_LAYER_SETTING_TYPE_INT32_EXT, 1, &valueA},
{"VK_LAYER_LUNARG_test", "my_settingA", VK_LAYER_SETTING_TYPE_INT32_EXT, 1, &valueA}, {"VK_LAYER_LUNARG_test", "my_settingC", VK_LAYER_SETTING_TYPE_INT32_EXT, 1, &valueC1}};
{"VK_LAYER_LUNARG_test", "my_settingC", VK_LAYER_SETTING_TYPE_INT32_EXT, 1, &valueC1}
};
const VkLayerSettingsCreateInfoEXT layer_settings_create_infoA{ const VkLayerSettingsCreateInfoEXT layer_settings_create_infoA{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT,
nullptr,
static_cast<uint32_t>(std::size(settingsA)), settingsA}; static_cast<uint32_t>(std::size(settingsA)), settingsA};
const std::int32_t valueB = 82; const std::int32_t valueB = 82;
const std::int32_t valueC2 = 83; // Override valueC1 value! const std::int32_t valueC2 = 83; // Override valueC1 value!
const VkLayerSettingEXT settingsB[] = { const VkLayerSettingEXT settingsB[] = {{"VK_LAYER_LUNARG_test", "my_settingB", VK_LAYER_SETTING_TYPE_INT32_EXT, 1, &valueB},
{"VK_LAYER_LUNARG_test", "my_settingB", VK_LAYER_SETTING_TYPE_INT32_EXT, 1, &valueB}, {"VK_LAYER_LUNARG_test", "my_settingC", VK_LAYER_SETTING_TYPE_INT32_EXT, 1, &valueC2}};
{"VK_LAYER_LUNARG_test", "my_settingC", VK_LAYER_SETTING_TYPE_INT32_EXT, 1, &valueC2}
};
const VkLayerSettingsCreateInfoEXT layer_settings_create_infoB{ const VkLayerSettingsCreateInfoEXT layer_settings_create_infoB{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT,
&layer_settings_create_infoA, &layer_settings_create_infoA,
static_cast<uint32_t>(std::size(settingsB)), settingsB}; static_cast<uint32_t>(std::size(settingsB)), settingsB};
@ -195,11 +188,11 @@ TEST(test_layer_setting_api, vkuHasLayerSetting) {
TEST(test_layer_setting_api, vkuGetLayerSettingValues_Bool) { TEST(test_layer_setting_api, vkuGetLayerSettingValues_Bool) {
std::vector<VkBool32> input_values{VK_TRUE, VK_FALSE}; std::vector<VkBool32> input_values{VK_TRUE, VK_FALSE};
std::vector<VkLayerSettingEXT> settings{ std::vector<VkLayerSettingEXT> settings{{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_BOOL32_EXT,
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_BOOL32_EXT, static_cast<uint32_t>(input_values.size()), &input_values[0]}}; static_cast<uint32_t>(input_values.size()), &input_values[0]}};
VkLayerSettingsCreateInfoEXT layer_settings_create_info{ VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<uint32_t>(settings.size()), &settings[0]}; static_cast<uint32_t>(settings.size()), &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -236,11 +229,11 @@ TEST(test_layer_setting_api, vkuGetLayerSettingValues_Bool) {
TEST(test_layer_setting_api, vkuGetLayerSettingValues_Int32) { TEST(test_layer_setting_api, vkuGetLayerSettingValues_Int32) {
std::vector<std::int32_t> input_values{76, -82}; std::vector<std::int32_t> input_values{76, -82};
std::vector<VkLayerSettingEXT> settings{ std::vector<VkLayerSettingEXT> settings{VkLayerSettingEXT{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_INT32_EXT,
VkLayerSettingEXT{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_INT32_EXT, static_cast<uint32_t>(input_values.size()), &input_values[0]}}; static_cast<uint32_t>(input_values.size()), &input_values[0]}};
VkLayerSettingsCreateInfoEXT layer_settings_create_info{ VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<uint32_t>(settings.size()), &settings[0]}; static_cast<uint32_t>(settings.size()), &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -277,11 +270,11 @@ TEST(test_layer_setting_api, vkuGetLayerSettingValues_Int32) {
TEST(test_layer_setting_api, vkuGetLayerSettingValues_Int64) { TEST(test_layer_setting_api, vkuGetLayerSettingValues_Int64) {
std::vector<std::int64_t> input_values{76, -82}; std::vector<std::int64_t> input_values{76, -82};
std::vector<VkLayerSettingEXT> settings{ std::vector<VkLayerSettingEXT> settings{{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_INT64_EXT,
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_INT64_EXT, static_cast<uint32_t>(input_values.size()), &input_values[0]}}; static_cast<uint32_t>(input_values.size()), &input_values[0]}};
VkLayerSettingsCreateInfoEXT layer_settings_create_info{ VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<uint32_t>(settings.size()), &settings[0]}; static_cast<uint32_t>(settings.size()), &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -318,12 +311,11 @@ TEST(test_layer_setting_api, vkuGetLayerSettingValues_Int64) {
TEST(test_layer_setting_api, vkuGetLayerSettingValues_Uint32) { TEST(test_layer_setting_api, vkuGetLayerSettingValues_Uint32) {
std::vector<std::uint32_t> input_values{76, 82}; std::vector<std::uint32_t> input_values{76, 82};
std::vector<VkLayerSettingEXT> settings{ std::vector<VkLayerSettingEXT> settings{{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT32_EXT,
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT32_EXT, static_cast<uint32_t>(input_values.size()), &input_values[0]} static_cast<uint32_t>(input_values.size()), &input_values[0]}};
};
VkLayerSettingsCreateInfoEXT layer_settings_create_info{ VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<uint32_t>(settings.size()), &settings[0]}; static_cast<uint32_t>(settings.size()), &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -360,12 +352,11 @@ TEST(test_layer_setting_api, vkuGetLayerSettingValues_Uint32) {
TEST(test_layer_setting_api, vkuGetLayerSettingValues_Uint64) { TEST(test_layer_setting_api, vkuGetLayerSettingValues_Uint64) {
std::vector<std::uint64_t> input_values{76, 82}; std::vector<std::uint64_t> input_values{76, 82};
std::vector<VkLayerSettingEXT> settings{ std::vector<VkLayerSettingEXT> settings{{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT64_EXT,
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT64_EXT, static_cast<uint32_t>(input_values.size()), &input_values[0]} static_cast<uint32_t>(input_values.size()), &input_values[0]}};
};
VkLayerSettingsCreateInfoEXT layer_settings_create_info{ VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<uint32_t>(settings.size()), &settings[0]}; static_cast<uint32_t>(settings.size()), &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -402,12 +393,11 @@ TEST(test_layer_setting_api, vkuGetLayerSettingValues_Uint64) {
TEST(test_layer_setting_api, vkuGetLayerSettingValues_Float) { TEST(test_layer_setting_api, vkuGetLayerSettingValues_Float) {
std::vector<float> input_values{76.1f, -82.5f}; std::vector<float> input_values{76.1f, -82.5f};
std::vector<VkLayerSettingEXT> settings{ std::vector<VkLayerSettingEXT> settings{{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_FLOAT32_EXT,
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_FLOAT32_EXT, static_cast<uint32_t>(input_values.size()), &input_values[0]} static_cast<uint32_t>(input_values.size()), &input_values[0]}};
};
VkLayerSettingsCreateInfoEXT layer_settings_create_info{ VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<uint32_t>(settings.size()), &settings[0]}; static_cast<uint32_t>(settings.size()), &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -443,12 +433,11 @@ TEST(test_layer_setting_api, vkuGetLayerSettingValues_Float) {
TEST(test_layer_setting_api, vkuGetLayerSettingValues_Double) { TEST(test_layer_setting_api, vkuGetLayerSettingValues_Double) {
std::vector<double> input_values{76.1, -82.5}; std::vector<double> input_values{76.1, -82.5};
std::vector<VkLayerSettingEXT> settings{ std::vector<VkLayerSettingEXT> settings{{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_FLOAT64_EXT,
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_FLOAT64_EXT, static_cast<uint32_t>(input_values.size()), &input_values[0]} static_cast<uint32_t>(input_values.size()), &input_values[0]}};
};
VkLayerSettingsCreateInfoEXT layer_settings_create_info{ VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<uint32_t>(settings.size()), &settings[0]}; static_cast<uint32_t>(settings.size()), &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -482,18 +471,15 @@ TEST(test_layer_setting_api, vkuGetLayerSettingValues_Double) {
} }
TEST(test_layer_setting_api, vkuGetLayerSettingValues_Frameset) { TEST(test_layer_setting_api, vkuGetLayerSettingValues_Frameset) {
const VkuFrameset input_values[] = { const VkuFrameset input_values[] = {{76, 100, 10}, {1, 100, 1}};
{76, 100, 10}, {1, 100, 1}
};
const std::uint32_t frameset_count = const std::uint32_t frameset_count =
static_cast<std::uint32_t>(std::size(input_values) * (sizeof(VkuFrameset) / sizeof(VkuFrameset::count))); static_cast<std::uint32_t>(std::size(input_values) * (sizeof(VkuFrameset) / sizeof(VkuFrameset::count)));
const VkLayerSettingEXT settings[] = { const VkLayerSettingEXT settings[] = {
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT32_EXT, frameset_count, input_values} {"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT32_EXT, frameset_count, input_values}};
};
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<std::uint32_t>(std::size(settings)), settings}; static_cast<std::uint32_t>(std::size(settings)), settings};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -534,12 +520,11 @@ TEST(test_layer_setting_api, vkuGetLayerSettingValues_Frameset) {
TEST(test_layer_setting_api, vkuGetLayerSettingValues_String) { TEST(test_layer_setting_api, vkuGetLayerSettingValues_String) {
std::vector<const char*> input_values{"VALUE_A", "VALUE_B"}; std::vector<const char*> input_values{"VALUE_A", "VALUE_B"};
std::vector<VkLayerSettingEXT> settings{ std::vector<VkLayerSettingEXT> settings{{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_STRING_EXT,
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_STRING_EXT, static_cast<uint32_t>(input_values.size()), &input_values[0]} static_cast<uint32_t>(input_values.size()), &input_values[0]}};
};
VkLayerSettingsCreateInfoEXT layer_settings_create_info{ VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<uint32_t>(settings.size()), &settings[0]}; static_cast<uint32_t>(settings.size()), &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);

View file

@ -15,11 +15,11 @@
TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Bool) { TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Bool) {
std::vector<VkBool32> input_values{VK_TRUE, VK_FALSE}; std::vector<VkBool32> input_values{VK_TRUE, VK_FALSE};
std::vector<VkLayerSettingEXT> settings{ std::vector<VkLayerSettingEXT> settings{{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_BOOL32_EXT,
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_BOOL32_EXT, static_cast<uint32_t>(input_values.size()), &input_values[0]}}; static_cast<uint32_t>(input_values.size()), &input_values[0]}};
VkLayerSettingsCreateInfoEXT layer_settings_create_info{ VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<uint32_t>(settings.size()), &settings[0]}; static_cast<uint32_t>(settings.size()), &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -51,11 +51,11 @@ TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Bool) {
TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Int32) { TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Int32) {
std::vector<std::int32_t> input_values{76, -82}; std::vector<std::int32_t> input_values{76, -82};
std::vector<VkLayerSettingEXT> settings{ std::vector<VkLayerSettingEXT> settings{VkLayerSettingEXT{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_INT32_EXT,
VkLayerSettingEXT{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_INT32_EXT, static_cast<uint32_t>(input_values.size()), &input_values[0]}}; static_cast<uint32_t>(input_values.size()), &input_values[0]}};
VkLayerSettingsCreateInfoEXT layer_settings_create_info{ VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<uint32_t>(settings.size()), &settings[0]}; static_cast<uint32_t>(settings.size()), &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -87,11 +87,11 @@ TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Int32) {
TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Int64) { TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Int64) {
std::vector<std::int64_t> input_values{76, -82}; std::vector<std::int64_t> input_values{76, -82};
std::vector<VkLayerSettingEXT> settings{ std::vector<VkLayerSettingEXT> settings{{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_INT64_EXT,
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_INT64_EXT, static_cast<uint32_t>(input_values.size()), &input_values[0]}}; static_cast<uint32_t>(input_values.size()), &input_values[0]}};
VkLayerSettingsCreateInfoEXT layer_settings_create_info{ VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<uint32_t>(settings.size()), &settings[0]}; static_cast<uint32_t>(settings.size()), &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -123,12 +123,11 @@ TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Int64) {
TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Uint32) { TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Uint32) {
std::vector<std::uint32_t> input_values{76, 82}; std::vector<std::uint32_t> input_values{76, 82};
std::vector<VkLayerSettingEXT> settings{ std::vector<VkLayerSettingEXT> settings{{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT32_EXT,
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT32_EXT, static_cast<uint32_t>(input_values.size()), &input_values[0]} static_cast<uint32_t>(input_values.size()), &input_values[0]}};
};
VkLayerSettingsCreateInfoEXT layer_settings_create_info{ VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<uint32_t>(settings.size()), &settings[0]}; static_cast<uint32_t>(settings.size()), &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -160,12 +159,11 @@ TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Uint32) {
TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Uint64) { TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Uint64) {
std::vector<std::uint64_t> input_values{76, 82}; std::vector<std::uint64_t> input_values{76, 82};
std::vector<VkLayerSettingEXT> settings{ std::vector<VkLayerSettingEXT> settings{{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT64_EXT,
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT64_EXT, static_cast<uint32_t>(input_values.size()), &input_values[0]} static_cast<uint32_t>(input_values.size()), &input_values[0]}};
};
VkLayerSettingsCreateInfoEXT layer_settings_create_info{ VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<uint32_t>(settings.size()), &settings[0]}; static_cast<uint32_t>(settings.size()), &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -197,12 +195,11 @@ TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Uint64) {
TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Float) { TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Float) {
std::vector<float> input_values{76.1f, -82.5f}; std::vector<float> input_values{76.1f, -82.5f};
std::vector<VkLayerSettingEXT> settings{ std::vector<VkLayerSettingEXT> settings{{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_FLOAT32_EXT,
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_FLOAT32_EXT, static_cast<uint32_t>(input_values.size()), &input_values[0]} static_cast<uint32_t>(input_values.size()), &input_values[0]}};
};
VkLayerSettingsCreateInfoEXT layer_settings_create_info{ VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<uint32_t>(settings.size()), &settings[0]}; static_cast<uint32_t>(settings.size()), &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -234,12 +231,11 @@ TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Float) {
TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Double) { TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Double) {
std::vector<double> input_values{76.1, -82.5}; std::vector<double> input_values{76.1, -82.5};
std::vector<VkLayerSettingEXT> settings{ std::vector<VkLayerSettingEXT> settings{{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_FLOAT64_EXT,
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_FLOAT64_EXT, static_cast<uint32_t>(input_values.size()), &input_values[0]} static_cast<uint32_t>(input_values.size()), &input_values[0]}};
};
VkLayerSettingsCreateInfoEXT layer_settings_create_info{ VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<uint32_t>(settings.size()), &settings[0]}; static_cast<uint32_t>(settings.size()), &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -271,16 +267,13 @@ TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Double) {
TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Frameset) { TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Frameset) {
const std::size_t frameset_size = (sizeof(VkuFrameset) / sizeof(VkuFrameset::count)); const std::size_t frameset_size = (sizeof(VkuFrameset) / sizeof(VkuFrameset::count));
std::vector<VkuFrameset> input_values{ std::vector<VkuFrameset> input_values{{76, 100, 10}, {1, 100, 1}};
{76, 100, 10}, {1, 100, 1}
};
std::vector<VkLayerSettingEXT> settings{ std::vector<VkLayerSettingEXT> settings{{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT32_EXT,
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT32_EXT, static_cast<uint32_t>(input_values.size() * frameset_size), &input_values[0]} static_cast<uint32_t>(input_values.size() * frameset_size), &input_values[0]}};
};
VkLayerSettingsCreateInfoEXT layer_settings_create_info{ VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<uint32_t>(settings.size()), &settings[0]}; static_cast<uint32_t>(settings.size()), &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -302,14 +295,15 @@ TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Frameset) {
EXPECT_EQ(6, value_count); EXPECT_EQ(6, value_count);
value_count = 0; value_count = 0;
result_complete = vkuGetLayerSettingValues(layerSettingSet, "my_setting", VKU_LAYER_SETTING_TYPE_FRAMESET_STRING, &value_count, nullptr); result_complete =
vkuGetLayerSettingValues(layerSettingSet, "my_setting", VKU_LAYER_SETTING_TYPE_FRAMESET_STRING, &value_count, nullptr);
EXPECT_EQ(2, value_count); EXPECT_EQ(2, value_count);
std::vector<const char*> string_values(input_values.size()); std::vector<const char*> string_values(input_values.size());
value_count = 2; value_count = 2;
result_complete = result_complete = vkuGetLayerSettingValues(layerSettingSet, "my_setting", VKU_LAYER_SETTING_TYPE_FRAMESET_STRING, &value_count,
vkuGetLayerSettingValues(layerSettingSet, "my_setting", VKU_LAYER_SETTING_TYPE_FRAMESET_STRING, &value_count, &string_values[0]); &string_values[0]);
EXPECT_EQ(VK_SUCCESS, result_complete); EXPECT_EQ(VK_SUCCESS, result_complete);
EXPECT_EQ(2, value_count); EXPECT_EQ(2, value_count);
EXPECT_STREQ("76-100-10", string_values[0]); EXPECT_STREQ("76-100-10", string_values[0]);
@ -320,12 +314,11 @@ TEST(test_layer_setting_cast, vkuGetLayerSettingValues_Frameset) {
TEST(test_layer_setting_cast, vkuGetLayerSettingValues_String) { TEST(test_layer_setting_cast, vkuGetLayerSettingValues_String) {
std::vector<const char*> input_values{"VALUE_A", "VALUE_B"}; std::vector<const char*> input_values{"VALUE_A", "VALUE_B"};
std::vector<VkLayerSettingEXT> settings{ std::vector<VkLayerSettingEXT> settings{{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_STRING_EXT,
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_STRING_EXT, static_cast<uint32_t>(input_values.size()), &input_values[0]} static_cast<uint32_t>(input_values.size()), &input_values[0]}};
};
VkLayerSettingsCreateInfoEXT layer_settings_create_info{ VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, static_cast<uint32_t>(settings.size()), &settings[0]}; static_cast<uint32_t>(settings.size()), &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);

View file

@ -17,8 +17,8 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValue_Bool) {
const VkLayerSettingEXT setting{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_BOOL32_EXT, 1, &value_data}; const VkLayerSettingEXT setting{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_BOOL32_EXT, 1, &value_data};
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, 1,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, 1, &setting}; &setting};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -38,12 +38,11 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValues_Bool) {
const uint32_t value_count = static_cast<uint32_t>(std::size(values_data)); const uint32_t value_count = static_cast<uint32_t>(std::size(values_data));
const VkLayerSettingEXT settings[] = { const VkLayerSettingEXT settings[] = {
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_BOOL32_EXT, value_count, values_data} {"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_BOOL32_EXT, value_count, values_data}};
};
const uint32_t settings_size = static_cast<uint32_t>(std::size(settings)); const uint32_t settings_size = static_cast<uint32_t>(std::size(settings));
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, settings_size, settings}; settings_size, settings};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -65,8 +64,8 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValue_Int32) {
const VkLayerSettingEXT setting{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_INT32_EXT, 1, &value_data}; const VkLayerSettingEXT setting{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_INT32_EXT, 1, &value_data};
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, 1,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, 1, &setting}; &setting};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -86,12 +85,11 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValues_Int32) {
const uint32_t value_count = static_cast<uint32_t>(std::size(values_data)); const uint32_t value_count = static_cast<uint32_t>(std::size(values_data));
const VkLayerSettingEXT settings[] = { const VkLayerSettingEXT settings[] = {
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_INT32_EXT, value_count, values_data} {"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_INT32_EXT, value_count, values_data}};
};
const uint32_t settings_size = static_cast<uint32_t>(std::size(settings)); const uint32_t settings_size = static_cast<uint32_t>(std::size(settings));
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, settings_size, settings}; settings_size, settings};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -113,8 +111,8 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValue_Uint32) {
const VkLayerSettingEXT setting{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT32_EXT, 1, &value_data}; const VkLayerSettingEXT setting{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT32_EXT, 1, &value_data};
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, 1,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, 1, &setting}; &setting};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -134,12 +132,11 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValues_Uint32) {
const uint32_t value_count = static_cast<uint32_t>(std::size(values_data)); const uint32_t value_count = static_cast<uint32_t>(std::size(values_data));
const VkLayerSettingEXT settings[] = { const VkLayerSettingEXT settings[] = {
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT32_EXT, value_count, values_data} {"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT32_EXT, value_count, values_data}};
};
const uint32_t settings_size = static_cast<uint32_t>(std::size(settings)); const uint32_t settings_size = static_cast<uint32_t>(std::size(settings));
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, settings_size, settings}; settings_size, settings};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -161,8 +158,8 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValue_Int64) {
const VkLayerSettingEXT setting{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_INT64_EXT, 1, &value_data}; const VkLayerSettingEXT setting{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_INT64_EXT, 1, &value_data};
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, 1,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, 1, &setting}; &setting};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -182,12 +179,11 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValues_Int64) {
const uint32_t value_count = static_cast<uint32_t>(std::size(values_data)); const uint32_t value_count = static_cast<uint32_t>(std::size(values_data));
const VkLayerSettingEXT settings[] = { const VkLayerSettingEXT settings[] = {
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_INT64_EXT, value_count, values_data} {"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_INT64_EXT, value_count, values_data}};
};
const uint32_t settings_size = static_cast<uint32_t>(std::size(settings)); const uint32_t settings_size = static_cast<uint32_t>(std::size(settings));
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, settings_size, &settings[0]}; settings_size, &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -209,8 +205,8 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValue_Uint64) {
const VkLayerSettingEXT setting{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT64_EXT, 1, &value_data}; const VkLayerSettingEXT setting{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT64_EXT, 1, &value_data};
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, 1,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, 1, &setting}; &setting};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -230,12 +226,11 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValues_Uint64) {
const uint32_t value_count = static_cast<uint32_t>(std::size(values_data)); const uint32_t value_count = static_cast<uint32_t>(std::size(values_data));
const VkLayerSettingEXT settings[] = { const VkLayerSettingEXT settings[] = {
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT64_EXT, value_count, values_data} {"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT64_EXT, value_count, values_data}};
};
const uint32_t settings_size = static_cast<uint32_t>(std::size(settings)); const uint32_t settings_size = static_cast<uint32_t>(std::size(settings));
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, settings_size, settings}; settings_size, settings};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -257,8 +252,8 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValue_Float) {
const VkLayerSettingEXT setting{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_FLOAT32_EXT, 1, &value_data}; const VkLayerSettingEXT setting{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_FLOAT32_EXT, 1, &value_data};
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, 1,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, 1, &setting}; &setting};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -278,12 +273,11 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValues_Float) {
const uint32_t value_count = static_cast<uint32_t>(std::size(values_data)); const uint32_t value_count = static_cast<uint32_t>(std::size(values_data));
const VkLayerSettingEXT settings[] = { const VkLayerSettingEXT settings[] = {
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_FLOAT32_EXT, value_count, values_data} {"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_FLOAT32_EXT, value_count, values_data}};
};
const uint32_t settings_size = static_cast<uint32_t>(std::size(settings)); const uint32_t settings_size = static_cast<uint32_t>(std::size(settings));
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, settings_size, settings}; settings_size, settings};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -305,8 +299,8 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValue_Double) {
const VkLayerSettingEXT setting{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_FLOAT64_EXT, 1, &value_data}; const VkLayerSettingEXT setting{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_FLOAT64_EXT, 1, &value_data};
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, 1,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, 1, &setting}; &setting};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -326,12 +320,11 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValues_Double) {
const uint32_t value_count = static_cast<uint32_t>(std::size(values_data)); const uint32_t value_count = static_cast<uint32_t>(std::size(values_data));
const VkLayerSettingEXT settings[] = { const VkLayerSettingEXT settings[] = {
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_FLOAT64_EXT, value_count, values_data} {"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_FLOAT64_EXT, value_count, values_data}};
};
const uint32_t settings_size = static_cast<uint32_t>(std::size(settings)); const uint32_t settings_size = static_cast<uint32_t>(std::size(settings));
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, settings_size, settings}; settings_size, settings};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -353,8 +346,8 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValue_String) {
const VkLayerSettingEXT setting{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_STRING_EXT, 1, value_data}; const VkLayerSettingEXT setting{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_STRING_EXT, 1, value_data};
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, 1,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, 1, &setting}; &setting};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -371,12 +364,11 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValue_Strings) {
const uint32_t value_count = static_cast<uint32_t>(std::size(values_data)); const uint32_t value_count = static_cast<uint32_t>(std::size(values_data));
const VkLayerSettingEXT settings[] = { const VkLayerSettingEXT settings[] = {
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_STRING_EXT, value_count, values_data} {"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_STRING_EXT, value_count, values_data}};
};
const uint32_t settings_size = static_cast<uint32_t>(std::size(settings)); const uint32_t settings_size = static_cast<uint32_t>(std::size(settings));
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, settings_size, settings}; settings_size, settings};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -393,12 +385,11 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValues_String) {
const uint32_t value_count = static_cast<uint32_t>(std::size(values_data)); const uint32_t value_count = static_cast<uint32_t>(std::size(values_data));
const VkLayerSettingEXT settings[] = { const VkLayerSettingEXT settings[] = {
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_STRING_EXT, value_count, values_data} {"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_STRING_EXT, value_count, values_data}};
};
const uint32_t settings_size = static_cast<uint32_t>(std::size(settings)); const uint32_t settings_size = static_cast<uint32_t>(std::size(settings));
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, settings_size, settings}; settings_size, settings};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -419,8 +410,8 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValue_Frameset) {
const VkLayerSettingEXT setting{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT32_EXT, 3, &value_data}; const VkLayerSettingEXT setting{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT32_EXT, 3, &value_data};
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, 1,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, 1, &setting}; &setting};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -438,18 +429,15 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValue_Frameset) {
} }
TEST(test_layer_setting_cpp, vkuGetLayerSettingValues_Frameset) { TEST(test_layer_setting_cpp, vkuGetLayerSettingValues_Frameset) {
const VkuFrameset values_data[] = { const VkuFrameset values_data[] = {{76, 100, 10}, {1, 100, 1}};
{76, 100, 10}, {1, 100, 1}
};
const uint32_t value_count = static_cast<uint32_t>(std::size(values_data) * (sizeof(VkuFrameset) / sizeof(VkuFrameset::count))); const uint32_t value_count = static_cast<uint32_t>(std::size(values_data) * (sizeof(VkuFrameset) / sizeof(VkuFrameset::count)));
const VkLayerSettingEXT settings[] = { const VkLayerSettingEXT settings[] = {
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT32_EXT, value_count, values_data} {"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_UINT32_EXT, value_count, values_data}};
};
const uint32_t settings_size = static_cast<uint32_t>(std::size(settings)); const uint32_t settings_size = static_cast<uint32_t>(std::size(settings));
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, settings_size, settings}; settings_size, settings};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);
@ -475,12 +463,11 @@ TEST(test_layer_setting_cpp, vkuGetLayerSettingValues_VkuCustomSTypeInfo) {
const uint32_t value_count = static_cast<uint32_t>(std::size(values_data)); const uint32_t value_count = static_cast<uint32_t>(std::size(values_data));
const VkLayerSettingEXT settings[] = { const VkLayerSettingEXT settings[] = {
{"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_STRING_EXT, value_count, values_data} {"VK_LAYER_LUNARG_test", "my_setting", VK_LAYER_SETTING_TYPE_STRING_EXT, value_count, values_data}};
};
const uint32_t settings_size = static_cast<uint32_t>(std::size(settings)); const uint32_t settings_size = static_cast<uint32_t>(std::size(settings));
const VkLayerSettingsCreateInfoEXT layer_settings_create_info{ const VkLayerSettingsCreateInfoEXT layer_settings_create_info{VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr,
VK_STRUCTURE_TYPE_LAYER_SETTINGS_CREATE_INFO_EXT, nullptr, settings_size, &settings[0]}; settings_size, &settings[0]};
VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE; VkuLayerSettingSet layerSettingSet = VK_NULL_HANDLE;
vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet); vkuCreateLayerSettingSet("VK_LAYER_LUNARG_test", &layer_settings_create_info, nullptr, nullptr, &layerSettingSet);

View file

@ -17,7 +17,7 @@ static void SetEnv(const char* value) {
#ifdef _WIN32 #ifdef _WIN32
_putenv(value); _putenv(value);
#else #else
putenv(const_cast<char *>(value)); putenv(const_cast<char*>(value));
#endif #endif
} }

View file

@ -310,7 +310,7 @@ TEST(test_layer_setting_file, vkuGetLayerSettingValues_String) {
EXPECT_EQ(VK_SUCCESS, result_count); EXPECT_EQ(VK_SUCCESS, result_count);
EXPECT_EQ(2, value_count); EXPECT_EQ(2, value_count);
std::vector<const char*> values(static_cast<uint32_t>(value_count)); std::vector<const char *> values(static_cast<uint32_t>(value_count));
value_count = 1; value_count = 1;
VkResult result_incomplete = VkResult result_incomplete =

View file

@ -578,7 +578,6 @@ TEST(test_layer_settings_util, to_framesets) {
} }
} }
TEST(test_layer_settings_util, vkuGetUnknownSettings_SingleCreateInfo) { TEST(test_layer_settings_util, vkuGetUnknownSettings_SingleCreateInfo) {
std::vector<VkLayerSettingEXT> settings; std::vector<VkLayerSettingEXT> settings;
@ -660,9 +659,7 @@ TEST(test_layer_settings_util, vkuGetUnknownSettings_SingleCreateInfo) {
create_info.settingCount = static_cast<uint32_t>(settings.size()); create_info.settingCount = static_cast<uint32_t>(settings.size());
create_info.pSettings = &settings[0]; create_info.pSettings = &settings[0];
const char* setting_names[] = { const char* setting_names[] = {"int32_value", "int64_value", "uint32_value", "uint64_value", "float_value", "double_value"};
"int32_value", "int64_value", "uint32_value", "uint64_value", "float_value", "double_value"
};
const std::uint32_t setting_name_count = static_cast<std::uint32_t>(std::size(setting_names)); const std::uint32_t setting_name_count = static_cast<std::uint32_t>(std::size(setting_names));
uint32_t unknown_settings_count = 0; uint32_t unknown_settings_count = 0;