openharmony/third_party_spirv-tools
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_spirv-tools synced 2024-11-23 15:30:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix up some test (#2351)

Browse Source 
I made a mistake merging a PR, and it contained tests that break with
the latest google test.  I've fixed them up.
This commit is contained in:
Steven Perron 2019-01-31 16:44:15 -05:00 committed by GitHub
parent 846d12afed
commit 453b7c85c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
test/val/val_builtins_test.cpp
View File

@ -1801,22 +1801,22 @@ INSTANTIATE_TEST_SUITE_P(
"needs to be a 32-bit int scalar",
"has bit width 64"))));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
LocalInvocationIndexSuccess,
ValidateWebGPUCombineBuiltInExecutionModelDataTypeResult,
Combine(Values("LocalInvocationIndex"), Values("GLCompute"),
Values("Input"), Values("%u32"), Values(TestResult())), );
Values("Input"), Values("%u32"), Values(TestResult())));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
LocalInvocationIndexInvalidExecutionModel,
ValidateWebGPUCombineBuiltInExecutionModelDataTypeResult,
Combine(Values("LocalInvocationIndex"), Values("Fragment", "Vertex"),
Values("Input"), Values("%u32"),
Values(TestResult(
SPV_ERROR_INVALID_DATA,
"to be used only with GLCompute execution model"))), );
Combine(
Values("LocalInvocationIndex"), Values("Fragment", "Vertex"),
Values("Input"), Values("%u32"),
Values(TestResult(SPV_ERROR_INVALID_DATA,
"to be used only with GLCompute execution model"))));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
LocalInvocationIndexNotInput,
ValidateWebGPUCombineBuiltInExecutionModelDataTypeResult,
Combine(
@ -1825,17 +1825,17 @@ INSTANTIATE_TEST_CASE_P(
Values(TestResult(SPV_ERROR_INVALID_DATA,
"WebGPU spec allows BuiltIn LocalInvocationIndex to "
"be only used for variables with Input storage "
"class"))), );
"class"))));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
LocalInvocationIndexNotIntScalar,
ValidateWebGPUCombineBuiltInExecutionModelDataTypeResult,
Combine(Values("LocalInvocationIndex"), Values("GLCompute"),
Values("Input"), Values("%f32", "%u32vec3"),
Values(TestResult(SPV_ERROR_INVALID_DATA,
"needs to be a 32-bit int", "is not an int"))), );
"needs to be a 32-bit int", "is not an int"))));
INSTANTIATE_TEST_CASE_P(
INSTANTIATE_TEST_SUITE_P(
WhitelistRejection,
ValidateWebGPUCombineBuiltInExecutionModelDataTypeResult,
Combine(Values("PointSize", "ClipDistance", "CullDistance", "VertexId",
@ -1843,7 +1843,7 @@ INSTANTIATE_TEST_CASE_P(
"WorkgroupId"),
Values("Vertex"), Values("Input"), Values("%u32"),
Values(TestResult(SPV_ERROR_INVALID_DATA,
"WebGPU does not allow BuiltIn"))), );
"WebGPU does not allow BuiltIn"))));
CodeGenerator GetArrayedVariableCodeGenerator(spv_target_env env,
const char* const built_in,