From 66abf3ed14e2ef93e6a88d6ef515e82050d7f438 Mon Sep 17 00:00:00 2001 From: Stephen White Date: Wed, 2 Mar 2022 14:09:22 +0000 Subject: [PATCH] GLSL: don't emit structs w/runtime-sized arrays. In GLSL, runtime-sized arrays are only valid in interface blocks, not in structs. The existing code was attempting to avoid emitting structs containing runtime-sized arrays but was confused by type aliases in the AST resulting in arrays being missed. The fix is to do the work on the semantic types instead, where type aliases have been resolved. Bug: tint:1339 Change-Id: I8c305ee9bddd75f975dd13f1d19d623d71410693 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/82360 Kokoro: Kokoro Reviewed-by: Ben Clayton Commit-Queue: Stephen White --- src/tint/writer/glsl/generator_impl.cc | 12 ++++++----- test/tint/bug/tint/943.spvasm.expected.glsl | 21 ------------------- test/tint/bug/tint/951.spvasm.expected.glsl | 17 --------------- test/tint/bug/tint/977.spvasm.expected.glsl | 21 ------------------- .../ba1481.wgsl.expected.glsl | 2 +- .../gen/textureLoad/8acf41.wgsl.expected.glsl | 2 +- .../979816.wgsl.expected.glsl | 2 +- ...ength_FromAccessChain.spvasm.expected.glsl | 14 ------------- ...t_ArrayLength_FromVar.spvasm.expected.glsl | 14 ------------- ...n_Struct_RuntimeArray.spvasm.expected.glsl | 14 ------------- ...hAccessChain_Cascaded.spvasm.expected.glsl | 14 ------------- ...cessChain_NonCascaded.spvasm.expected.glsl | 14 ------------- ...d_InBoundsAccessChain.spvasm.expected.glsl | 14 ------------- ...pesAndVarDeclarations.spvasm.expected.glsl | 14 ------------- .../0-opt.spvasm.expected.glsl | 14 ------------- .../0-opt.wgsl.expected.glsl | 14 ------------- .../0-opt.spvasm.expected.glsl | 13 ------------ .../0-opt.wgsl.expected.glsl | 13 ------------ .../0-opt.spvasm.expected.glsl | 13 ------------ .../0-opt.wgsl.expected.glsl | 13 ------------ .../0-opt.spvasm.expected.glsl | 13 ------------ .../0-opt.wgsl.expected.glsl | 13 ------------ .../1.spvasm.expected.glsl | 13 ------------ .../1.wgsl.expected.glsl | 13 ------------ .../uint_sgreaterthan/0.spvasm.expected.glsl | 13 ------------ .../uint_sgreaterthan/0.wgsl.expected.glsl | 13 ------------ .../0.spvasm.expected.glsl | 13 ------------ .../0.wgsl.expected.glsl | 13 ------------ .../uint_slessthan/0.spvasm.expected.glsl | 13 ------------ .../uint_slessthan/0.wgsl.expected.glsl | 13 ------------ .../0.spvasm.expected.glsl | 13 ------------ .../uint_slessthanequal/0.wgsl.expected.glsl | 13 ------------ .../0-opt.spvasm.expected.glsl | 13 ------------ .../glsl_int_uclamp/0-opt.wgsl.expected.glsl | 13 ------------ .../glsl_uint_sabs/0-opt.spvasm.expected.glsl | 13 ------------ .../glsl_uint_sabs/0-opt.wgsl.expected.glsl | 13 ------------ .../0-opt.spvasm.expected.glsl | 13 ------------ .../glsl_uint_sclamp/0-opt.wgsl.expected.glsl | 13 ------------ .../glsl_uint_smax/0-opt.spvasm.expected.glsl | 13 ------------ .../glsl_uint_smax/0-opt.wgsl.expected.glsl | 13 ------------ .../glsl_uint_smin/0-opt.spvasm.expected.glsl | 13 ------------ .../glsl_uint_smin/0-opt.wgsl.expected.glsl | 13 ------------ .../uint_sdiv/0-opt.spvasm.expected.glsl | 13 ------------ .../uint_sdiv/0-opt.wgsl.expected.glsl | 13 ------------ .../uint_snegate/0-opt.spvasm.expected.glsl | 13 ------------ .../uint_snegate/0-opt.wgsl.expected.glsl | 13 ------------ .../no_ssbo_store/1.spvasm.expected.glsl | 13 ------------ .../no_ssbo_store/1.wgsl.expected.glsl | 13 ------------ .../1.spvasm.expected.glsl | 13 ------------ .../1.wgsl.expected.glsl | 13 ------------ 50 files changed, 10 insertions(+), 635 deletions(-) diff --git a/src/tint/writer/glsl/generator_impl.cc b/src/tint/writer/glsl/generator_impl.cc index fe42ee33ea..fecb069864 100644 --- a/src/tint/writer/glsl/generator_impl.cc +++ b/src/tint/writer/glsl/generator_impl.cc @@ -164,11 +164,13 @@ bool GeneratorImpl::Generate() { // elsewhere. // TODO(crbug.com/tint/1339): We could also avoid emitting any other // struct that is only used as a buffer store type. - TINT_ASSERT(Writer, str->members.size() > 0); - auto* last_member = str->members[str->members.size() - 1]; - auto* arr = last_member->type->As(); - if (!arr || !arr->IsRuntimeArray()) { - if (!EmitStructType(current_buffer_, builder_.Sem().Get(str))) { + const sem::Struct* sem_str = builder_.Sem().Get(str); + const auto& members = sem_str->Members(); + TINT_ASSERT(Writer, members.size() > 0); + auto* last_member = members[members.size() - 1]; + auto* arr = last_member->Type()->As(); + if (!arr || !arr->IsRuntimeSized()) { + if (!EmitStructType(current_buffer_, sem_str)) { return false; } } diff --git a/test/tint/bug/tint/943.spvasm.expected.glsl b/test/tint/bug/tint/943.spvasm.expected.glsl index 60a4a56bc9..c488064c12 100644 --- a/test/tint/bug/tint/943.spvasm.expected.glsl +++ b/test/tint/bug/tint/943.spvasm.expected.glsl @@ -1,5 +1,3 @@ -SKIP: FAILED - #version 310 es struct Uniforms { @@ -10,18 +8,6 @@ struct Uniforms { ivec2 outShapeStrides; }; -struct ssbOut { - float result[]; -}; - -struct ssbA { - float A[]; -}; - -struct ssbB { - float B[]; -}; - int dimAOuter_1 = 0; layout(binding = 3) uniform Uniforms_1 { float NAN; @@ -397,10 +383,3 @@ void main() { tint_symbol_2(gl_LocalInvocationID, gl_GlobalInvocationID, gl_LocalInvocationIndex); return; } -Error parsing GLSL shader: -ERROR: 0:12: '' : array size required -ERROR: 0:13: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/bug/tint/951.spvasm.expected.glsl b/test/tint/bug/tint/951.spvasm.expected.glsl index 3455fb0711..865294ef11 100644 --- a/test/tint/bug/tint/951.spvasm.expected.glsl +++ b/test/tint/bug/tint/951.spvasm.expected.glsl @@ -1,15 +1,5 @@ -SKIP: FAILED - #version 310 es -struct ssbOut { - float result[]; -}; - -struct ssbA { - float A[]; -}; - struct Uniforms { float NAN; int aShape; @@ -87,10 +77,3 @@ void main() { tint_symbol_1(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/bug/tint/977.spvasm.expected.glsl b/test/tint/bug/tint/977.spvasm.expected.glsl index 88839a009c..b784f3e2fe 100644 --- a/test/tint/bug/tint/977.spvasm.expected.glsl +++ b/test/tint/bug/tint/977.spvasm.expected.glsl @@ -1,19 +1,5 @@ -SKIP: FAILED - #version 310 es -struct ResultMatrix { - float numbers[]; -}; - -struct FirstMatrix { - float numbers[]; -}; - -struct SecondMatrix { - float numbers[]; -}; - struct Uniforms { float NAN; int sizeA; @@ -70,10 +56,3 @@ void main() { tint_symbol_1(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/textureDimensions/ba1481.wgsl.expected.glsl b/test/tint/builtins/gen/textureDimensions/ba1481.wgsl.expected.glsl index 31b244c822..0e70b6c325 100644 --- a/test/tint/builtins/gen/textureDimensions/ba1481.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureDimensions/ba1481.wgsl.expected.glsl @@ -1,6 +1,6 @@ SKIP: FAILED -../../src/tint/writer/glsl/generator_impl.cc:2569 internal compiler error: Multiplanar external texture transform was not run. +../../src/tint/writer/glsl/generator_impl.cc:2571 internal compiler error: Multiplanar external texture transform was not run. ******************************************************************** diff --git a/test/tint/builtins/gen/textureLoad/8acf41.wgsl.expected.glsl b/test/tint/builtins/gen/textureLoad/8acf41.wgsl.expected.glsl index 31b244c822..0e70b6c325 100644 --- a/test/tint/builtins/gen/textureLoad/8acf41.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureLoad/8acf41.wgsl.expected.glsl @@ -1,6 +1,6 @@ SKIP: FAILED -../../src/tint/writer/glsl/generator_impl.cc:2569 internal compiler error: Multiplanar external texture transform was not run. +../../src/tint/writer/glsl/generator_impl.cc:2571 internal compiler error: Multiplanar external texture transform was not run. ******************************************************************** diff --git a/test/tint/builtins/gen/textureSampleLevel/979816.wgsl.expected.glsl b/test/tint/builtins/gen/textureSampleLevel/979816.wgsl.expected.glsl index 31b244c822..0e70b6c325 100644 --- a/test/tint/builtins/gen/textureSampleLevel/979816.wgsl.expected.glsl +++ b/test/tint/builtins/gen/textureSampleLevel/979816.wgsl.expected.glsl @@ -1,6 +1,6 @@ SKIP: FAILED -../../src/tint/writer/glsl/generator_impl.cc:2569 internal compiler error: Multiplanar external texture transform was not run. +../../src/tint/writer/glsl/generator_impl.cc:2571 internal compiler error: Multiplanar external texture transform was not run. ******************************************************************** diff --git a/test/tint/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromAccessChain.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromAccessChain.spvasm.expected.glsl index 644c948d79..8035758fff 100644 --- a/test/tint/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromAccessChain.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromAccessChain.spvasm.expected.glsl @@ -1,13 +1,6 @@ -SKIP: FAILED - #version 310 es precision mediump float; -struct S { - uint first; - uint rtarr[]; -}; - layout(binding = 0, std430) buffer S_1 { uint first; uint rtarr[]; @@ -25,10 +18,3 @@ void main() { tint_symbol(); return; } -Error parsing GLSL shader: -ERROR: 0:6: '' : array size required -ERROR: 0:7: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromVar.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromVar.spvasm.expected.glsl index 644c948d79..8035758fff 100644 --- a/test/tint/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromVar.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromVar.spvasm.expected.glsl @@ -1,13 +1,6 @@ -SKIP: FAILED - #version 310 es precision mediump float; -struct S { - uint first; - uint rtarr[]; -}; - layout(binding = 0, std430) buffer S_1 { uint first; uint rtarr[]; @@ -25,10 +18,3 @@ void main() { tint_symbol(); return; } -Error parsing GLSL shader: -ERROR: 0:6: '' : array size required -ERROR: 0:7: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/SpvParserMemoryTest_EmitStatement_AccessChain_Struct_RuntimeArray.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/SpvParserMemoryTest_EmitStatement_AccessChain_Struct_RuntimeArray.spvasm.expected.glsl index 278174435c..7d46c88d58 100644 --- a/test/tint/unittest/reader/spirv/SpvParserMemoryTest_EmitStatement_AccessChain_Struct_RuntimeArray.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/SpvParserMemoryTest_EmitStatement_AccessChain_Struct_RuntimeArray.spvasm.expected.glsl @@ -1,13 +1,6 @@ -SKIP: FAILED - #version 310 es precision mediump float; -struct S { - float field0; - float age[]; -}; - layout(binding = 0, std430) buffer S_1 { float field0; float age[]; @@ -25,10 +18,3 @@ void main() { tint_symbol(); return; } -Error parsing GLSL shader: -ERROR: 0:6: '' : array size required -ERROR: 0:7: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_Cascaded.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_Cascaded.spvasm.expected.glsl index f7775411e8..90110c6ef4 100644 --- a/test/tint/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_Cascaded.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_Cascaded.spvasm.expected.glsl @@ -1,13 +1,6 @@ -SKIP: FAILED - #version 310 es precision mediump float; -struct S { - uint field0; - uint field1[]; -}; - layout(binding = 0, std430) buffer S_1 { uint field0; uint field1[]; @@ -25,10 +18,3 @@ void main() { tint_symbol(); return; } -Error parsing GLSL shader: -ERROR: 0:6: '' : array size required -ERROR: 0:7: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded.spvasm.expected.glsl index dfa261f3d4..615efaa8f8 100644 --- a/test/tint/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded.spvasm.expected.glsl @@ -1,13 +1,6 @@ -SKIP: FAILED - #version 310 es precision mediump float; -struct S { - uint field0; - uint field1[]; -}; - layout(binding = 0, std430) buffer S_1 { uint field0; uint field1[]; @@ -26,10 +19,3 @@ void main() { tint_symbol(); return; } -Error parsing GLSL shader: -ERROR: 0:6: '' : array size required -ERROR: 0:7: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded_InBoundsAccessChain.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded_InBoundsAccessChain.spvasm.expected.glsl index dfa261f3d4..615efaa8f8 100644 --- a/test/tint/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded_InBoundsAccessChain.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded_InBoundsAccessChain.spvasm.expected.glsl @@ -1,13 +1,6 @@ -SKIP: FAILED - #version 310 es precision mediump float; -struct S { - uint field0; - uint field1[]; -}; - layout(binding = 0, std430) buffer S_1 { uint field0; uint field1[]; @@ -26,10 +19,3 @@ void main() { tint_symbol(); return; } -Error parsing GLSL shader: -ERROR: 0:6: '' : array size required -ERROR: 0:7: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_TypesAndVarDeclarations.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_TypesAndVarDeclarations.spvasm.expected.glsl index 9501ceae0c..1eb60a2db7 100644 --- a/test/tint/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_TypesAndVarDeclarations.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_TypesAndVarDeclarations.spvasm.expected.glsl @@ -1,13 +1,6 @@ -SKIP: FAILED - #version 310 es precision mediump float; -struct S { - uint field0; - uint field1[]; -}; - void main_1() { return; } @@ -20,10 +13,3 @@ void main() { tint_symbol(); return; } -Error parsing GLSL shader: -ERROR: 0:6: '' : array size required -ERROR: 0:7: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.spvasm.expected.glsl b/test/tint/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.spvasm.expected.glsl index c6efb4bc3e..8270991be5 100644 --- a/test/tint/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.spvasm.expected.glsl +++ b/test/tint/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.spvasm.expected.glsl @@ -1,12 +1,5 @@ -SKIP: FAILED - #version 310 es -struct doesNotMatter { - int global_seed; - int data[]; -}; - struct buf1 { vec2 injectionSwitch; }; @@ -58,10 +51,3 @@ void main() { tint_symbol_1(gl_LocalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:5: '' : array size required -ERROR: 0:6: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl.expected.glsl b/test/tint/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl.expected.glsl index 3c372c8144..9bc540b29c 100644 --- a/test/tint/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl.expected.glsl +++ b/test/tint/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl.expected.glsl @@ -1,16 +1,9 @@ -SKIP: FAILED - vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary type RTArr = @stride(4) array; ^^^^^^ #version 310 es -struct doesNotMatter { - int global_seed; - int data[]; -}; - struct buf1 { vec2 injectionSwitch; }; @@ -62,10 +55,3 @@ void main() { tint_symbol_1(gl_LocalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:5: '' : array size required -ERROR: 0:6: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.spvasm.expected.glsl b/test/tint/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.spvasm.expected.glsl index 1c36a9f7a9..4e9743ebcd 100644 --- a/test/tint/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.spvasm.expected.glsl +++ b/test/tint/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.spvasm.expected.glsl @@ -1,15 +1,9 @@ -SKIP: FAILED - #version 310 es struct buf0 { vec2 injectionSwitch; }; -struct doesNotMatter { - uint x_compute_data[]; -}; - vec4 GLF_live2gl_FragCoord = vec4(0.0f, 0.0f, 0.0f, 0.0f); layout(binding = 1) uniform buf0_1 { vec2 injectionSwitch; @@ -77,10 +71,3 @@ void main() { tint_symbol(); return; } -Error parsing GLSL shader: -ERROR: 0:8: '' : array size required -ERROR: 0:9: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl.expected.glsl b/test/tint/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl.expected.glsl index 2b2f42b5b1..08eb117fef 100644 --- a/test/tint/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl.expected.glsl +++ b/test/tint/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl.expected.glsl @@ -1,5 +1,3 @@ -SKIP: FAILED - vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl:5:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary type RTArr = @stride(4) array; ^^^^^^ @@ -10,10 +8,6 @@ struct buf0 { vec2 injectionSwitch; }; -struct doesNotMatter { - uint x_compute_data[]; -}; - vec4 GLF_live2gl_FragCoord = vec4(0.0f, 0.0f, 0.0f, 0.0f); layout(binding = 1) uniform buf0_1 { vec2 injectionSwitch; @@ -81,10 +75,3 @@ void main() { tint_symbol(); return; } -Error parsing GLSL shader: -ERROR: 0:8: '' : array size required -ERROR: 0:9: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.spvasm.expected.glsl b/test/tint/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.spvasm.expected.glsl index 9df6e05774..5adbbbe016 100644 --- a/test/tint/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.spvasm.expected.glsl +++ b/test/tint/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.spvasm.expected.glsl @@ -1,11 +1,5 @@ -SKIP: FAILED - #version 310 es -struct doesNotMatter { - float x_compute_data[]; -}; - layout(binding = 0, std430) buffer doesNotMatter_1 { float x_compute_data[]; } x_9; @@ -66,10 +60,3 @@ void main() { tint_symbol(); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl.expected.glsl b/test/tint/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl.expected.glsl index a433ae8b63..7cc70f3697 100644 --- a/test/tint/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl.expected.glsl +++ b/test/tint/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl.expected.glsl @@ -1,15 +1,9 @@ -SKIP: FAILED - vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary type RTArr = @stride(4) array; ^^^^^^ #version 310 es -struct doesNotMatter { - float x_compute_data[]; -}; - layout(binding = 0, std430) buffer doesNotMatter_1 { float x_compute_data[]; } x_9; @@ -70,10 +64,3 @@ void main() { tint_symbol(); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.spvasm.expected.glsl b/test/tint/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.spvasm.expected.glsl index 076640422b..5c0702cc65 100644 --- a/test/tint/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.spvasm.expected.glsl +++ b/test/tint/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.spvasm.expected.glsl @@ -1,5 +1,3 @@ -SKIP: FAILED - #version 310 es struct buf1 { @@ -10,10 +8,6 @@ struct buf2 { vec2 resolution; }; -struct doesNotMatter { - int x_compute_data[]; -}; - uvec3 tint_symbol = uvec3(0u, 0u, 0u); layout(binding = 1) uniform buf1_1 { vec2 injectionSwitch; @@ -123,10 +117,3 @@ void main() { tint_symbol_1(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:12: '' : array size required -ERROR: 0:13: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl.expected.glsl b/test/tint/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl.expected.glsl index 4650ab15ec..c9a8c2cda7 100644 --- a/test/tint/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl.expected.glsl +++ b/test/tint/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl.expected.glsl @@ -1,5 +1,3 @@ -SKIP: FAILED - vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl:9:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary type RTArr = @stride(4) array; ^^^^^^ @@ -14,10 +12,6 @@ struct buf2 { vec2 resolution; }; -struct doesNotMatter { - int x_compute_data[]; -}; - uvec3 tint_symbol = uvec3(0u, 0u, 0u); layout(binding = 1) uniform buf1_1 { vec2 injectionSwitch; @@ -127,10 +121,3 @@ void main() { tint_symbol_1(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:12: '' : array size required -ERROR: 0:13: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.spvasm.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.spvasm.expected.glsl index 7789645e47..0224581cb2 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.spvasm.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.spvasm.expected.glsl @@ -1,15 +1,9 @@ -SKIP: FAILED - #version 310 es struct Buf1 { int result; }; -struct Buf0 { - uint values[]; -}; - layout(binding = 1, std430) buffer Buf1_1 { int result; } x_4; @@ -40,10 +34,3 @@ void main() { tint_symbol(); return; } -Error parsing GLSL shader: -ERROR: 0:8: '' : array size required -ERROR: 0:9: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl.expected.glsl index a396de9890..2aaa4542b6 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl.expected.glsl @@ -1,5 +1,3 @@ -SKIP: FAILED - vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl:5:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary type RTArr = @stride(4) array; ^^^^^^ @@ -10,10 +8,6 @@ struct Buf1 { int result; }; -struct Buf0 { - uint values[]; -}; - layout(binding = 1, std430) buffer Buf1_1 { int result; } x_4; @@ -44,10 +38,3 @@ void main() { tint_symbol(); return; } -Error parsing GLSL shader: -ERROR: 0:8: '' : array size required -ERROR: 0:9: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.spvasm.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.spvasm.expected.glsl index 4db18f6931..95529d2f48 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.spvasm.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.spvasm.expected.glsl @@ -1,11 +1,5 @@ -SKIP: FAILED - #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_2 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -34,10 +28,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl.expected.glsl index 9c005bedac..b99aba7daf 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl.expected.glsl @@ -1,15 +1,9 @@ -SKIP: FAILED - vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary type RTArr = @stride(4) array; ^^^^^^ #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_2 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -38,10 +32,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.spvasm.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.spvasm.expected.glsl index 82f46db435..14da4cbfd7 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.spvasm.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.spvasm.expected.glsl @@ -1,11 +1,5 @@ -SKIP: FAILED - #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_2 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -34,10 +28,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl.expected.glsl index 735bcc67bd..28fa601889 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl.expected.glsl @@ -1,15 +1,9 @@ -SKIP: FAILED - vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary type RTArr = @stride(4) array; ^^^^^^ #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_2 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -38,10 +32,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.spvasm.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.spvasm.expected.glsl index 23be66a801..bdf36c61f0 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.spvasm.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.spvasm.expected.glsl @@ -1,11 +1,5 @@ -SKIP: FAILED - #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_2 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -34,10 +28,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl.expected.glsl index 4a16a0a406..f2f426c0f6 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl.expected.glsl @@ -1,15 +1,9 @@ -SKIP: FAILED - vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary type RTArr = @stride(4) array; ^^^^^^ #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_2 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -38,10 +32,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.spvasm.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.spvasm.expected.glsl index e4ca0dd730..b7cf34c8a3 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.spvasm.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.spvasm.expected.glsl @@ -1,11 +1,5 @@ -SKIP: FAILED - #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_2 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -34,10 +28,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl.expected.glsl index 5500fa3669..278a968541 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl.expected.glsl @@ -1,15 +1,9 @@ -SKIP: FAILED - vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary type RTArr = @stride(4) array; ^^^^^^ #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_2 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -38,10 +32,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.spvasm.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.spvasm.expected.glsl index 7335a19b66..581c92aa29 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.spvasm.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.spvasm.expected.glsl @@ -1,11 +1,5 @@ -SKIP: FAILED - #version 310 es -struct S { - int field0[]; -}; - uvec3 x_3 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { int field0[]; @@ -38,10 +32,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl.expected.glsl index 88b843ffb9..5abc6428c6 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl.expected.glsl @@ -1,15 +1,9 @@ -SKIP: FAILED - vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary type RTArr = @stride(4) array; ^^^^^^ #version 310 es -struct S { - int field0[]; -}; - uvec3 x_3 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { int field0[]; @@ -42,10 +36,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.spvasm.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.spvasm.expected.glsl index 0eb6b45d20..7d2b9ddc17 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.spvasm.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.spvasm.expected.glsl @@ -1,11 +1,5 @@ -SKIP: FAILED - #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_3 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -30,10 +24,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl.expected.glsl index 292866090d..c63ba55ef1 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl.expected.glsl @@ -1,15 +1,9 @@ -SKIP: FAILED - vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary type RTArr = @stride(4) array; ^^^^^^ #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_3 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -34,10 +28,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.spvasm.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.spvasm.expected.glsl index cd3aea5527..aa006e7eb7 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.spvasm.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.spvasm.expected.glsl @@ -1,11 +1,5 @@ -SKIP: FAILED - #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_3 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -38,10 +32,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl.expected.glsl index 6225445e7b..0453f7b477 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl.expected.glsl @@ -1,15 +1,9 @@ -SKIP: FAILED - vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary type RTArr = @stride(4) array; ^^^^^^ #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_3 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -42,10 +36,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.spvasm.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.spvasm.expected.glsl index 3edb93ddc8..62d91ce241 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.spvasm.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.spvasm.expected.glsl @@ -1,11 +1,5 @@ -SKIP: FAILED - #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_3 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -34,10 +28,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl.expected.glsl index 5a257b66e5..5a76c16566 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl.expected.glsl @@ -1,15 +1,9 @@ -SKIP: FAILED - vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary type RTArr = @stride(4) array; ^^^^^^ #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_3 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -38,10 +32,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.spvasm.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.spvasm.expected.glsl index 83ab583e41..250913cad4 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.spvasm.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.spvasm.expected.glsl @@ -1,11 +1,5 @@ -SKIP: FAILED - #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_3 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -34,10 +28,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl.expected.glsl index 1078c62da0..a6269d9bb7 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl.expected.glsl @@ -1,15 +1,9 @@ -SKIP: FAILED - vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary type RTArr = @stride(4) array; ^^^^^^ #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_3 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -38,10 +32,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.spvasm.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.spvasm.expected.glsl index 44d2902e12..f02beed406 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.spvasm.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.spvasm.expected.glsl @@ -1,11 +1,5 @@ -SKIP: FAILED - #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_2 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -34,10 +28,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl.expected.glsl index a777b12d8d..c065d5012e 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl.expected.glsl @@ -1,15 +1,9 @@ -SKIP: FAILED - vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary type RTArr = @stride(4) array; ^^^^^^ #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_2 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -38,10 +32,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.spvasm.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.spvasm.expected.glsl index 6c8f3c598b..f56da3f4ae 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.spvasm.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.spvasm.expected.glsl @@ -1,11 +1,5 @@ -SKIP: FAILED - #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_2 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -30,10 +24,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl.expected.glsl index 3834124966..23c6f717f4 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl.expected.glsl @@ -1,15 +1,9 @@ -SKIP: FAILED - vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary type RTArr = @stride(4) array; ^^^^^^ #version 310 es -struct S { - uint field0[]; -}; - uvec3 x_2 = uvec3(0u, 0u, 0u); layout(binding = 0, std430) buffer S_1 { uint field0[]; @@ -34,10 +28,3 @@ void main() { tint_symbol(gl_GlobalInvocationID); return; } -Error parsing GLSL shader: -ERROR: 0:4: '' : array size required -ERROR: 0:5: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.spvasm.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.spvasm.expected.glsl index 054a5ccad4..98554ed928 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.spvasm.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.spvasm.expected.glsl @@ -1,14 +1,8 @@ -SKIP: FAILED - #version 310 es precision mediump float; layout(location = 0) flat in int x_3_param_1; layout(location = 0) out int x_4_1_1; -struct S { - int field0[]; -}; - vec4 x_2 = vec4(0.0f, 0.0f, 0.0f, 0.0f); int x_3 = 0; int x_4 = 0; @@ -43,10 +37,3 @@ void main() { x_4_1_1 = inner_result.x_4_1; return; } -Error parsing GLSL shader: -ERROR: 0:7: '' : array size required -ERROR: 0:8: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl.expected.glsl index 5fbe8991b8..e0ca6f66d5 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl.expected.glsl @@ -1,5 +1,3 @@ -SKIP: FAILED - vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary type RTArr = @stride(4) array; ^^^^^^ @@ -9,10 +7,6 @@ precision mediump float; layout(location = 0) flat in int x_3_param_1; layout(location = 0) out int x_4_1_1; -struct S { - int field0[]; -}; - vec4 x_2 = vec4(0.0f, 0.0f, 0.0f, 0.0f); int x_3 = 0; int x_4 = 0; @@ -47,10 +41,3 @@ void main() { x_4_1_1 = inner_result.x_4_1; return; } -Error parsing GLSL shader: -ERROR: 0:7: '' : array size required -ERROR: 0:8: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.spvasm.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.spvasm.expected.glsl index d1e6534db7..86c6f4826f 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.spvasm.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.spvasm.expected.glsl @@ -1,14 +1,8 @@ -SKIP: FAILED - #version 310 es precision mediump float; layout(location = 0) flat in int x_3_param_1; layout(location = 0) out int x_4_1_1; -struct S { - int field0[]; -}; - vec4 x_2 = vec4(0.0f, 0.0f, 0.0f, 0.0f); int x_3 = 0; int x_4 = 0; @@ -44,10 +38,3 @@ void main() { x_4_1_1 = inner_result.x_4_1; return; } -Error parsing GLSL shader: -ERROR: 0:7: '' : array size required -ERROR: 0:8: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl.expected.glsl b/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl.expected.glsl index 4bd98da1fc..f6e5b9bb1c 100644 --- a/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl.expected.glsl +++ b/test/tint/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl.expected.glsl @@ -1,5 +1,3 @@ -SKIP: FAILED - vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary type RTArr = @stride(4) array; ^^^^^^ @@ -9,10 +7,6 @@ precision mediump float; layout(location = 0) flat in int x_3_param_1; layout(location = 0) out int x_4_1_1; -struct S { - int field0[]; -}; - vec4 x_2 = vec4(0.0f, 0.0f, 0.0f, 0.0f); int x_3 = 0; int x_4 = 0; @@ -48,10 +42,3 @@ void main() { x_4_1_1 = inner_result.x_4_1; return; } -Error parsing GLSL shader: -ERROR: 0:7: '' : array size required -ERROR: 0:8: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - -