AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2025-01-13 18:00:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add WebGPU specific validation for FragCoord BuiltIn decoration (#2331)

Browse Source 
Part of resolving #2276
This commit is contained in:
Ryan Harrison 2019-01-30 14:53:43 -05:00 committed by GitHub
parent b6698e0d83
commit 0c14583f15
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/val/validate_builtins.cpp
View File

@ -937,12 +937,14 @@ spv_result_t BuiltInsValidator::ValidateClipOrCullDistanceAtReference(
spv_result_t BuiltInsValidator::ValidateFragCoordAtDefinition( spv_result_t BuiltInsValidator::ValidateFragCoordAtDefinition(
const Decoration& decoration, const Instruction& inst) { const Decoration& decoration, const Instruction& inst) {
if (spvIsVulkanEnv(_.context()->target_env)) { if (spvIsVulkanOrWebGPUEnv(_.context()->target_env)) {
if (spv_result_t error = ValidateF32Vec( if (spv_result_t error = ValidateF32Vec(
decoration, inst, 4, decoration, inst, 4,
[this, &inst](const std::string& message) -> spv_result_t { [this, &inst](const std::string& message) -> spv_result_t {
return _.diag(SPV_ERROR_INVALID_DATA, &inst) return _.diag(SPV_ERROR_INVALID_DATA, &inst)
<< "According to the Vulkan spec BuiltIn FragCoord " << "According to the "
<< spvLogStringForEnv(_.context()->target_env)
<< " spec BuiltIn FragCoord "
"variable needs to be a 4-component 32-bit float " "variable needs to be a 4-component 32-bit float "
"vector. " "vector. "
<< message; << message;
@ -959,12 +961,13 @@ spv_result_t BuiltInsValidator::ValidateFragCoordAtReference(
const Decoration& decoration, const Instruction& built_in_inst, const Decoration& decoration, const Instruction& built_in_inst,
const Instruction& referenced_inst, const Instruction& referenced_inst,
const Instruction& referenced_from_inst) { const Instruction& referenced_from_inst) {
if (spvIsVulkanEnv(_.context()->target_env)) { if (spvIsVulkanOrWebGPUEnv(_.context()->target_env)) {
const SpvStorageClass storage_class = GetStorageClass(referenced_from_inst); const SpvStorageClass storage_class = GetStorageClass(referenced_from_inst);
if (storage_class != SpvStorageClassMax && if (storage_class != SpvStorageClassMax &&
storage_class != SpvStorageClassInput) { storage_class != SpvStorageClassInput) {
return _.diag(SPV_ERROR_INVALID_DATA, &referenced_from_inst) return _.diag(SPV_ERROR_INVALID_DATA, &referenced_from_inst)
<< "Vulkan spec allows BuiltIn FragCoord to be only used for " << spvLogStringForEnv(_.context()->target_env)
<< " spec allows BuiltIn FragCoord to be only used for "
"variables with Input storage class. " "variables with Input storage class. "
<< GetReferenceDesc(decoration, built_in_inst, referenced_inst, << GetReferenceDesc(decoration, built_in_inst, referenced_inst,
referenced_from_inst) referenced_from_inst)
@ -974,7 +977,8 @@ spv_result_t BuiltInsValidator::ValidateFragCoordAtReference(
for (const SpvExecutionModel execution_model : execution_models_) { for (const SpvExecutionModel execution_model : execution_models_) {
if (execution_model != SpvExecutionModelFragment) { if (execution_model != SpvExecutionModelFragment) {
return _.diag(SPV_ERROR_INVALID_DATA, &referenced_from_inst) return _.diag(SPV_ERROR_INVALID_DATA, &referenced_from_inst)
<< "Vulkan spec allows BuiltIn FragCoord to be used only with " << spvLogStringForEnv(_.context()->target_env)
<< " spec allows BuiltIn FragCoord to be used only with "
"Fragment execution model. " "Fragment execution model. "
<< GetReferenceDesc(decoration, built_in_inst, referenced_inst, << GetReferenceDesc(decoration, built_in_inst, referenced_inst,
referenced_from_inst, execution_model); referenced_from_inst, execution_model);

41
test/val/val_builtins_test.cpp
View File

@ -502,6 +502,11 @@ INSTANTIATE_TEST_SUITE_P(
Combine(Values("FragCoord"), Values("Fragment"), Values("Input"), Combine(Values("FragCoord"), Values("Fragment"), Values("Input"),
Values("%f32vec4"), Values(TestResult()))); Values("%f32vec4"), Values(TestResult())));
INSTANTIATE_TEST_SUITE_P(
FragCoordSuccess, ValidateWebGPUCombineBuiltInExecutionModelDataTypeResult,
Combine(Values("FragCoord"), Values("Fragment"), Values("Input"),
Values("%f32vec4"), Values(TestResult())));
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
FragCoordNotFragment, FragCoordNotFragment,
ValidateVulkanCombineBuiltInExecutionModelDataTypeResult, ValidateVulkanCombineBuiltInExecutionModelDataTypeResult,
@ -513,6 +518,15 @@ INSTANTIATE_TEST_SUITE_P(
Values(TestResult(SPV_ERROR_INVALID_DATA, Values(TestResult(SPV_ERROR_INVALID_DATA,
"to be used only with Fragment execution model")))); "to be used only with Fragment execution model"))));
INSTANTIATE_TEST_SUITE_P(
FragCoordNotFragment,
ValidateWebGPUCombineBuiltInExecutionModelDataTypeResult,
Combine(
Values("FragCoord"), Values("Vertex", "GLCompute"), Values("Input"),
Values("%f32vec4"),
Values(TestResult(SPV_ERROR_INVALID_DATA,
"to be used only with Fragment execution model"))));
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
FragCoordNotInput, ValidateVulkanCombineBuiltInExecutionModelDataTypeResult, FragCoordNotInput, ValidateVulkanCombineBuiltInExecutionModelDataTypeResult,
Combine(Values("FragCoord"), Values("Fragment"), Values("Output"), Combine(Values("FragCoord"), Values("Fragment"), Values("Output"),
@ -522,6 +536,15 @@ INSTANTIATE_TEST_SUITE_P(
"to be only used for variables with Input storage class", "to be only used for variables with Input storage class",
"uses storage class Output")))); "uses storage class Output"))));
INSTANTIATE_TEST_SUITE_P(
FragCoordNotInput, ValidateWebGPUCombineBuiltInExecutionModelDataTypeResult,
Combine(Values("FragCoord"), Values("Fragment"), Values("Output"),
Values("%f32vec4"),
Values(TestResult(
SPV_ERROR_INVALID_DATA,
"to be only used for variables with Input storage class",
"uses storage class Output"))));
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
FragCoordNotFloatVector, FragCoordNotFloatVector,
ValidateVulkanCombineBuiltInExecutionModelDataTypeResult, ValidateVulkanCombineBuiltInExecutionModelDataTypeResult,
@ -531,6 +554,15 @@ INSTANTIATE_TEST_SUITE_P(
"needs to be a 4-component 32-bit float vector", "needs to be a 4-component 32-bit float vector",
"is not a float vector")))); "is not a float vector"))));
INSTANTIATE_TEST_SUITE_P(
FragCoordNotFloatVector,
ValidateWebGPUCombineBuiltInExecutionModelDataTypeResult,
Combine(Values("FragCoord"), Values("Fragment"), Values("Input"),
Values("%f32arr4", "%u32vec4"),
Values(TestResult(SPV_ERROR_INVALID_DATA,
"needs to be a 4-component 32-bit float vector",
"is not a float vector"))));
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
FragCoordNotFloatVec4, FragCoordNotFloatVec4,
ValidateVulkanCombineBuiltInExecutionModelDataTypeResult, ValidateVulkanCombineBuiltInExecutionModelDataTypeResult,
@ -540,6 +572,15 @@ INSTANTIATE_TEST_SUITE_P(
"needs to be a 4-component 32-bit float vector", "needs to be a 4-component 32-bit float vector",
"has 3 components")))); "has 3 components"))));
INSTANTIATE_TEST_SUITE_P(
FragCoordNotFloatVec4,
ValidateWebGPUCombineBuiltInExecutionModelDataTypeResult,
Combine(Values("FragCoord"), Values("Fragment"), Values("Input"),
Values("%f32vec3"),
Values(TestResult(SPV_ERROR_INVALID_DATA,
"needs to be a 4-component 32-bit float vector",
"has 3 components"))));
INSTANTIATE_TEST_SUITE_P( INSTANTIATE_TEST_SUITE_P(
FragCoordNotF32Vec4, FragCoordNotF32Vec4,
ValidateVulkanCombineBuiltInExecutionModelDataTypeResult, ValidateVulkanCombineBuiltInExecutionModelDataTypeResult,