From 1d04cf841c5d628fe0fc19e5626fbf95b519bf55 Mon Sep 17 00:00:00 2001 From: Stephen White Date: Sat, 7 Jan 2023 17:19:21 +0000 Subject: [PATCH] Enable the 1D -> 2D texture transform in GLSL writer. Fix unit and WGSL test results. Bug: dawn:1301 Change-Id: Idfe046bdb211c8db9724e02c2f9dfb12d04d5c2a Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/114800 Kokoro: Kokoro Reviewed-by: Ben Clayton Commit-Queue: Stephen White --- src/tint/writer/glsl/generator_impl.cc | 3 ++ .../generator_impl_builtin_texture_test.cc | 8 ++-- .../022903.wgsl.expected.glsl | 35 +++------------ .../09140b.wgsl.expected.glsl | 38 +++------------- .../0c0b0c.wgsl.expected.glsl | 38 +++------------- .../26d6bf.wgsl.expected.glsl | 35 +++------------ .../3af3e7.wgsl.expected.glsl | 38 +++------------- .../58a82d.wgsl.expected.glsl | 38 +++------------- .../5df042.wgsl.expected.glsl | 35 +++------------ .../607979.wgsl.expected.glsl | 38 +++------------- .../7228de.wgsl.expected.glsl | 38 +++------------- .../8efd47.wgsl.expected.glsl | 38 +++------------- .../920006.wgsl.expected.glsl | 35 +++------------ .../92552e.wgsl.expected.glsl | 38 +++------------- .../965645.wgsl.expected.glsl | 35 +++------------ .../9c7a00.wgsl.expected.glsl | 35 +++------------ .../aac604.wgsl.expected.glsl | 35 +++------------ .../ad7d3b.wgsl.expected.glsl | 38 +++------------- .../b46d97.wgsl.expected.glsl | 35 +++------------ .../b51345.wgsl.expected.glsl | 12 ++--- .../d08a94.wgsl.expected.glsl | 38 +++------------- .../da30d2.wgsl.expected.glsl | 38 +++------------- .../e122fe.wgsl.expected.glsl | 38 +++------------- .../ea066c.wgsl.expected.glsl | 38 +++------------- .../ea25bc.wgsl.expected.glsl | 12 ++--- .../f17acd.wgsl.expected.glsl | 35 +++------------ .../f264a3.wgsl.expected.glsl | 12 ++--- .../textureLoad/0cb698.wgsl.expected.glsl | 35 +++------------ .../textureLoad/1373dc.wgsl.expected.glsl | 35 +++------------ .../textureLoad/1b8588.wgsl.expected.glsl | 35 +++------------ .../textureLoad/216c37.wgsl.expected.glsl | 35 +++------------ .../textureLoad/3da3ed.wgsl.expected.glsl | 35 +++------------ .../textureLoad/4c423f.wgsl.expected.glsl | 35 +++------------ .../textureLoad/5a2f9d.wgsl.expected.glsl | 35 +++------------ .../textureLoad/62d1de.wgsl.expected.glsl | 35 +++------------ .../textureLoad/6b77d4.wgsl.expected.glsl | 35 +++------------ .../textureLoad/6d376a.wgsl.expected.glsl | 35 +++------------ .../textureLoad/81c381.wgsl.expected.glsl | 35 +++------------ .../textureLoad/bc3201.wgsl.expected.glsl | 35 +++------------ .../1a7fc3.wgsl.expected.glsl | 18 ++++---- .../c399f9.wgsl.expected.glsl | 18 ++++---- .../f742c0.wgsl.expected.glsl | 18 ++++---- .../textureSample/6e64fb.wgsl.expected.glsl | 13 +----- .../textureStore/102722.wgsl.expected.glsl | 38 +++------------- .../textureStore/1dc954.wgsl.expected.glsl | 38 +++------------- .../textureStore/285218.wgsl.expected.glsl | 38 +++------------- .../textureStore/2ac6c7.wgsl.expected.glsl | 38 +++------------- .../textureStore/2eb2a4.wgsl.expected.glsl | 38 +++------------- .../textureStore/2ed2a3.wgsl.expected.glsl | 38 +++------------- .../textureStore/3bec15.wgsl.expected.glsl | 38 +++------------- .../textureStore/3c1937.wgsl.expected.glsl | 38 +++------------- .../textureStore/3d6f01.wgsl.expected.glsl | 12 ++--- .../textureStore/5a2f8f.wgsl.expected.glsl | 38 +++------------- .../textureStore/602b5a.wgsl.expected.glsl | 12 ++--- .../textureStore/6b75c3.wgsl.expected.glsl | 38 +++------------- .../textureStore/6b80d2.wgsl.expected.glsl | 38 +++------------- .../textureStore/7f7fae.wgsl.expected.glsl | 38 +++------------- .../textureStore/83bcc1.wgsl.expected.glsl | 12 ++--- .../textureStore/872747.wgsl.expected.glsl | 12 ++--- .../textureStore/8c76e9.wgsl.expected.glsl | 38 +++------------- .../textureStore/958353.wgsl.expected.glsl | 38 +++------------- .../textureStore/959d94.wgsl.expected.glsl | 38 +++------------- .../textureStore/969534.wgsl.expected.glsl | 38 +++------------- .../textureStore/a4c338.wgsl.expected.glsl | 38 +++------------- .../textureStore/a6e78f.wgsl.expected.glsl | 38 +++------------- .../textureStore/b70ded.wgsl.expected.glsl | 38 +++------------- .../textureStore/b77161.wgsl.expected.glsl | 12 ++--- .../textureStore/bf775c.wgsl.expected.glsl | 38 +++------------- .../textureStore/c1f29e.wgsl.expected.glsl | 38 +++------------- .../textureStore/d26166.wgsl.expected.glsl | 38 +++------------- .../textureStore/d73b5c.wgsl.expected.glsl | 12 ++--- .../textureStore/de4b94.wgsl.expected.glsl | 38 +++------------- .../textureStore/e7c6d8.wgsl.expected.glsl | 38 +++------------- .../textureStore/e885e8.wgsl.expected.glsl | 38 +++------------- .../textureStore/fb9a8f.wgsl.expected.glsl | 38 +++------------- .../022903.wgsl.expected.glsl | 35 +++------------ .../09140b.wgsl.expected.glsl | 38 +++------------- .../0c0b0c.wgsl.expected.glsl | 38 +++------------- .../26d6bf.wgsl.expected.glsl | 35 +++------------ .../3af3e7.wgsl.expected.glsl | 38 +++------------- .../58a82d.wgsl.expected.glsl | 38 +++------------- .../5df042.wgsl.expected.glsl | 35 +++------------ .../607979.wgsl.expected.glsl | 38 +++------------- .../7228de.wgsl.expected.glsl | 38 +++------------- .../8efd47.wgsl.expected.glsl | 38 +++------------- .../920006.wgsl.expected.glsl | 35 +++------------ .../92552e.wgsl.expected.glsl | 38 +++------------- .../965645.wgsl.expected.glsl | 35 +++------------ .../9c7a00.wgsl.expected.glsl | 35 +++------------ .../aac604.wgsl.expected.glsl | 35 +++------------ .../ad7d3b.wgsl.expected.glsl | 38 +++------------- .../b46d97.wgsl.expected.glsl | 35 +++------------ .../b51345.wgsl.expected.glsl | 12 ++--- .../d08a94.wgsl.expected.glsl | 38 +++------------- .../da30d2.wgsl.expected.glsl | 38 +++------------- .../e122fe.wgsl.expected.glsl | 38 +++------------- .../ea066c.wgsl.expected.glsl | 38 +++------------- .../ea25bc.wgsl.expected.glsl | 12 ++--- .../f17acd.wgsl.expected.glsl | 35 +++------------ .../f264a3.wgsl.expected.glsl | 12 ++--- .../var/textureLoad/0cb698.wgsl.expected.glsl | 35 +++------------ .../var/textureLoad/1373dc.wgsl.expected.glsl | 35 +++------------ .../var/textureLoad/1b8588.wgsl.expected.glsl | 35 +++------------ .../var/textureLoad/216c37.wgsl.expected.glsl | 35 +++------------ .../var/textureLoad/3da3ed.wgsl.expected.glsl | 35 +++------------ .../var/textureLoad/4c423f.wgsl.expected.glsl | 35 +++------------ .../var/textureLoad/5a2f9d.wgsl.expected.glsl | 35 +++------------ .../var/textureLoad/62d1de.wgsl.expected.glsl | 35 +++------------ .../var/textureLoad/6b77d4.wgsl.expected.glsl | 35 +++------------ .../var/textureLoad/6d376a.wgsl.expected.glsl | 35 +++------------ .../var/textureLoad/81c381.wgsl.expected.glsl | 35 +++------------ .../var/textureLoad/bc3201.wgsl.expected.glsl | 35 +++------------ .../1a7fc3.wgsl.expected.glsl | 18 ++++---- .../c399f9.wgsl.expected.glsl | 18 ++++---- .../f742c0.wgsl.expected.glsl | 18 ++++---- .../textureSample/6e64fb.wgsl.expected.glsl | 13 +----- .../textureStore/102722.wgsl.expected.glsl | 38 +++------------- .../textureStore/1dc954.wgsl.expected.glsl | 38 +++------------- .../textureStore/285218.wgsl.expected.glsl | 38 +++------------- .../textureStore/2ac6c7.wgsl.expected.glsl | 38 +++------------- .../textureStore/2eb2a4.wgsl.expected.glsl | 38 +++------------- .../textureStore/2ed2a3.wgsl.expected.glsl | 38 +++------------- .../textureStore/3bec15.wgsl.expected.glsl | 38 +++------------- .../textureStore/3c1937.wgsl.expected.glsl | 38 +++------------- .../textureStore/3d6f01.wgsl.expected.glsl | 12 ++--- .../textureStore/5a2f8f.wgsl.expected.glsl | 38 +++------------- .../textureStore/602b5a.wgsl.expected.glsl | 12 ++--- .../textureStore/6b75c3.wgsl.expected.glsl | 38 +++------------- .../textureStore/6b80d2.wgsl.expected.glsl | 38 +++------------- .../textureStore/7f7fae.wgsl.expected.glsl | 38 +++------------- .../textureStore/83bcc1.wgsl.expected.glsl | 12 ++--- .../textureStore/872747.wgsl.expected.glsl | 12 ++--- .../textureStore/8c76e9.wgsl.expected.glsl | 38 +++------------- .../textureStore/958353.wgsl.expected.glsl | 38 +++------------- .../textureStore/959d94.wgsl.expected.glsl | 38 +++------------- .../textureStore/969534.wgsl.expected.glsl | 38 +++------------- .../textureStore/a4c338.wgsl.expected.glsl | 38 +++------------- .../textureStore/a6e78f.wgsl.expected.glsl | 38 +++------------- .../textureStore/b70ded.wgsl.expected.glsl | 38 +++------------- .../textureStore/b77161.wgsl.expected.glsl | 12 ++--- .../textureStore/bf775c.wgsl.expected.glsl | 38 +++------------- .../textureStore/c1f29e.wgsl.expected.glsl | 38 +++------------- .../textureStore/d26166.wgsl.expected.glsl | 38 +++------------- .../textureStore/d73b5c.wgsl.expected.glsl | 12 ++--- .../textureStore/de4b94.wgsl.expected.glsl | 38 +++------------- .../textureStore/e7c6d8.wgsl.expected.glsl | 38 +++------------- .../textureStore/e885e8.wgsl.expected.glsl | 38 +++------------- .../textureStore/fb9a8f.wgsl.expected.glsl | 38 +++------------- .../texture/storage/1d.wgsl.expected.glsl | 37 ++++++++-------- ...randsForImageAccess_0.spvasm.expected.glsl | 40 ----------------- ...randsForImageAccess_1.spvasm.expected.glsl | 40 ----------------- ...randsForImageAccess_2.spvasm.expected.glsl | 41 ----------------- ...randsForImageAccess_0.spvasm.expected.glsl | 41 ----------------- ...randsForImageAccess_1.spvasm.expected.glsl | 41 ----------------- ...randsForImageAccess_2.spvasm.expected.glsl | 41 ----------------- ...randsForImageAccess_3.spvasm.expected.glsl | 41 ----------------- ...AccessTest_Variable_0.spvasm.expected.glsl | 44 ------------------- ...randsForImageAccess_0.spvasm.expected.glsl | 41 ----------------- ...randsForImageAccess_0.spvasm.expected.glsl | 40 ----------------- ...randsForImageAccess_1.spvasm.expected.glsl | 40 ----------------- ...randsForImageAccess_2.spvasm.expected.glsl | 41 ----------------- ...e_RawImage_Variable_0.spvasm.expected.glsl | 26 ----------- ...e_RawImage_Variable_1.spvasm.expected.glsl | 4 +- ...e_RawImage_Variable_2.spvasm.expected.glsl | 26 ----------- 164 files changed, 913 insertions(+), 4466 deletions(-) delete mode 100644 test/tint/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl delete mode 100644 test/tint/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl delete mode 100644 test/tint/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl delete mode 100644 test/tint/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl delete mode 100644 test/tint/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl delete mode 100644 test/tint/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl delete mode 100644 test/tint/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_3.spvasm.expected.glsl delete mode 100644 test/tint/unittest/reader/spirv/ImageSampleProjImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl delete mode 100644 test/tint/unittest/reader/spirv/PreserveFloatCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl delete mode 100644 test/tint/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl delete mode 100644 test/tint/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl delete mode 100644 test/tint/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl delete mode 100644 test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_0.spvasm.expected.glsl delete mode 100644 test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_2.spvasm.expected.glsl diff --git a/src/tint/writer/glsl/generator_impl.cc b/src/tint/writer/glsl/generator_impl.cc index 8450be33d2..bc52f15044 100644 --- a/src/tint/writer/glsl/generator_impl.cc +++ b/src/tint/writer/glsl/generator_impl.cc @@ -60,6 +60,7 @@ #include "src/tint/transform/simplify_pointers.h" #include "src/tint/transform/single_entry_point.h" #include "src/tint/transform/std140.h" +#include "src/tint/transform/texture_1d_to_2d.h" #include "src/tint/transform/unshadow.h" #include "src/tint/transform/zero_init_workgroup_memory.h" #include "src/tint/type/array.h" @@ -253,6 +254,8 @@ SanitizedResult Sanitize(const Program* in, // Std140 must come after PromoteSideEffectsToDecl and before SimplifyPointers. manager.Add(); + manager.Add(); + manager.Add(); data.Add( diff --git a/src/tint/writer/glsl/generator_impl_builtin_texture_test.cc b/src/tint/writer/glsl/generator_impl_builtin_texture_test.cc index 8fc984430c..cb5a4c81f0 100644 --- a/src/tint/writer/glsl/generator_impl_builtin_texture_test.cc +++ b/src/tint/writer/glsl/generator_impl_builtin_texture_test.cc @@ -117,7 +117,7 @@ ExpectedResult expected_texture_overload(ast::builtin::test::ValidTextureOverloa case ValidTextureOverload::kNumSamplesMultisampled2d: return {"textureSamples"}; case ValidTextureOverload::kSample1dF32: - return R"(texture(tint_symbol_sampler, 1.0f);)"; + return R"(texture(tint_symbol_sampler, vec2(1.0f, 0.5f));)"; case ValidTextureOverload::kSample2dF32: return R"(texture(tint_symbol_sampler, vec2(1.0f, 2.0f));)"; case ValidTextureOverload::kSample2dOffsetF32: @@ -231,10 +231,10 @@ ExpectedResult expected_texture_overload(ast::builtin::test::ValidTextureOverloa case ValidTextureOverload::kSampleCompareLevelDepthCubeArrayF32: return R"(texture(tint_symbol_sampler, vec4(1.0f, 2.0f, 3.0f, float(4)), 5.0f);)"; case ValidTextureOverload::kLoad1dLevelF32: - return R"(texelFetch(tint_symbol_2, int(1u), int(3u));)"; + return R"(texelFetch(tint_symbol_2, ivec2(uvec2(1u, 0u)), int(3u));)"; case ValidTextureOverload::kLoad1dLevelU32: case ValidTextureOverload::kLoad1dLevelI32: - return R"(texelFetch(tint_symbol_2, 1, 3);)"; + return R"(texelFetch(tint_symbol_2, ivec2(1, 0), 3);)"; case ValidTextureOverload::kLoad2dLevelU32: return R"(texelFetch(tint_symbol_2, ivec2(1, 2), 3);)"; case ValidTextureOverload::kLoad2dLevelF32: @@ -260,7 +260,7 @@ ExpectedResult expected_texture_overload(ast::builtin::test::ValidTextureOverloa case ValidTextureOverload::kLoadDepthMultisampled2dF32: return R"(texelFetch(tint_symbol_2, ivec2(uvec2(1u, 2u)), int(3u)).x;)"; case ValidTextureOverload::kStoreWO1dRgba32float: - return R"(imageStore(tint_symbol, 1, vec4(2.0f, 3.0f, 4.0f, 5.0f));)"; + return R"(imageStore(tint_symbol, ivec2(1, 0), vec4(2.0f, 3.0f, 4.0f, 5.0f));)"; case ValidTextureOverload::kStoreWO2dRgba32float: return R"(imageStore(tint_symbol, ivec2(1, 2), vec4(3.0f, 4.0f, 5.0f, 6.0f));)"; case ValidTextureOverload::kStoreWO2dArrayRgba32float: diff --git a/test/tint/builtins/gen/literal/textureDimensions/022903.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/022903.wgsl.expected.glsl index 471ad98a99..8b4126ceee 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/022903.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/022903.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureDimensions_022903() { - uint res = uint(textureSize(arg_0_1, int(1u))); + uint res = uvec2(textureSize(arg_0_1, int(1u))).x; } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureDimensions_022903() { - uint res = uint(textureSize(arg_0_1, int(1u))); + uint res = uvec2(textureSize(arg_0_1, int(1u))).x; } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'isampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureDimensions_022903() { - uint res = uint(textureSize(arg_0_1, int(1u))); + uint res = uvec2(textureSize(arg_0_1, int(1u))).x; } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/09140b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/09140b.wgsl.expected.glsl index 67cfd46954..24162f1c75 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/09140b.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/09140b.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba32ui) uniform highp writeonly uimage1D arg_0; +layout(rgba32ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_09140b() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba32ui) uniform highp writeonly uimage1D arg_0; +layout(rgba32ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_09140b() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba32ui) uniform highp writeonly uimage1D arg_0; +layout(rgba32ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_09140b() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/0c0b0c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/0c0b0c.wgsl.expected.glsl index a3815af023..21af8e84e5 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/0c0b0c.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/0c0b0c.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba16f) uniform highp writeonly image1D arg_0; +layout(rgba16f) uniform highp writeonly image2D arg_0; void textureDimensions_0c0b0c() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba16f) uniform highp writeonly image1D arg_0; +layout(rgba16f) uniform highp writeonly image2D arg_0; void textureDimensions_0c0b0c() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba16f) uniform highp writeonly image1D arg_0; +layout(rgba16f) uniform highp writeonly image2D arg_0; void textureDimensions_0c0b0c() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/26d6bf.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/26d6bf.wgsl.expected.glsl index d262540e00..fe3f7ba832 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/26d6bf.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/26d6bf.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureDimensions_26d6bf() { - uint res = uint(textureSize(arg_0_1, 0)); + uint res = uvec2(textureSize(arg_0_1, 0)).x; } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureDimensions_26d6bf() { - uint res = uint(textureSize(arg_0_1, 0)); + uint res = uvec2(textureSize(arg_0_1, 0)).x; } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureDimensions_26d6bf() { - uint res = uint(textureSize(arg_0_1, 0)); + uint res = uvec2(textureSize(arg_0_1, 0)).x; } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/3af3e7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/3af3e7.wgsl.expected.glsl index dc7f1b8871..5d059f4ffc 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/3af3e7.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/3af3e7.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba8) uniform highp writeonly image1D arg_0; +layout(rgba8) uniform highp writeonly image2D arg_0; void textureDimensions_3af3e7() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8) uniform highp writeonly image1D arg_0; +layout(rgba8) uniform highp writeonly image2D arg_0; void textureDimensions_3af3e7() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8) uniform highp writeonly image1D arg_0; +layout(rgba8) uniform highp writeonly image2D arg_0; void textureDimensions_3af3e7() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/58a82d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/58a82d.wgsl.expected.glsl index 2fcd82ea88..735e74e503 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/58a82d.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/58a82d.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba16ui) uniform highp writeonly uimage1D arg_0; +layout(rgba16ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_58a82d() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba16ui) uniform highp writeonly uimage1D arg_0; +layout(rgba16ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_58a82d() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba16ui) uniform highp writeonly uimage1D arg_0; +layout(rgba16ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_58a82d() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/5df042.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/5df042.wgsl.expected.glsl index c8e4d65133..95c45a2259 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/5df042.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/5df042.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureDimensions_5df042() { - uint res = uint(textureSize(arg_0_1, 0)); + uint res = uvec2(textureSize(arg_0_1, 0)).x; } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureDimensions_5df042() { - uint res = uint(textureSize(arg_0_1, 0)); + uint res = uvec2(textureSize(arg_0_1, 0)).x; } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'isampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureDimensions_5df042() { - uint res = uint(textureSize(arg_0_1, 0)); + uint res = uvec2(textureSize(arg_0_1, 0)).x; } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/607979.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/607979.wgsl.expected.glsl index 5b5a4c38c6..2033c188c9 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/607979.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/607979.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(r32i) uniform highp writeonly iimage1D arg_0; +layout(r32i) uniform highp writeonly iimage2D arg_0; void textureDimensions_607979() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(r32i) uniform highp writeonly iimage1D arg_0; +layout(r32i) uniform highp writeonly iimage2D arg_0; void textureDimensions_607979() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(r32i) uniform highp writeonly iimage1D arg_0; +layout(r32i) uniform highp writeonly iimage2D arg_0; void textureDimensions_607979() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/7228de.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/7228de.wgsl.expected.glsl index d148823a77..196bd3ad0f 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/7228de.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/7228de.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(r32ui) uniform highp writeonly uimage1D arg_0; +layout(r32ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_7228de() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(r32ui) uniform highp writeonly uimage1D arg_0; +layout(r32ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_7228de() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(r32ui) uniform highp writeonly uimage1D arg_0; +layout(r32ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_7228de() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/8efd47.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/8efd47.wgsl.expected.glsl index ae3365d57c..ae6f7ebbd7 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/8efd47.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/8efd47.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba32i) uniform highp writeonly iimage1D arg_0; +layout(rgba32i) uniform highp writeonly iimage2D arg_0; void textureDimensions_8efd47() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba32i) uniform highp writeonly iimage1D arg_0; +layout(rgba32i) uniform highp writeonly iimage2D arg_0; void textureDimensions_8efd47() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba32i) uniform highp writeonly iimage1D arg_0; +layout(rgba32i) uniform highp writeonly iimage2D arg_0; void textureDimensions_8efd47() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/920006.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/920006.wgsl.expected.glsl index ea1406ce04..4859264ca9 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/920006.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/920006.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureDimensions_920006() { - uint res = uint(textureSize(arg_0_1, 1)); + uint res = uvec2(textureSize(arg_0_1, 1)).x; } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureDimensions_920006() { - uint res = uint(textureSize(arg_0_1, 1)); + uint res = uvec2(textureSize(arg_0_1, 1)).x; } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'usampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureDimensions_920006() { - uint res = uint(textureSize(arg_0_1, 1)); + uint res = uvec2(textureSize(arg_0_1, 1)).x; } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/92552e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/92552e.wgsl.expected.glsl index aea8be7e71..c14a7b65d3 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/92552e.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/92552e.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba8i) uniform highp writeonly iimage1D arg_0; +layout(rgba8i) uniform highp writeonly iimage2D arg_0; void textureDimensions_92552e() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8i) uniform highp writeonly iimage1D arg_0; +layout(rgba8i) uniform highp writeonly iimage2D arg_0; void textureDimensions_92552e() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8i) uniform highp writeonly iimage1D arg_0; +layout(rgba8i) uniform highp writeonly iimage2D arg_0; void textureDimensions_92552e() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/965645.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/965645.wgsl.expected.glsl index 1aaef12ee1..e5540d60f7 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/965645.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/965645.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureDimensions_965645() { - uint res = uint(textureSize(arg_0_1, 0)); + uint res = uvec2(textureSize(arg_0_1, 0)).x; } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureDimensions_965645() { - uint res = uint(textureSize(arg_0_1, 0)); + uint res = uvec2(textureSize(arg_0_1, 0)).x; } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'usampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureDimensions_965645() { - uint res = uint(textureSize(arg_0_1, 0)); + uint res = uvec2(textureSize(arg_0_1, 0)).x; } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/9c7a00.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/9c7a00.wgsl.expected.glsl index c645494095..6f68a027cd 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/9c7a00.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/9c7a00.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureDimensions_9c7a00() { - uint res = uint(textureSize(arg_0_1, int(1u))); + uint res = uvec2(textureSize(arg_0_1, int(1u))).x; } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureDimensions_9c7a00() { - uint res = uint(textureSize(arg_0_1, int(1u))); + uint res = uvec2(textureSize(arg_0_1, int(1u))).x; } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'usampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureDimensions_9c7a00() { - uint res = uint(textureSize(arg_0_1, int(1u))); + uint res = uvec2(textureSize(arg_0_1, int(1u))).x; } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/aac604.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/aac604.wgsl.expected.glsl index 05ccce873c..c3a49ff438 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/aac604.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/aac604.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureDimensions_aac604() { - uint res = uint(textureSize(arg_0_1, int(1u))); + uint res = uvec2(textureSize(arg_0_1, int(1u))).x; } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureDimensions_aac604() { - uint res = uint(textureSize(arg_0_1, int(1u))); + uint res = uvec2(textureSize(arg_0_1, int(1u))).x; } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureDimensions_aac604() { - uint res = uint(textureSize(arg_0_1, int(1u))); + uint res = uvec2(textureSize(arg_0_1, int(1u))).x; } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/ad7d3b.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/ad7d3b.wgsl.expected.glsl index 37dc452687..c88b88eed9 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/ad7d3b.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/ad7d3b.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba8ui) uniform highp writeonly uimage1D arg_0; +layout(rgba8ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_ad7d3b() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8ui) uniform highp writeonly uimage1D arg_0; +layout(rgba8ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_ad7d3b() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8ui) uniform highp writeonly uimage1D arg_0; +layout(rgba8ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_ad7d3b() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/b46d97.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/b46d97.wgsl.expected.glsl index 9b283fe009..267ef8d31e 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/b46d97.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/b46d97.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureDimensions_b46d97() { - uint res = uint(textureSize(arg_0_1, 1)); + uint res = uvec2(textureSize(arg_0_1, 1)).x; } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureDimensions_b46d97() { - uint res = uint(textureSize(arg_0_1, 1)); + uint res = uvec2(textureSize(arg_0_1, 1)).x; } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'isampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureDimensions_b46d97() { - uint res = uint(textureSize(arg_0_1, 1)); + uint res = uvec2(textureSize(arg_0_1, 1)).x; } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/b51345.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/b51345.wgsl.expected.glsl index 058e7ca1ba..67f3776ee4 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/b51345.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/b51345.wgsl.expected.glsl @@ -2,9 +2,9 @@ SKIP: FAILED #version 310 es -layout(rg32f) uniform highp writeonly image1D arg_0; +layout(rg32f) uniform highp writeonly image2D arg_0; void textureDimensions_b51345() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -30,9 +30,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -layout(rg32f) uniform highp writeonly image1D arg_0; +layout(rg32f) uniform highp writeonly image2D arg_0; void textureDimensions_b51345() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -52,9 +52,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es -layout(rg32f) uniform highp writeonly image1D arg_0; +layout(rg32f) uniform highp writeonly image2D arg_0; void textureDimensions_b51345() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { diff --git a/test/tint/builtins/gen/literal/textureDimensions/d08a94.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/d08a94.wgsl.expected.glsl index 58a0a3b403..b4a0c706f2 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/d08a94.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/d08a94.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba16i) uniform highp writeonly iimage1D arg_0; +layout(rgba16i) uniform highp writeonly iimage2D arg_0; void textureDimensions_d08a94() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba16i) uniform highp writeonly iimage1D arg_0; +layout(rgba16i) uniform highp writeonly iimage2D arg_0; void textureDimensions_d08a94() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba16i) uniform highp writeonly iimage1D arg_0; +layout(rgba16i) uniform highp writeonly iimage2D arg_0; void textureDimensions_d08a94() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/da30d2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/da30d2.wgsl.expected.glsl index 15c9df4ade..4a3d01d525 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/da30d2.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/da30d2.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba32f) uniform highp writeonly image1D arg_0; +layout(rgba32f) uniform highp writeonly image2D arg_0; void textureDimensions_da30d2() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba32f) uniform highp writeonly image1D arg_0; +layout(rgba32f) uniform highp writeonly image2D arg_0; void textureDimensions_da30d2() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba32f) uniform highp writeonly image1D arg_0; +layout(rgba32f) uniform highp writeonly image2D arg_0; void textureDimensions_da30d2() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/e122fe.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/e122fe.wgsl.expected.glsl index 5c766e8f23..d4febc0054 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/e122fe.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/e122fe.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba8_snorm) uniform highp writeonly image1D arg_0; +layout(rgba8_snorm) uniform highp writeonly image2D arg_0; void textureDimensions_e122fe() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8_snorm) uniform highp writeonly image1D arg_0; +layout(rgba8_snorm) uniform highp writeonly image2D arg_0; void textureDimensions_e122fe() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8_snorm) uniform highp writeonly image1D arg_0; +layout(rgba8_snorm) uniform highp writeonly image2D arg_0; void textureDimensions_e122fe() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/ea066c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/ea066c.wgsl.expected.glsl index 70bc37da57..ea156b2739 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/ea066c.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/ea066c.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(r32f) uniform highp writeonly image1D arg_0; +layout(r32f) uniform highp writeonly image2D arg_0; void textureDimensions_ea066c() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(r32f) uniform highp writeonly image1D arg_0; +layout(r32f) uniform highp writeonly image2D arg_0; void textureDimensions_ea066c() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(r32f) uniform highp writeonly image1D arg_0; +layout(r32f) uniform highp writeonly image2D arg_0; void textureDimensions_ea066c() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/ea25bc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/ea25bc.wgsl.expected.glsl index 46e8cb3e81..a9b19229cd 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/ea25bc.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/ea25bc.wgsl.expected.glsl @@ -2,9 +2,9 @@ SKIP: FAILED #version 310 es -layout(rg32ui) uniform highp writeonly uimage1D arg_0; +layout(rg32ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_ea25bc() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -30,9 +30,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -layout(rg32ui) uniform highp writeonly uimage1D arg_0; +layout(rg32ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_ea25bc() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -52,9 +52,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es -layout(rg32ui) uniform highp writeonly uimage1D arg_0; +layout(rg32ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_ea25bc() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { diff --git a/test/tint/builtins/gen/literal/textureDimensions/f17acd.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/f17acd.wgsl.expected.glsl index 1e1f79bc46..79a674ae91 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/f17acd.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/f17acd.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureDimensions_f17acd() { - uint res = uint(textureSize(arg_0_1, 1)); + uint res = uvec2(textureSize(arg_0_1, 1)).x; } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureDimensions_f17acd() { - uint res = uint(textureSize(arg_0_1, 1)); + uint res = uvec2(textureSize(arg_0_1, 1)).x; } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureDimensions_f17acd() { - uint res = uint(textureSize(arg_0_1, 1)); + uint res = uvec2(textureSize(arg_0_1, 1)).x; } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureDimensions/f264a3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureDimensions/f264a3.wgsl.expected.glsl index 93568a0a1a..0be986cd4d 100644 --- a/test/tint/builtins/gen/literal/textureDimensions/f264a3.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureDimensions/f264a3.wgsl.expected.glsl @@ -2,9 +2,9 @@ SKIP: FAILED #version 310 es -layout(rg32i) uniform highp writeonly iimage1D arg_0; +layout(rg32i) uniform highp writeonly iimage2D arg_0; void textureDimensions_f264a3() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -30,9 +30,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -layout(rg32i) uniform highp writeonly iimage1D arg_0; +layout(rg32i) uniform highp writeonly iimage2D arg_0; void textureDimensions_f264a3() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -52,9 +52,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es -layout(rg32i) uniform highp writeonly iimage1D arg_0; +layout(rg32i) uniform highp writeonly iimage2D arg_0; void textureDimensions_f264a3() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { diff --git a/test/tint/builtins/gen/literal/textureLoad/0cb698.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/0cb698.wgsl.expected.glsl index 62fc8ec92e..5def0a594d 100644 --- a/test/tint/builtins/gen/literal/textureLoad/0cb698.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureLoad/0cb698.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_0cb698() { - ivec4 res = texelFetch(arg_0_1, int(1u), int(1u)); + ivec4 res = texelFetch(arg_0_1, ivec2(uvec2(1u, 0u)), int(1u)); } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_0cb698() { - ivec4 res = texelFetch(arg_0_1, int(1u), int(1u)); + ivec4 res = texelFetch(arg_0_1, ivec2(uvec2(1u, 0u)), int(1u)); } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'isampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_0cb698() { - ivec4 res = texelFetch(arg_0_1, int(1u), int(1u)); + ivec4 res = texelFetch(arg_0_1, ivec2(uvec2(1u, 0u)), int(1u)); } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureLoad/1373dc.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1373dc.wgsl.expected.glsl index 4952ed3c9d..73e3675dfe 100644 --- a/test/tint/builtins/gen/literal/textureLoad/1373dc.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureLoad/1373dc.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_1373dc() { - vec4 res = texelFetch(arg_0_1, int(1u), 1); + vec4 res = texelFetch(arg_0_1, ivec2(uvec2(1u, 0u)), 1); } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_1373dc() { - vec4 res = texelFetch(arg_0_1, int(1u), 1); + vec4 res = texelFetch(arg_0_1, ivec2(uvec2(1u, 0u)), 1); } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_1373dc() { - vec4 res = texelFetch(arg_0_1, int(1u), 1); + vec4 res = texelFetch(arg_0_1, ivec2(uvec2(1u, 0u)), 1); } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.glsl index ec4fb7f456..1ed0f4d314 100644 --- a/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureLoad/1b8588.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_1b8588() { - uvec4 res = texelFetch(arg_0_1, 1, 1); + uvec4 res = texelFetch(arg_0_1, ivec2(1, 0), 1); } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_1b8588() { - uvec4 res = texelFetch(arg_0_1, 1, 1); + uvec4 res = texelFetch(arg_0_1, ivec2(1, 0), 1); } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'usampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_1b8588() { - uvec4 res = texelFetch(arg_0_1, 1, 1); + uvec4 res = texelFetch(arg_0_1, ivec2(1, 0), 1); } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureLoad/216c37.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/216c37.wgsl.expected.glsl index 9bda9d8807..f7b868835d 100644 --- a/test/tint/builtins/gen/literal/textureLoad/216c37.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureLoad/216c37.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_216c37() { - uvec4 res = texelFetch(arg_0_1, int(1u), 1); + uvec4 res = texelFetch(arg_0_1, ivec2(uvec2(1u, 0u)), 1); } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_216c37() { - uvec4 res = texelFetch(arg_0_1, int(1u), 1); + uvec4 res = texelFetch(arg_0_1, ivec2(uvec2(1u, 0u)), 1); } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'usampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_216c37() { - uvec4 res = texelFetch(arg_0_1, int(1u), 1); + uvec4 res = texelFetch(arg_0_1, ivec2(uvec2(1u, 0u)), 1); } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureLoad/3da3ed.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/3da3ed.wgsl.expected.glsl index 7d7008acec..f09b08ee61 100644 --- a/test/tint/builtins/gen/literal/textureLoad/3da3ed.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureLoad/3da3ed.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_3da3ed() { - vec4 res = texelFetch(arg_0_1, 1, int(1u)); + vec4 res = texelFetch(arg_0_1, ivec2(1, 0), int(1u)); } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_3da3ed() { - vec4 res = texelFetch(arg_0_1, 1, int(1u)); + vec4 res = texelFetch(arg_0_1, ivec2(1, 0), int(1u)); } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_3da3ed() { - vec4 res = texelFetch(arg_0_1, 1, int(1u)); + vec4 res = texelFetch(arg_0_1, ivec2(1, 0), int(1u)); } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureLoad/4c423f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/4c423f.wgsl.expected.glsl index a030cacad7..dc5e7ae808 100644 --- a/test/tint/builtins/gen/literal/textureLoad/4c423f.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureLoad/4c423f.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_4c423f() { - ivec4 res = texelFetch(arg_0_1, int(1u), 1); + ivec4 res = texelFetch(arg_0_1, ivec2(uvec2(1u, 0u)), 1); } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_4c423f() { - ivec4 res = texelFetch(arg_0_1, int(1u), 1); + ivec4 res = texelFetch(arg_0_1, ivec2(uvec2(1u, 0u)), 1); } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'isampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_4c423f() { - ivec4 res = texelFetch(arg_0_1, int(1u), 1); + ivec4 res = texelFetch(arg_0_1, ivec2(uvec2(1u, 0u)), 1); } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.glsl index 0774d37241..4c85dce598 100644 --- a/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureLoad/5a2f9d.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_5a2f9d() { - ivec4 res = texelFetch(arg_0_1, 1, 1); + ivec4 res = texelFetch(arg_0_1, ivec2(1, 0), 1); } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_5a2f9d() { - ivec4 res = texelFetch(arg_0_1, 1, 1); + ivec4 res = texelFetch(arg_0_1, ivec2(1, 0), 1); } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'isampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_5a2f9d() { - ivec4 res = texelFetch(arg_0_1, 1, 1); + ivec4 res = texelFetch(arg_0_1, ivec2(1, 0), 1); } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureLoad/62d1de.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/62d1de.wgsl.expected.glsl index 55bcb8d629..825667b4c0 100644 --- a/test/tint/builtins/gen/literal/textureLoad/62d1de.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureLoad/62d1de.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_62d1de() { - ivec4 res = texelFetch(arg_0_1, 1, int(1u)); + ivec4 res = texelFetch(arg_0_1, ivec2(1, 0), int(1u)); } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_62d1de() { - ivec4 res = texelFetch(arg_0_1, 1, int(1u)); + ivec4 res = texelFetch(arg_0_1, ivec2(1, 0), int(1u)); } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'isampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_62d1de() { - ivec4 res = texelFetch(arg_0_1, 1, int(1u)); + ivec4 res = texelFetch(arg_0_1, ivec2(1, 0), int(1u)); } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureLoad/6b77d4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/6b77d4.wgsl.expected.glsl index 4fbc6f4999..14aca1e066 100644 --- a/test/tint/builtins/gen/literal/textureLoad/6b77d4.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureLoad/6b77d4.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_6b77d4() { - uvec4 res = texelFetch(arg_0_1, 1, int(1u)); + uvec4 res = texelFetch(arg_0_1, ivec2(1, 0), int(1u)); } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_6b77d4() { - uvec4 res = texelFetch(arg_0_1, 1, int(1u)); + uvec4 res = texelFetch(arg_0_1, ivec2(1, 0), int(1u)); } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'usampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_6b77d4() { - uvec4 res = texelFetch(arg_0_1, 1, int(1u)); + uvec4 res = texelFetch(arg_0_1, ivec2(1, 0), int(1u)); } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureLoad/6d376a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/6d376a.wgsl.expected.glsl index c4a6d4ce9b..04f82efbdb 100644 --- a/test/tint/builtins/gen/literal/textureLoad/6d376a.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureLoad/6d376a.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_6d376a() { - vec4 res = texelFetch(arg_0_1, int(1u), int(1u)); + vec4 res = texelFetch(arg_0_1, ivec2(uvec2(1u, 0u)), int(1u)); } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_6d376a() { - vec4 res = texelFetch(arg_0_1, int(1u), int(1u)); + vec4 res = texelFetch(arg_0_1, ivec2(uvec2(1u, 0u)), int(1u)); } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_6d376a() { - vec4 res = texelFetch(arg_0_1, int(1u), int(1u)); + vec4 res = texelFetch(arg_0_1, ivec2(uvec2(1u, 0u)), int(1u)); } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.glsl index 93e1046bb6..3fc37a2468 100644 --- a/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureLoad/81c381.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_81c381() { - vec4 res = texelFetch(arg_0_1, 1, 1); + vec4 res = texelFetch(arg_0_1, ivec2(1, 0), 1); } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_81c381() { - vec4 res = texelFetch(arg_0_1, 1, 1); + vec4 res = texelFetch(arg_0_1, ivec2(1, 0), 1); } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_81c381() { - vec4 res = texelFetch(arg_0_1, 1, 1); + vec4 res = texelFetch(arg_0_1, ivec2(1, 0), 1); } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureLoad/bc3201.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureLoad/bc3201.wgsl.expected.glsl index 9ae41f2f37..eb87c92923 100644 --- a/test/tint/builtins/gen/literal/textureLoad/bc3201.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureLoad/bc3201.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_bc3201() { - uvec4 res = texelFetch(arg_0_1, int(1u), int(1u)); + uvec4 res = texelFetch(arg_0_1, ivec2(uvec2(1u, 0u)), int(1u)); } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_bc3201() { - uvec4 res = texelFetch(arg_0_1, int(1u), int(1u)); + uvec4 res = texelFetch(arg_0_1, ivec2(uvec2(1u, 0u)), int(1u)); } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'usampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_bc3201() { - uvec4 res = texelFetch(arg_0_1, int(1u), int(1u)); + uvec4 res = texelFetch(arg_0_1, ivec2(uvec2(1u, 0u)), int(1u)); } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureNumLevels/1a7fc3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/1a7fc3.wgsl.expected.glsl index a0dc02a0dc..8a5f3021de 100644 --- a/test/tint/builtins/gen/literal/textureNumLevels/1a7fc3.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureNumLevels/1a7fc3.wgsl.expected.glsl @@ -2,7 +2,7 @@ SKIP: FAILED #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureNumLevels_1a7fc3() { uint res = uint(textureQueryLevels(arg_0_1)); } @@ -21,8 +21,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated +ERROR: 0:5: 'textureQueryLevels' : no matching overloaded function found +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. @@ -30,7 +30,7 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureNumLevels_1a7fc3() { uint res = uint(textureQueryLevels(arg_0_1)); } @@ -44,15 +44,15 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:4: 'usampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated +ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found +ERROR: 0:6: '' : compilation terminated ERROR: 2 compilation errors. No code generated. #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureNumLevels_1a7fc3() { uint res = uint(textureQueryLevels(arg_0_1)); } @@ -67,8 +67,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated +ERROR: 0:5: 'textureQueryLevels' : no matching overloaded function found +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/tint/builtins/gen/literal/textureNumLevels/c399f9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/c399f9.wgsl.expected.glsl index 91caecf46c..5a2ccbe9da 100644 --- a/test/tint/builtins/gen/literal/textureNumLevels/c399f9.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureNumLevels/c399f9.wgsl.expected.glsl @@ -2,7 +2,7 @@ SKIP: FAILED #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureNumLevels_c399f9() { uint res = uint(textureQueryLevels(arg_0_1)); } @@ -21,8 +21,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated +ERROR: 0:5: 'textureQueryLevels' : no matching overloaded function found +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. @@ -30,7 +30,7 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureNumLevels_c399f9() { uint res = uint(textureQueryLevels(arg_0_1)); } @@ -44,15 +44,15 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated +ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found +ERROR: 0:6: '' : compilation terminated ERROR: 2 compilation errors. No code generated. #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureNumLevels_c399f9() { uint res = uint(textureQueryLevels(arg_0_1)); } @@ -67,8 +67,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated +ERROR: 0:5: 'textureQueryLevels' : no matching overloaded function found +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/tint/builtins/gen/literal/textureNumLevels/f742c0.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureNumLevels/f742c0.wgsl.expected.glsl index c34994eaa6..da1a01ffb2 100644 --- a/test/tint/builtins/gen/literal/textureNumLevels/f742c0.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureNumLevels/f742c0.wgsl.expected.glsl @@ -2,7 +2,7 @@ SKIP: FAILED #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureNumLevels_f742c0() { uint res = uint(textureQueryLevels(arg_0_1)); } @@ -21,8 +21,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated +ERROR: 0:5: 'textureQueryLevels' : no matching overloaded function found +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. @@ -30,7 +30,7 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureNumLevels_f742c0() { uint res = uint(textureQueryLevels(arg_0_1)); } @@ -44,15 +44,15 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:4: 'isampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated +ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found +ERROR: 0:6: '' : compilation terminated ERROR: 2 compilation errors. No code generated. #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureNumLevels_f742c0() { uint res = uint(textureQueryLevels(arg_0_1)); } @@ -67,8 +67,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated +ERROR: 0:5: 'textureQueryLevels' : no matching overloaded function found +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/tint/builtins/gen/literal/textureSample/6e64fb.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureSample/6e64fb.wgsl.expected.glsl index 319afe29de..0563cdf525 100644 --- a/test/tint/builtins/gen/literal/textureSample/6e64fb.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureSample/6e64fb.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es precision mediump float; -uniform highp sampler1D arg_0_arg_1; +uniform highp sampler2D arg_0_arg_1; void textureSample_6e64fb() { - vec4 res = texture(arg_0_arg_1, 1.0f); + vec4 res = texture(arg_0_arg_1, vec2(1.0f, 0.5f)); } void fragment_main() { @@ -17,10 +15,3 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/102722.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/102722.wgsl.expected.glsl index c78f285636..91d49dd365 100644 --- a/test/tint/builtins/gen/literal/textureStore/102722.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/102722.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(r32ui) uniform highp writeonly uimage1D arg_0; +layout(r32ui) uniform highp writeonly uimage2D arg_0; void textureStore_102722() { - imageStore(arg_0, 1, uvec4(1u)); + imageStore(arg_0, ivec2(1, 0), uvec4(1u)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(r32ui) uniform highp writeonly uimage1D arg_0; +layout(r32ui) uniform highp writeonly uimage2D arg_0; void textureStore_102722() { - imageStore(arg_0, 1, uvec4(1u)); + imageStore(arg_0, ivec2(1, 0), uvec4(1u)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(r32ui) uniform highp writeonly uimage1D arg_0; +layout(r32ui) uniform highp writeonly uimage2D arg_0; void textureStore_102722() { - imageStore(arg_0, 1, uvec4(1u)); + imageStore(arg_0, ivec2(1, 0), uvec4(1u)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/1dc954.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/1dc954.wgsl.expected.glsl index 874e204330..b9cc53624a 100644 --- a/test/tint/builtins/gen/literal/textureStore/1dc954.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/1dc954.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba32i) uniform highp writeonly iimage1D arg_0; +layout(rgba32i) uniform highp writeonly iimage2D arg_0; void textureStore_1dc954() { - imageStore(arg_0, int(1u), ivec4(1)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), ivec4(1)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba32i) uniform highp writeonly iimage1D arg_0; +layout(rgba32i) uniform highp writeonly iimage2D arg_0; void textureStore_1dc954() { - imageStore(arg_0, int(1u), ivec4(1)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), ivec4(1)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba32i) uniform highp writeonly iimage1D arg_0; +layout(rgba32i) uniform highp writeonly iimage2D arg_0; void textureStore_1dc954() { - imageStore(arg_0, int(1u), ivec4(1)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), ivec4(1)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/285218.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/285218.wgsl.expected.glsl index 2c24579388..6986f2787b 100644 --- a/test/tint/builtins/gen/literal/textureStore/285218.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/285218.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba32f) uniform highp writeonly image1D arg_0; +layout(rgba32f) uniform highp writeonly image2D arg_0; void textureStore_285218() { - imageStore(arg_0, int(1u), vec4(1.0f)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), vec4(1.0f)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba32f) uniform highp writeonly image1D arg_0; +layout(rgba32f) uniform highp writeonly image2D arg_0; void textureStore_285218() { - imageStore(arg_0, int(1u), vec4(1.0f)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), vec4(1.0f)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba32f) uniform highp writeonly image1D arg_0; +layout(rgba32f) uniform highp writeonly image2D arg_0; void textureStore_285218() { - imageStore(arg_0, int(1u), vec4(1.0f)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), vec4(1.0f)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/2ac6c7.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/2ac6c7.wgsl.expected.glsl index 2f68d867f6..292852b6eb 100644 --- a/test/tint/builtins/gen/literal/textureStore/2ac6c7.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/2ac6c7.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(r32f) uniform highp writeonly image1D arg_0; +layout(r32f) uniform highp writeonly image2D arg_0; void textureStore_2ac6c7() { - imageStore(arg_0, 1, vec4(1.0f)); + imageStore(arg_0, ivec2(1, 0), vec4(1.0f)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(r32f) uniform highp writeonly image1D arg_0; +layout(r32f) uniform highp writeonly image2D arg_0; void textureStore_2ac6c7() { - imageStore(arg_0, 1, vec4(1.0f)); + imageStore(arg_0, ivec2(1, 0), vec4(1.0f)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(r32f) uniform highp writeonly image1D arg_0; +layout(r32f) uniform highp writeonly image2D arg_0; void textureStore_2ac6c7() { - imageStore(arg_0, 1, vec4(1.0f)); + imageStore(arg_0, ivec2(1, 0), vec4(1.0f)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/2eb2a4.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/2eb2a4.wgsl.expected.glsl index d39c865f02..d887e41708 100644 --- a/test/tint/builtins/gen/literal/textureStore/2eb2a4.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/2eb2a4.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba16ui) uniform highp writeonly uimage1D arg_0; +layout(rgba16ui) uniform highp writeonly uimage2D arg_0; void textureStore_2eb2a4() { - imageStore(arg_0, 1, uvec4(1u)); + imageStore(arg_0, ivec2(1, 0), uvec4(1u)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba16ui) uniform highp writeonly uimage1D arg_0; +layout(rgba16ui) uniform highp writeonly uimage2D arg_0; void textureStore_2eb2a4() { - imageStore(arg_0, 1, uvec4(1u)); + imageStore(arg_0, ivec2(1, 0), uvec4(1u)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba16ui) uniform highp writeonly uimage1D arg_0; +layout(rgba16ui) uniform highp writeonly uimage2D arg_0; void textureStore_2eb2a4() { - imageStore(arg_0, 1, uvec4(1u)); + imageStore(arg_0, ivec2(1, 0), uvec4(1u)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/2ed2a3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/2ed2a3.wgsl.expected.glsl index 56f90f39d1..f5d59daf2a 100644 --- a/test/tint/builtins/gen/literal/textureStore/2ed2a3.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/2ed2a3.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba8_snorm) uniform highp writeonly image1D arg_0; +layout(rgba8_snorm) uniform highp writeonly image2D arg_0; void textureStore_2ed2a3() { - imageStore(arg_0, 1, vec4(1.0f)); + imageStore(arg_0, ivec2(1, 0), vec4(1.0f)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8_snorm) uniform highp writeonly image1D arg_0; +layout(rgba8_snorm) uniform highp writeonly image2D arg_0; void textureStore_2ed2a3() { - imageStore(arg_0, 1, vec4(1.0f)); + imageStore(arg_0, ivec2(1, 0), vec4(1.0f)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8_snorm) uniform highp writeonly image1D arg_0; +layout(rgba8_snorm) uniform highp writeonly image2D arg_0; void textureStore_2ed2a3() { - imageStore(arg_0, 1, vec4(1.0f)); + imageStore(arg_0, ivec2(1, 0), vec4(1.0f)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/3bec15.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/3bec15.wgsl.expected.glsl index ca1c1f1b53..48ba6b46b2 100644 --- a/test/tint/builtins/gen/literal/textureStore/3bec15.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/3bec15.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba8ui) uniform highp writeonly uimage1D arg_0; +layout(rgba8ui) uniform highp writeonly uimage2D arg_0; void textureStore_3bec15() { - imageStore(arg_0, 1, uvec4(1u)); + imageStore(arg_0, ivec2(1, 0), uvec4(1u)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8ui) uniform highp writeonly uimage1D arg_0; +layout(rgba8ui) uniform highp writeonly uimage2D arg_0; void textureStore_3bec15() { - imageStore(arg_0, 1, uvec4(1u)); + imageStore(arg_0, ivec2(1, 0), uvec4(1u)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8ui) uniform highp writeonly uimage1D arg_0; +layout(rgba8ui) uniform highp writeonly uimage2D arg_0; void textureStore_3bec15() { - imageStore(arg_0, 1, uvec4(1u)); + imageStore(arg_0, ivec2(1, 0), uvec4(1u)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/3c1937.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/3c1937.wgsl.expected.glsl index 4e8eebd8c1..c4d67d0cc5 100644 --- a/test/tint/builtins/gen/literal/textureStore/3c1937.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/3c1937.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba8ui) uniform highp writeonly uimage1D arg_0; +layout(rgba8ui) uniform highp writeonly uimage2D arg_0; void textureStore_3c1937() { - imageStore(arg_0, int(1u), uvec4(1u)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), uvec4(1u)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8ui) uniform highp writeonly uimage1D arg_0; +layout(rgba8ui) uniform highp writeonly uimage2D arg_0; void textureStore_3c1937() { - imageStore(arg_0, int(1u), uvec4(1u)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), uvec4(1u)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8ui) uniform highp writeonly uimage1D arg_0; +layout(rgba8ui) uniform highp writeonly uimage2D arg_0; void textureStore_3c1937() { - imageStore(arg_0, int(1u), uvec4(1u)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), uvec4(1u)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/3d6f01.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/3d6f01.wgsl.expected.glsl index 7fca5f4554..4c4e4ed4e3 100644 --- a/test/tint/builtins/gen/literal/textureStore/3d6f01.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/3d6f01.wgsl.expected.glsl @@ -2,9 +2,9 @@ SKIP: FAILED #version 310 es -layout(rg32i) uniform highp writeonly iimage1D arg_0; +layout(rg32i) uniform highp writeonly iimage2D arg_0; void textureStore_3d6f01() { - imageStore(arg_0, int(1u), ivec4(1)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), ivec4(1)); } vec4 vertex_main() { @@ -30,9 +30,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -layout(rg32i) uniform highp writeonly iimage1D arg_0; +layout(rg32i) uniform highp writeonly iimage2D arg_0; void textureStore_3d6f01() { - imageStore(arg_0, int(1u), ivec4(1)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), ivec4(1)); } void fragment_main() { @@ -52,9 +52,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es -layout(rg32i) uniform highp writeonly iimage1D arg_0; +layout(rg32i) uniform highp writeonly iimage2D arg_0; void textureStore_3d6f01() { - imageStore(arg_0, int(1u), ivec4(1)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), ivec4(1)); } void compute_main() { diff --git a/test/tint/builtins/gen/literal/textureStore/5a2f8f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/5a2f8f.wgsl.expected.glsl index 5dea1f99ea..f0e7f4e689 100644 --- a/test/tint/builtins/gen/literal/textureStore/5a2f8f.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/5a2f8f.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba16i) uniform highp writeonly iimage1D arg_0; +layout(rgba16i) uniform highp writeonly iimage2D arg_0; void textureStore_5a2f8f() { - imageStore(arg_0, 1, ivec4(1)); + imageStore(arg_0, ivec2(1, 0), ivec4(1)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba16i) uniform highp writeonly iimage1D arg_0; +layout(rgba16i) uniform highp writeonly iimage2D arg_0; void textureStore_5a2f8f() { - imageStore(arg_0, 1, ivec4(1)); + imageStore(arg_0, ivec2(1, 0), ivec4(1)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba16i) uniform highp writeonly iimage1D arg_0; +layout(rgba16i) uniform highp writeonly iimage2D arg_0; void textureStore_5a2f8f() { - imageStore(arg_0, 1, ivec4(1)); + imageStore(arg_0, ivec2(1, 0), ivec4(1)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/602b5a.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/602b5a.wgsl.expected.glsl index c8ad73a1c5..e72fa95e93 100644 --- a/test/tint/builtins/gen/literal/textureStore/602b5a.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/602b5a.wgsl.expected.glsl @@ -2,9 +2,9 @@ SKIP: FAILED #version 310 es -layout(rg32f) uniform highp writeonly image1D arg_0; +layout(rg32f) uniform highp writeonly image2D arg_0; void textureStore_602b5a() { - imageStore(arg_0, int(1u), vec4(1.0f)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), vec4(1.0f)); } vec4 vertex_main() { @@ -30,9 +30,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -layout(rg32f) uniform highp writeonly image1D arg_0; +layout(rg32f) uniform highp writeonly image2D arg_0; void textureStore_602b5a() { - imageStore(arg_0, int(1u), vec4(1.0f)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), vec4(1.0f)); } void fragment_main() { @@ -52,9 +52,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es -layout(rg32f) uniform highp writeonly image1D arg_0; +layout(rg32f) uniform highp writeonly image2D arg_0; void textureStore_602b5a() { - imageStore(arg_0, int(1u), vec4(1.0f)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), vec4(1.0f)); } void compute_main() { diff --git a/test/tint/builtins/gen/literal/textureStore/6b75c3.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/6b75c3.wgsl.expected.glsl index 7ea0dcad38..e244a82176 100644 --- a/test/tint/builtins/gen/literal/textureStore/6b75c3.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/6b75c3.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba32f) uniform highp writeonly image1D arg_0; +layout(rgba32f) uniform highp writeonly image2D arg_0; void textureStore_6b75c3() { - imageStore(arg_0, 1, vec4(1.0f)); + imageStore(arg_0, ivec2(1, 0), vec4(1.0f)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba32f) uniform highp writeonly image1D arg_0; +layout(rgba32f) uniform highp writeonly image2D arg_0; void textureStore_6b75c3() { - imageStore(arg_0, 1, vec4(1.0f)); + imageStore(arg_0, ivec2(1, 0), vec4(1.0f)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba32f) uniform highp writeonly image1D arg_0; +layout(rgba32f) uniform highp writeonly image2D arg_0; void textureStore_6b75c3() { - imageStore(arg_0, 1, vec4(1.0f)); + imageStore(arg_0, ivec2(1, 0), vec4(1.0f)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/6b80d2.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/6b80d2.wgsl.expected.glsl index af65051373..57a5b9050a 100644 --- a/test/tint/builtins/gen/literal/textureStore/6b80d2.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/6b80d2.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(r32i) uniform highp writeonly iimage1D arg_0; +layout(r32i) uniform highp writeonly iimage2D arg_0; void textureStore_6b80d2() { - imageStore(arg_0, 1, ivec4(1)); + imageStore(arg_0, ivec2(1, 0), ivec4(1)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(r32i) uniform highp writeonly iimage1D arg_0; +layout(r32i) uniform highp writeonly iimage2D arg_0; void textureStore_6b80d2() { - imageStore(arg_0, 1, ivec4(1)); + imageStore(arg_0, ivec2(1, 0), ivec4(1)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(r32i) uniform highp writeonly iimage1D arg_0; +layout(r32i) uniform highp writeonly iimage2D arg_0; void textureStore_6b80d2() { - imageStore(arg_0, 1, ivec4(1)); + imageStore(arg_0, ivec2(1, 0), ivec4(1)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/7f7fae.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/7f7fae.wgsl.expected.glsl index bf5d1af379..0bd19b3413 100644 --- a/test/tint/builtins/gen/literal/textureStore/7f7fae.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/7f7fae.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba8) uniform highp writeonly image1D arg_0; +layout(rgba8) uniform highp writeonly image2D arg_0; void textureStore_7f7fae() { - imageStore(arg_0, 1, vec4(1.0f)); + imageStore(arg_0, ivec2(1, 0), vec4(1.0f)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8) uniform highp writeonly image1D arg_0; +layout(rgba8) uniform highp writeonly image2D arg_0; void textureStore_7f7fae() { - imageStore(arg_0, 1, vec4(1.0f)); + imageStore(arg_0, ivec2(1, 0), vec4(1.0f)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8) uniform highp writeonly image1D arg_0; +layout(rgba8) uniform highp writeonly image2D arg_0; void textureStore_7f7fae() { - imageStore(arg_0, 1, vec4(1.0f)); + imageStore(arg_0, ivec2(1, 0), vec4(1.0f)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/83bcc1.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/83bcc1.wgsl.expected.glsl index c3e21ed88b..5b2228740b 100644 --- a/test/tint/builtins/gen/literal/textureStore/83bcc1.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/83bcc1.wgsl.expected.glsl @@ -2,9 +2,9 @@ SKIP: FAILED #version 310 es -layout(rg32ui) uniform highp writeonly uimage1D arg_0; +layout(rg32ui) uniform highp writeonly uimage2D arg_0; void textureStore_83bcc1() { - imageStore(arg_0, 1, uvec4(1u)); + imageStore(arg_0, ivec2(1, 0), uvec4(1u)); } vec4 vertex_main() { @@ -30,9 +30,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -layout(rg32ui) uniform highp writeonly uimage1D arg_0; +layout(rg32ui) uniform highp writeonly uimage2D arg_0; void textureStore_83bcc1() { - imageStore(arg_0, 1, uvec4(1u)); + imageStore(arg_0, ivec2(1, 0), uvec4(1u)); } void fragment_main() { @@ -52,9 +52,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es -layout(rg32ui) uniform highp writeonly uimage1D arg_0; +layout(rg32ui) uniform highp writeonly uimage2D arg_0; void textureStore_83bcc1() { - imageStore(arg_0, 1, uvec4(1u)); + imageStore(arg_0, ivec2(1, 0), uvec4(1u)); } void compute_main() { diff --git a/test/tint/builtins/gen/literal/textureStore/872747.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/872747.wgsl.expected.glsl index b6b9982d4b..ed7e122476 100644 --- a/test/tint/builtins/gen/literal/textureStore/872747.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/872747.wgsl.expected.glsl @@ -2,9 +2,9 @@ SKIP: FAILED #version 310 es -layout(rg32f) uniform highp writeonly image1D arg_0; +layout(rg32f) uniform highp writeonly image2D arg_0; void textureStore_872747() { - imageStore(arg_0, 1, vec4(1.0f)); + imageStore(arg_0, ivec2(1, 0), vec4(1.0f)); } vec4 vertex_main() { @@ -30,9 +30,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -layout(rg32f) uniform highp writeonly image1D arg_0; +layout(rg32f) uniform highp writeonly image2D arg_0; void textureStore_872747() { - imageStore(arg_0, 1, vec4(1.0f)); + imageStore(arg_0, ivec2(1, 0), vec4(1.0f)); } void fragment_main() { @@ -52,9 +52,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es -layout(rg32f) uniform highp writeonly image1D arg_0; +layout(rg32f) uniform highp writeonly image2D arg_0; void textureStore_872747() { - imageStore(arg_0, 1, vec4(1.0f)); + imageStore(arg_0, ivec2(1, 0), vec4(1.0f)); } void compute_main() { diff --git a/test/tint/builtins/gen/literal/textureStore/8c76e9.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/8c76e9.wgsl.expected.glsl index 80ed6ae43f..6f80d0cf08 100644 --- a/test/tint/builtins/gen/literal/textureStore/8c76e9.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/8c76e9.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba16i) uniform highp writeonly iimage1D arg_0; +layout(rgba16i) uniform highp writeonly iimage2D arg_0; void textureStore_8c76e9() { - imageStore(arg_0, int(1u), ivec4(1)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), ivec4(1)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba16i) uniform highp writeonly iimage1D arg_0; +layout(rgba16i) uniform highp writeonly iimage2D arg_0; void textureStore_8c76e9() { - imageStore(arg_0, int(1u), ivec4(1)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), ivec4(1)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba16i) uniform highp writeonly iimage1D arg_0; +layout(rgba16i) uniform highp writeonly iimage2D arg_0; void textureStore_8c76e9() { - imageStore(arg_0, int(1u), ivec4(1)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), ivec4(1)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/958353.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/958353.wgsl.expected.glsl index c381fc1162..6207b4f17c 100644 --- a/test/tint/builtins/gen/literal/textureStore/958353.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/958353.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba8i) uniform highp writeonly iimage1D arg_0; +layout(rgba8i) uniform highp writeonly iimage2D arg_0; void textureStore_958353() { - imageStore(arg_0, int(1u), ivec4(1)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), ivec4(1)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8i) uniform highp writeonly iimage1D arg_0; +layout(rgba8i) uniform highp writeonly iimage2D arg_0; void textureStore_958353() { - imageStore(arg_0, int(1u), ivec4(1)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), ivec4(1)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8i) uniform highp writeonly iimage1D arg_0; +layout(rgba8i) uniform highp writeonly iimage2D arg_0; void textureStore_958353() { - imageStore(arg_0, int(1u), ivec4(1)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), ivec4(1)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/959d94.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/959d94.wgsl.expected.glsl index 3603c31e4e..c5ee416097 100644 --- a/test/tint/builtins/gen/literal/textureStore/959d94.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/959d94.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba8_snorm) uniform highp writeonly image1D arg_0; +layout(rgba8_snorm) uniform highp writeonly image2D arg_0; void textureStore_959d94() { - imageStore(arg_0, int(1u), vec4(1.0f)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), vec4(1.0f)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8_snorm) uniform highp writeonly image1D arg_0; +layout(rgba8_snorm) uniform highp writeonly image2D arg_0; void textureStore_959d94() { - imageStore(arg_0, int(1u), vec4(1.0f)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), vec4(1.0f)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8_snorm) uniform highp writeonly image1D arg_0; +layout(rgba8_snorm) uniform highp writeonly image2D arg_0; void textureStore_959d94() { - imageStore(arg_0, int(1u), vec4(1.0f)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), vec4(1.0f)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/969534.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/969534.wgsl.expected.glsl index 46975745c0..abb1fea6eb 100644 --- a/test/tint/builtins/gen/literal/textureStore/969534.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/969534.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba32i) uniform highp writeonly iimage1D arg_0; +layout(rgba32i) uniform highp writeonly iimage2D arg_0; void textureStore_969534() { - imageStore(arg_0, 1, ivec4(1)); + imageStore(arg_0, ivec2(1, 0), ivec4(1)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba32i) uniform highp writeonly iimage1D arg_0; +layout(rgba32i) uniform highp writeonly iimage2D arg_0; void textureStore_969534() { - imageStore(arg_0, 1, ivec4(1)); + imageStore(arg_0, ivec2(1, 0), ivec4(1)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba32i) uniform highp writeonly iimage1D arg_0; +layout(rgba32i) uniform highp writeonly iimage2D arg_0; void textureStore_969534() { - imageStore(arg_0, 1, ivec4(1)); + imageStore(arg_0, ivec2(1, 0), ivec4(1)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/a4c338.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/a4c338.wgsl.expected.glsl index b0db4ff3cb..6612cbb763 100644 --- a/test/tint/builtins/gen/literal/textureStore/a4c338.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/a4c338.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba16f) uniform highp writeonly image1D arg_0; +layout(rgba16f) uniform highp writeonly image2D arg_0; void textureStore_a4c338() { - imageStore(arg_0, int(1u), vec4(1.0f)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), vec4(1.0f)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba16f) uniform highp writeonly image1D arg_0; +layout(rgba16f) uniform highp writeonly image2D arg_0; void textureStore_a4c338() { - imageStore(arg_0, int(1u), vec4(1.0f)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), vec4(1.0f)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba16f) uniform highp writeonly image1D arg_0; +layout(rgba16f) uniform highp writeonly image2D arg_0; void textureStore_a4c338() { - imageStore(arg_0, int(1u), vec4(1.0f)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), vec4(1.0f)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/a6e78f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/a6e78f.wgsl.expected.glsl index ec339e9223..c367db8a8b 100644 --- a/test/tint/builtins/gen/literal/textureStore/a6e78f.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/a6e78f.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(r32ui) uniform highp writeonly uimage1D arg_0; +layout(r32ui) uniform highp writeonly uimage2D arg_0; void textureStore_a6e78f() { - imageStore(arg_0, int(1u), uvec4(1u)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), uvec4(1u)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(r32ui) uniform highp writeonly uimage1D arg_0; +layout(r32ui) uniform highp writeonly uimage2D arg_0; void textureStore_a6e78f() { - imageStore(arg_0, int(1u), uvec4(1u)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), uvec4(1u)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(r32ui) uniform highp writeonly uimage1D arg_0; +layout(r32ui) uniform highp writeonly uimage2D arg_0; void textureStore_a6e78f() { - imageStore(arg_0, int(1u), uvec4(1u)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), uvec4(1u)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/b70ded.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/b70ded.wgsl.expected.glsl index b9541c492e..202c44fd9f 100644 --- a/test/tint/builtins/gen/literal/textureStore/b70ded.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/b70ded.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba16ui) uniform highp writeonly uimage1D arg_0; +layout(rgba16ui) uniform highp writeonly uimage2D arg_0; void textureStore_b70ded() { - imageStore(arg_0, int(1u), uvec4(1u)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), uvec4(1u)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba16ui) uniform highp writeonly uimage1D arg_0; +layout(rgba16ui) uniform highp writeonly uimage2D arg_0; void textureStore_b70ded() { - imageStore(arg_0, int(1u), uvec4(1u)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), uvec4(1u)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba16ui) uniform highp writeonly uimage1D arg_0; +layout(rgba16ui) uniform highp writeonly uimage2D arg_0; void textureStore_b70ded() { - imageStore(arg_0, int(1u), uvec4(1u)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), uvec4(1u)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/b77161.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/b77161.wgsl.expected.glsl index b45770f458..44165f1997 100644 --- a/test/tint/builtins/gen/literal/textureStore/b77161.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/b77161.wgsl.expected.glsl @@ -2,9 +2,9 @@ SKIP: FAILED #version 310 es -layout(rg32ui) uniform highp writeonly uimage1D arg_0; +layout(rg32ui) uniform highp writeonly uimage2D arg_0; void textureStore_b77161() { - imageStore(arg_0, int(1u), uvec4(1u)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), uvec4(1u)); } vec4 vertex_main() { @@ -30,9 +30,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -layout(rg32ui) uniform highp writeonly uimage1D arg_0; +layout(rg32ui) uniform highp writeonly uimage2D arg_0; void textureStore_b77161() { - imageStore(arg_0, int(1u), uvec4(1u)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), uvec4(1u)); } void fragment_main() { @@ -52,9 +52,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es -layout(rg32ui) uniform highp writeonly uimage1D arg_0; +layout(rg32ui) uniform highp writeonly uimage2D arg_0; void textureStore_b77161() { - imageStore(arg_0, int(1u), uvec4(1u)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), uvec4(1u)); } void compute_main() { diff --git a/test/tint/builtins/gen/literal/textureStore/bf775c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/bf775c.wgsl.expected.glsl index 69290d0f15..44ad74eb1c 100644 --- a/test/tint/builtins/gen/literal/textureStore/bf775c.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/bf775c.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba8i) uniform highp writeonly iimage1D arg_0; +layout(rgba8i) uniform highp writeonly iimage2D arg_0; void textureStore_bf775c() { - imageStore(arg_0, 1, ivec4(1)); + imageStore(arg_0, ivec2(1, 0), ivec4(1)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8i) uniform highp writeonly iimage1D arg_0; +layout(rgba8i) uniform highp writeonly iimage2D arg_0; void textureStore_bf775c() { - imageStore(arg_0, 1, ivec4(1)); + imageStore(arg_0, ivec2(1, 0), ivec4(1)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8i) uniform highp writeonly iimage1D arg_0; +layout(rgba8i) uniform highp writeonly iimage2D arg_0; void textureStore_bf775c() { - imageStore(arg_0, 1, ivec4(1)); + imageStore(arg_0, ivec2(1, 0), ivec4(1)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/c1f29e.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/c1f29e.wgsl.expected.glsl index 4e368246ff..8dc8283e56 100644 --- a/test/tint/builtins/gen/literal/textureStore/c1f29e.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/c1f29e.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(r32f) uniform highp writeonly image1D arg_0; +layout(r32f) uniform highp writeonly image2D arg_0; void textureStore_c1f29e() { - imageStore(arg_0, int(1u), vec4(1.0f)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), vec4(1.0f)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(r32f) uniform highp writeonly image1D arg_0; +layout(r32f) uniform highp writeonly image2D arg_0; void textureStore_c1f29e() { - imageStore(arg_0, int(1u), vec4(1.0f)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), vec4(1.0f)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(r32f) uniform highp writeonly image1D arg_0; +layout(r32f) uniform highp writeonly image2D arg_0; void textureStore_c1f29e() { - imageStore(arg_0, int(1u), vec4(1.0f)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), vec4(1.0f)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/d26166.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/d26166.wgsl.expected.glsl index 8b958944fa..6d35f741ed 100644 --- a/test/tint/builtins/gen/literal/textureStore/d26166.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/d26166.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba32ui) uniform highp writeonly uimage1D arg_0; +layout(rgba32ui) uniform highp writeonly uimage2D arg_0; void textureStore_d26166() { - imageStore(arg_0, int(1u), uvec4(1u)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), uvec4(1u)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba32ui) uniform highp writeonly uimage1D arg_0; +layout(rgba32ui) uniform highp writeonly uimage2D arg_0; void textureStore_d26166() { - imageStore(arg_0, int(1u), uvec4(1u)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), uvec4(1u)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba32ui) uniform highp writeonly uimage1D arg_0; +layout(rgba32ui) uniform highp writeonly uimage2D arg_0; void textureStore_d26166() { - imageStore(arg_0, int(1u), uvec4(1u)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), uvec4(1u)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/d73b5c.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/d73b5c.wgsl.expected.glsl index c22e0af4f4..5de1007481 100644 --- a/test/tint/builtins/gen/literal/textureStore/d73b5c.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/d73b5c.wgsl.expected.glsl @@ -2,9 +2,9 @@ SKIP: FAILED #version 310 es -layout(rg32i) uniform highp writeonly iimage1D arg_0; +layout(rg32i) uniform highp writeonly iimage2D arg_0; void textureStore_d73b5c() { - imageStore(arg_0, 1, ivec4(1)); + imageStore(arg_0, ivec2(1, 0), ivec4(1)); } vec4 vertex_main() { @@ -30,9 +30,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -layout(rg32i) uniform highp writeonly iimage1D arg_0; +layout(rg32i) uniform highp writeonly iimage2D arg_0; void textureStore_d73b5c() { - imageStore(arg_0, 1, ivec4(1)); + imageStore(arg_0, ivec2(1, 0), ivec4(1)); } void fragment_main() { @@ -52,9 +52,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es -layout(rg32i) uniform highp writeonly iimage1D arg_0; +layout(rg32i) uniform highp writeonly iimage2D arg_0; void textureStore_d73b5c() { - imageStore(arg_0, 1, ivec4(1)); + imageStore(arg_0, ivec2(1, 0), ivec4(1)); } void compute_main() { diff --git a/test/tint/builtins/gen/literal/textureStore/de4b94.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/de4b94.wgsl.expected.glsl index 7b68c04488..b64d9728d2 100644 --- a/test/tint/builtins/gen/literal/textureStore/de4b94.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/de4b94.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(r32i) uniform highp writeonly iimage1D arg_0; +layout(r32i) uniform highp writeonly iimage2D arg_0; void textureStore_de4b94() { - imageStore(arg_0, int(1u), ivec4(1)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), ivec4(1)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(r32i) uniform highp writeonly iimage1D arg_0; +layout(r32i) uniform highp writeonly iimage2D arg_0; void textureStore_de4b94() { - imageStore(arg_0, int(1u), ivec4(1)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), ivec4(1)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(r32i) uniform highp writeonly iimage1D arg_0; +layout(r32i) uniform highp writeonly iimage2D arg_0; void textureStore_de4b94() { - imageStore(arg_0, int(1u), ivec4(1)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), ivec4(1)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/e7c6d8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/e7c6d8.wgsl.expected.glsl index 95f750580a..06daf2bdfd 100644 --- a/test/tint/builtins/gen/literal/textureStore/e7c6d8.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/e7c6d8.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba8) uniform highp writeonly image1D arg_0; +layout(rgba8) uniform highp writeonly image2D arg_0; void textureStore_e7c6d8() { - imageStore(arg_0, int(1u), vec4(1.0f)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), vec4(1.0f)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8) uniform highp writeonly image1D arg_0; +layout(rgba8) uniform highp writeonly image2D arg_0; void textureStore_e7c6d8() { - imageStore(arg_0, int(1u), vec4(1.0f)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), vec4(1.0f)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8) uniform highp writeonly image1D arg_0; +layout(rgba8) uniform highp writeonly image2D arg_0; void textureStore_e7c6d8() { - imageStore(arg_0, int(1u), vec4(1.0f)); + imageStore(arg_0, ivec2(uvec2(1u, 0u)), vec4(1.0f)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/e885e8.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/e885e8.wgsl.expected.glsl index 7d76c5ad6a..8afd92c870 100644 --- a/test/tint/builtins/gen/literal/textureStore/e885e8.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/e885e8.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba16f) uniform highp writeonly image1D arg_0; +layout(rgba16f) uniform highp writeonly image2D arg_0; void textureStore_e885e8() { - imageStore(arg_0, 1, vec4(1.0f)); + imageStore(arg_0, ivec2(1, 0), vec4(1.0f)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba16f) uniform highp writeonly image1D arg_0; +layout(rgba16f) uniform highp writeonly image2D arg_0; void textureStore_e885e8() { - imageStore(arg_0, 1, vec4(1.0f)); + imageStore(arg_0, ivec2(1, 0), vec4(1.0f)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba16f) uniform highp writeonly image1D arg_0; +layout(rgba16f) uniform highp writeonly image2D arg_0; void textureStore_e885e8() { - imageStore(arg_0, 1, vec4(1.0f)); + imageStore(arg_0, ivec2(1, 0), vec4(1.0f)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/literal/textureStore/fb9a8f.wgsl.expected.glsl b/test/tint/builtins/gen/literal/textureStore/fb9a8f.wgsl.expected.glsl index 7a0cd4d596..bf5c50078b 100644 --- a/test/tint/builtins/gen/literal/textureStore/fb9a8f.wgsl.expected.glsl +++ b/test/tint/builtins/gen/literal/textureStore/fb9a8f.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba32ui) uniform highp writeonly uimage1D arg_0; +layout(rgba32ui) uniform highp writeonly uimage2D arg_0; void textureStore_fb9a8f() { - imageStore(arg_0, 1, uvec4(1u)); + imageStore(arg_0, ivec2(1, 0), uvec4(1u)); } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba32ui) uniform highp writeonly uimage1D arg_0; +layout(rgba32ui) uniform highp writeonly uimage2D arg_0; void textureStore_fb9a8f() { - imageStore(arg_0, 1, uvec4(1u)); + imageStore(arg_0, ivec2(1, 0), uvec4(1u)); } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba32ui) uniform highp writeonly uimage1D arg_0; +layout(rgba32ui) uniform highp writeonly uimage2D arg_0; void textureStore_fb9a8f() { - imageStore(arg_0, 1, uvec4(1u)); + imageStore(arg_0, ivec2(1, 0), uvec4(1u)); } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/022903.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/022903.wgsl.expected.glsl index 5a365cff61..e077da8905 100644 --- a/test/tint/builtins/gen/var/textureDimensions/022903.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/022903.wgsl.expected.glsl @@ -1,11 +1,9 @@ -SKIP: FAILED - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureDimensions_022903() { uint arg_1 = 1u; - uint res = uint(textureSize(arg_0_1, int(arg_1))); + uint res = uvec2(textureSize(arg_0_1, int(arg_1))).x; } vec4 vertex_main() { @@ -21,20 +19,13 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureDimensions_022903() { uint arg_1 = 1u; - uint res = uint(textureSize(arg_0_1, int(arg_1))); + uint res = uvec2(textureSize(arg_0_1, int(arg_1))).x; } void fragment_main() { @@ -45,19 +36,12 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'isampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureDimensions_022903() { uint arg_1 = 1u; - uint res = uint(textureSize(arg_0_1, int(arg_1))); + uint res = uvec2(textureSize(arg_0_1, int(arg_1))).x; } void compute_main() { @@ -69,10 +53,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/09140b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/09140b.wgsl.expected.glsl index 67cfd46954..24162f1c75 100644 --- a/test/tint/builtins/gen/var/textureDimensions/09140b.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/09140b.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba32ui) uniform highp writeonly uimage1D arg_0; +layout(rgba32ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_09140b() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba32ui) uniform highp writeonly uimage1D arg_0; +layout(rgba32ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_09140b() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba32ui) uniform highp writeonly uimage1D arg_0; +layout(rgba32ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_09140b() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/0c0b0c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/0c0b0c.wgsl.expected.glsl index a3815af023..21af8e84e5 100644 --- a/test/tint/builtins/gen/var/textureDimensions/0c0b0c.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/0c0b0c.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba16f) uniform highp writeonly image1D arg_0; +layout(rgba16f) uniform highp writeonly image2D arg_0; void textureDimensions_0c0b0c() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba16f) uniform highp writeonly image1D arg_0; +layout(rgba16f) uniform highp writeonly image2D arg_0; void textureDimensions_0c0b0c() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba16f) uniform highp writeonly image1D arg_0; +layout(rgba16f) uniform highp writeonly image2D arg_0; void textureDimensions_0c0b0c() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/26d6bf.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/26d6bf.wgsl.expected.glsl index d262540e00..fe3f7ba832 100644 --- a/test/tint/builtins/gen/var/textureDimensions/26d6bf.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/26d6bf.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureDimensions_26d6bf() { - uint res = uint(textureSize(arg_0_1, 0)); + uint res = uvec2(textureSize(arg_0_1, 0)).x; } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureDimensions_26d6bf() { - uint res = uint(textureSize(arg_0_1, 0)); + uint res = uvec2(textureSize(arg_0_1, 0)).x; } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureDimensions_26d6bf() { - uint res = uint(textureSize(arg_0_1, 0)); + uint res = uvec2(textureSize(arg_0_1, 0)).x; } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/3af3e7.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/3af3e7.wgsl.expected.glsl index dc7f1b8871..5d059f4ffc 100644 --- a/test/tint/builtins/gen/var/textureDimensions/3af3e7.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/3af3e7.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba8) uniform highp writeonly image1D arg_0; +layout(rgba8) uniform highp writeonly image2D arg_0; void textureDimensions_3af3e7() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8) uniform highp writeonly image1D arg_0; +layout(rgba8) uniform highp writeonly image2D arg_0; void textureDimensions_3af3e7() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8) uniform highp writeonly image1D arg_0; +layout(rgba8) uniform highp writeonly image2D arg_0; void textureDimensions_3af3e7() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/58a82d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/58a82d.wgsl.expected.glsl index 2fcd82ea88..735e74e503 100644 --- a/test/tint/builtins/gen/var/textureDimensions/58a82d.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/58a82d.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba16ui) uniform highp writeonly uimage1D arg_0; +layout(rgba16ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_58a82d() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba16ui) uniform highp writeonly uimage1D arg_0; +layout(rgba16ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_58a82d() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba16ui) uniform highp writeonly uimage1D arg_0; +layout(rgba16ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_58a82d() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/5df042.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/5df042.wgsl.expected.glsl index c8e4d65133..95c45a2259 100644 --- a/test/tint/builtins/gen/var/textureDimensions/5df042.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/5df042.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureDimensions_5df042() { - uint res = uint(textureSize(arg_0_1, 0)); + uint res = uvec2(textureSize(arg_0_1, 0)).x; } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureDimensions_5df042() { - uint res = uint(textureSize(arg_0_1, 0)); + uint res = uvec2(textureSize(arg_0_1, 0)).x; } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'isampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureDimensions_5df042() { - uint res = uint(textureSize(arg_0_1, 0)); + uint res = uvec2(textureSize(arg_0_1, 0)).x; } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/607979.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/607979.wgsl.expected.glsl index 5b5a4c38c6..2033c188c9 100644 --- a/test/tint/builtins/gen/var/textureDimensions/607979.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/607979.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(r32i) uniform highp writeonly iimage1D arg_0; +layout(r32i) uniform highp writeonly iimage2D arg_0; void textureDimensions_607979() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(r32i) uniform highp writeonly iimage1D arg_0; +layout(r32i) uniform highp writeonly iimage2D arg_0; void textureDimensions_607979() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(r32i) uniform highp writeonly iimage1D arg_0; +layout(r32i) uniform highp writeonly iimage2D arg_0; void textureDimensions_607979() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/7228de.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/7228de.wgsl.expected.glsl index d148823a77..196bd3ad0f 100644 --- a/test/tint/builtins/gen/var/textureDimensions/7228de.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/7228de.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(r32ui) uniform highp writeonly uimage1D arg_0; +layout(r32ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_7228de() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(r32ui) uniform highp writeonly uimage1D arg_0; +layout(r32ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_7228de() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(r32ui) uniform highp writeonly uimage1D arg_0; +layout(r32ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_7228de() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/8efd47.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/8efd47.wgsl.expected.glsl index ae3365d57c..ae6f7ebbd7 100644 --- a/test/tint/builtins/gen/var/textureDimensions/8efd47.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/8efd47.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba32i) uniform highp writeonly iimage1D arg_0; +layout(rgba32i) uniform highp writeonly iimage2D arg_0; void textureDimensions_8efd47() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba32i) uniform highp writeonly iimage1D arg_0; +layout(rgba32i) uniform highp writeonly iimage2D arg_0; void textureDimensions_8efd47() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba32i) uniform highp writeonly iimage1D arg_0; +layout(rgba32i) uniform highp writeonly iimage2D arg_0; void textureDimensions_8efd47() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/920006.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/920006.wgsl.expected.glsl index 270dde93dd..c34e4c1533 100644 --- a/test/tint/builtins/gen/var/textureDimensions/920006.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/920006.wgsl.expected.glsl @@ -1,11 +1,9 @@ -SKIP: FAILED - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureDimensions_920006() { int arg_1 = 1; - uint res = uint(textureSize(arg_0_1, arg_1)); + uint res = uvec2(textureSize(arg_0_1, arg_1)).x; } vec4 vertex_main() { @@ -21,20 +19,13 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureDimensions_920006() { int arg_1 = 1; - uint res = uint(textureSize(arg_0_1, arg_1)); + uint res = uvec2(textureSize(arg_0_1, arg_1)).x; } void fragment_main() { @@ -45,19 +36,12 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'usampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureDimensions_920006() { int arg_1 = 1; - uint res = uint(textureSize(arg_0_1, arg_1)); + uint res = uvec2(textureSize(arg_0_1, arg_1)).x; } void compute_main() { @@ -69,10 +53,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/92552e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/92552e.wgsl.expected.glsl index aea8be7e71..c14a7b65d3 100644 --- a/test/tint/builtins/gen/var/textureDimensions/92552e.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/92552e.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba8i) uniform highp writeonly iimage1D arg_0; +layout(rgba8i) uniform highp writeonly iimage2D arg_0; void textureDimensions_92552e() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8i) uniform highp writeonly iimage1D arg_0; +layout(rgba8i) uniform highp writeonly iimage2D arg_0; void textureDimensions_92552e() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8i) uniform highp writeonly iimage1D arg_0; +layout(rgba8i) uniform highp writeonly iimage2D arg_0; void textureDimensions_92552e() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/965645.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/965645.wgsl.expected.glsl index 1aaef12ee1..e5540d60f7 100644 --- a/test/tint/builtins/gen/var/textureDimensions/965645.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/965645.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureDimensions_965645() { - uint res = uint(textureSize(arg_0_1, 0)); + uint res = uvec2(textureSize(arg_0_1, 0)).x; } vec4 vertex_main() { @@ -20,19 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureDimensions_965645() { - uint res = uint(textureSize(arg_0_1, 0)); + uint res = uvec2(textureSize(arg_0_1, 0)).x; } void fragment_main() { @@ -43,18 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'usampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureDimensions_965645() { - uint res = uint(textureSize(arg_0_1, 0)); + uint res = uvec2(textureSize(arg_0_1, 0)).x; } void compute_main() { @@ -66,10 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/9c7a00.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/9c7a00.wgsl.expected.glsl index eb83b7ad43..c98108ccbe 100644 --- a/test/tint/builtins/gen/var/textureDimensions/9c7a00.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/9c7a00.wgsl.expected.glsl @@ -1,11 +1,9 @@ -SKIP: FAILED - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureDimensions_9c7a00() { uint arg_1 = 1u; - uint res = uint(textureSize(arg_0_1, int(arg_1))); + uint res = uvec2(textureSize(arg_0_1, int(arg_1))).x; } vec4 vertex_main() { @@ -21,20 +19,13 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureDimensions_9c7a00() { uint arg_1 = 1u; - uint res = uint(textureSize(arg_0_1, int(arg_1))); + uint res = uvec2(textureSize(arg_0_1, int(arg_1))).x; } void fragment_main() { @@ -45,19 +36,12 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'usampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureDimensions_9c7a00() { uint arg_1 = 1u; - uint res = uint(textureSize(arg_0_1, int(arg_1))); + uint res = uvec2(textureSize(arg_0_1, int(arg_1))).x; } void compute_main() { @@ -69,10 +53,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/aac604.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/aac604.wgsl.expected.glsl index e83045c2e6..042543f382 100644 --- a/test/tint/builtins/gen/var/textureDimensions/aac604.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/aac604.wgsl.expected.glsl @@ -1,11 +1,9 @@ -SKIP: FAILED - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureDimensions_aac604() { uint arg_1 = 1u; - uint res = uint(textureSize(arg_0_1, int(arg_1))); + uint res = uvec2(textureSize(arg_0_1, int(arg_1))).x; } vec4 vertex_main() { @@ -21,20 +19,13 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureDimensions_aac604() { uint arg_1 = 1u; - uint res = uint(textureSize(arg_0_1, int(arg_1))); + uint res = uvec2(textureSize(arg_0_1, int(arg_1))).x; } void fragment_main() { @@ -45,19 +36,12 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureDimensions_aac604() { uint arg_1 = 1u; - uint res = uint(textureSize(arg_0_1, int(arg_1))); + uint res = uvec2(textureSize(arg_0_1, int(arg_1))).x; } void compute_main() { @@ -69,10 +53,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/ad7d3b.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/ad7d3b.wgsl.expected.glsl index 37dc452687..c88b88eed9 100644 --- a/test/tint/builtins/gen/var/textureDimensions/ad7d3b.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/ad7d3b.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba8ui) uniform highp writeonly uimage1D arg_0; +layout(rgba8ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_ad7d3b() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8ui) uniform highp writeonly uimage1D arg_0; +layout(rgba8ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_ad7d3b() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8ui) uniform highp writeonly uimage1D arg_0; +layout(rgba8ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_ad7d3b() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/b46d97.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/b46d97.wgsl.expected.glsl index 6a0314ac48..74c1b0e659 100644 --- a/test/tint/builtins/gen/var/textureDimensions/b46d97.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/b46d97.wgsl.expected.glsl @@ -1,11 +1,9 @@ -SKIP: FAILED - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureDimensions_b46d97() { int arg_1 = 1; - uint res = uint(textureSize(arg_0_1, arg_1)); + uint res = uvec2(textureSize(arg_0_1, arg_1)).x; } vec4 vertex_main() { @@ -21,20 +19,13 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureDimensions_b46d97() { int arg_1 = 1; - uint res = uint(textureSize(arg_0_1, arg_1)); + uint res = uvec2(textureSize(arg_0_1, arg_1)).x; } void fragment_main() { @@ -45,19 +36,12 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'isampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureDimensions_b46d97() { int arg_1 = 1; - uint res = uint(textureSize(arg_0_1, arg_1)); + uint res = uvec2(textureSize(arg_0_1, arg_1)).x; } void compute_main() { @@ -69,10 +53,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/b51345.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/b51345.wgsl.expected.glsl index 058e7ca1ba..67f3776ee4 100644 --- a/test/tint/builtins/gen/var/textureDimensions/b51345.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/b51345.wgsl.expected.glsl @@ -2,9 +2,9 @@ SKIP: FAILED #version 310 es -layout(rg32f) uniform highp writeonly image1D arg_0; +layout(rg32f) uniform highp writeonly image2D arg_0; void textureDimensions_b51345() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -30,9 +30,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -layout(rg32f) uniform highp writeonly image1D arg_0; +layout(rg32f) uniform highp writeonly image2D arg_0; void textureDimensions_b51345() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -52,9 +52,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es -layout(rg32f) uniform highp writeonly image1D arg_0; +layout(rg32f) uniform highp writeonly image2D arg_0; void textureDimensions_b51345() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { diff --git a/test/tint/builtins/gen/var/textureDimensions/d08a94.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/d08a94.wgsl.expected.glsl index 58a0a3b403..b4a0c706f2 100644 --- a/test/tint/builtins/gen/var/textureDimensions/d08a94.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/d08a94.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba16i) uniform highp writeonly iimage1D arg_0; +layout(rgba16i) uniform highp writeonly iimage2D arg_0; void textureDimensions_d08a94() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba16i) uniform highp writeonly iimage1D arg_0; +layout(rgba16i) uniform highp writeonly iimage2D arg_0; void textureDimensions_d08a94() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba16i) uniform highp writeonly iimage1D arg_0; +layout(rgba16i) uniform highp writeonly iimage2D arg_0; void textureDimensions_d08a94() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/da30d2.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/da30d2.wgsl.expected.glsl index 15c9df4ade..4a3d01d525 100644 --- a/test/tint/builtins/gen/var/textureDimensions/da30d2.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/da30d2.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba32f) uniform highp writeonly image1D arg_0; +layout(rgba32f) uniform highp writeonly image2D arg_0; void textureDimensions_da30d2() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba32f) uniform highp writeonly image1D arg_0; +layout(rgba32f) uniform highp writeonly image2D arg_0; void textureDimensions_da30d2() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba32f) uniform highp writeonly image1D arg_0; +layout(rgba32f) uniform highp writeonly image2D arg_0; void textureDimensions_da30d2() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/e122fe.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/e122fe.wgsl.expected.glsl index 5c766e8f23..d4febc0054 100644 --- a/test/tint/builtins/gen/var/textureDimensions/e122fe.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/e122fe.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(rgba8_snorm) uniform highp writeonly image1D arg_0; +layout(rgba8_snorm) uniform highp writeonly image2D arg_0; void textureDimensions_e122fe() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8_snorm) uniform highp writeonly image1D arg_0; +layout(rgba8_snorm) uniform highp writeonly image2D arg_0; void textureDimensions_e122fe() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8_snorm) uniform highp writeonly image1D arg_0; +layout(rgba8_snorm) uniform highp writeonly image2D arg_0; void textureDimensions_e122fe() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/ea066c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/ea066c.wgsl.expected.glsl index 70bc37da57..ea156b2739 100644 --- a/test/tint/builtins/gen/var/textureDimensions/ea066c.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/ea066c.wgsl.expected.glsl @@ -1,10 +1,8 @@ -SKIP: FAILED - #version 310 es -layout(r32f) uniform highp writeonly image1D arg_0; +layout(r32f) uniform highp writeonly image2D arg_0; void textureDimensions_ea066c() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -20,20 +18,12 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(r32f) uniform highp writeonly image1D arg_0; +layout(r32f) uniform highp writeonly image2D arg_0; void textureDimensions_ea066c() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -44,19 +34,11 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(r32f) uniform highp writeonly image1D arg_0; +layout(r32f) uniform highp writeonly image2D arg_0; void textureDimensions_ea066c() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { @@ -68,11 +50,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/ea25bc.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/ea25bc.wgsl.expected.glsl index 46e8cb3e81..a9b19229cd 100644 --- a/test/tint/builtins/gen/var/textureDimensions/ea25bc.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/ea25bc.wgsl.expected.glsl @@ -2,9 +2,9 @@ SKIP: FAILED #version 310 es -layout(rg32ui) uniform highp writeonly uimage1D arg_0; +layout(rg32ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_ea25bc() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -30,9 +30,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -layout(rg32ui) uniform highp writeonly uimage1D arg_0; +layout(rg32ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_ea25bc() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -52,9 +52,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es -layout(rg32ui) uniform highp writeonly uimage1D arg_0; +layout(rg32ui) uniform highp writeonly uimage2D arg_0; void textureDimensions_ea25bc() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { diff --git a/test/tint/builtins/gen/var/textureDimensions/f17acd.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/f17acd.wgsl.expected.glsl index b9c93dd98b..edf4bb1aab 100644 --- a/test/tint/builtins/gen/var/textureDimensions/f17acd.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/f17acd.wgsl.expected.glsl @@ -1,11 +1,9 @@ -SKIP: FAILED - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureDimensions_f17acd() { int arg_1 = 1; - uint res = uint(textureSize(arg_0_1, arg_1)); + uint res = uvec2(textureSize(arg_0_1, arg_1)).x; } vec4 vertex_main() { @@ -21,20 +19,13 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureDimensions_f17acd() { int arg_1 = 1; - uint res = uint(textureSize(arg_0_1, arg_1)); + uint res = uvec2(textureSize(arg_0_1, arg_1)).x; } void fragment_main() { @@ -45,19 +36,12 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureDimensions_f17acd() { int arg_1 = 1; - uint res = uint(textureSize(arg_0_1, arg_1)); + uint res = uvec2(textureSize(arg_0_1, arg_1)).x; } void compute_main() { @@ -69,10 +53,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureDimensions/f264a3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureDimensions/f264a3.wgsl.expected.glsl index 93568a0a1a..0be986cd4d 100644 --- a/test/tint/builtins/gen/var/textureDimensions/f264a3.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureDimensions/f264a3.wgsl.expected.glsl @@ -2,9 +2,9 @@ SKIP: FAILED #version 310 es -layout(rg32i) uniform highp writeonly iimage1D arg_0; +layout(rg32i) uniform highp writeonly iimage2D arg_0; void textureDimensions_f264a3() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } vec4 vertex_main() { @@ -30,9 +30,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -layout(rg32i) uniform highp writeonly iimage1D arg_0; +layout(rg32i) uniform highp writeonly iimage2D arg_0; void textureDimensions_f264a3() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void fragment_main() { @@ -52,9 +52,9 @@ ERROR: 2 compilation errors. No code generated. #version 310 es -layout(rg32i) uniform highp writeonly iimage1D arg_0; +layout(rg32i) uniform highp writeonly iimage2D arg_0; void textureDimensions_f264a3() { - uint res = uint(imageSize(arg_0)); + uint res = uvec2(imageSize(arg_0)).x; } void compute_main() { diff --git a/test/tint/builtins/gen/var/textureLoad/0cb698.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/0cb698.wgsl.expected.glsl index 740326ad9d..d06dd55f83 100644 --- a/test/tint/builtins/gen/var/textureLoad/0cb698.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureLoad/0cb698.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_0cb698() { uint arg_1 = 1u; uint arg_2 = 1u; - ivec4 res = texelFetch(arg_0_1, int(arg_1), int(arg_2)); + ivec4 res = texelFetch(arg_0_1, ivec2(uvec2(arg_1, 0u)), int(arg_2)); } vec4 vertex_main() { @@ -22,21 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_0cb698() { uint arg_1 = 1u; uint arg_2 = 1u; - ivec4 res = texelFetch(arg_0_1, int(arg_1), int(arg_2)); + ivec4 res = texelFetch(arg_0_1, ivec2(uvec2(arg_1, 0u)), int(arg_2)); } void fragment_main() { @@ -47,20 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'isampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_0cb698() { uint arg_1 = 1u; uint arg_2 = 1u; - ivec4 res = texelFetch(arg_0_1, int(arg_1), int(arg_2)); + ivec4 res = texelFetch(arg_0_1, ivec2(uvec2(arg_1, 0u)), int(arg_2)); } void compute_main() { @@ -72,10 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureLoad/1373dc.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1373dc.wgsl.expected.glsl index bbec6f9e20..ece13e4fa9 100644 --- a/test/tint/builtins/gen/var/textureLoad/1373dc.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureLoad/1373dc.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_1373dc() { uint arg_1 = 1u; int arg_2 = 1; - vec4 res = texelFetch(arg_0_1, int(arg_1), arg_2); + vec4 res = texelFetch(arg_0_1, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -22,21 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_1373dc() { uint arg_1 = 1u; int arg_2 = 1; - vec4 res = texelFetch(arg_0_1, int(arg_1), arg_2); + vec4 res = texelFetch(arg_0_1, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -47,20 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_1373dc() { uint arg_1 = 1u; int arg_2 = 1; - vec4 res = texelFetch(arg_0_1, int(arg_1), arg_2); + vec4 res = texelFetch(arg_0_1, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { @@ -72,10 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureLoad/1b8588.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/1b8588.wgsl.expected.glsl index d8ba0a3bb9..60b3de055b 100644 --- a/test/tint/builtins/gen/var/textureLoad/1b8588.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureLoad/1b8588.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_1b8588() { int arg_1 = 1; int arg_2 = 1; - uvec4 res = texelFetch(arg_0_1, arg_1, arg_2); + uvec4 res = texelFetch(arg_0_1, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -22,21 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_1b8588() { int arg_1 = 1; int arg_2 = 1; - uvec4 res = texelFetch(arg_0_1, arg_1, arg_2); + uvec4 res = texelFetch(arg_0_1, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -47,20 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'usampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_1b8588() { int arg_1 = 1; int arg_2 = 1; - uvec4 res = texelFetch(arg_0_1, arg_1, arg_2); + uvec4 res = texelFetch(arg_0_1, ivec2(arg_1, 0), arg_2); } void compute_main() { @@ -72,10 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureLoad/216c37.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/216c37.wgsl.expected.glsl index 1555f2a2b4..95ad423dae 100644 --- a/test/tint/builtins/gen/var/textureLoad/216c37.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureLoad/216c37.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_216c37() { uint arg_1 = 1u; int arg_2 = 1; - uvec4 res = texelFetch(arg_0_1, int(arg_1), arg_2); + uvec4 res = texelFetch(arg_0_1, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -22,21 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_216c37() { uint arg_1 = 1u; int arg_2 = 1; - uvec4 res = texelFetch(arg_0_1, int(arg_1), arg_2); + uvec4 res = texelFetch(arg_0_1, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -47,20 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'usampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_216c37() { uint arg_1 = 1u; int arg_2 = 1; - uvec4 res = texelFetch(arg_0_1, int(arg_1), arg_2); + uvec4 res = texelFetch(arg_0_1, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { @@ -72,10 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureLoad/3da3ed.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/3da3ed.wgsl.expected.glsl index 1fbe075410..960b84ebaf 100644 --- a/test/tint/builtins/gen/var/textureLoad/3da3ed.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureLoad/3da3ed.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_3da3ed() { int arg_1 = 1; uint arg_2 = 1u; - vec4 res = texelFetch(arg_0_1, arg_1, int(arg_2)); + vec4 res = texelFetch(arg_0_1, ivec2(arg_1, 0), int(arg_2)); } vec4 vertex_main() { @@ -22,21 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_3da3ed() { int arg_1 = 1; uint arg_2 = 1u; - vec4 res = texelFetch(arg_0_1, arg_1, int(arg_2)); + vec4 res = texelFetch(arg_0_1, ivec2(arg_1, 0), int(arg_2)); } void fragment_main() { @@ -47,20 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_3da3ed() { int arg_1 = 1; uint arg_2 = 1u; - vec4 res = texelFetch(arg_0_1, arg_1, int(arg_2)); + vec4 res = texelFetch(arg_0_1, ivec2(arg_1, 0), int(arg_2)); } void compute_main() { @@ -72,10 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureLoad/4c423f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/4c423f.wgsl.expected.glsl index 57f0a4f4c1..c3a48479ce 100644 --- a/test/tint/builtins/gen/var/textureLoad/4c423f.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureLoad/4c423f.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_4c423f() { uint arg_1 = 1u; int arg_2 = 1; - ivec4 res = texelFetch(arg_0_1, int(arg_1), arg_2); + ivec4 res = texelFetch(arg_0_1, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -22,21 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_4c423f() { uint arg_1 = 1u; int arg_2 = 1; - ivec4 res = texelFetch(arg_0_1, int(arg_1), arg_2); + ivec4 res = texelFetch(arg_0_1, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -47,20 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'isampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_4c423f() { uint arg_1 = 1u; int arg_2 = 1; - ivec4 res = texelFetch(arg_0_1, int(arg_1), arg_2); + ivec4 res = texelFetch(arg_0_1, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { @@ -72,10 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureLoad/5a2f9d.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/5a2f9d.wgsl.expected.glsl index 9f480a33d3..afa321e1e8 100644 --- a/test/tint/builtins/gen/var/textureLoad/5a2f9d.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureLoad/5a2f9d.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_5a2f9d() { int arg_1 = 1; int arg_2 = 1; - ivec4 res = texelFetch(arg_0_1, arg_1, arg_2); + ivec4 res = texelFetch(arg_0_1, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -22,21 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_5a2f9d() { int arg_1 = 1; int arg_2 = 1; - ivec4 res = texelFetch(arg_0_1, arg_1, arg_2); + ivec4 res = texelFetch(arg_0_1, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -47,20 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'isampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_5a2f9d() { int arg_1 = 1; int arg_2 = 1; - ivec4 res = texelFetch(arg_0_1, arg_1, arg_2); + ivec4 res = texelFetch(arg_0_1, ivec2(arg_1, 0), arg_2); } void compute_main() { @@ -72,10 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureLoad/62d1de.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/62d1de.wgsl.expected.glsl index 8a29cdc377..0322ef77f2 100644 --- a/test/tint/builtins/gen/var/textureLoad/62d1de.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureLoad/62d1de.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_62d1de() { int arg_1 = 1; uint arg_2 = 1u; - ivec4 res = texelFetch(arg_0_1, arg_1, int(arg_2)); + ivec4 res = texelFetch(arg_0_1, ivec2(arg_1, 0), int(arg_2)); } vec4 vertex_main() { @@ -22,21 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_62d1de() { int arg_1 = 1; uint arg_2 = 1u; - ivec4 res = texelFetch(arg_0_1, arg_1, int(arg_2)); + ivec4 res = texelFetch(arg_0_1, ivec2(arg_1, 0), int(arg_2)); } void fragment_main() { @@ -47,20 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'isampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureLoad_62d1de() { int arg_1 = 1; uint arg_2 = 1u; - ivec4 res = texelFetch(arg_0_1, arg_1, int(arg_2)); + ivec4 res = texelFetch(arg_0_1, ivec2(arg_1, 0), int(arg_2)); } void compute_main() { @@ -72,10 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureLoad/6b77d4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/6b77d4.wgsl.expected.glsl index c3be096342..5aac53fd3c 100644 --- a/test/tint/builtins/gen/var/textureLoad/6b77d4.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureLoad/6b77d4.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_6b77d4() { int arg_1 = 1; uint arg_2 = 1u; - uvec4 res = texelFetch(arg_0_1, arg_1, int(arg_2)); + uvec4 res = texelFetch(arg_0_1, ivec2(arg_1, 0), int(arg_2)); } vec4 vertex_main() { @@ -22,21 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_6b77d4() { int arg_1 = 1; uint arg_2 = 1u; - uvec4 res = texelFetch(arg_0_1, arg_1, int(arg_2)); + uvec4 res = texelFetch(arg_0_1, ivec2(arg_1, 0), int(arg_2)); } void fragment_main() { @@ -47,20 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'usampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_6b77d4() { int arg_1 = 1; uint arg_2 = 1u; - uvec4 res = texelFetch(arg_0_1, arg_1, int(arg_2)); + uvec4 res = texelFetch(arg_0_1, ivec2(arg_1, 0), int(arg_2)); } void compute_main() { @@ -72,10 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureLoad/6d376a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/6d376a.wgsl.expected.glsl index feaca4dbc3..95ba92ece9 100644 --- a/test/tint/builtins/gen/var/textureLoad/6d376a.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureLoad/6d376a.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_6d376a() { uint arg_1 = 1u; uint arg_2 = 1u; - vec4 res = texelFetch(arg_0_1, int(arg_1), int(arg_2)); + vec4 res = texelFetch(arg_0_1, ivec2(uvec2(arg_1, 0u)), int(arg_2)); } vec4 vertex_main() { @@ -22,21 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_6d376a() { uint arg_1 = 1u; uint arg_2 = 1u; - vec4 res = texelFetch(arg_0_1, int(arg_1), int(arg_2)); + vec4 res = texelFetch(arg_0_1, ivec2(uvec2(arg_1, 0u)), int(arg_2)); } void fragment_main() { @@ -47,20 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_6d376a() { uint arg_1 = 1u; uint arg_2 = 1u; - vec4 res = texelFetch(arg_0_1, int(arg_1), int(arg_2)); + vec4 res = texelFetch(arg_0_1, ivec2(uvec2(arg_1, 0u)), int(arg_2)); } void compute_main() { @@ -72,10 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureLoad/81c381.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/81c381.wgsl.expected.glsl index 93c2a7a5fc..daffdcb1e8 100644 --- a/test/tint/builtins/gen/var/textureLoad/81c381.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureLoad/81c381.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_81c381() { int arg_1 = 1; int arg_2 = 1; - vec4 res = texelFetch(arg_0_1, arg_1, arg_2); + vec4 res = texelFetch(arg_0_1, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -22,21 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_81c381() { int arg_1 = 1; int arg_2 = 1; - vec4 res = texelFetch(arg_0_1, arg_1, arg_2); + vec4 res = texelFetch(arg_0_1, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -47,20 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureLoad_81c381() { int arg_1 = 1; int arg_2 = 1; - vec4 res = texelFetch(arg_0_1, arg_1, arg_2); + vec4 res = texelFetch(arg_0_1, ivec2(arg_1, 0), arg_2); } void compute_main() { @@ -72,10 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureLoad/bc3201.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureLoad/bc3201.wgsl.expected.glsl index 9c502e08c0..276c68bbfd 100644 --- a/test/tint/builtins/gen/var/textureLoad/bc3201.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureLoad/bc3201.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_bc3201() { uint arg_1 = 1u; uint arg_2 = 1u; - uvec4 res = texelFetch(arg_0_1, int(arg_1), int(arg_2)); + uvec4 res = texelFetch(arg_0_1, ivec2(uvec2(arg_1, 0u)), int(arg_2)); } vec4 vertex_main() { @@ -22,21 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_bc3201() { uint arg_1 = 1u; uint arg_2 = 1u; - uvec4 res = texelFetch(arg_0_1, int(arg_1), int(arg_2)); + uvec4 res = texelFetch(arg_0_1, ivec2(uvec2(arg_1, 0u)), int(arg_2)); } void fragment_main() { @@ -47,20 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'usampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureLoad_bc3201() { uint arg_1 = 1u; uint arg_2 = 1u; - uvec4 res = texelFetch(arg_0_1, int(arg_1), int(arg_2)); + uvec4 res = texelFetch(arg_0_1, ivec2(uvec2(arg_1, 0u)), int(arg_2)); } void compute_main() { @@ -72,10 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureNumLevels/1a7fc3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/1a7fc3.wgsl.expected.glsl index a0dc02a0dc..8a5f3021de 100644 --- a/test/tint/builtins/gen/var/textureNumLevels/1a7fc3.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureNumLevels/1a7fc3.wgsl.expected.glsl @@ -2,7 +2,7 @@ SKIP: FAILED #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureNumLevels_1a7fc3() { uint res = uint(textureQueryLevels(arg_0_1)); } @@ -21,8 +21,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated +ERROR: 0:5: 'textureQueryLevels' : no matching overloaded function found +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. @@ -30,7 +30,7 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureNumLevels_1a7fc3() { uint res = uint(textureQueryLevels(arg_0_1)); } @@ -44,15 +44,15 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:4: 'usampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated +ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found +ERROR: 0:6: '' : compilation terminated ERROR: 2 compilation errors. No code generated. #version 310 es -uniform highp usampler1D arg_0_1; +uniform highp usampler2D arg_0_1; void textureNumLevels_1a7fc3() { uint res = uint(textureQueryLevels(arg_0_1)); } @@ -67,8 +67,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:3: 'usampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated +ERROR: 0:5: 'textureQueryLevels' : no matching overloaded function found +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/tint/builtins/gen/var/textureNumLevels/c399f9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/c399f9.wgsl.expected.glsl index 91caecf46c..5a2ccbe9da 100644 --- a/test/tint/builtins/gen/var/textureNumLevels/c399f9.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureNumLevels/c399f9.wgsl.expected.glsl @@ -2,7 +2,7 @@ SKIP: FAILED #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureNumLevels_c399f9() { uint res = uint(textureQueryLevels(arg_0_1)); } @@ -21,8 +21,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated +ERROR: 0:5: 'textureQueryLevels' : no matching overloaded function found +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. @@ -30,7 +30,7 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureNumLevels_c399f9() { uint res = uint(textureQueryLevels(arg_0_1)); } @@ -44,15 +44,15 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated +ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found +ERROR: 0:6: '' : compilation terminated ERROR: 2 compilation errors. No code generated. #version 310 es -uniform highp sampler1D arg_0_1; +uniform highp sampler2D arg_0_1; void textureNumLevels_c399f9() { uint res = uint(textureQueryLevels(arg_0_1)); } @@ -67,8 +67,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:3: 'sampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated +ERROR: 0:5: 'textureQueryLevels' : no matching overloaded function found +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/tint/builtins/gen/var/textureNumLevels/f742c0.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureNumLevels/f742c0.wgsl.expected.glsl index c34994eaa6..da1a01ffb2 100644 --- a/test/tint/builtins/gen/var/textureNumLevels/f742c0.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureNumLevels/f742c0.wgsl.expected.glsl @@ -2,7 +2,7 @@ SKIP: FAILED #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureNumLevels_f742c0() { uint res = uint(textureQueryLevels(arg_0_1)); } @@ -21,8 +21,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated +ERROR: 0:5: 'textureQueryLevels' : no matching overloaded function found +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. @@ -30,7 +30,7 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureNumLevels_f742c0() { uint res = uint(textureQueryLevels(arg_0_1)); } @@ -44,15 +44,15 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:4: 'isampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated +ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found +ERROR: 0:6: '' : compilation terminated ERROR: 2 compilation errors. No code generated. #version 310 es -uniform highp isampler1D arg_0_1; +uniform highp isampler2D arg_0_1; void textureNumLevels_f742c0() { uint res = uint(textureQueryLevels(arg_0_1)); } @@ -67,8 +67,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:3: 'isampler1D' : Reserved word. -ERROR: 0:3: '' : compilation terminated +ERROR: 0:5: 'textureQueryLevels' : no matching overloaded function found +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/tint/builtins/gen/var/textureSample/6e64fb.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureSample/6e64fb.wgsl.expected.glsl index 15771c5c9a..1fe1c59bff 100644 --- a/test/tint/builtins/gen/var/textureSample/6e64fb.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureSample/6e64fb.wgsl.expected.glsl @@ -1,13 +1,11 @@ -SKIP: FAILED - #version 310 es precision mediump float; -uniform highp sampler1D arg_0_arg_1; +uniform highp sampler2D arg_0_arg_1; void textureSample_6e64fb() { float arg_2 = 1.0f; - vec4 res = texture(arg_0_arg_1, arg_2); + vec4 res = texture(arg_0_arg_1, vec2(arg_2, 0.5f)); } void fragment_main() { @@ -18,10 +16,3 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/102722.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/102722.wgsl.expected.glsl index bb01c0a8ae..99991064e1 100644 --- a/test/tint/builtins/gen/var/textureStore/102722.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/102722.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(r32ui) uniform highp writeonly uimage1D arg_0; +layout(r32ui) uniform highp writeonly uimage2D arg_0; void textureStore_102722() { int arg_1 = 1; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(r32ui) uniform highp writeonly uimage1D arg_0; +layout(r32ui) uniform highp writeonly uimage2D arg_0; void textureStore_102722() { int arg_1 = 1; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(r32ui) uniform highp writeonly uimage1D arg_0; +layout(r32ui) uniform highp writeonly uimage2D arg_0; void textureStore_102722() { int arg_1 = 1; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/1dc954.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/1dc954.wgsl.expected.glsl index 7ba68db20a..866cb8182c 100644 --- a/test/tint/builtins/gen/var/textureStore/1dc954.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/1dc954.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba32i) uniform highp writeonly iimage1D arg_0; +layout(rgba32i) uniform highp writeonly iimage2D arg_0; void textureStore_1dc954() { uint arg_1 = 1u; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba32i) uniform highp writeonly iimage1D arg_0; +layout(rgba32i) uniform highp writeonly iimage2D arg_0; void textureStore_1dc954() { uint arg_1 = 1u; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba32i) uniform highp writeonly iimage1D arg_0; +layout(rgba32i) uniform highp writeonly iimage2D arg_0; void textureStore_1dc954() { uint arg_1 = 1u; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/285218.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/285218.wgsl.expected.glsl index 0e5b2732f2..dfa6c9b249 100644 --- a/test/tint/builtins/gen/var/textureStore/285218.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/285218.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba32f) uniform highp writeonly image1D arg_0; +layout(rgba32f) uniform highp writeonly image2D arg_0; void textureStore_285218() { uint arg_1 = 1u; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba32f) uniform highp writeonly image1D arg_0; +layout(rgba32f) uniform highp writeonly image2D arg_0; void textureStore_285218() { uint arg_1 = 1u; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba32f) uniform highp writeonly image1D arg_0; +layout(rgba32f) uniform highp writeonly image2D arg_0; void textureStore_285218() { uint arg_1 = 1u; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/2ac6c7.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/2ac6c7.wgsl.expected.glsl index 9ec94ea815..a3f44d9ad3 100644 --- a/test/tint/builtins/gen/var/textureStore/2ac6c7.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/2ac6c7.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(r32f) uniform highp writeonly image1D arg_0; +layout(r32f) uniform highp writeonly image2D arg_0; void textureStore_2ac6c7() { int arg_1 = 1; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(r32f) uniform highp writeonly image1D arg_0; +layout(r32f) uniform highp writeonly image2D arg_0; void textureStore_2ac6c7() { int arg_1 = 1; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(r32f) uniform highp writeonly image1D arg_0; +layout(r32f) uniform highp writeonly image2D arg_0; void textureStore_2ac6c7() { int arg_1 = 1; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/2eb2a4.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/2eb2a4.wgsl.expected.glsl index 90a79951d8..02e6f6db55 100644 --- a/test/tint/builtins/gen/var/textureStore/2eb2a4.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/2eb2a4.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba16ui) uniform highp writeonly uimage1D arg_0; +layout(rgba16ui) uniform highp writeonly uimage2D arg_0; void textureStore_2eb2a4() { int arg_1 = 1; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba16ui) uniform highp writeonly uimage1D arg_0; +layout(rgba16ui) uniform highp writeonly uimage2D arg_0; void textureStore_2eb2a4() { int arg_1 = 1; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba16ui) uniform highp writeonly uimage1D arg_0; +layout(rgba16ui) uniform highp writeonly uimage2D arg_0; void textureStore_2eb2a4() { int arg_1 = 1; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/2ed2a3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/2ed2a3.wgsl.expected.glsl index ec43125b7b..24a68fe20a 100644 --- a/test/tint/builtins/gen/var/textureStore/2ed2a3.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/2ed2a3.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba8_snorm) uniform highp writeonly image1D arg_0; +layout(rgba8_snorm) uniform highp writeonly image2D arg_0; void textureStore_2ed2a3() { int arg_1 = 1; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8_snorm) uniform highp writeonly image1D arg_0; +layout(rgba8_snorm) uniform highp writeonly image2D arg_0; void textureStore_2ed2a3() { int arg_1 = 1; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8_snorm) uniform highp writeonly image1D arg_0; +layout(rgba8_snorm) uniform highp writeonly image2D arg_0; void textureStore_2ed2a3() { int arg_1 = 1; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/3bec15.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/3bec15.wgsl.expected.glsl index 4e5d74810a..bf3528655c 100644 --- a/test/tint/builtins/gen/var/textureStore/3bec15.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/3bec15.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba8ui) uniform highp writeonly uimage1D arg_0; +layout(rgba8ui) uniform highp writeonly uimage2D arg_0; void textureStore_3bec15() { int arg_1 = 1; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8ui) uniform highp writeonly uimage1D arg_0; +layout(rgba8ui) uniform highp writeonly uimage2D arg_0; void textureStore_3bec15() { int arg_1 = 1; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8ui) uniform highp writeonly uimage1D arg_0; +layout(rgba8ui) uniform highp writeonly uimage2D arg_0; void textureStore_3bec15() { int arg_1 = 1; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/3c1937.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/3c1937.wgsl.expected.glsl index 36538758b2..20078bb931 100644 --- a/test/tint/builtins/gen/var/textureStore/3c1937.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/3c1937.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba8ui) uniform highp writeonly uimage1D arg_0; +layout(rgba8ui) uniform highp writeonly uimage2D arg_0; void textureStore_3c1937() { uint arg_1 = 1u; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8ui) uniform highp writeonly uimage1D arg_0; +layout(rgba8ui) uniform highp writeonly uimage2D arg_0; void textureStore_3c1937() { uint arg_1 = 1u; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8ui) uniform highp writeonly uimage1D arg_0; +layout(rgba8ui) uniform highp writeonly uimage2D arg_0; void textureStore_3c1937() { uint arg_1 = 1u; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/3d6f01.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/3d6f01.wgsl.expected.glsl index 347618a36f..a74081bb3f 100644 --- a/test/tint/builtins/gen/var/textureStore/3d6f01.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/3d6f01.wgsl.expected.glsl @@ -2,11 +2,11 @@ SKIP: FAILED #version 310 es -layout(rg32i) uniform highp writeonly iimage1D arg_0; +layout(rg32i) uniform highp writeonly iimage2D arg_0; void textureStore_3d6f01() { uint arg_1 = 1u; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -32,11 +32,11 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -layout(rg32i) uniform highp writeonly iimage1D arg_0; +layout(rg32i) uniform highp writeonly iimage2D arg_0; void textureStore_3d6f01() { uint arg_1 = 1u; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -56,11 +56,11 @@ ERROR: 2 compilation errors. No code generated. #version 310 es -layout(rg32i) uniform highp writeonly iimage1D arg_0; +layout(rg32i) uniform highp writeonly iimage2D arg_0; void textureStore_3d6f01() { uint arg_1 = 1u; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { diff --git a/test/tint/builtins/gen/var/textureStore/5a2f8f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/5a2f8f.wgsl.expected.glsl index 123a580529..72b32ed905 100644 --- a/test/tint/builtins/gen/var/textureStore/5a2f8f.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/5a2f8f.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba16i) uniform highp writeonly iimage1D arg_0; +layout(rgba16i) uniform highp writeonly iimage2D arg_0; void textureStore_5a2f8f() { int arg_1 = 1; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba16i) uniform highp writeonly iimage1D arg_0; +layout(rgba16i) uniform highp writeonly iimage2D arg_0; void textureStore_5a2f8f() { int arg_1 = 1; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba16i) uniform highp writeonly iimage1D arg_0; +layout(rgba16i) uniform highp writeonly iimage2D arg_0; void textureStore_5a2f8f() { int arg_1 = 1; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/602b5a.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/602b5a.wgsl.expected.glsl index a40a3fadd6..b5afeea388 100644 --- a/test/tint/builtins/gen/var/textureStore/602b5a.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/602b5a.wgsl.expected.glsl @@ -2,11 +2,11 @@ SKIP: FAILED #version 310 es -layout(rg32f) uniform highp writeonly image1D arg_0; +layout(rg32f) uniform highp writeonly image2D arg_0; void textureStore_602b5a() { uint arg_1 = 1u; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -32,11 +32,11 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -layout(rg32f) uniform highp writeonly image1D arg_0; +layout(rg32f) uniform highp writeonly image2D arg_0; void textureStore_602b5a() { uint arg_1 = 1u; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -56,11 +56,11 @@ ERROR: 2 compilation errors. No code generated. #version 310 es -layout(rg32f) uniform highp writeonly image1D arg_0; +layout(rg32f) uniform highp writeonly image2D arg_0; void textureStore_602b5a() { uint arg_1 = 1u; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { diff --git a/test/tint/builtins/gen/var/textureStore/6b75c3.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/6b75c3.wgsl.expected.glsl index b1c6052ba2..351aa34a13 100644 --- a/test/tint/builtins/gen/var/textureStore/6b75c3.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/6b75c3.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba32f) uniform highp writeonly image1D arg_0; +layout(rgba32f) uniform highp writeonly image2D arg_0; void textureStore_6b75c3() { int arg_1 = 1; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba32f) uniform highp writeonly image1D arg_0; +layout(rgba32f) uniform highp writeonly image2D arg_0; void textureStore_6b75c3() { int arg_1 = 1; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba32f) uniform highp writeonly image1D arg_0; +layout(rgba32f) uniform highp writeonly image2D arg_0; void textureStore_6b75c3() { int arg_1 = 1; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/6b80d2.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/6b80d2.wgsl.expected.glsl index 1ef7771cc4..3548299710 100644 --- a/test/tint/builtins/gen/var/textureStore/6b80d2.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/6b80d2.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(r32i) uniform highp writeonly iimage1D arg_0; +layout(r32i) uniform highp writeonly iimage2D arg_0; void textureStore_6b80d2() { int arg_1 = 1; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(r32i) uniform highp writeonly iimage1D arg_0; +layout(r32i) uniform highp writeonly iimage2D arg_0; void textureStore_6b80d2() { int arg_1 = 1; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(r32i) uniform highp writeonly iimage1D arg_0; +layout(r32i) uniform highp writeonly iimage2D arg_0; void textureStore_6b80d2() { int arg_1 = 1; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/7f7fae.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/7f7fae.wgsl.expected.glsl index 6e6aa779a6..75ff306de1 100644 --- a/test/tint/builtins/gen/var/textureStore/7f7fae.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/7f7fae.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba8) uniform highp writeonly image1D arg_0; +layout(rgba8) uniform highp writeonly image2D arg_0; void textureStore_7f7fae() { int arg_1 = 1; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8) uniform highp writeonly image1D arg_0; +layout(rgba8) uniform highp writeonly image2D arg_0; void textureStore_7f7fae() { int arg_1 = 1; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8) uniform highp writeonly image1D arg_0; +layout(rgba8) uniform highp writeonly image2D arg_0; void textureStore_7f7fae() { int arg_1 = 1; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/83bcc1.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/83bcc1.wgsl.expected.glsl index fef2f65ab4..dd1fb9e0dc 100644 --- a/test/tint/builtins/gen/var/textureStore/83bcc1.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/83bcc1.wgsl.expected.glsl @@ -2,11 +2,11 @@ SKIP: FAILED #version 310 es -layout(rg32ui) uniform highp writeonly uimage1D arg_0; +layout(rg32ui) uniform highp writeonly uimage2D arg_0; void textureStore_83bcc1() { int arg_1 = 1; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -32,11 +32,11 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -layout(rg32ui) uniform highp writeonly uimage1D arg_0; +layout(rg32ui) uniform highp writeonly uimage2D arg_0; void textureStore_83bcc1() { int arg_1 = 1; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -56,11 +56,11 @@ ERROR: 2 compilation errors. No code generated. #version 310 es -layout(rg32ui) uniform highp writeonly uimage1D arg_0; +layout(rg32ui) uniform highp writeonly uimage2D arg_0; void textureStore_83bcc1() { int arg_1 = 1; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void compute_main() { diff --git a/test/tint/builtins/gen/var/textureStore/872747.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/872747.wgsl.expected.glsl index 03366aeec3..3b48a87a63 100644 --- a/test/tint/builtins/gen/var/textureStore/872747.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/872747.wgsl.expected.glsl @@ -2,11 +2,11 @@ SKIP: FAILED #version 310 es -layout(rg32f) uniform highp writeonly image1D arg_0; +layout(rg32f) uniform highp writeonly image2D arg_0; void textureStore_872747() { int arg_1 = 1; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -32,11 +32,11 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -layout(rg32f) uniform highp writeonly image1D arg_0; +layout(rg32f) uniform highp writeonly image2D arg_0; void textureStore_872747() { int arg_1 = 1; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -56,11 +56,11 @@ ERROR: 2 compilation errors. No code generated. #version 310 es -layout(rg32f) uniform highp writeonly image1D arg_0; +layout(rg32f) uniform highp writeonly image2D arg_0; void textureStore_872747() { int arg_1 = 1; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void compute_main() { diff --git a/test/tint/builtins/gen/var/textureStore/8c76e9.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/8c76e9.wgsl.expected.glsl index 207ca5e803..53b54c0b53 100644 --- a/test/tint/builtins/gen/var/textureStore/8c76e9.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/8c76e9.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba16i) uniform highp writeonly iimage1D arg_0; +layout(rgba16i) uniform highp writeonly iimage2D arg_0; void textureStore_8c76e9() { uint arg_1 = 1u; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba16i) uniform highp writeonly iimage1D arg_0; +layout(rgba16i) uniform highp writeonly iimage2D arg_0; void textureStore_8c76e9() { uint arg_1 = 1u; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba16i) uniform highp writeonly iimage1D arg_0; +layout(rgba16i) uniform highp writeonly iimage2D arg_0; void textureStore_8c76e9() { uint arg_1 = 1u; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/958353.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/958353.wgsl.expected.glsl index 7cf63cef2f..67a39708c7 100644 --- a/test/tint/builtins/gen/var/textureStore/958353.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/958353.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba8i) uniform highp writeonly iimage1D arg_0; +layout(rgba8i) uniform highp writeonly iimage2D arg_0; void textureStore_958353() { uint arg_1 = 1u; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8i) uniform highp writeonly iimage1D arg_0; +layout(rgba8i) uniform highp writeonly iimage2D arg_0; void textureStore_958353() { uint arg_1 = 1u; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8i) uniform highp writeonly iimage1D arg_0; +layout(rgba8i) uniform highp writeonly iimage2D arg_0; void textureStore_958353() { uint arg_1 = 1u; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/959d94.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/959d94.wgsl.expected.glsl index 6493f457f7..34ad3bfede 100644 --- a/test/tint/builtins/gen/var/textureStore/959d94.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/959d94.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba8_snorm) uniform highp writeonly image1D arg_0; +layout(rgba8_snorm) uniform highp writeonly image2D arg_0; void textureStore_959d94() { uint arg_1 = 1u; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8_snorm) uniform highp writeonly image1D arg_0; +layout(rgba8_snorm) uniform highp writeonly image2D arg_0; void textureStore_959d94() { uint arg_1 = 1u; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8_snorm) uniform highp writeonly image1D arg_0; +layout(rgba8_snorm) uniform highp writeonly image2D arg_0; void textureStore_959d94() { uint arg_1 = 1u; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/969534.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/969534.wgsl.expected.glsl index f6a0206a73..4b9f3bc34c 100644 --- a/test/tint/builtins/gen/var/textureStore/969534.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/969534.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba32i) uniform highp writeonly iimage1D arg_0; +layout(rgba32i) uniform highp writeonly iimage2D arg_0; void textureStore_969534() { int arg_1 = 1; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba32i) uniform highp writeonly iimage1D arg_0; +layout(rgba32i) uniform highp writeonly iimage2D arg_0; void textureStore_969534() { int arg_1 = 1; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba32i) uniform highp writeonly iimage1D arg_0; +layout(rgba32i) uniform highp writeonly iimage2D arg_0; void textureStore_969534() { int arg_1 = 1; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/a4c338.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/a4c338.wgsl.expected.glsl index 0b9d310b33..2a0bbbfc3c 100644 --- a/test/tint/builtins/gen/var/textureStore/a4c338.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/a4c338.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba16f) uniform highp writeonly image1D arg_0; +layout(rgba16f) uniform highp writeonly image2D arg_0; void textureStore_a4c338() { uint arg_1 = 1u; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba16f) uniform highp writeonly image1D arg_0; +layout(rgba16f) uniform highp writeonly image2D arg_0; void textureStore_a4c338() { uint arg_1 = 1u; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba16f) uniform highp writeonly image1D arg_0; +layout(rgba16f) uniform highp writeonly image2D arg_0; void textureStore_a4c338() { uint arg_1 = 1u; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/a6e78f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/a6e78f.wgsl.expected.glsl index 583ceaeb77..372b2de611 100644 --- a/test/tint/builtins/gen/var/textureStore/a6e78f.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/a6e78f.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(r32ui) uniform highp writeonly uimage1D arg_0; +layout(r32ui) uniform highp writeonly uimage2D arg_0; void textureStore_a6e78f() { uint arg_1 = 1u; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(r32ui) uniform highp writeonly uimage1D arg_0; +layout(r32ui) uniform highp writeonly uimage2D arg_0; void textureStore_a6e78f() { uint arg_1 = 1u; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(r32ui) uniform highp writeonly uimage1D arg_0; +layout(r32ui) uniform highp writeonly uimage2D arg_0; void textureStore_a6e78f() { uint arg_1 = 1u; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/b70ded.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/b70ded.wgsl.expected.glsl index b4d7af6dcc..751e1d4311 100644 --- a/test/tint/builtins/gen/var/textureStore/b70ded.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/b70ded.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba16ui) uniform highp writeonly uimage1D arg_0; +layout(rgba16ui) uniform highp writeonly uimage2D arg_0; void textureStore_b70ded() { uint arg_1 = 1u; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba16ui) uniform highp writeonly uimage1D arg_0; +layout(rgba16ui) uniform highp writeonly uimage2D arg_0; void textureStore_b70ded() { uint arg_1 = 1u; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba16ui) uniform highp writeonly uimage1D arg_0; +layout(rgba16ui) uniform highp writeonly uimage2D arg_0; void textureStore_b70ded() { uint arg_1 = 1u; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/b77161.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/b77161.wgsl.expected.glsl index 794411662a..1d0eb51d44 100644 --- a/test/tint/builtins/gen/var/textureStore/b77161.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/b77161.wgsl.expected.glsl @@ -2,11 +2,11 @@ SKIP: FAILED #version 310 es -layout(rg32ui) uniform highp writeonly uimage1D arg_0; +layout(rg32ui) uniform highp writeonly uimage2D arg_0; void textureStore_b77161() { uint arg_1 = 1u; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -32,11 +32,11 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -layout(rg32ui) uniform highp writeonly uimage1D arg_0; +layout(rg32ui) uniform highp writeonly uimage2D arg_0; void textureStore_b77161() { uint arg_1 = 1u; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -56,11 +56,11 @@ ERROR: 2 compilation errors. No code generated. #version 310 es -layout(rg32ui) uniform highp writeonly uimage1D arg_0; +layout(rg32ui) uniform highp writeonly uimage2D arg_0; void textureStore_b77161() { uint arg_1 = 1u; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { diff --git a/test/tint/builtins/gen/var/textureStore/bf775c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/bf775c.wgsl.expected.glsl index 7dabf5be2d..eb4d0528cf 100644 --- a/test/tint/builtins/gen/var/textureStore/bf775c.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/bf775c.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba8i) uniform highp writeonly iimage1D arg_0; +layout(rgba8i) uniform highp writeonly iimage2D arg_0; void textureStore_bf775c() { int arg_1 = 1; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8i) uniform highp writeonly iimage1D arg_0; +layout(rgba8i) uniform highp writeonly iimage2D arg_0; void textureStore_bf775c() { int arg_1 = 1; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8i) uniform highp writeonly iimage1D arg_0; +layout(rgba8i) uniform highp writeonly iimage2D arg_0; void textureStore_bf775c() { int arg_1 = 1; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/c1f29e.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/c1f29e.wgsl.expected.glsl index add07eb5f0..55d7623e9c 100644 --- a/test/tint/builtins/gen/var/textureStore/c1f29e.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/c1f29e.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(r32f) uniform highp writeonly image1D arg_0; +layout(r32f) uniform highp writeonly image2D arg_0; void textureStore_c1f29e() { uint arg_1 = 1u; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(r32f) uniform highp writeonly image1D arg_0; +layout(r32f) uniform highp writeonly image2D arg_0; void textureStore_c1f29e() { uint arg_1 = 1u; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(r32f) uniform highp writeonly image1D arg_0; +layout(r32f) uniform highp writeonly image2D arg_0; void textureStore_c1f29e() { uint arg_1 = 1u; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/d26166.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/d26166.wgsl.expected.glsl index ebd121a308..b5c26dd41f 100644 --- a/test/tint/builtins/gen/var/textureStore/d26166.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/d26166.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba32ui) uniform highp writeonly uimage1D arg_0; +layout(rgba32ui) uniform highp writeonly uimage2D arg_0; void textureStore_d26166() { uint arg_1 = 1u; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba32ui) uniform highp writeonly uimage1D arg_0; +layout(rgba32ui) uniform highp writeonly uimage2D arg_0; void textureStore_d26166() { uint arg_1 = 1u; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba32ui) uniform highp writeonly uimage1D arg_0; +layout(rgba32ui) uniform highp writeonly uimage2D arg_0; void textureStore_d26166() { uint arg_1 = 1u; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/d73b5c.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/d73b5c.wgsl.expected.glsl index 91293953ab..d3d214346f 100644 --- a/test/tint/builtins/gen/var/textureStore/d73b5c.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/d73b5c.wgsl.expected.glsl @@ -2,11 +2,11 @@ SKIP: FAILED #version 310 es -layout(rg32i) uniform highp writeonly iimage1D arg_0; +layout(rg32i) uniform highp writeonly iimage2D arg_0; void textureStore_d73b5c() { int arg_1 = 1; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -32,11 +32,11 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; -layout(rg32i) uniform highp writeonly iimage1D arg_0; +layout(rg32i) uniform highp writeonly iimage2D arg_0; void textureStore_d73b5c() { int arg_1 = 1; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -56,11 +56,11 @@ ERROR: 2 compilation errors. No code generated. #version 310 es -layout(rg32i) uniform highp writeonly iimage1D arg_0; +layout(rg32i) uniform highp writeonly iimage2D arg_0; void textureStore_d73b5c() { int arg_1 = 1; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void compute_main() { diff --git a/test/tint/builtins/gen/var/textureStore/de4b94.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/de4b94.wgsl.expected.glsl index 38118643ad..9d4b945231 100644 --- a/test/tint/builtins/gen/var/textureStore/de4b94.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/de4b94.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(r32i) uniform highp writeonly iimage1D arg_0; +layout(r32i) uniform highp writeonly iimage2D arg_0; void textureStore_de4b94() { uint arg_1 = 1u; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(r32i) uniform highp writeonly iimage1D arg_0; +layout(r32i) uniform highp writeonly iimage2D arg_0; void textureStore_de4b94() { uint arg_1 = 1u; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'iimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(r32i) uniform highp writeonly iimage1D arg_0; +layout(r32i) uniform highp writeonly iimage2D arg_0; void textureStore_de4b94() { uint arg_1 = 1u; ivec4 arg_2 = ivec4(1); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'iimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/e7c6d8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/e7c6d8.wgsl.expected.glsl index 06eff87c57..d180ebbcea 100644 --- a/test/tint/builtins/gen/var/textureStore/e7c6d8.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/e7c6d8.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba8) uniform highp writeonly image1D arg_0; +layout(rgba8) uniform highp writeonly image2D arg_0; void textureStore_e7c6d8() { uint arg_1 = 1u; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba8) uniform highp writeonly image1D arg_0; +layout(rgba8) uniform highp writeonly image2D arg_0; void textureStore_e7c6d8() { uint arg_1 = 1u; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba8) uniform highp writeonly image1D arg_0; +layout(rgba8) uniform highp writeonly image2D arg_0; void textureStore_e7c6d8() { uint arg_1 = 1u; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, int(arg_1), arg_2); + imageStore(arg_0, ivec2(uvec2(arg_1, 0u)), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/e885e8.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/e885e8.wgsl.expected.glsl index 658099b3c2..ae20bbeb4c 100644 --- a/test/tint/builtins/gen/var/textureStore/e885e8.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/e885e8.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba16f) uniform highp writeonly image1D arg_0; +layout(rgba16f) uniform highp writeonly image2D arg_0; void textureStore_e885e8() { int arg_1 = 1; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba16f) uniform highp writeonly image1D arg_0; +layout(rgba16f) uniform highp writeonly image2D arg_0; void textureStore_e885e8() { int arg_1 = 1; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba16f) uniform highp writeonly image1D arg_0; +layout(rgba16f) uniform highp writeonly image2D arg_0; void textureStore_e885e8() { int arg_1 = 1; vec4 arg_2 = vec4(1.0f); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/builtins/gen/var/textureStore/fb9a8f.wgsl.expected.glsl b/test/tint/builtins/gen/var/textureStore/fb9a8f.wgsl.expected.glsl index 33b004fcf1..c7efe2c109 100644 --- a/test/tint/builtins/gen/var/textureStore/fb9a8f.wgsl.expected.glsl +++ b/test/tint/builtins/gen/var/textureStore/fb9a8f.wgsl.expected.glsl @@ -1,12 +1,10 @@ -SKIP: FAILED - #version 310 es -layout(rgba32ui) uniform highp writeonly uimage1D arg_0; +layout(rgba32ui) uniform highp writeonly uimage2D arg_0; void textureStore_fb9a8f() { int arg_1 = 1; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } vec4 vertex_main() { @@ -22,22 +20,14 @@ void main() { gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es precision mediump float; -layout(rgba32ui) uniform highp writeonly uimage1D arg_0; +layout(rgba32ui) uniform highp writeonly uimage2D arg_0; void textureStore_fb9a8f() { int arg_1 = 1; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void fragment_main() { @@ -48,21 +38,13 @@ void main() { fragment_main(); return; } -Error parsing GLSL shader: -ERROR: 0:4: 'uimage1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - #version 310 es -layout(rgba32ui) uniform highp writeonly uimage1D arg_0; +layout(rgba32ui) uniform highp writeonly uimage2D arg_0; void textureStore_fb9a8f() { int arg_1 = 1; uvec4 arg_2 = uvec4(1u); - imageStore(arg_0, arg_1, arg_2); + imageStore(arg_0, ivec2(arg_1, 0), arg_2); } void compute_main() { @@ -74,11 +56,3 @@ void main() { compute_main(); return; } -Error parsing GLSL shader: -ERROR: 0:3: 'uimage1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/types/texture/storage/1d.wgsl.expected.glsl b/test/tint/types/texture/storage/1d.wgsl.expected.glsl index b79d46e925..dbca2af5e3 100644 --- a/test/tint/types/texture/storage/1d.wgsl.expected.glsl +++ b/test/tint/types/texture/storage/1d.wgsl.expected.glsl @@ -2,22 +2,22 @@ SKIP: FAILED #version 310 es -layout(rgba8) uniform highp writeonly image1D t_rgba8unorm; -layout(rgba8_snorm) uniform highp writeonly image1D t_rgba8snorm; -layout(rgba8ui) uniform highp writeonly uimage1D t_rgba8uint; -layout(rgba8i) uniform highp writeonly iimage1D t_rgba8sint; -layout(rgba16ui) uniform highp writeonly uimage1D t_rgba16uint; -layout(rgba16i) uniform highp writeonly iimage1D t_rgba16sint; -layout(rgba16f) uniform highp writeonly image1D t_rgba16float; -layout(r32ui) uniform highp writeonly uimage1D t_r32uint; -layout(r32i) uniform highp writeonly iimage1D t_r32sint; -layout(r32f) uniform highp writeonly image1D t_r32float; -layout(rg32ui) uniform highp writeonly uimage1D t_rg32uint; -layout(rg32i) uniform highp writeonly iimage1D t_rg32sint; -layout(rg32f) uniform highp writeonly image1D t_rg32float; -layout(rgba32ui) uniform highp writeonly uimage1D t_rgba32uint; -layout(rgba32i) uniform highp writeonly iimage1D t_rgba32sint; -layout(rgba32f) uniform highp writeonly image1D t_rgba32float; +layout(rgba8) uniform highp writeonly image2D t_rgba8unorm; +layout(rgba8_snorm) uniform highp writeonly image2D t_rgba8snorm; +layout(rgba8ui) uniform highp writeonly uimage2D t_rgba8uint; +layout(rgba8i) uniform highp writeonly iimage2D t_rgba8sint; +layout(rgba16ui) uniform highp writeonly uimage2D t_rgba16uint; +layout(rgba16i) uniform highp writeonly iimage2D t_rgba16sint; +layout(rgba16f) uniform highp writeonly image2D t_rgba16float; +layout(r32ui) uniform highp writeonly uimage2D t_r32uint; +layout(r32i) uniform highp writeonly iimage2D t_r32sint; +layout(r32f) uniform highp writeonly image2D t_r32float; +layout(rg32ui) uniform highp writeonly uimage2D t_rg32uint; +layout(rg32i) uniform highp writeonly iimage2D t_rg32sint; +layout(rg32f) uniform highp writeonly image2D t_rg32float; +layout(rgba32ui) uniform highp writeonly uimage2D t_rgba32uint; +layout(rgba32i) uniform highp writeonly iimage2D t_rgba32sint; +layout(rgba32f) uniform highp writeonly image2D t_rgba32float; void tint_symbol() { } @@ -27,9 +27,8 @@ void main() { return; } Error parsing GLSL shader: -ERROR: 0:3: 'image1D' : Reserved word. -WARNING: 0:3: 'layout' : useless application of layout qualifier -ERROR: 0:3: '' : compilation terminated +ERROR: 0:13: 'image load-store format' : not supported with this profile: es +ERROR: 0:13: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/tint/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl deleted file mode 100644 index ec8695da06..0000000000 --- a/test/tint/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl +++ /dev/null @@ -1,40 +0,0 @@ -SKIP: FAILED - -#version 310 es -precision mediump float; - -uniform highp sampler1D x_20_1; -void main_1() { - float float_var = 0.0f; - int i1 = 1; - ivec2 vi12 = ivec2(1, 2); - ivec3 vi123 = ivec3(1, 2, 3); - ivec4 vi1234 = ivec4(1, 2, 3, 4); - uint u1 = 1u; - uvec2 vu12 = uvec2(1u, 2u); - uvec3 vu123 = uvec3(1u, 2u, 3u); - uvec4 vu1234 = uvec4(1u, 2u, 3u, 4u); - float f1 = 1.0f; - vec2 vf12 = vec2(1.0f, 2.0f); - vec3 vf123 = vec3(1.0f, 2.0f, 3.0f); - vec4 vf1234 = vec4(1.0f, 2.0f, 3.0f, 4.0f); - vec4 x_73 = texelFetch(x_20_1, int(u1), 0); - uint x_1000 = 0u; - return; -} - -void tint_symbol() { - main_1(); -} - -void main() { - tint_symbol(); - return; -} -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl deleted file mode 100644 index 32d48826d7..0000000000 --- a/test/tint/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl +++ /dev/null @@ -1,40 +0,0 @@ -SKIP: FAILED - -#version 310 es -precision mediump float; - -uniform highp sampler1D x_20_1; -void main_1() { - float float_var = 0.0f; - int i1 = 1; - ivec2 vi12 = ivec2(1, 2); - ivec3 vi123 = ivec3(1, 2, 3); - ivec4 vi1234 = ivec4(1, 2, 3, 4); - uint u1 = 1u; - uvec2 vu12 = uvec2(1u, 2u); - uvec3 vu123 = uvec3(1u, 2u, 3u); - uvec4 vu1234 = uvec4(1u, 2u, 3u, 4u); - float f1 = 1.0f; - vec2 vf12 = vec2(1.0f, 2.0f); - vec3 vf123 = vec3(1.0f, 2.0f, 3.0f); - vec4 vf1234 = vec4(1.0f, 2.0f, 3.0f, 4.0f); - vec4 x_71 = texelFetch(x_20_1, int(u1), 0); - uint x_1000 = 0u; - return; -} - -void tint_symbol() { - main_1(); -} - -void main() { - tint_symbol(); - return; -} -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl deleted file mode 100644 index 886bf499b4..0000000000 --- a/test/tint/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl +++ /dev/null @@ -1,41 +0,0 @@ -SKIP: FAILED - -#version 310 es -precision mediump float; - -layout(r32f) uniform highp writeonly image1D x_20; -void main_1() { - float float_var = 0.0f; - int i1 = 1; - ivec2 vi12 = ivec2(1, 2); - ivec3 vi123 = ivec3(1, 2, 3); - ivec4 vi1234 = ivec4(1, 2, 3, 4); - uint u1 = 1u; - uvec2 vu12 = uvec2(1u, 2u); - uvec3 vu123 = uvec3(1u, 2u, 3u); - uvec4 vu1234 = uvec4(1u, 2u, 3u, 4u); - float f1 = 1.0f; - vec2 vf12 = vec2(1.0f, 2.0f); - vec3 vf123 = vec3(1.0f, 2.0f, 3.0f); - vec4 vf1234 = vec4(1.0f, 2.0f, 3.0f, 4.0f); - imageStore(x_20, int(u1), vf1234); - uint x_1000 = 0u; - return; -} - -void tint_symbol() { - main_1(); -} - -void main() { - tint_symbol(); - return; -} -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl deleted file mode 100644 index 7f918795db..0000000000 --- a/test/tint/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl +++ /dev/null @@ -1,41 +0,0 @@ -SKIP: FAILED - -#version 310 es -precision mediump float; - -uniform highp sampler1D x_20_x_10; - -void main_1() { - float float_var = 0.0f; - int i1 = 1; - ivec2 vi12 = ivec2(1, 2); - ivec3 vi123 = ivec3(1, 2, 3); - ivec4 vi1234 = ivec4(1, 2, 3, 4); - uint u1 = 1u; - uvec2 vu12 = uvec2(1u, 2u); - uvec3 vu123 = uvec3(1u, 2u, 3u); - uvec4 vu1234 = uvec4(1u, 2u, 3u, 4u); - float f1 = 1.0f; - vec2 vf12 = vec2(1.0f, 2.0f); - vec3 vf123 = vec3(1.0f, 2.0f, 3.0f); - vec4 vf1234 = vec4(1.0f, 2.0f, 3.0f, 4.0f); - vec4 x_73 = texture(x_20_x_10, f1); - uint x_1000 = 0u; - return; -} - -void tint_symbol() { - main_1(); -} - -void main() { - tint_symbol(); - return; -} -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl deleted file mode 100644 index 320675383f..0000000000 --- a/test/tint/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl +++ /dev/null @@ -1,41 +0,0 @@ -SKIP: FAILED - -#version 310 es -precision mediump float; - -uniform highp sampler1D x_20_x_10; - -void main_1() { - float float_var = 0.0f; - int i1 = 1; - ivec2 vi12 = ivec2(1, 2); - ivec3 vi123 = ivec3(1, 2, 3); - ivec4 vi1234 = ivec4(1, 2, 3, 4); - uint u1 = 1u; - uvec2 vu12 = uvec2(1u, 2u); - uvec3 vu123 = uvec3(1u, 2u, 3u); - uvec4 vu1234 = uvec4(1u, 2u, 3u, 4u); - float f1 = 1.0f; - vec2 vf12 = vec2(1.0f, 2.0f); - vec3 vf123 = vec3(1.0f, 2.0f, 3.0f); - vec4 vf1234 = vec4(1.0f, 2.0f, 3.0f, 4.0f); - vec4 x_73 = texture(x_20_x_10, vf12.x); - uint x_1000 = 0u; - return; -} - -void tint_symbol() { - main_1(); -} - -void main() { - tint_symbol(); - return; -} -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl deleted file mode 100644 index d606dc56d2..0000000000 --- a/test/tint/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl +++ /dev/null @@ -1,41 +0,0 @@ -SKIP: FAILED - -#version 310 es -precision mediump float; - -uniform highp sampler1D x_20_x_10; - -void main_1() { - float float_var = 0.0f; - int i1 = 1; - ivec2 vi12 = ivec2(1, 2); - ivec3 vi123 = ivec3(1, 2, 3); - ivec4 vi1234 = ivec4(1, 2, 3, 4); - uint u1 = 1u; - uvec2 vu12 = uvec2(1u, 2u); - uvec3 vu123 = uvec3(1u, 2u, 3u); - uvec4 vu1234 = uvec4(1u, 2u, 3u, 4u); - float f1 = 1.0f; - vec2 vf12 = vec2(1.0f, 2.0f); - vec3 vf123 = vec3(1.0f, 2.0f, 3.0f); - vec4 vf1234 = vec4(1.0f, 2.0f, 3.0f, 4.0f); - vec4 x_73 = texture(x_20_x_10, vf123.x); - uint x_1000 = 0u; - return; -} - -void tint_symbol() { - main_1(); -} - -void main() { - tint_symbol(); - return; -} -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_3.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_3.spvasm.expected.glsl deleted file mode 100644 index c91d5032be..0000000000 --- a/test/tint/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_3.spvasm.expected.glsl +++ /dev/null @@ -1,41 +0,0 @@ -SKIP: FAILED - -#version 310 es -precision mediump float; - -uniform highp sampler1D x_20_x_10; - -void main_1() { - float float_var = 0.0f; - int i1 = 1; - ivec2 vi12 = ivec2(1, 2); - ivec3 vi123 = ivec3(1, 2, 3); - ivec4 vi1234 = ivec4(1, 2, 3, 4); - uint u1 = 1u; - uvec2 vu12 = uvec2(1u, 2u); - uvec3 vu123 = uvec3(1u, 2u, 3u); - uvec4 vu1234 = uvec4(1u, 2u, 3u, 4u); - float f1 = 1.0f; - vec2 vf12 = vec2(1.0f, 2.0f); - vec3 vf123 = vec3(1.0f, 2.0f, 3.0f); - vec4 vf1234 = vec4(1.0f, 2.0f, 3.0f, 4.0f); - vec4 x_73 = texture(x_20_x_10, vf1234.x); - uint x_1000 = 0u; - return; -} - -void tint_symbol() { - main_1(); -} - -void main() { - tint_symbol(); - return; -} -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/ImageSampleProjImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/ImageSampleProjImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl deleted file mode 100644 index 73b24ad4f2..0000000000 --- a/test/tint/unittest/reader/spirv/ImageSampleProjImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl +++ /dev/null @@ -1,44 +0,0 @@ -SKIP: FAILED - -#version 310 es -precision mediump float; - -uniform highp sampler1D x_20_x_10; - -void main_1() { - float f1 = 1.0f; - vec2 vf12 = vec2(1.0f, 2.0f); - vec2 vf21 = vec2(2.0f, 1.0f); - vec3 vf123 = vec3(1.0f, 2.0f, 3.0f); - vec4 vf1234 = vec4(1.0f, 2.0f, 3.0f, 4.0f); - int i1 = 1; - ivec2 vi12 = ivec2(1, 2); - ivec3 vi123 = ivec3(1, 2, 3); - ivec4 vi1234 = ivec4(1, 2, 3, 4); - uint u1 = 1u; - uvec2 vu12 = uvec2(1u, 2u); - uvec3 vu123 = uvec3(1u, 2u, 3u); - uvec4 vu1234 = uvec4(1u, 2u, 3u, 4u); - float coords1 = 1.0f; - vec2 coords12 = vf12; - vec3 coords123 = vf123; - vec4 coords1234 = vf1234; - vec4 x_79 = texture(x_20_x_10, (coords12.x / coords12.y)); - return; -} - -void tint_symbol() { - main_1(); -} - -void main() { - tint_symbol(); - return; -} -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/PreserveFloatCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/PreserveFloatCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl deleted file mode 100644 index 7f918795db..0000000000 --- a/test/tint/unittest/reader/spirv/PreserveFloatCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl +++ /dev/null @@ -1,41 +0,0 @@ -SKIP: FAILED - -#version 310 es -precision mediump float; - -uniform highp sampler1D x_20_x_10; - -void main_1() { - float float_var = 0.0f; - int i1 = 1; - ivec2 vi12 = ivec2(1, 2); - ivec3 vi123 = ivec3(1, 2, 3); - ivec4 vi1234 = ivec4(1, 2, 3, 4); - uint u1 = 1u; - uvec2 vu12 = uvec2(1u, 2u); - uvec3 vu123 = uvec3(1u, 2u, 3u); - uvec4 vu1234 = uvec4(1u, 2u, 3u, 4u); - float f1 = 1.0f; - vec2 vf12 = vec2(1.0f, 2.0f); - vec3 vf123 = vec3(1.0f, 2.0f, 3.0f); - vec4 vf1234 = vec4(1.0f, 2.0f, 3.0f, 4.0f); - vec4 x_73 = texture(x_20_x_10, f1); - uint x_1000 = 0u; - return; -} - -void tint_symbol() { - main_1(); -} - -void main() { - tint_symbol(); - return; -} -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl deleted file mode 100644 index 7f6f121288..0000000000 --- a/test/tint/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl +++ /dev/null @@ -1,40 +0,0 @@ -SKIP: FAILED - -#version 310 es -precision mediump float; - -uniform highp sampler1D x_20_1; -void main_1() { - float float_var = 0.0f; - int i1 = 1; - ivec2 vi12 = ivec2(1, 2); - ivec3 vi123 = ivec3(1, 2, 3); - ivec4 vi1234 = ivec4(1, 2, 3, 4); - uint u1 = 1u; - uvec2 vu12 = uvec2(1u, 2u); - uvec3 vu123 = uvec3(1u, 2u, 3u); - uvec4 vu1234 = uvec4(1u, 2u, 3u, 4u); - float f1 = 1.0f; - vec2 vf12 = vec2(1.0f, 2.0f); - vec3 vf123 = vec3(1.0f, 2.0f, 3.0f); - vec4 vf1234 = vec4(1.0f, 2.0f, 3.0f, 4.0f); - vec4 x_73 = texelFetch(x_20_1, i1, 0); - uint x_1000 = 0u; - return; -} - -void tint_symbol() { - main_1(); -} - -void main() { - tint_symbol(); - return; -} -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl deleted file mode 100644 index 7d58180495..0000000000 --- a/test/tint/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl +++ /dev/null @@ -1,40 +0,0 @@ -SKIP: FAILED - -#version 310 es -precision mediump float; - -uniform highp sampler1D x_20_1; -void main_1() { - float float_var = 0.0f; - int i1 = 1; - ivec2 vi12 = ivec2(1, 2); - ivec3 vi123 = ivec3(1, 2, 3); - ivec4 vi1234 = ivec4(1, 2, 3, 4); - uint u1 = 1u; - uvec2 vu12 = uvec2(1u, 2u); - uvec3 vu123 = uvec3(1u, 2u, 3u); - uvec4 vu1234 = uvec4(1u, 2u, 3u, 4u); - float f1 = 1.0f; - vec2 vf12 = vec2(1.0f, 2.0f); - vec3 vf123 = vec3(1.0f, 2.0f, 3.0f); - vec4 vf1234 = vec4(1.0f, 2.0f, 3.0f, 4.0f); - vec4 x_71 = texelFetch(x_20_1, i1, 0); - uint x_1000 = 0u; - return; -} - -void tint_symbol() { - main_1(); -} - -void main() { - tint_symbol(); - return; -} -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl deleted file mode 100644 index 64e0b809aa..0000000000 --- a/test/tint/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl +++ /dev/null @@ -1,41 +0,0 @@ -SKIP: FAILED - -#version 310 es -precision mediump float; - -layout(r32f) uniform highp writeonly image1D x_20; -void main_1() { - float float_var = 0.0f; - int i1 = 1; - ivec2 vi12 = ivec2(1, 2); - ivec3 vi123 = ivec3(1, 2, 3); - ivec4 vi1234 = ivec4(1, 2, 3, 4); - uint u1 = 1u; - uvec2 vu12 = uvec2(1u, 2u); - uvec3 vu123 = uvec3(1u, 2u, 3u); - uvec4 vu1234 = uvec4(1u, 2u, 3u, 4u); - float f1 = 1.0f; - vec2 vf12 = vec2(1.0f, 2.0f); - vec3 vf123 = vec3(1.0f, 2.0f, 3.0f); - vec4 vf1234 = vec4(1.0f, 2.0f, 3.0f, 4.0f); - imageStore(x_20, i1, vf1234); - uint x_1000 = 0u; - return; -} - -void tint_symbol() { - main_1(); -} - -void main() { - tint_symbol(); - return; -} -Error parsing GLSL shader: -ERROR: 0:4: 'image1D' : Reserved word. -WARNING: 0:4: 'layout' : useless application of layout qualifier -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_0.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_0.spvasm.expected.glsl deleted file mode 100644 index 9104946d71..0000000000 --- a/test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_0.spvasm.expected.glsl +++ /dev/null @@ -1,26 +0,0 @@ -SKIP: FAILED - -#version 310 es -precision mediump float; - -uniform highp sampler1D x_20_1; -void main_1() { - vec4 x_125 = texelFetch(x_20_1, 1, 0); - return; -} - -void tint_symbol() { - main_1(); -} - -void main() { - tint_symbol(); - return; -} -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_1.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_1.spvasm.expected.glsl index 2d85a108ad..4a46c2018d 100644 --- a/test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_1.spvasm.expected.glsl +++ b/test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_1.spvasm.expected.glsl @@ -3,9 +3,9 @@ SKIP: FAILED #version 310 es precision mediump float; -layout(rg32f) uniform highp writeonly image1D x_20; +layout(rg32f) uniform highp writeonly image2D x_20; void main_1() { - imageStore(x_20, 1, vec4(0.0f)); + imageStore(x_20, ivec2(1, 0), vec4(0.0f)); return; } diff --git a/test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_2.spvasm.expected.glsl b/test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_2.spvasm.expected.glsl deleted file mode 100644 index e147d8cc38..0000000000 --- a/test/tint/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_2.spvasm.expected.glsl +++ /dev/null @@ -1,26 +0,0 @@ -SKIP: FAILED - -#version 310 es -precision mediump float; - -uniform highp sampler1D x_20_1; -void main_1() { - vec4 x_125 = texelFetch(x_20_1, 0, 0); - return; -} - -void tint_symbol() { - main_1(); -} - -void main() { - tint_symbol(); - return; -} -Error parsing GLSL shader: -ERROR: 0:4: 'sampler1D' : Reserved word. -ERROR: 0:4: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - -