Skip to content

Commit

Permalink
layer: Implement vlGetUnknownSettings and Vul to Vku
Browse files Browse the repository at this point in the history
  • Loading branch information
@christophe-lunarg
christophe-lunarg committed Sep 14, 2023
1 parent 5074ebe commit f5f28a6
Show file tree
Hide file tree
Showing 17 changed files with 455 additions and 349 deletions.
33 changes: 1 addition & 32 deletions layer/profiles.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,36 +40,5 @@ std::string GetSimulateCapabilitiesLog(SimulateCapabilityFlags flags);
std::string GetDebugReportsLog(DebugActionFlags flags);

#define kLayerName "VK_LAYER_KHRONOS_profiles"
#define kLayerSettingsProfileFile "profile_file"
#define kLayerSettingsProfileName "profile_name"
#define kLayerSettingsProfileValidation "profile_validation"
#define kLayerSettingsEmulatePortability "emulate_portability"
#define kLayerSettings_constantAlphaColorBlendFactors "constantAlphaColorBlendFactors"
#define kLayerSettings_events "events"
#define kLayerSettings_imageViewFormatReinterpretation "imageViewFormatReinterpretation"
#define kLayerSettings_imageViewFormatSwizzle "imageViewFormatSwizzle"
#define kLayerSettings_imageView2DOn3DImage "imageView2DOn3DImage"
#define kLayerSettings_multisampleArrayImage "multisampleArrayImage"
#define kLayerSettings_mutableComparisonSamplers "mutableComparisonSamplers"
#define kLayerSettings_pointPolygons "pointPolygons"
#define kLayerSettings_samplerMipLodBias "samplerMipLodBias"
#define kLayerSettings_separateStencilMaskRef "separateStencilMaskRef"
#define kLayerSettings_shaderSampleRateInterpolationFunctions "shaderSampleRateInterpolationFunctions"
#define kLayerSettings_tessellationIsolines "tessellationIsolines"
#define kLayerSettings_tessellationPointMode "tessellationPointMode"
#define kLayerSettings_triangleFans "triangleFans"
#define kLayerSettings_vertexAttributeAccessBeyondStride "vertexAttributeAccessBeyondStride"
#define kLayerSettings_minVertexInputBindingStrideAlignment "minVertexInputBindingStrideAlignment"
#define kLayerSettingsSimulateCapabilities "simulate_capabilities"
#define kLayerSettingsDebugActions "debug_actions"
#define kLayerSettingsDebugFilename "debug_filename"
#define kLayerSettingsDebugFileClear "debug_file_clear"
#define kLayerSettingsDebugFailOnError "debug_fail_on_error"
#define kLayerSettingsDebugReports "debug_reports"
#define kLayerSettingsExcludeDeviceExtensions "exclude_device_extensions"
#define kLayerSettingsExcludeFormats "exclude_formats"
#define kLayerSettingsDefaultFeatureValues "default_feature_values"
#define kLayerSettingsForceDevice "force_device"
#define kLayerSettingsForceDeviceUUID "force_device_uuid"
#define kLayerSettingsForceDeviceName "force_device_name"


241 changes: 147 additions & 94 deletions layer/profiles_settings.cpp
View file

Large diffs are not rendered by default.

91 changes: 84 additions & 7 deletions layer/profiles_settings.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,82 @@
#include <vector>
#include <string>

enum SettingId {
SETTING_PROFILE_FILE = 0,
SETTING_PROFILE_NAME,
SETTING_PROFILE_VALIDATION,
SETTING_EMULATE_PORTABILITY,
SETTING_CONTANT_ALPHA_COLOR_BLEND_FACTORS,
SETTING_EVENTS,
SETTING_IMAGE_VIEW_FORMAT_REINTERPRETATION,
SETTING_IMAGE_VIEW_FORMAT_SWIZZLE,
SETTING_IMAGE_VIEW_2D_ON_3D_IMAGE,
SETTING_MULTISAMPLE_ARRAY_IMAGE,
SETTING_MUTABLE_COMPARISON_SAMPLERS,
SETTING_POINT_POLYGONS,
SETTING_SAMPLER_MIP_LOD_BIAS,
SETTING_SEPARATE_STENCIL_MASK_REF,
SETTING_SEPARATE_SAMPLE_RATE_INTERPOLATION_FUNCTIONS,
SETTING_TESSELLATION_ISOLINES,
SETTING_TESSELLATION_POINT_MODE,
SETTING_TRIANGLE_FANS,
SETTING_VERTEX_ATTRIBUTE_ACCESS_BEYOND_STRIDE,
SETTING_MIN_VERTEX_INPUT_BINDING_STRIDE_ALIGMENT,
SETTING_SIMULATE_CAPABILITIES,
SETTING_DEBUG_ACTIONS,
SETTING_DEBUG_FILENAME,
SETTING_DEBUG_FILE_CLEAR,
SETTING_DEBUG_FAIL_ON_ERROR,
SETTING_DEBUG_REPORTS,
SETTING_EXCLUDE_DEVICE_EXTENSIONS,
SETTING_EXCLUDE_FORMATS,
SETTING_DEFAULT_FEATURE_VALUES,
SETTING_FORCE_DEVICE,
SETTING_FORCE_DEVICE_UUID,
SETTING_FORCE_DEVICE_NAME,

SETTING_FIRST = SETTING_PROFILE_FILE,
SETTING_LAST = SETTING_FORCE_DEVICE_NAME
};

