From bd546e41d3ab1deff04a593364d3522332df179e Mon Sep 17 00:00:00 2001
From: Mark Lobodzinski <mark@lunarg.com>
Date: Thu, 23 Mar 2017 14:30:25 -0600
Subject: [PATCH] layers: Support CapabilitySampleMaskOverrideCoverage
Recognize and validate shader capability added in the new
VK_NV_sample_mask_override_coverage extension.
Change-Id: I30131189beee8cb5f087846eff3a5f7571d0d309
---
layers/core_validation.cpp | 9 +++++++++
layers/core_validation_types.h | 1 +
2 files changed, 10 insertions(+)
diff --git a/layers/core_validation.cpp b/layers/core_validation.cpp
index 4664c344b..5d481a9da 100644
--- a/layers/core_validation.cpp
+++ b/layers/core_validation.cpp
@@ -2536,6 +2536,11 @@ static bool validate_shader_capabilities(layer_data *dev_data, shader_module con
VK_NV_GEOMETRY_SHADER_PASSTHROUGH_EXTENSION_NAME);
break;
+ case spv::CapabilitySampleMaskOverrideCoverageNV:
+ pass &= require_extension(report_data, dev_data->device_extensions.nv_sample_mask_override_coverage_enabled,
+ VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_EXTENSION_NAME);
+ break;
+
default:
// Spirv-validator should catch these errors
break;
@@ -3848,6 +3853,7 @@ static void checkDeviceRegisterExtensions(const VkDeviceCreateInfo *pCreateInfo,
dev_data->device_extensions.khr_shader_draw_parameters_enabled = false;
dev_data->device_extensions.khr_maintenance1_enabled = false;
dev_data->device_extensions.nv_geometry_shader_passthrough_enabled = false;
+ dev_data->device_extensions.nv_sample_mask_override_coverage_enabled = false;
for (i = 0; i < pCreateInfo->enabledExtensionCount; i++) {
if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_KHR_SWAPCHAIN_EXTENSION_NAME) == 0) {
@@ -3871,6 +3877,9 @@ static void checkDeviceRegisterExtensions(const VkDeviceCreateInfo *pCreateInfo,
if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_NV_GEOMETRY_SHADER_PASSTHROUGH_EXTENSION_NAME) == 0) {
dev_data->device_extensions.nv_geometry_shader_passthrough_enabled = true;
}
+ if (strcmp(pCreateInfo->ppEnabledExtensionNames[i], VK_NV_SAMPLE_MASK_OVERRIDE_COVERAGE_EXTENSION_NAME) == 0) {
+ dev_data->device_extensions.nv_sample_mask_override_coverage_enabled = true;
+ }
}
}
diff --git a/layers/core_validation_types.h b/layers/core_validation_types.h
index 83bb83592..b8f261b70 100644
--- a/layers/core_validation_types.h
+++ b/layers/core_validation_types.h
@@ -792,6 +792,7 @@ struct devExts {
bool khr_shader_draw_parameters_enabled;
bool khr_maintenance1_enabled;
bool nv_geometry_shader_passthrough_enabled;
+ bool nv_sample_mask_override_coverage_enabled;
std::unordered_map<VkSwapchainKHR, std::unique_ptr<SWAPCHAIN_NODE>> swapchainMap;
std::unordered_map<VkImage, VkSwapchainKHR> imageToSwapchainMap;
};
--
GitLab