aboutsummaryrefslogtreecommitdiff
path: root/layers
diff options
context:
space:
mode:
Diffstat (limited to 'layers')
-rw-r--r--layers/shader_validation.cpp132
1 files changed, 104 insertions, 28 deletions
diff --git a/layers/shader_validation.cpp b/layers/shader_validation.cpp
index 5c281e7ae..8f02a8de6 100644
--- a/layers/shader_validation.cpp
+++ b/layers/shader_validation.cpp
@@ -2348,13 +2348,32 @@ bool CoreChecks::ValidateExecutionModes(SHADER_MODULE_STATE const *src, spirv_in
if (first_denorm_execution_mode.first == spv::ExecutionModeMax) {
// Register the first denorm execution mode found
first_denorm_execution_mode = std::make_pair(static_cast<spv::ExecutionMode>(mode), bit_width);
- } else if (first_denorm_execution_mode.first != mode && first_denorm_execution_mode.second != bit_width &&
- enabled_features.float_controls.denormBehaviorIndependence ==
- VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE_KHR) {
- skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, 0,
- kVUID_Core_Shader_FeatureNotEnabled,
- "Shader uses independent denorm execution modes for different bit widths but that is not "
- "supported on the device");
+ } else if (first_denorm_execution_mode.first != mode && first_denorm_execution_mode.second != bit_width) {
+ switch (enabled_features.float_controls.denormBehaviorIndependence) {
+ case VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_32_BIT_ONLY_KHR:
+ if (first_rounding_mode.second != 32 && bit_width != 32) {
+ skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT,
+ VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, 0, kVUID_Core_Shader_FeatureNotEnabled,
+ "Shader uses different denorm execution modes for 16 and 64-bit but "
+ "denormBehaviorIndependence is "
+ "VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_32_BIT_ONLY_KHR on the device");
+ }
+ break;
+
+ case VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL_KHR:
+ break;
+
+ case VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE_KHR:
+ skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT,
+ 0, kVUID_Core_Shader_FeatureNotEnabled,
+ "Shader uses different denorm execution modes for different bit widths but "
+ "denormBehaviorIndependence is "
+ "VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE_KHR on the device");
+ break;
+
+ default:
+ break;
+ }
}
break;
}
@@ -2373,13 +2392,32 @@ bool CoreChecks::ValidateExecutionModes(SHADER_MODULE_STATE const *src, spirv_in
if (first_denorm_execution_mode.first == spv::ExecutionModeMax) {
// Register the first denorm execution mode found
first_denorm_execution_mode = std::make_pair(static_cast<spv::ExecutionMode>(mode), bit_width);
- } else if (first_denorm_execution_mode.first != mode && first_denorm_execution_mode.second != bit_width &&
- enabled_features.float_controls.denormBehaviorIndependence ==
- VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE_KHR) {
- skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, 0,
- kVUID_Core_Shader_FeatureNotEnabled,
- "Shader uses independent denorm execution modes for different bit widths but that is not "
- "supported on the device");
+ } else if (first_denorm_execution_mode.first != mode && first_denorm_execution_mode.second != bit_width) {
+ switch (enabled_features.float_controls.denormBehaviorIndependence) {
+ case VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_32_BIT_ONLY_KHR:
+ if (first_rounding_mode.second != 32 && bit_width != 32) {
+ skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT,
+ VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, 0, kVUID_Core_Shader_FeatureNotEnabled,
+ "Shader uses different denorm execution modes for 16 and 64-bit but "
+ "denormBehaviorIndependence is "
+ "VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_32_BIT_ONLY_KHR on the device");
+ }
+ break;
+
+ case VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL_KHR:
+ break;
+
+ case VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE_KHR:
+ skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT,
+ 0, kVUID_Core_Shader_FeatureNotEnabled,
+ "Shader uses different denorm execution modes for different bit widths but "
+ "denormBehaviorIndependence is "
+ "VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE_KHR on the device");
+ break;
+
+ default:
+ break;
+ }
}
break;
}
@@ -2398,13 +2436,32 @@ bool CoreChecks::ValidateExecutionModes(SHADER_MODULE_STATE const *src, spirv_in
if (first_rounding_mode.first == spv::ExecutionModeMax) {
// Register the first rounding mode found
first_rounding_mode = std::make_pair(static_cast<spv::ExecutionMode>(mode), bit_width);
- } else if (first_rounding_mode.first != mode && first_rounding_mode.second != bit_width &&
- enabled_features.float_controls.roundingModeIndependence ==
- VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE_KHR) {
- skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, 0,
- kVUID_Core_Shader_FeatureNotEnabled,
- "Shader uses independent rounding modes for different bit widths but that is not supported "
- "on the device");
+ } else if (first_rounding_mode.first != mode && first_rounding_mode.second != bit_width) {
+ switch (enabled_features.float_controls.roundingModeIndependence) {
+ case VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_32_BIT_ONLY_KHR:
+ if (first_rounding_mode.second != 32 && bit_width != 32) {
+ skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT,
+ VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, 0, kVUID_Core_Shader_FeatureNotEnabled,
+ "Shader uses different rounding modes for 16 and 64-bit but "
+ "roundingModeIndependence is "
+ "VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_32_BIT_ONLY_KHR on the device");
+ }
+ break;
+
+ case VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL_KHR:
+ break;
+
+ case VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE_KHR:
+ skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT,
+ 0, kVUID_Core_Shader_FeatureNotEnabled,
+ "Shader uses different rounding modes for different bit widths but "
+ "roundingModeIndependence is "
+ "VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE_KHR on the device");
+ break;
+
+ default:
+ break;
+ }
}
break;
}
@@ -2423,13 +2480,32 @@ bool CoreChecks::ValidateExecutionModes(SHADER_MODULE_STATE const *src, spirv_in
if (first_rounding_mode.first == spv::ExecutionModeMax) {
// Register the first rounding mode found
first_rounding_mode = std::make_pair(static_cast<spv::ExecutionMode>(mode), bit_width);
- } else if (first_rounding_mode.first != mode && first_rounding_mode.second != bit_width &&
- enabled_features.float_controls.roundingModeIndependence ==
- VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE_KHR) {
- skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, 0,
- kVUID_Core_Shader_FeatureNotEnabled,
- "Shader uses independent rounding modes for different bit widths but that is not supported "
- "on the device");
+ } else if (first_rounding_mode.first != mode && first_rounding_mode.second != bit_width) {
+ switch (enabled_features.float_controls.roundingModeIndependence) {
+ case VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_32_BIT_ONLY_KHR:
+ if (first_rounding_mode.second != 32 && bit_width != 32) {
+ skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT,
+ VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT, 0, kVUID_Core_Shader_FeatureNotEnabled,
+ "Shader uses different rounding modes for 16 and 64-bit but "
+ "roundingModeIndependence is "
+ "VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_32_BIT_ONLY_KHR on the device");
+ }
+ break;
+
+ case VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_ALL_KHR:
+ break;
+
+ case VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE_KHR:
+ skip |= log_msg(report_data, VK_DEBUG_REPORT_ERROR_BIT_EXT, VK_DEBUG_REPORT_OBJECT_TYPE_UNKNOWN_EXT,
+ 0, kVUID_Core_Shader_FeatureNotEnabled,
+ "Shader uses different rounding modes for different bit widths but "
+ "roundingModeIndependence is "
+ "VK_SHADER_FLOAT_CONTROLS_INDEPENDENCE_NONE_KHR on the device");
+ break;
+
+ default:
+ break;
+ }
}
break;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 12:06:28 +0000