enum { SETTING_COUNT = SETTING_LAST - SETTING_FIRST + 1 };

static const char *kSettingNames[] = {"profile_file",
"profile_name",
"profile_validation",
"emulate_portability",
"constantAlphaColorBlendFactors",
"events",
"imageViewFormatReinterpretation",
"imageViewFormatSwizzle",
"imageView2DOn3DImage",
"multisampleArrayImage",
"mutableComparisonSamplers",
"pointPolygons",
"samplerMipLodBias",
"separateStencilMaskRef",
"shaderSampleRateInterpolationFunctions",
"tessellationIsolines",
"tessellationPointMode",
"triangleFans",
"vertexAttributeAccessBeyondStride",
"minVertexInputBindingStrideAlignment",
"simulate_capabilities",
"debug_actions",
"debug_filename",
"debug_file_clear",
"debug_fail_on_error",
"debug_reports",
"exclude_device_extensions",
"exclude_formats",
"default_feature_values",
"force_device",
"force_device_uuid",
"force_device_name"};
static_assert(std::size(kSettingNames) == SETTING_COUNT);

inline const char *GetString(SettingId setting_id) { return kSettingNames[setting_id]; }

enum SimulateCapabilityBits {
SIMULATE_API_VERSION_BIT = 1 << 0,
SIMULATE_FEATURES_BIT = 1 << 1,
Expand All @@ -44,7 +120,7 @@ enum DebugActionBits {
};
typedef int DebugActionFlags;

static DebugActionFlags GetDebugActionFlags(const std::vector<std::string> &values) {
inline DebugActionFlags GetDebugActionFlags(const std::vector<std::string> &values) {
DebugActionFlags result = 0;

for (std::size_t i = 0, n = values.size(); i < n; ++i) {
Expand All @@ -64,9 +140,9 @@ static DebugActionFlags GetDebugActionFlags(const std::vector<std::string> &valu
return result;
}

static std::vector<std::string> GetDebugActionStrings(DebugActionFlags flags) {
static const char *table[] = {
"DEBUG_ACTION_FILE_BIT", "DEBUG_ACTION_STDOUT_BIT", "DEBUG_ACTION_OUTPUT_BIT", "DEBUG_ACTION_BREAKPOINT_BIT"};
inline std::vector<std::string> GetDebugActionStrings(DebugActionFlags flags) {
static const char *table[] = {"DEBUG_ACTION_FILE_BIT", "DEBUG_ACTION_STDOUT_BIT", "DEBUG_ACTION_OUTPUT_BIT",
"DEBUG_ACTION_BREAKPOINT_BIT"};

std::vector<std::string> result;

Expand All @@ -78,6 +154,7 @@ static std::vector<std::string> GetDebugActionStrings(DebugActionFlags flags) {

return result;
}

std::string GetDebugActionsLog(DebugActionFlags flags);

enum DebugReportBits {
Expand All @@ -89,7 +166,7 @@ enum DebugReportBits {
};
typedef int DebugReportFlags;

static DebugReportFlags GetDebugReportFlags(const std::vector<std::string> &values) {
inline DebugReportFlags GetDebugReportFlags(const std::vector<std::string> &values) {
DebugReportFlags result = 0;

for (std::size_t i = 0, n = values.size(); i < n; ++i) {
Expand All @@ -114,7 +191,7 @@ enum DefaultFeatureValues {
DEFAULT_FEATURE_VALUES_DEVICE
};

static DefaultFeatureValues GetDefaultFeatureValues(const std::string &value) {
inline DefaultFeatureValues GetDefaultFeatureValues(const std::string &value) {
if (value == "DEFAULT_FEATURE_VALUES_FALSE") {
return DEFAULT_FEATURE_VALUES_FALSE;
} else if (value == "DEFAULT_FEATURE_VALUES_DEVICE") {
Expand All @@ -124,7 +201,7 @@ static DefaultFeatureValues GetDefaultFeatureValues(const std::string &value) {
return DEFAULT_FEATURE_VALUES_DEVICE;
}

static std::string GetDefaultFeatureValuesString(DefaultFeatureValues value) {
inline std::string GetDefaultFeatureValuesString(DefaultFeatureValues value) {
if (value == DEFAULT_FEATURE_VALUES_FALSE) {
return "DEFAULT_FEATURE_VALUES_FALSE";
} else if (value == DEFAULT_FEATURE_VALUES_DEVICE) {
Expand Down
Loading

0 comments on commit f5f28a6

Please sign in to comment.