layers: Make device extension enables consistent
I want to get rid of the "_enable" suffix everywhere to allow for a
second instance of the same structure to represent the /supported/ set
for better diagnostics.
diff --git a/layers/buffer_validation.cpp b/layers/buffer_validation.cpp
index 770ee98..eed9e2c 100644
--- a/layers/buffer_validation.cpp
+++ b/layers/buffer_validation.cpp
@@ -1323,7 +1323,7 @@
ss.str().c_str());
}
- if (!GetDeviceExtensions(device_data)->khr_maintenance1_enabled) {
+ if (!GetDeviceExtensions(device_data)->khr_maintenance1) {
// For each region the layerCount member of srcSubresource and dstSubresource must match
if (regions[i].srcSubresource.layerCount != regions[i].dstSubresource.layerCount) {
std::stringstream ss;
@@ -1382,7 +1382,7 @@
validation_error_map[VALIDATION_ERROR_01221]);
}
- if (!GetDeviceExtensions(device_data)->khr_maintenance1_enabled) {
+ if (!GetDeviceExtensions(device_data)->khr_maintenance1) {
// If either of the calling command's src_image or dst_image parameters are of VkImageType VK_IMAGE_TYPE_3D,
// the baseArrayLayer and layerCount members of both srcSubresource and dstSubresource must be 0 and 1, respectively
if (((src_image_state->createInfo.imageType == VK_IMAGE_TYPE_3D) ||
@@ -2547,7 +2547,7 @@
log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, 0, __LINE__,
VALIDATION_ERROR_00768, "IMAGE", "%s %s", ss.str().c_str(), validation_error_map[VALIDATION_ERROR_00768]);
}
- if (!GetDeviceExtensions(device_data)->khr_maintenance1_enabled) {
+ if (!GetDeviceExtensions(device_data)->khr_maintenance1) {
if (create_info->subresourceRange.baseArrayLayer >= image_state->createInfo.arrayLayers) {
std::stringstream ss;
ss << "vkCreateImageView called with baseArrayLayer " << create_info->subresourceRange.baseArrayLayer
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index dacd800..6e36c30 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -2216,13 +2216,13 @@
{spv::CapabilityMultiViewport, {"multiViewport", &F::multiViewport}},
// Capabilities that require an extension
- {spv::CapabilityDrawParameters, {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, nullptr, &E::khr_shader_draw_parameters_enabled}},
- {spv::CapabilityGeometryShaderPassthroughNV, {VK_NV_GEOMETRY_SHADER_PASSTHROUGH_EXTENSION_NAME, nullptr, &E::nv_geometry_shader_passthrough_enabled}},
- {spv::CapabilitySampleMaskOverrideCoverageNV, {VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_EXTENSION_NAME, nullptr, &E::nv_sample_mask_override_coverage_enabled}},
- {spv::CapabilityShaderViewportIndexLayerNV, {VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME, nullptr, &E::nv_viewport_array2_enabled}},
- {spv::CapabilityShaderViewportMaskNV, {VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME, nullptr, &E::nv_viewport_array2_enabled}},
- {spv::CapabilitySubgroupBallotKHR, {VK_EXT_SHADER_SUBGROUP_BALLOT_EXTENSION_NAME, nullptr, &E::khr_subgroup_ballot_enabled}},
- {spv::CapabilitySubgroupVoteKHR, {VK_EXT_SHADER_SUBGROUP_VOTE_EXTENSION_NAME, nullptr, &E::khr_subgroup_vote_enabled}},
+ {spv::CapabilityDrawParameters, {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, nullptr, &E::khr_shader_draw_parameters}},
+ {spv::CapabilityGeometryShaderPassthroughNV, {VK_NV_GEOMETRY_SHADER_PASSTHROUGH_EXTENSION_NAME, nullptr, &E::nv_geometry_shader_passthrough}},
+ {spv::CapabilitySampleMaskOverrideCoverageNV, {VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_EXTENSION_NAME, nullptr, &E::nv_sample_mask_override_coverage}},
+ {spv::CapabilityShaderViewportIndexLayerNV, {VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME, nullptr, &E::nv_viewport_array2}},
+ {spv::CapabilityShaderViewportMaskNV, {VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME, nullptr, &E::nv_viewport_array2}},
+ {spv::CapabilitySubgroupBallotKHR, {VK_EXT_SHADER_SUBGROUP_BALLOT_EXTENSION_NAME, nullptr, &E::khr_subgroup_ballot}},
+ {spv::CapabilitySubgroupVoteKHR, {VK_EXT_SHADER_SUBGROUP_VOTE_EXTENSION_NAME, nullptr, &E::khr_subgroup_vote}},
};
// clang-format on
@@ -3508,17 +3508,17 @@
using E = devExts;
static const std::pair<char const *, bool E::*> known_extensions[] {
- {VK_KHR_SWAPCHAIN_EXTENSION_NAME, &E::khr_swapchain_enabled},
- {VK_KHR_DISPLAY_SWAPCHAIN_EXTENSION_NAME, &E::khr_display_swapchain_enabled},
- {VK_NV_GLSL_SHADER_EXTENSION_NAME, &E::nv_glsl_shader_enabled},
- {VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_EXTENSION_NAME, &E::khr_descriptor_update_template_enabled},
- {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, &E::khr_shader_draw_parameters_enabled},
- {VK_KHR_MAINTENANCE1_EXTENSION_NAME, &E::khr_maintenance1_enabled},
- {VK_NV_GEOMETRY_SHADER_PASSTHROUGH_EXTENSION_NAME, &E::nv_geometry_shader_passthrough_enabled},
- {VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_EXTENSION_NAME, &E::nv_sample_mask_override_coverage_enabled},
- {VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME, &E::nv_viewport_array2_enabled},
- {VK_EXT_SHADER_SUBGROUP_BALLOT_EXTENSION_NAME, &E::khr_subgroup_ballot_enabled},
- {VK_EXT_SHADER_SUBGROUP_VOTE_EXTENSION_NAME, &E::khr_subgroup_vote_enabled},
+ {VK_KHR_SWAPCHAIN_EXTENSION_NAME, &E::khr_swapchain},
+ {VK_KHR_DISPLAY_SWAPCHAIN_EXTENSION_NAME, &E::khr_display_swapchain},
+ {VK_NV_GLSL_SHADER_EXTENSION_NAME, &E::nv_glsl_shader},
+ {VK_KHR_DESCRIPTOR_UPDATE_TEMPLATE_EXTENSION_NAME, &E::khr_descriptor_update_template},
+ {VK_KHR_SHADER_DRAW_PARAMETERS_EXTENSION_NAME, &E::khr_shader_draw_parameters},
+ {VK_KHR_MAINTENANCE1_EXTENSION_NAME, &E::khr_maintenance1},
+ {VK_NV_GEOMETRY_SHADER_PASSTHROUGH_EXTENSION_NAME, &E::nv_geometry_shader_passthrough},
+ {VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_EXTENSION_NAME, &E::nv_sample_mask_override_coverage},
+ {VK_NV_VIEWPORT_ARRAY2_EXTENSION_NAME, &E::nv_viewport_array2},
+ {VK_EXT_SHADER_SUBGROUP_BALLOT_EXTENSION_NAME, &E::khr_subgroup_ballot},
+ {VK_EXT_SHADER_SUBGROUP_VOTE_EXTENSION_NAME, &E::khr_subgroup_vote},
};
for (auto ext : known_extensions) {
@@ -7843,7 +7843,7 @@
arrayLayers = image_data->createInfo.arrayLayers;
mipLevels = image_data->createInfo.mipLevels;
imageFound = true;
- } else if (dev_data->device_extensions.khr_swapchain_enabled) {
+ } else if (dev_data->device_extensions.khr_swapchain) {
auto imageswap_data = GetSwapchainFromImage(dev_data, mem_barrier->image);
if (imageswap_data) {
auto swapchain_data = GetSwapchainNode(dev_data, imageswap_data);
@@ -8892,7 +8892,7 @@
spv_valid = spvValidate(ctx, &binary, &diag);
if (spv_valid != SPV_SUCCESS) {
- if (!dev_data->device_extensions.nv_glsl_shader_enabled || (pCreateInfo->pCode[0] == spv::MagicNumber)) {
+ if (!dev_data->device_extensions.nv_glsl_shader || (pCreateInfo->pCode[0] == spv::MagicNumber)) {
skip |= log_msg(dev_data->report_data,
spv_valid == SPV_WARNING ? VK_DEBUG_REPORT_WARNING_BIT_EXT : VK_DEBUG_REPORT_ERROR_BIT_EXT,
VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, 0, __LINE__, SHADER_CHECKER_INCONSISTENT_SPIRV, "SC",
@@ -11603,13 +11603,13 @@
bool enabled;
} device_extension_commands[] = {
{"vkCreateDescriptorUpdateTemplateKHR", reinterpret_cast<PFN_vkVoidFunction>(CreateDescriptorUpdateTemplateKHR),
- device_data->device_extensions.khr_descriptor_update_template_enabled},
+ device_data->device_extensions.khr_descriptor_update_template},
{"vkDestroyDescriptorUpdateTemplateKHR", reinterpret_cast<PFN_vkVoidFunction>(DestroyDescriptorUpdateTemplateKHR),
- device_data->device_extensions.khr_descriptor_update_template_enabled},
+ device_data->device_extensions.khr_descriptor_update_template},
{"vkUpdateDescriptorSetWithTemplateKHR", reinterpret_cast<PFN_vkVoidFunction>(UpdateDescriptorSetWithTemplateKHR),
- device_data->device_extensions.khr_descriptor_update_template_enabled},
+ device_data->device_extensions.khr_descriptor_update_template},
{"vkCmdPushDescriptorSetWithTemplateKHR", reinterpret_cast<PFN_vkVoidFunction>(CmdPushDescriptorSetWithTemplateKHR),
- device_data->device_extensions.khr_descriptor_update_template_enabled},
+ device_data->device_extensions.khr_descriptor_update_template},
};
if (!device_data) return nullptr;
@@ -11637,7 +11637,7 @@
if (dev) {
dev_data = GetLayerDataPtr(get_dispatch_key(dev), layer_data_map);
- if (!dev_data->device_extensions.khr_swapchain_enabled) return nullptr;
+ if (!dev_data->device_extensions.khr_swapchain) return nullptr;
}
for (size_t i = 0; i < ARRAY_SIZE(khr_swapchain_commands); i++) {
@@ -11645,7 +11645,7 @@
}
if (dev_data) {
- if (!dev_data->device_extensions.khr_display_swapchain_enabled) return nullptr;
+ if (!dev_data->device_extensions.khr_display_swapchain) return nullptr;
}
if (!strcmp("vkCreateSharedSwapchainsKHR", name)) return reinterpret_cast<PFN_vkVoidFunction>(CreateSharedSwapchainsKHR);
diff --git a/layers/core_validation_types.h b/layers/core_validation_types.h
index 4c0d4bf..b86e663 100644
--- a/layers/core_validation_types.h
+++ b/layers/core_validation_types.h
@@ -754,17 +754,17 @@
struct layer_data;
struct devExts {
- bool khr_swapchain_enabled;
- bool khr_display_swapchain_enabled;
- bool nv_glsl_shader_enabled;
- bool khr_descriptor_update_template_enabled;
- bool khr_shader_draw_parameters_enabled;
- bool khr_maintenance1_enabled;
- bool nv_geometry_shader_passthrough_enabled;
- bool nv_sample_mask_override_coverage_enabled;
- bool nv_viewport_array2_enabled;
- bool khr_subgroup_ballot_enabled;
- bool khr_subgroup_vote_enabled;
+ bool khr_swapchain;
+ bool khr_display_swapchain;
+ bool nv_glsl_shader;
+ bool khr_descriptor_update_template;
+ bool khr_shader_draw_parameters;
+ bool khr_maintenance1;
+ bool nv_geometry_shader_passthrough;
+ bool nv_sample_mask_override_coverage;
+ bool nv_viewport_array2;
+ bool khr_subgroup_ballot;
+ bool khr_subgroup_vote;
};
cvdescriptorset::DescriptorSet *GetSetNode(const layer_data *, VkDescriptorSet);
diff --git a/layers/descriptor_sets.cpp b/layers/descriptor_sets.cpp
index 3f5ddb5..40c280b 100644
--- a/layers/descriptor_sets.cpp
+++ b/layers/descriptor_sets.cpp
@@ -1672,7 +1672,7 @@
reinterpret_cast<const uint64_t &>(p_alloc_info->pSetLayouts[i]));
}
}
- if (!GetDeviceExtensions(dev_data)->khr_maintenance1_enabled) {
+ if (!GetDeviceExtensions(dev_data)->khr_maintenance1) {
auto pool_state = GetDescriptorPoolState(dev_data, p_alloc_info->descriptorPool);
// Track number of descriptorSets allowable in this pool
if (pool_state->availableSets < p_alloc_info->descriptorSetCount) {
diff --git a/layers/parameter_validation.cpp b/layers/parameter_validation.cpp
index 7dfaaf4..bf878ab 100644
--- a/layers/parameter_validation.cpp
+++ b/layers/parameter_validation.cpp
@@ -70,8 +70,8 @@
};
struct device_extension_enables {
- bool khr_swapchain_enabled;
- bool khr_display_swapchain_enabled;
+ bool khr_swapchain;
+ bool khr_display_swapchain;
bool khr_maintenance1;
bool khr_push_descriptor;
bool khr_descriptor_update_template;
@@ -89,7 +89,7 @@
bool nv_external_memory;
bool nv_external_memory_win32;
bool nvx_device_generated_commands;
- bool incremental_present;
+ bool khr_incremental_present;
};
struct layer_data {
@@ -1634,9 +1634,9 @@
layer_data *device_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
for (uint32_t i = 0; i < pCreateInfo->enabledExtensionCount; i++) {
if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_SWAPCHAIN_EXTENSION_NAME) == 0) {
- device_data->enables.khr_swapchain_enabled = true;
+ device_data->enables.khr_swapchain = true;
} else if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_DISPLAY_SWAPCHAIN_EXTENSION_NAME) == 0) {
- device_data->enables.khr_display_swapchain_enabled = true;
+ device_data->enables.khr_display_swapchain = true;
} else if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_MAINTENANCE1_EXTENSION_NAME) == 0) {
device_data->enables.khr_maintenance1 = true;
} else if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_PUSH_DESCRIPTOR_EXTENSION_NAME) == 0) {
@@ -1676,7 +1676,7 @@
} else if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_NVX_DEVICE_GENERATED_COMMANDS_EXTENSION_NAME) == 0) {
device_data->enables.nvx_device_generated_commands = true;
} else if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME) == 0) {
- device_data->enables.incremental_present = true;
+ device_data->enables.khr_incremental_present = true;
}
}
}
@@ -5116,7 +5116,7 @@
layer_data *my_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
assert(my_data != NULL);
- skip |= require_device_extension(my_data, my_data->enables.khr_swapchain_enabled, "vkCreateSwapchainKHR",
+ skip |= require_device_extension(my_data, my_data->enables.khr_swapchain, "vkCreateSwapchainKHR",
VK_KHR_SWAPCHAIN_EXTENSION_NAME);
skip |= parameter_validation_vkCreateSwapchainKHR(my_data->report_data, pCreateInfo, pAllocator, pSwapchain);
@@ -5137,7 +5137,7 @@
layer_data *my_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
assert(my_data != NULL);
- skip |= require_device_extension(my_data, my_data->enables.khr_swapchain_enabled, "vkGetSwapchainImagesKHR",
+ skip |= require_device_extension(my_data, my_data->enables.khr_swapchain, "vkGetSwapchainImagesKHR",
VK_KHR_SWAPCHAIN_EXTENSION_NAME);
skip |= parameter_validation_vkGetSwapchainImagesKHR(my_data->report_data, swapchain, pSwapchainImageCount, pSwapchainImages);
@@ -5158,7 +5158,7 @@
layer_data *my_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
assert(my_data != NULL);
- skip |= require_device_extension(my_data, my_data->enables.khr_swapchain_enabled, "vkAcquireNextImageKHR",
+ skip |= require_device_extension(my_data, my_data->enables.khr_swapchain, "vkAcquireNextImageKHR",
VK_KHR_SWAPCHAIN_EXTENSION_NAME);
skip |= parameter_validation_vkAcquireNextImageKHR(my_data->report_data, swapchain, timeout, semaphore, fence, pImageIndex);
@@ -5178,7 +5178,7 @@
layer_data *my_data = GetLayerDataPtr(get_dispatch_key(queue), layer_data_map);
assert(my_data != NULL);
- skip |= require_device_extension(my_data, my_data->enables.khr_swapchain_enabled, "vkQueuePresentKHR",
+ skip |= require_device_extension(my_data, my_data->enables.khr_swapchain, "vkQueuePresentKHR",
VK_KHR_SWAPCHAIN_EXTENSION_NAME);
skip |= parameter_validation_vkQueuePresentKHR(my_data->report_data, pPresentInfo);
@@ -5192,7 +5192,7 @@
std_header *pnext = (std_header *)pPresentInfo->pNext;
while (pnext) {
if (VK_STRUCTURE_TYPE_PRESENT_REGIONS_KHR == pnext->sType) {
- skip |= require_device_extension(my_data, my_data->enables.incremental_present, "vkQueuePresentKHR",
+ skip |= require_device_extension(my_data, my_data->enables.khr_incremental_present, "vkQueuePresentKHR",
VK_KHR_INCREMENTAL_PRESENT_EXTENSION_NAME);
VkPresentRegionsKHR *present_regions = (VkPresentRegionsKHR *)pnext;
if (present_regions->swapchainCount != pPresentInfo->swapchainCount) {
@@ -5232,7 +5232,7 @@
layer_data *my_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
assert(my_data != NULL);
- skip |= require_device_extension(my_data, my_data->enables.khr_swapchain_enabled, "vkDestroySwapchainKHR",
+ skip |= require_device_extension(my_data, my_data->enables.khr_swapchain, "vkDestroySwapchainKHR",
VK_KHR_SWAPCHAIN_EXTENSION_NAME);
/* No generated validation function for this call */
@@ -5616,7 +5616,7 @@
auto my_data = GetLayerDataPtr(get_dispatch_key(device), layer_data_map);
assert(my_data != NULL);
- skip |= require_device_extension(my_data, my_data->enables.khr_display_swapchain_enabled, "vkCreateSharedSwapchainsKHR",
+ skip |= require_device_extension(my_data, my_data->enables.khr_display_swapchain, "vkCreateSharedSwapchainsKHR",
VK_KHR_DISPLAY_SWAPCHAIN_EXTENSION_NAME);
skip |= parameter_validation_vkCreateSharedSwapchainsKHR(my_data->report_data, swapchainCount, pCreateInfos, pAllocator,