diff --git a/src/transform/combine_samplers.cc b/src/transform/combine_samplers.cc index 86ee8ae6b1..66f6a94b83 100644 --- a/src/transform/combine_samplers.cc +++ b/src/transform/combine_samplers.cc @@ -135,7 +135,8 @@ struct CombineSamplers::State { // Remove all texture and sampler global variables. These will be replaced // by combined samplers. for (auto* var : ctx.src->AST().GlobalVariables()) { - if (sem.Get(var->type)->IsAnyOf()) { + auto* type = sem.Get(var->type); + if (type && type->IsAnyOf()) { ctx.Remove(ctx.src->AST().GlobalDeclarations(), var); } else if (auto binding_point = var->BindingPoint()) { if (binding_point.group->value == 0 && diff --git a/test/benchmark/particles.wgsl.expected.glsl b/test/benchmark/particles.wgsl.expected.glsl index 7afb6e1c9b..a8c4386538 100644 --- a/test/benchmark/particles.wgsl.expected.glsl +++ b/test/benchmark/particles.wgsl.expected.glsl @@ -260,12 +260,13 @@ layout (binding = 0) uniform SimulationParams_1 { layout (binding = 1) buffer Particles_1 { Particle particles[]; } data; -uniform highp sampler2D tint_symbol_2; struct tint_symbol_10 { uvec3 GlobalInvocationID; }; +uniform highp sampler2D tint_symbol_2_1; + void simulate_inner(uvec3 GlobalInvocationID) { rand_seed = ((sim_params.seed.xy + vec2(GlobalInvocationID.xy)) * sim_params.seed.zw); uint idx = GlobalInvocationID.x; @@ -277,8 +278,8 @@ void simulate_inner(uvec3 GlobalInvocationID) { if ((particle.lifetime < 0.0f)) { ivec2 coord = ivec2(0, 0); { - for(int level = (textureQueryLevels(tint_symbol_2); - 1); (level > 0); level = (level - 1)) { - vec4 probabilites = texelFetch(tint_symbol_2, coord, level); + for(int level = (textureQueryLevels(tint_symbol_2_1); - 1); (level > 0); level = (level - 1)) { + vec4 probabilites = texelFetch(tint_symbol_2_1, coord, level); vec4 value = vec4(rand()); bvec4 mask = (greaterThanEqual(value, vec4(0.0f, probabilites.xyz)) & lessThan(value, probabilites)); coord = (coord * 2); @@ -286,9 +287,9 @@ void simulate_inner(uvec3 GlobalInvocationID) { coord.y = (coord.y + (any(mask.zw) ? 1 : 0)); } } - vec2 uv = (vec2(coord) / vec2(textureSize(tint_symbol_2, 0))); + vec2 uv = (vec2(coord) / vec2(textureSize(tint_symbol_2_1, 0))); particle.position = vec3((((uv - 0.5f) * 3.0f) * vec2(1.0f, -1.0f)), 0.0f); - particle.color = texelFetch(tint_symbol_2, coord, 0); + particle.color = texelFetch(tint_symbol_2_1, coord, 0); particle.velocity.x = ((rand() - 0.5f) * 0.100000001f); particle.velocity.y = ((rand() - 0.5f) * 0.100000001f); particle.velocity.z = (rand() * 0.300000012f); @@ -388,15 +389,16 @@ layout (binding = 4) buffer Buffer_1 { layout (binding = 5) buffer Buffer_2 { float weights[]; } buf_out; -uniform highp sampler2D tex_in; struct tint_symbol_12 { uvec3 coord; }; +uniform highp sampler2D tex_in_1; + void import_level_inner(uvec3 coord) { uint offset = (coord.x + (coord.y * ubo.width)); - buf_out.weights[offset] = texelFetch(tex_in, ivec2(coord.xy), 0).w; + buf_out.weights[offset] = texelFetch(tex_in_1, ivec2(coord.xy), 0).w; } struct tint_symbol_14 { @@ -477,7 +479,6 @@ layout (binding = 4) buffer Buffer_1 { layout (binding = 5) buffer Buffer_2 { float weights[]; } buf_out; -uniform highp writeonly image2D tex_out; struct tint_symbol_12 { uvec3 coord; @@ -486,8 +487,10 @@ struct tint_symbol_14 { uvec3 coord; }; +uniform highp writeonly image2D tex_out_1; + void export_level_inner(uvec3 coord) { - if (all(lessThan(coord.xy, uvec2(imageSize(tex_out))))) { + if (all(lessThan(coord.xy, uvec2(imageSize(tex_out_1))))) { uint dst_offset = (coord.x + (coord.y * ubo.width)); uint src_offset = ((coord.x * 2u) + ((coord.y * 2u) * ubo.width)); float a_1 = buf_in.weights[(src_offset + 0u)]; @@ -497,7 +500,7 @@ void export_level_inner(uvec3 coord) { float sum = dot(vec4(a_1, b, c, d), vec4(1.0f)); buf_out.weights[dst_offset] = (sum / 4.0f); vec4 probabilities = (vec4(a_1, (a_1 + b), ((a_1 + b) + c), sum) / max(sum, 0.0001f)); - imageStore(tex_out, ivec2(coord.xy), probabilities); + imageStore(tex_out_1, ivec2(coord.xy), probabilities); } } diff --git a/test/benchmark/shadow-fragment.wgsl.expected.glsl b/test/benchmark/shadow-fragment.wgsl.expected.glsl index f2248c446b..8c70f2689b 100644 --- a/test/benchmark/shadow-fragment.wgsl.expected.glsl +++ b/test/benchmark/shadow-fragment.wgsl.expected.glsl @@ -16,8 +16,6 @@ layout (binding = 0) uniform Scene_1 { mat4 cameraViewProjMatrix; vec3 lightPos; } scene; -uniform highp sampler2D shadowMap; - struct FragmentInput { vec3 shadowPos; @@ -37,6 +35,9 @@ struct tint_symbol_4 { vec4 value; }; +uniform highp sampler2D shadowMap_shadowSampler; + + vec4 tint_symbol_inner(FragmentInput tint_symbol_1) { float visibility = 0.0f; float oneOverShadowDepthTextureSize = (1.0f / shadowDepthTextureSize); @@ -45,7 +46,7 @@ vec4 tint_symbol_inner(FragmentInput tint_symbol_1) { { for(int x = -1; (x <= 1); x = (x + 1)) { vec2 offset = vec2((float(x) * oneOverShadowDepthTextureSize), (float(y) * oneOverShadowDepthTextureSize)); - visibility = (visibility + texture(shadowMap, (tint_symbol_1.shadowPos.xy + offset), (tint_symbol_1.shadowPos.z - 0.007f))); + visibility = (visibility + texture(shadowMap_shadowSampler, (tint_symbol_1.shadowPos.xy + offset), (tint_symbol_1.shadowPos.z - 0.007f))); } } } @@ -79,8 +80,8 @@ void main() { Error parsing GLSL shader: -ERROR: 0:46: 'assign' : cannot convert from ' temp highp 4-component vector of float' to ' temp mediump float' -ERROR: 0:46: '' : compilation terminated +ERROR: 0:47: 'assign' : cannot convert from ' temp highp 4-component vector of float' to ' temp mediump float' +ERROR: 0:47: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/benchmark/skinned-shadowed-pbr-fragment.wgsl.expected.glsl b/test/benchmark/skinned-shadowed-pbr-fragment.wgsl.expected.glsl index fe680445d3..d64d1d92bb 100644 --- a/test/benchmark/skinned-shadowed-pbr-fragment.wgsl.expected.glsl +++ b/test/benchmark/skinned-shadowed-pbr-fragment.wgsl.expected.glsl @@ -85,10 +85,6 @@ uint getClusterIndex(vec4 fragCoord) { return ((tile.x + (tile.y * tileCount.x)) + ((tile.z * tileCount.x) * tileCount.y)); } - -uniform highp sampler2D shadowTexture; - - layout (binding = 6) buffer LightShadowTable_1 { int light[]; } lightShadowTable; @@ -103,6 +99,9 @@ struct ShadowProperties { layout (binding = 7) buffer LightShadows_1 { ShadowProperties properties[]; } shadow; +uniform highp sampler2D shadowTexture_1; +uniform highp sampler2D shadowTexture_shadowSampler; + float dirLightVisibility(vec3 worldPos) { int shadowIndex = lightShadowTable.light[0u]; @@ -113,12 +112,12 @@ float dirLightVisibility(vec3 worldPos) { vec4 lightPos = (shadow.properties[shadowIndex].viewProj * vec4(worldPos, 1.0f)); vec3 shadowPos = vec3((((lightPos.xy / lightPos.w) * vec2(0.5f, -0.5f)) + vec2(0.5f, 0.5f)), (lightPos.z / lightPos.w)); vec2 viewportPos = vec2((viewport.xy + (shadowPos.xy * viewport.zw))); - vec2 texelSize = (1.0f / vec2(textureSize(shadowTexture, 0))); + vec2 texelSize = (1.0f / vec2(textureSize(shadowTexture_1, 0))); vec4 clampRect = vec4((viewport.xy - texelSize), ((viewport.xy + viewport.zw) + texelSize)); float visibility = 0.0f; { for(uint i = 0u; (i < shadowSampleCount); i = (i + 1u)) { - visibility = (visibility + texture(shadowTexture, clamp((viewportPos + (shadowSampleOffsets[i] * texelSize)), clampRect.xy, clampRect.zw), (shadowPos.z - 0.003f))); + visibility = (visibility + texture(shadowTexture_shadowSampler, clamp((viewportPos + (shadowSampleOffsets[i] * texelSize)), clampRect.xy, clampRect.zw), (shadowPos.z - 0.003f))); } } return (visibility / float(shadowSampleCount)); @@ -158,12 +157,12 @@ float pointLightVisibility(uint lightIndex, vec3 worldPos, vec3 pointToLight) { vec4 lightPos = (shadow.properties[shadowIndex].viewProj * vec4(worldPos, 1.0f)); vec3 shadowPos = vec3((((lightPos.xy / lightPos.w) * vec2(0.5f, -0.5f)) + vec2(0.5f, 0.5f)), (lightPos.z / lightPos.w)); vec2 viewportPos = vec2((viewport.xy + (shadowPos.xy * viewport.zw))); - vec2 texelSize = (1.0f / vec2(textureSize(shadowTexture, 0))); + vec2 texelSize = (1.0f / vec2(textureSize(shadowTexture_1, 0))); vec4 clampRect = vec4(viewport.xy, (viewport.xy + viewport.zw)); float visibility = 0.0f; { for(uint i = 0u; (i < shadowSampleCount); i = (i + 1u)) { - visibility = (visibility + texture(shadowTexture, clamp((viewportPos + (shadowSampleOffsets[i] * texelSize)), clampRect.xy, clampRect.zw), (shadowPos.z - 0.01f))); + visibility = (visibility + texture(shadowTexture_shadowSampler, clamp((viewportPos + (shadowSampleOffsets[i] * texelSize)), clampRect.xy, clampRect.zw), (shadowPos.z - 0.01f))); } } return (visibility / float(shadowSampleCount)); @@ -196,16 +195,6 @@ layout (binding = 8) uniform Material_1 { vec2 metallicRoughnessFactor; float alphaCutoff; } material; -uniform highp sampler2D baseColorTexture; - -uniform highp sampler2D normalTexture; - -uniform highp sampler2D metallicRoughnessTexture; - -uniform highp sampler2D occlusionTexture; - -uniform highp sampler2D emissiveTexture; - struct SurfaceInfo { vec4 baseColor; @@ -219,26 +208,33 @@ struct SurfaceInfo { vec3 v; }; +uniform highp sampler2D normalTexture_normalSampler; +uniform highp sampler2D baseColorTexture_baseColorSampler; +uniform highp sampler2D metallicRoughnessTexture_metallicRoughnessSampler; +uniform highp sampler2D occlusionTexture_occlusionSampler; +uniform highp sampler2D emissiveTexture_emissiveSampler; + + SurfaceInfo GetSurfaceInfo(VertexOutput tint_symbol) { SurfaceInfo surface = SurfaceInfo(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), 0.0f, 0.0f, vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), 0.0f, vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); surface.v = normalize(tint_symbol.view); mat3 tbn = mat3(tint_symbol.tangent, tint_symbol.bitangent, tint_symbol.normal); - vec3 normalMap = texture(normalTexture, tint_symbol.texcoord).rgb; + vec3 normalMap = texture(normalTexture_normalSampler, tint_symbol.texcoord).rgb; surface.normal = normalize((tbn * ((2.0f * normalMap) - vec3(1.0f)))); - vec4 baseColorMap = texture(baseColorTexture, tint_symbol.texcoord); + vec4 baseColorMap = texture(baseColorTexture_baseColorSampler, tint_symbol.texcoord); surface.baseColor = ((tint_symbol.color * material.baseColorFactor) * baseColorMap); if ((surface.baseColor.a < material.alphaCutoff)) { discard; } surface.albedo = surface.baseColor.rgb; - vec4 metallicRoughnessMap = texture(metallicRoughnessTexture, tint_symbol.texcoord); + vec4 metallicRoughnessMap = texture(metallicRoughnessTexture_metallicRoughnessSampler, tint_symbol.texcoord); surface.metallic = (material.metallicRoughnessFactor.x * metallicRoughnessMap.b); surface.roughness = (material.metallicRoughnessFactor.y * metallicRoughnessMap.g); vec3 dielectricSpec = vec3(0.039999999f); surface.f0 = mix(dielectricSpec, surface.albedo, vec3(surface.metallic)); - vec4 occlusionMap = texture(occlusionTexture, tint_symbol.texcoord); + vec4 occlusionMap = texture(occlusionTexture_occlusionSampler, tint_symbol.texcoord); surface.ao = (material.occlusionStrength * occlusionMap.r); - vec4 emissiveMap = texture(emissiveTexture, tint_symbol.texcoord); + vec4 emissiveMap = texture(emissiveTexture_emissiveSampler, tint_symbol.texcoord); surface.emissive = (material.emissiveFactor * emissiveMap.rgb); if ((tint_symbol.instanceColor.a == 0.0f)) { surface.albedo = (surface.albedo + tint_symbol.instanceColor.rgb); @@ -316,8 +312,6 @@ vec3 lightRadiance(PuctualLight light, SurfaceInfo surface) { return (((((kD * surface.albedo) / vec3(PI)) + specular) * radiance) * NdotL); } -uniform highp sampler2D ssaoTexture; - struct FragmentOutput { vec4 color; vec4 emissive; @@ -339,6 +333,9 @@ struct tint_symbol_5 { vec4 emissive; }; +uniform highp sampler2D ssaoTexture_1; +uniform highp sampler2D ssaoTexture_defaultSampler; + FragmentOutput fragmentMain_inner(VertexOutput tint_symbol) { SurfaceInfo surface = GetSurfaceInfo(tint_symbol); vec3 Lo = vec3(0.0f, 0.0f, 0.0f); @@ -367,8 +364,8 @@ FragmentOutput fragmentMain_inner(VertexOutput tint_symbol) { Lo = (Lo + (lightRadiance(light, surface) * lightVis)); } } - vec2 ssaoCoord = (tint_symbol.position.xy / vec2(textureSize(ssaoTexture, 0).xy)); - float ssaoFactor = texture(ssaoTexture, ssaoCoord).r; + vec2 ssaoCoord = (tint_symbol.position.xy / vec2(textureSize(ssaoTexture_1, 0).xy)); + float ssaoFactor = texture(ssaoTexture_defaultSampler, ssaoCoord).r; vec3 ambient = (((globalLights.ambient * surface.albedo) * surface.ao) * ssaoFactor); vec3 color = linearTosRGB(((Lo + ambient) + surface.emissive)); FragmentOutput tint_symbol_2 = FragmentOutput(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); diff --git a/test/bug/tint/1369.wgsl.expected.glsl b/test/bug/tint/1369.wgsl.expected.glsl new file mode 100644 index 0000000000..e167ca914b --- /dev/null +++ b/test/bug/tint/1369.wgsl.expected.glsl @@ -0,0 +1,26 @@ +bug/tint/1369.wgsl:3:3 warning: code is unreachable + return true; + ^^^^^^ + +bug/tint/1369.wgsl:9:9 warning: code is unreachable + var also_unreachable : bool; + ^^^^^^^^^^^^^^^^ + +#version 310 es +precision mediump float; + +bool call_discard() { + discard; + return true; +} + +void f() { + bool v = call_discard(); + bool also_unreachable = false; + return; +} +void main() { + f(); +} + + diff --git a/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.glsl b/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.glsl index 7de1a90994..54535770b3 100644 --- a/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.glsl +++ b/test/intrinsics/gen/ignore/2a6ac2.wgsl.expected.glsl @@ -31,3 +31,57 @@ Failed to generate: intrinsics/gen/ignore/2a6ac2.wgsl:29:10 error: unknown ident ignore(arg_0); ^^^^^ + +@group(1) @binding(0) var arg_0 : texture_depth_multisampled_2d; + +fn ignore_2a6ac2() { + ignore(arg_0); +} + +@stage(vertex) +fn vertex_main() -> @builtin(position) vec4 { + ignore_2a6ac2(); + return vec4(); +} + +@stage(fragment) +fn fragment_main() { + ignore_2a6ac2(); +} + +@stage(compute) @workgroup_size(1) +fn compute_main() { + ignore_2a6ac2(); +} + +Failed to generate: intrinsics/gen/ignore/2a6ac2.wgsl:29:10 error: unknown identifier: 'arg_0' + ignore(arg_0); + ^^^^^ + + +@group(1) @binding(0) var arg_0 : texture_depth_multisampled_2d; + +fn ignore_2a6ac2() { + ignore(arg_0); +} + +@stage(vertex) +fn vertex_main() -> @builtin(position) vec4 { + ignore_2a6ac2(); + return vec4(); +} + +@stage(fragment) +fn fragment_main() { + ignore_2a6ac2(); +} + +@stage(compute) @workgroup_size(1) +fn compute_main() { + ignore_2a6ac2(); +} + +Failed to generate: intrinsics/gen/ignore/2a6ac2.wgsl:29:10 error: unknown identifier: 'arg_0' + ignore(arg_0); + ^^^^^ + diff --git a/test/intrinsics/gen/ignore/5016e5.wgsl.expected.glsl b/test/intrinsics/gen/ignore/5016e5.wgsl.expected.glsl index a58dca4f5b..735832311f 100644 --- a/test/intrinsics/gen/ignore/5016e5.wgsl.expected.glsl +++ b/test/intrinsics/gen/ignore/5016e5.wgsl.expected.glsl @@ -31,3 +31,57 @@ Failed to generate: intrinsics/gen/ignore/5016e5.wgsl:29:10 error: unknown ident ignore(arg_0); ^^^^^ + +@group(1) @binding(0) var arg_0 : sampler; + +fn ignore_5016e5() { + ignore(arg_0); +} + +@stage(vertex) +fn vertex_main() -> @builtin(position) vec4 { + ignore_5016e5(); + return vec4(); +} + +@stage(fragment) +fn fragment_main() { + ignore_5016e5(); +} + +@stage(compute) @workgroup_size(1) +fn compute_main() { + ignore_5016e5(); +} + +Failed to generate: intrinsics/gen/ignore/5016e5.wgsl:29:10 error: unknown identifier: 'arg_0' + ignore(arg_0); + ^^^^^ + + +@group(1) @binding(0) var arg_0 : sampler; + +fn ignore_5016e5() { + ignore(arg_0); +} + +@stage(vertex) +fn vertex_main() -> @builtin(position) vec4 { + ignore_5016e5(); + return vec4(); +} + +@stage(fragment) +fn fragment_main() { + ignore_5016e5(); +} + +@stage(compute) @workgroup_size(1) +fn compute_main() { + ignore_5016e5(); +} + +Failed to generate: intrinsics/gen/ignore/5016e5.wgsl:29:10 error: unknown identifier: 'arg_0' + ignore(arg_0); + ^^^^^ + diff --git a/test/intrinsics/gen/ignore/509355.wgsl.expected.glsl b/test/intrinsics/gen/ignore/509355.wgsl.expected.glsl index 38db3763bf..82ea1102b5 100644 --- a/test/intrinsics/gen/ignore/509355.wgsl.expected.glsl +++ b/test/intrinsics/gen/ignore/509355.wgsl.expected.glsl @@ -31,3 +31,57 @@ Failed to generate: intrinsics/gen/ignore/509355.wgsl:29:10 error: unknown ident ignore(arg_0); ^^^^^ + +@group(1) @binding(0) var arg_0 : texture_depth_cube; + +fn ignore_509355() { + ignore(arg_0); +} + +@stage(vertex) +fn vertex_main() -> @builtin(position) vec4 { + ignore_509355(); + return vec4(); +} + +@stage(fragment) +fn fragment_main() { + ignore_509355(); +} + +@stage(compute) @workgroup_size(1) +fn compute_main() { + ignore_509355(); +} + +Failed to generate: intrinsics/gen/ignore/509355.wgsl:29:10 error: unknown identifier: 'arg_0' + ignore(arg_0); + ^^^^^ + + +@group(1) @binding(0) var arg_0 : texture_depth_cube; + +fn ignore_509355() { + ignore(arg_0); +} + +@stage(vertex) +fn vertex_main() -> @builtin(position) vec4 { + ignore_509355(); + return vec4(); +} + +@stage(fragment) +fn fragment_main() { + ignore_509355(); +} + +@stage(compute) @workgroup_size(1) +fn compute_main() { + ignore_509355(); +} + +Failed to generate: intrinsics/gen/ignore/509355.wgsl:29:10 error: unknown identifier: 'arg_0' + ignore(arg_0); + ^^^^^ + diff --git a/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.glsl b/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.glsl index a00047e0f3..26c1686433 100644 --- a/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.glsl +++ b/test/intrinsics/gen/ignore/5c9edf.wgsl.expected.glsl @@ -31,3 +31,57 @@ Failed to generate: intrinsics/gen/ignore/5c9edf.wgsl:29:10 error: unknown ident ignore(arg_0); ^^^^^ + +@group(1) @binding(0) var arg_0 : texture_external; + +fn ignore_5c9edf() { + ignore(arg_0); +} + +@stage(vertex) +fn vertex_main() -> @builtin(position) vec4 { + ignore_5c9edf(); + return vec4(); +} + +@stage(fragment) +fn fragment_main() { + ignore_5c9edf(); +} + +@stage(compute) @workgroup_size(1) +fn compute_main() { + ignore_5c9edf(); +} + +Failed to generate: intrinsics/gen/ignore/5c9edf.wgsl:29:10 error: unknown identifier: 'arg_0' + ignore(arg_0); + ^^^^^ + + +@group(1) @binding(0) var arg_0 : texture_external; + +fn ignore_5c9edf() { + ignore(arg_0); +} + +@stage(vertex) +fn vertex_main() -> @builtin(position) vec4 { + ignore_5c9edf(); + return vec4(); +} + +@stage(fragment) +fn fragment_main() { + ignore_5c9edf(); +} + +@stage(compute) @workgroup_size(1) +fn compute_main() { + ignore_5c9edf(); +} + +Failed to generate: intrinsics/gen/ignore/5c9edf.wgsl:29:10 error: unknown identifier: 'arg_0' + ignore(arg_0); + ^^^^^ + diff --git a/test/intrinsics/gen/ignore/ad88be.wgsl.expected.glsl b/test/intrinsics/gen/ignore/ad88be.wgsl.expected.glsl index af97009b96..c780680546 100644 --- a/test/intrinsics/gen/ignore/ad88be.wgsl.expected.glsl +++ b/test/intrinsics/gen/ignore/ad88be.wgsl.expected.glsl @@ -31,3 +31,57 @@ Failed to generate: intrinsics/gen/ignore/ad88be.wgsl:29:10 error: unknown ident ignore(arg_0); ^^^^^ + +@group(1) @binding(0) var arg_0 : texture_depth_cube_array; + +fn ignore_ad88be() { + ignore(arg_0); +} + +@stage(vertex) +fn vertex_main() -> @builtin(position) vec4 { + ignore_ad88be(); + return vec4(); +} + +@stage(fragment) +fn fragment_main() { + ignore_ad88be(); +} + +@stage(compute) @workgroup_size(1) +fn compute_main() { + ignore_ad88be(); +} + +Failed to generate: intrinsics/gen/ignore/ad88be.wgsl:29:10 error: unknown identifier: 'arg_0' + ignore(arg_0); + ^^^^^ + + +@group(1) @binding(0) var arg_0 : texture_depth_cube_array; + +fn ignore_ad88be() { + ignore(arg_0); +} + +@stage(vertex) +fn vertex_main() -> @builtin(position) vec4 { + ignore_ad88be(); + return vec4(); +} + +@stage(fragment) +fn fragment_main() { + ignore_ad88be(); +} + +@stage(compute) @workgroup_size(1) +fn compute_main() { + ignore_ad88be(); +} + +Failed to generate: intrinsics/gen/ignore/ad88be.wgsl:29:10 error: unknown identifier: 'arg_0' + ignore(arg_0); + ^^^^^ + diff --git a/test/intrinsics/gen/ignore/b469af.wgsl.expected.glsl b/test/intrinsics/gen/ignore/b469af.wgsl.expected.glsl index 0f7685f147..b2b81de036 100644 --- a/test/intrinsics/gen/ignore/b469af.wgsl.expected.glsl +++ b/test/intrinsics/gen/ignore/b469af.wgsl.expected.glsl @@ -31,3 +31,57 @@ Failed to generate: intrinsics/gen/ignore/b469af.wgsl:29:10 error: unknown ident ignore(arg_0); ^^^^^ + +@group(1) @binding(0) var arg_0 : sampler_comparison; + +fn ignore_b469af() { + ignore(arg_0); +} + +@stage(vertex) +fn vertex_main() -> @builtin(position) vec4 { + ignore_b469af(); + return vec4(); +} + +@stage(fragment) +fn fragment_main() { + ignore_b469af(); +} + +@stage(compute) @workgroup_size(1) +fn compute_main() { + ignore_b469af(); +} + +Failed to generate: intrinsics/gen/ignore/b469af.wgsl:29:10 error: unknown identifier: 'arg_0' + ignore(arg_0); + ^^^^^ + + +@group(1) @binding(0) var arg_0 : sampler_comparison; + +fn ignore_b469af() { + ignore(arg_0); +} + +@stage(vertex) +fn vertex_main() -> @builtin(position) vec4 { + ignore_b469af(); + return vec4(); +} + +@stage(fragment) +fn fragment_main() { + ignore_b469af(); +} + +@stage(compute) @workgroup_size(1) +fn compute_main() { + ignore_b469af(); +} + +Failed to generate: intrinsics/gen/ignore/b469af.wgsl:29:10 error: unknown identifier: 'arg_0' + ignore(arg_0); + ^^^^^ + diff --git a/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.glsl b/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.glsl index 2ba2d466c9..e6999350ba 100644 --- a/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.glsl +++ b/test/intrinsics/gen/ignore/c8a0ee.wgsl.expected.glsl @@ -31,3 +31,57 @@ Failed to generate: intrinsics/gen/ignore/c8a0ee.wgsl:29:10 error: unknown ident ignore(arg_0); ^^^^^ + +@group(1) @binding(0) var arg_0 : texture_depth_2d_array; + +fn ignore_c8a0ee() { + ignore(arg_0); +} + +@stage(vertex) +fn vertex_main() -> @builtin(position) vec4 { + ignore_c8a0ee(); + return vec4(); +} + +@stage(fragment) +fn fragment_main() { + ignore_c8a0ee(); +} + +@stage(compute) @workgroup_size(1) +fn compute_main() { + ignore_c8a0ee(); +} + +Failed to generate: intrinsics/gen/ignore/c8a0ee.wgsl:29:10 error: unknown identifier: 'arg_0' + ignore(arg_0); + ^^^^^ + + +@group(1) @binding(0) var arg_0 : texture_depth_2d_array; + +fn ignore_c8a0ee() { + ignore(arg_0); +} + +@stage(vertex) +fn vertex_main() -> @builtin(position) vec4 { + ignore_c8a0ee(); + return vec4(); +} + +@stage(fragment) +fn fragment_main() { + ignore_c8a0ee(); +} + +@stage(compute) @workgroup_size(1) +fn compute_main() { + ignore_c8a0ee(); +} + +Failed to generate: intrinsics/gen/ignore/c8a0ee.wgsl:29:10 error: unknown identifier: 'arg_0' + ignore(arg_0); + ^^^^^ + diff --git a/test/intrinsics/gen/ignore/e0187b.wgsl.expected.glsl b/test/intrinsics/gen/ignore/e0187b.wgsl.expected.glsl index 00748d4cdb..c07186c1f5 100644 --- a/test/intrinsics/gen/ignore/e0187b.wgsl.expected.glsl +++ b/test/intrinsics/gen/ignore/e0187b.wgsl.expected.glsl @@ -31,3 +31,57 @@ Failed to generate: intrinsics/gen/ignore/e0187b.wgsl:29:10 error: unknown ident ignore(arg_0); ^^^^^ + +@group(1) @binding(0) var arg_0 : texture_depth_2d; + +fn ignore_e0187b() { + ignore(arg_0); +} + +@stage(vertex) +fn vertex_main() -> @builtin(position) vec4 { + ignore_e0187b(); + return vec4(); +} + +@stage(fragment) +fn fragment_main() { + ignore_e0187b(); +} + +@stage(compute) @workgroup_size(1) +fn compute_main() { + ignore_e0187b(); +} + +Failed to generate: intrinsics/gen/ignore/e0187b.wgsl:29:10 error: unknown identifier: 'arg_0' + ignore(arg_0); + ^^^^^ + + +@group(1) @binding(0) var arg_0 : texture_depth_2d; + +fn ignore_e0187b() { + ignore(arg_0); +} + +@stage(vertex) +fn vertex_main() -> @builtin(position) vec4 { + ignore_e0187b(); + return vec4(); +} + +@stage(fragment) +fn fragment_main() { + ignore_e0187b(); +} + +@stage(compute) @workgroup_size(1) +fn compute_main() { + ignore_e0187b(); +} + +Failed to generate: intrinsics/gen/ignore/e0187b.wgsl:29:10 error: unknown identifier: 'arg_0' + ignore(arg_0); + ^^^^^ + diff --git a/test/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl b/test/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl index b20b79962c..954dacb59b 100644 --- a/test/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler1D x_20; +uniform highp sampler1D x_20_1; void main_1() { float float_var = 0.0f; @@ -19,7 +19,7 @@ void main_1() { 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, int(u1), 0); + vec4 x_73 = texelFetch(x_20_1, int(u1), 0); uint x_1000 = 0u; return; } diff --git a/test/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl b/test/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl index 98d844a749..2a1640ae29 100644 --- a/test/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler1D x_20; +uniform highp sampler1D x_20_1; void main_1() { float float_var = 0.0f; @@ -19,7 +19,7 @@ void main_1() { 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, int(u1), 0); + vec4 x_71 = texelFetch(x_20_1, int(u1), 0); uint x_1000 = 0u; return; } diff --git a/test/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl b/test/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl index afb1e34fd0..4f243d94b4 100644 --- a/test/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ConvertUintCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp writeonly image1D x_20; +uniform highp writeonly image1D x_20_1; void main_1() { float float_var = 0.0f; @@ -19,7 +19,7 @@ void main_1() { 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); + imageStore(x_20_1, int(u1), vf1234); uint x_1000 = 0u; return; } diff --git a/test/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl b/test/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl index 735611a007..72425bb68e 100644 --- a/test/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler1D x_20_x_10; -uniform highp sampler1D x_20; void main_1() { float float_var = 0.0f; @@ -20,7 +20,7 @@ void main_1() { 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, f1); + vec4 x_73 = texture(x_20_x_10, f1); uint x_1000 = 0u; return; } @@ -35,8 +35,8 @@ void main() { Error parsing GLSL shader: -ERROR: 0:5: 'sampler1D' : Reserved word. -ERROR: 0:5: '' : compilation terminated +ERROR: 0:4: 'sampler1D' : Reserved word. +ERROR: 0:4: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl b/test/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl index b9671b92b7..a421115974 100644 --- a/test/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler1D x_20_x_10; -uniform highp sampler1D x_20; void main_1() { float float_var = 0.0f; @@ -20,7 +20,7 @@ void main_1() { 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, vf12.x); + vec4 x_73 = texture(x_20_x_10, vf12.x); uint x_1000 = 0u; return; } @@ -35,8 +35,8 @@ void main() { Error parsing GLSL shader: -ERROR: 0:5: 'sampler1D' : Reserved word. -ERROR: 0:5: '' : compilation terminated +ERROR: 0:4: 'sampler1D' : Reserved word. +ERROR: 0:4: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl b/test/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl index 3ef2dc54a0..d1f3ab8e16 100644 --- a/test/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler1D x_20_x_10; -uniform highp sampler1D x_20; void main_1() { float float_var = 0.0f; @@ -20,7 +20,7 @@ void main_1() { 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, vf123.x); + vec4 x_73 = texture(x_20_x_10, vf123.x); uint x_1000 = 0u; return; } @@ -35,8 +35,8 @@ void main() { Error parsing GLSL shader: -ERROR: 0:5: 'sampler1D' : Reserved word. -ERROR: 0:5: '' : compilation terminated +ERROR: 0:4: 'sampler1D' : Reserved word. +ERROR: 0:4: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_3.spvasm.expected.glsl b/test/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_3.spvasm.expected.glsl index 705386541e..3931b9532d 100644 --- a/test/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_3.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Good_1D_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_3.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler1D x_20_x_10; -uniform highp sampler1D x_20; void main_1() { float float_var = 0.0f; @@ -20,7 +20,7 @@ void main_1() { 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, vf1234.x); + vec4 x_73 = texture(x_20_x_10, vf1234.x); uint x_1000 = 0u; return; } @@ -35,8 +35,8 @@ void main() { Error parsing GLSL shader: -ERROR: 0:5: 'sampler1D' : Reserved word. -ERROR: 0:5: '' : compilation terminated +ERROR: 0:4: 'sampler1D' : Reserved word. +ERROR: 0:4: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/Good_CubeArray_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl b/test/unittest/reader/spirv/Good_CubeArray_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl index c19b066480..6b4d81a5da 100644 --- a/test/unittest/reader/spirv/Good_CubeArray_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Good_CubeArray_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp samplerCubeArray x_20_x_10; -uniform highp samplerCubeArray x_20; void main_1() { float float_var = 0.0f; @@ -20,7 +20,7 @@ void main_1() { 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, vec4(vf1234.xyz, float(int(round(vf1234.w))))); + vec4 x_73 = texture(x_20_x_10, vec4(vf1234.xyz, float(int(round(vf1234.w))))); uint x_1000 = 0u; return; } @@ -35,8 +35,8 @@ void main() { Error parsing GLSL shader: -ERROR: 0:5: 'samplerCubeArray' : Reserved word. -ERROR: 0:5: '' : compilation terminated +ERROR: 0:4: 'samplerCubeArray' : Reserved word. +ERROR: 0:4: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl index 7523dea07c..6e04e7fff3 100644 --- a/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler2D x_20; +uniform highp sampler2D x_20_1; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureQueryLevels(x_20);; + int x_99 = textureQueryLevels(x_20_1);; return; } diff --git a/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl index f7fc1520ec..7589e0e6fe 100644 --- a/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler2DArray x_20; +uniform highp sampler2DArray x_20_1; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureQueryLevels(x_20);; + int x_99 = textureQueryLevels(x_20_1);; return; } diff --git a/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl index b6b4c81fe0..3a5ee1ddb0 100644 --- a/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler3D x_20; +uniform highp sampler3D x_20_1; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureQueryLevels(x_20);; + int x_99 = textureQueryLevels(x_20_1);; return; } diff --git a/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl index 55fd9bf19c..49d98ce886 100644 --- a/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp samplerCube x_20; +uniform highp samplerCube x_20_1; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureQueryLevels(x_20);; + int x_99 = textureQueryLevels(x_20_1);; return; } diff --git a/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_4.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_4.spvasm.expected.glsl index 487cb1dbdd..75e87cbbb4 100644 --- a/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_4.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_4.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp samplerCubeArray x_20; +uniform highp samplerCubeArray x_20_1; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureQueryLevels(x_20);; + int x_99 = textureQueryLevels(x_20_1);; return; } diff --git a/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_5.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_5.spvasm.expected.glsl index 7523dea07c..6e04e7fff3 100644 --- a/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_5.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_5.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler2D x_20; +uniform highp sampler2D x_20_1; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureQueryLevels(x_20);; + int x_99 = textureQueryLevels(x_20_1);; return; } diff --git a/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_6.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_6.spvasm.expected.glsl index f7fc1520ec..7589e0e6fe 100644 --- a/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_6.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_6.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler2DArray x_20; +uniform highp sampler2DArray x_20_1; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureQueryLevels(x_20);; + int x_99 = textureQueryLevels(x_20_1);; return; } diff --git a/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_7.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_7.spvasm.expected.glsl index 55fd9bf19c..49d98ce886 100644 --- a/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_7.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_7.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp samplerCube x_20; +uniform highp samplerCube x_20_1; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureQueryLevels(x_20);; + int x_99 = textureQueryLevels(x_20_1);; return; } diff --git a/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_8.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_8.spvasm.expected.glsl index 487cb1dbdd..75e87cbbb4 100644 --- a/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_8.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageQueryLevels_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_8.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp samplerCubeArray x_20; +uniform highp samplerCubeArray x_20_1; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureQueryLevels(x_20);; + int x_99 = textureQueryLevels(x_20_1);; return; } diff --git a/test/unittest/reader/spirv/ImageQueryLevels_UnsignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageQueryLevels_UnsignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl index 01be1d8687..b90eca46eb 100644 --- a/test/unittest/reader/spirv/ImageQueryLevels_UnsignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageQueryLevels_UnsignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler2D x_20; +uniform highp sampler2D x_20_1; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - uint x_99 = uint(textureQueryLevels(x_20);); + uint x_99 = uint(textureQueryLevels(x_20_1);); return; } diff --git a/test/unittest/reader/spirv/ImageQuerySamples_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageQuerySamples_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl index c14ab95e22..d6fcba309a 100644 --- a/test/unittest/reader/spirv/ImageQuerySamples_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageQuerySamples_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler2DMS x_20; +uniform highp sampler2DMS x_20_1; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - int x_99 = textureSamples(x_20);; + int x_99 = textureSamples(x_20_1);; return; } diff --git a/test/unittest/reader/spirv/ImageQuerySamples_UnsignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageQuerySamples_UnsignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl index 50b237e17f..1ed30a9c28 100644 --- a/test/unittest/reader/spirv/ImageQuerySamples_UnsignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageQuerySamples_UnsignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler2DMS x_20; +uniform highp sampler2DMS x_20_1; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - uint x_99 = uint(textureSamples(x_20);); + uint x_99 = uint(textureSamples(x_20_1);); return; } diff --git a/test/unittest/reader/spirv/ImageQuerySizeLod_Arrayed_SignedResult_SignedLevel_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageQuerySizeLod_Arrayed_SignedResult_SignedLevel_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl index e7c25b95d8..fc93ba19dd 100644 --- a/test/unittest/reader/spirv/ImageQuerySizeLod_Arrayed_SignedResult_SignedLevel_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageQuerySizeLod_Arrayed_SignedResult_SignedLevel_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler2DArray x_20; +uniform highp sampler2DArray x_20_1; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - ivec3 x_99 = ivec3(textureSize(x_20, i1).xy, textureQueryLevels(x_20);); + ivec3 x_99 = ivec3(textureSize(x_20_1, i1).xy, textureQueryLevels(x_20_1);); return; } diff --git a/test/unittest/reader/spirv/ImageQuerySizeLod_Arrayed_SignedResult_SignedLevel_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageQuerySizeLod_Arrayed_SignedResult_SignedLevel_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl index 3488465bcb..f57af6e915 100644 --- a/test/unittest/reader/spirv/ImageQuerySizeLod_Arrayed_SignedResult_SignedLevel_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageQuerySizeLod_Arrayed_SignedResult_SignedLevel_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp samplerCubeArray x_20; +uniform highp samplerCubeArray x_20_1; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - ivec3 x_99 = ivec3(textureSize(x_20, i1).xy, textureQueryLevels(x_20);); + ivec3 x_99 = ivec3(textureSize(x_20_1, i1).xy, textureQueryLevels(x_20_1);); return; } diff --git a/test/unittest/reader/spirv/ImageQuerySizeLod_Arrayed_SignedResult_SignedLevel_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageQuerySizeLod_Arrayed_SignedResult_SignedLevel_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl index e7c25b95d8..fc93ba19dd 100644 --- a/test/unittest/reader/spirv/ImageQuerySizeLod_Arrayed_SignedResult_SignedLevel_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageQuerySizeLod_Arrayed_SignedResult_SignedLevel_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler2DArray x_20; +uniform highp sampler2DArray x_20_1; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - ivec3 x_99 = ivec3(textureSize(x_20, i1).xy, textureQueryLevels(x_20);); + ivec3 x_99 = ivec3(textureSize(x_20_1, i1).xy, textureQueryLevels(x_20_1);); return; } diff --git a/test/unittest/reader/spirv/ImageQuerySizeLod_Arrayed_SignedResult_SignedLevel_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageQuerySizeLod_Arrayed_SignedResult_SignedLevel_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl index 3488465bcb..f57af6e915 100644 --- a/test/unittest/reader/spirv/ImageQuerySizeLod_Arrayed_SignedResult_SignedLevel_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageQuerySizeLod_Arrayed_SignedResult_SignedLevel_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp samplerCubeArray x_20; +uniform highp samplerCubeArray x_20_1; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - ivec3 x_99 = ivec3(textureSize(x_20, i1).xy, textureQueryLevels(x_20);); + ivec3 x_99 = ivec3(textureSize(x_20_1, i1).xy, textureQueryLevels(x_20_1);); return; } diff --git a/test/unittest/reader/spirv/ImageQuerySize_Arrayed_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageQuerySize_Arrayed_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl index a6fcb047dc..cea9b02850 100644 --- a/test/unittest/reader/spirv/ImageQuerySize_Arrayed_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageQuerySize_Arrayed_SignedResult_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler2DArray x_20; +uniform highp sampler2DArray x_20_1; void main_1() { float f1 = 1.0f; @@ -23,8 +23,8 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - ivec3 x_99 = ivec3(textureSize(x_20, 0).xy, textureQueryLevels(x_20);); - vec4 x_98 = texelFetch(x_20, ivec3(vi123.xy, vi123.z), 0); + ivec3 x_99 = ivec3(textureSize(x_20_1, 0).xy, textureQueryLevels(x_20_1);); + vec4 x_98 = texelFetch(x_20_1, ivec3(vi123.xy, vi123.z), 0); return; } diff --git a/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl index fced705968..0d5fe72eec 100644 --- a/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2D x_20_x_10; -uniform highp sampler2D x_20; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { float coords1 = 1.0f; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - float x_79 = texture(x_20, vf12, 0.200000003f); + float x_79 = texture(x_20_x_10, vf12, 0.200000003f); return; } diff --git a/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl index f9cc170668..c7eaa89c84 100644 --- a/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2DArray x_20_x_10; -uniform highp sampler2DArray x_20; void main_1() { float f1 = 1.0f; @@ -24,7 +24,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - float x_79 = texture(x_20, vec3(coords123.xy, float(int(round(coords123.z)))), 0.200000003f); + float x_79 = texture(x_20_x_10, vec3(coords123.xy, float(int(round(coords123.z)))), 0.200000003f); return; } diff --git a/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl index 843b89f92d..3c3aa8a08d 100644 --- a/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2D x_20_x_10; -uniform highp sampler2D x_20; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { float coords1 = 1.0f; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - float x_79 = textureOffset(x_20, vf12, 0.200000003f, ivec2(3, 4)); + float x_79 = textureOffset(x_20_x_10, vf12, 0.200000003f, ivec2(3, 4)); return; } diff --git a/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl index 1213fe6b6e..abcde0de83 100644 --- a/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2DArray x_20_x_10; -uniform highp sampler2DArray x_20; void main_1() { float f1 = 1.0f; @@ -24,7 +24,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - float x_79 = textureOffset(x_20, vec3(coords123.xy, float(int(round(coords123.z)))), 0.200000003f, ivec2(3, 4)); + float x_79 = textureOffset(x_20_x_10, vec3(coords123.xy, float(int(round(coords123.z)))), 0.200000003f, ivec2(3, 4)); return; } diff --git a/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_4.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_4.spvasm.expected.glsl index a47bce5318..4c5161fc8e 100644 --- a/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_4.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_4.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp samplerCube x_20_x_10; -uniform highp samplerCube x_20; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { float coords1 = 1.0f; vec2 coords12 = vf12; vec4 coords1234 = vf1234; - float x_79 = texture(x_20, vf123, 0.200000003f); + float x_79 = texture(x_20_x_10, vf123, 0.200000003f); return; } diff --git a/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_5.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_5.spvasm.expected.glsl index 988f1a04cd..5d1e906b4f 100644 --- a/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_5.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageSampleDrefExplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_5.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp samplerCubeArray x_20_x_10; -uniform highp samplerCubeArray x_20; void main_1() { float f1 = 1.0f; @@ -24,7 +24,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - float x_79 = texture(x_20, vec4(coords1234.xyz, float(int(round(coords1234.w)))), 0.200000003f); + float x_79 = texture(x_20_x_10, vec4(coords1234.xyz, float(int(round(coords1234.w)))), 0.200000003f); return; } @@ -38,8 +38,8 @@ void main() { Error parsing GLSL shader: -ERROR: 0:5: 'samplerCubeArray' : Reserved word. -ERROR: 0:5: '' : compilation terminated +ERROR: 0:4: 'samplerCubeArray' : Reserved word. +ERROR: 0:4: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/ImageSampleDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageSampleDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl index fced705968..0d5fe72eec 100644 --- a/test/unittest/reader/spirv/ImageSampleDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageSampleDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2D x_20_x_10; -uniform highp sampler2D x_20; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { float coords1 = 1.0f; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - float x_79 = texture(x_20, vf12, 0.200000003f); + float x_79 = texture(x_20_x_10, vf12, 0.200000003f); return; } diff --git a/test/unittest/reader/spirv/ImageSampleDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageSampleDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl index f9cc170668..c7eaa89c84 100644 --- a/test/unittest/reader/spirv/ImageSampleDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageSampleDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2DArray x_20_x_10; -uniform highp sampler2DArray x_20; void main_1() { float f1 = 1.0f; @@ -24,7 +24,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - float x_79 = texture(x_20, vec3(coords123.xy, float(int(round(coords123.z)))), 0.200000003f); + float x_79 = texture(x_20_x_10, vec3(coords123.xy, float(int(round(coords123.z)))), 0.200000003f); return; } diff --git a/test/unittest/reader/spirv/ImageSampleDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageSampleDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl index 843b89f92d..3c3aa8a08d 100644 --- a/test/unittest/reader/spirv/ImageSampleDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageSampleDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_2.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2D x_20_x_10; -uniform highp sampler2D x_20; void main_1() { float f1 = 1.0f; @@ -23,7 +23,7 @@ void main_1() { float coords1 = 1.0f; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - float x_79 = textureOffset(x_20, vf12, 0.200000003f, ivec2(3, 4)); + float x_79 = textureOffset(x_20_x_10, vf12, 0.200000003f, ivec2(3, 4)); return; } diff --git a/test/unittest/reader/spirv/ImageSampleDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageSampleDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl index 1213fe6b6e..abcde0de83 100644 --- a/test/unittest/reader/spirv/ImageSampleDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageSampleDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_3.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2DArray x_20_x_10; -uniform highp sampler2DArray x_20; void main_1() { float f1 = 1.0f; @@ -24,7 +24,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - float x_79 = textureOffset(x_20, vec3(coords123.xy, float(int(round(coords123.z)))), 0.200000003f, ivec2(3, 4)); + float x_79 = textureOffset(x_20_x_10, vec3(coords123.xy, float(int(round(coords123.z)))), 0.200000003f, ivec2(3, 4)); return; } diff --git a/test/unittest/reader/spirv/ImageSampleExplicitLod_DepthTexture_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageSampleExplicitLod_DepthTexture_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl index 5c2f96870b..28d06740d1 100644 --- a/test/unittest/reader/spirv/ImageSampleExplicitLod_DepthTexture_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageSampleExplicitLod_DepthTexture_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2D x_20_x_10; -uniform highp sampler2D x_20; void main_1() { float f1 = 1.0f; @@ -24,7 +24,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - vec4 x_79 = vec4(textureLod(x_20, vf12, int(f1)).x, 0.0f, 0.0f, 0.0f); + vec4 x_79 = vec4(textureLod(x_20_x_10, vf12, int(f1)).x, 0.0f, 0.0f, 0.0f); return; } diff --git a/test/unittest/reader/spirv/ImageSampleImplicitLod_BothDrefAndNonDref_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageSampleImplicitLod_BothDrefAndNonDref_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl index bb29897597..44e2600861 100644 --- a/test/unittest/reader/spirv/ImageSampleImplicitLod_BothDrefAndNonDref_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageSampleImplicitLod_BothDrefAndNonDref_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl @@ -3,8 +3,9 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2D x_20_x_10; +uniform highp sampler2D x_20_x_30; -uniform highp sampler2D x_20; void main_1() { @@ -25,8 +26,8 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - vec4 x_200 = vec4(texture(x_20, coords12).x, 0.0f, 0.0f, 0.0f); - float x_210 = texture(x_20, coords12, 0.200000003f); + vec4 x_200 = vec4(texture(x_20_x_10, coords12).x, 0.0f, 0.0f, 0.0f); + float x_210 = texture(x_20_x_30, coords12, 0.200000003f); return; } @@ -40,8 +41,8 @@ void main() { Error parsing GLSL shader: -ERROR: 0:27: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' -ERROR: 0:27: '' : compilation terminated +ERROR: 0:28: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' +ERROR: 0:28: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/ImageSampleProjDrefExplicitLod_CheckForLod0_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageSampleProjDrefExplicitLod_CheckForLod0_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl index 7290b15d7d..cee1442953 100644 --- a/test/unittest/reader/spirv/ImageSampleProjDrefExplicitLod_CheckForLod0_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageSampleProjDrefExplicitLod_CheckForLod0_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2D x_20_x_10; -uniform highp sampler2D x_20; void main_1() { float float_var = 0.0f; @@ -20,7 +20,7 @@ void main_1() { 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); - float x_73 = texture(x_20, (vf1234.xy / vf1234.z), 0.200000003f); + float x_73 = texture(x_20_x_10, (vf1234.xy / vf1234.z), 0.200000003f); uint x_1000 = 0u; return; } diff --git a/test/unittest/reader/spirv/ImageSampleProjDrefExplicitLod_CheckForLod0_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageSampleProjDrefExplicitLod_CheckForLod0_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl index 7290b15d7d..cee1442953 100644 --- a/test/unittest/reader/spirv/ImageSampleProjDrefExplicitLod_CheckForLod0_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageSampleProjDrefExplicitLod_CheckForLod0_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2D x_20_x_10; -uniform highp sampler2D x_20; void main_1() { float float_var = 0.0f; @@ -20,7 +20,7 @@ void main_1() { 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); - float x_73 = texture(x_20, (vf1234.xy / vf1234.z), 0.200000003f); + float x_73 = texture(x_20_x_10, (vf1234.xy / vf1234.z), 0.200000003f); uint x_1000 = 0u; return; } diff --git a/test/unittest/reader/spirv/ImageSampleProjDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageSampleProjDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl index 586d03d4eb..f3758a7e7c 100644 --- a/test/unittest/reader/spirv/ImageSampleProjDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageSampleProjDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2D x_20_x_10; -uniform highp sampler2D x_20; void main_1() { float f1 = 1.0f; @@ -24,7 +24,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - float x_79 = texture(x_20, (coords123.xy / coords123.z), f1); + float x_79 = texture(x_20_x_10, (coords123.xy / coords123.z), f1); return; } diff --git a/test/unittest/reader/spirv/ImageSampleProjDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageSampleProjDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl index 92fc6e3e74..f105e43000 100644 --- a/test/unittest/reader/spirv/ImageSampleProjDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageSampleProjDrefImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_1.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2D x_20_x_10; -uniform highp sampler2D x_20; void main_1() { float f1 = 1.0f; @@ -24,7 +24,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - float x_79 = textureOffset(x_20, (coords123.xy / coords123.z), f1, ivec2(3, 4)); + float x_79 = textureOffset(x_20_x_10, (coords123.xy / coords123.z), f1, ivec2(3, 4)); return; } diff --git a/test/unittest/reader/spirv/ImageSampleProjImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageSampleProjImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl index 4aece98505..8810a0c6f9 100644 --- a/test/unittest/reader/spirv/ImageSampleProjImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageSampleProjImplicitLod_SpvParserHandleTest_SampledImageAccessTest_Variable_0.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler1D x_20_x_10; -uniform highp sampler1D x_20; void main_1() { float f1 = 1.0f; @@ -24,7 +24,7 @@ void main_1() { vec2 coords12 = vf12; vec3 coords123 = vf123; vec4 coords1234 = vf1234; - vec4 x_79 = texture(x_20, (coords12.x / coords12.y)); + vec4 x_79 = texture(x_20_x_10, (coords12.x / coords12.y)); return; } @@ -38,8 +38,8 @@ void main() { Error parsing GLSL shader: -ERROR: 0:5: 'sampler1D' : Reserved word. -ERROR: 0:5: '' : compilation terminated +ERROR: 0:4: 'sampler1D' : Reserved word. +ERROR: 0:4: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/Multisampled_Only2DNonArrayedIsValid_SpvParserHandleTest_ImageDeclTest_DeclareAndUseHandle_2.spvasm.expected.glsl b/test/unittest/reader/spirv/Multisampled_Only2DNonArrayedIsValid_SpvParserHandleTest_ImageDeclTest_DeclareAndUseHandle_2.spvasm.expected.glsl index daa8569430..f48e7483fe 100644 --- a/test/unittest/reader/spirv/Multisampled_Only2DNonArrayedIsValid_SpvParserHandleTest_ImageDeclTest_DeclareAndUseHandle_2.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Multisampled_Only2DNonArrayedIsValid_SpvParserHandleTest_ImageDeclTest_DeclareAndUseHandle_2.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler2DMS x_20; +uniform highp sampler2DMS x_20_1; void main_1() { float float_var = 0.0f; @@ -19,7 +19,7 @@ void main_1() { 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); - uint x_71 = uint(textureSamples(x_20);); + uint x_71 = uint(textureSamples(x_20_1);); uint x_1000 = 0u; return; } diff --git a/test/unittest/reader/spirv/PreserveFloatCoords_Arrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl b/test/unittest/reader/spirv/PreserveFloatCoords_Arrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl index 2f1a282202..d87e9a9788 100644 --- a/test/unittest/reader/spirv/PreserveFloatCoords_Arrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/PreserveFloatCoords_Arrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2DArray x_20_x_10; -uniform highp sampler2DArray x_20; void main_1() { float float_var = 0.0f; @@ -20,7 +20,7 @@ void main_1() { 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); - float x_73 = texture(x_20, vec3(vf123.xy, float(int(round(vf123.z)))), 0.200000003f); + float x_73 = texture(x_20_x_10, vec3(vf123.xy, float(int(round(vf123.z)))), 0.200000003f); uint x_1000 = 0u; return; } diff --git a/test/unittest/reader/spirv/PreserveFloatCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl b/test/unittest/reader/spirv/PreserveFloatCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl index 735611a007..72425bb68e 100644 --- a/test/unittest/reader/spirv/PreserveFloatCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/PreserveFloatCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler1D x_20_x_10; -uniform highp sampler1D x_20; void main_1() { float float_var = 0.0f; @@ -20,7 +20,7 @@ void main_1() { 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, f1); + vec4 x_73 = texture(x_20_x_10, f1); uint x_1000 = 0u; return; } @@ -35,8 +35,8 @@ void main() { Error parsing GLSL shader: -ERROR: 0:5: 'sampler1D' : Reserved word. -ERROR: 0:5: '' : compilation terminated +ERROR: 0:4: 'sampler1D' : Reserved word. +ERROR: 0:4: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/PreserveFloatCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_4.spvasm.expected.glsl b/test/unittest/reader/spirv/PreserveFloatCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_4.spvasm.expected.glsl index 1919a37483..f4f90ff940 100644 --- a/test/unittest/reader/spirv/PreserveFloatCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_4.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/PreserveFloatCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_4.spvasm.expected.glsl @@ -3,8 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2D x_20_x_10; -uniform highp sampler2D x_20; void main_1() { float float_var = 0.0f; @@ -20,7 +20,7 @@ void main_1() { 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); - float x_73 = texture(x_20, vf12, 0.200000003f); + float x_73 = texture(x_20_x_10, vf12, 0.200000003f); uint x_1000 = 0u; return; } diff --git a/test/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl b/test/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl index 1b96987a52..944b571982 100644 --- a/test/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_0.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler1D x_20; +uniform highp sampler1D x_20_1; void main_1() { float float_var = 0.0f; @@ -19,7 +19,7 @@ void main_1() { 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, i1, 0); + vec4 x_73 = texelFetch(x_20_1, i1, 0); uint x_1000 = 0u; return; } diff --git a/test/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl b/test/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl index 46b327e450..972196664d 100644 --- a/test/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_1.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler1D x_20; +uniform highp sampler1D x_20_1; void main_1() { float float_var = 0.0f; @@ -19,7 +19,7 @@ void main_1() { 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, i1, 0); + vec4 x_71 = texelFetch(x_20_1, i1, 0); uint x_1000 = 0u; return; } diff --git a/test/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl b/test/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl index c15ccc036c..79cb8f906c 100644 --- a/test/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/PreserveIntCoords_NonArrayed_SpvParserHandleTest_ImageCoordsTest_MakeCoordinateOperandsForImageAccess_2.spvasm.expected.glsl @@ -3,7 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp writeonly image1D x_20; +uniform highp writeonly image1D x_20_1; void main_1() { float float_var = 0.0f; @@ -19,7 +19,7 @@ void main_1() { 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); + imageStore(x_20_1, i1, vf1234); uint x_1000 = 0u; return; } diff --git a/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_0.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_0.spvasm.expected.glsl index 44851bbe5e..87536a1399 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_0.spvasm.expected.glsl @@ -3,10 +3,10 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler1D x_20; +uniform highp sampler1D x_20_1; void main_1() { - vec4 x_125 = texelFetch(x_20, int(1u), 0); + vec4 x_125 = texelFetch(x_20_1, int(1u), 0); return; } diff --git a/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_1.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_1.spvasm.expected.glsl index e98da9d2cb..1bc1de87f7 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_1.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_1.spvasm.expected.glsl @@ -3,10 +3,10 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp writeonly image1D x_20; +uniform highp writeonly image1D x_20_1; void main_1() { - imageStore(x_20, int(1u), vec4(0.0f, 0.0f, 0.0f, 0.0f)); + imageStore(x_20_1, int(1u), vec4(0.0f, 0.0f, 0.0f, 0.0f)); return; } diff --git a/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_2.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_2.spvasm.expected.glsl index 1c9d5ded3f..7e328eca8e 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_2.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_2.spvasm.expected.glsl @@ -3,10 +3,10 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler1D x_20; +uniform highp sampler1D x_20_1; void main_1() { - vec4 x_125 = texelFetch(x_20, int(0u), 0); + vec4 x_125 = texelFetch(x_20_1, int(0u), 0); return; } diff --git a/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_5.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_5.spvasm.expected.glsl index 67b6484c66..1f16d62f42 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_5.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_5.spvasm.expected.glsl @@ -3,10 +3,10 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler2D x_20; +uniform highp sampler2D x_20_1; void main_1() { - uint x_125 = uint(textureQueryLevels(x_20);); + uint x_125 = uint(textureQueryLevels(x_20_1);); return; } diff --git a/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_6.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_6.spvasm.expected.glsl index 70e014d133..03a41ae6c2 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_6.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_RawImage_Variable_6.spvasm.expected.glsl @@ -3,10 +3,10 @@ SKIP: FAILED #version 310 es precision mediump float; -uniform highp sampler2DMS x_20; +uniform highp sampler2DMS x_20_1; void main_1() { - uint x_125 = uint(textureSamples(x_20);); + uint x_125 = uint(textureSamples(x_20_1);); return; } diff --git a/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_SampledImage_Variable_4.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_SampledImage_Variable_4.spvasm.expected.glsl index bb550c9a8d..6f9189fb13 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_SampledImage_Variable_4.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_SampledImage_Variable_4.spvasm.expected.glsl @@ -3,11 +3,11 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2D x_20_x_10; -uniform highp sampler2D x_20; void main_1() { - float x_131 = texture(x_20, vec2(0.0f, 0.0f), 0.200000003f); + float x_131 = texture(x_20_x_10, vec2(0.0f, 0.0f), 0.200000003f); return; } diff --git a/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_SampledImage_Variable_8.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_SampledImage_Variable_8.spvasm.expected.glsl index a35480eaef..bdd4ebd84d 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_SampledImage_Variable_8.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_SampledImage_Variable_8.spvasm.expected.glsl @@ -3,11 +3,11 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2D x_20_x_10; -uniform highp sampler2D x_20; void main_1() { - float x_131 = texture(x_20, (vec3(0.0f, 0.0f, 0.0f).xy / vec3(0.0f, 0.0f, 0.0f).z), 0.200000003f); + float x_131 = texture(x_20_x_10, (vec3(0.0f, 0.0f, 0.0f).xy / vec3(0.0f, 0.0f, 0.0f).z), 0.200000003f); return; } diff --git a/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_SampledImage_Variable_9.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_SampledImage_Variable_9.spvasm.expected.glsl index a35480eaef..bdd4ebd84d 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_SampledImage_Variable_9.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserHandleTest_RegisterHandleUsage_SampledImage_Variable_9.spvasm.expected.glsl @@ -3,11 +3,11 @@ SKIP: FAILED #version 310 es precision mediump float; +uniform highp sampler2D x_20_x_10; -uniform highp sampler2D x_20; void main_1() { - float x_131 = texture(x_20, (vec3(0.0f, 0.0f, 0.0f).xy / vec3(0.0f, 0.0f, 0.0f).z), 0.200000003f); + float x_131 = texture(x_20_x_10, (vec3(0.0f, 0.0f, 0.0f).xy / vec3(0.0f, 0.0f, 0.0f).z), 0.200000003f); return; } diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Back_SingleBlock_Back.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Back_SingleBlock_Back.spvasm.expected.glsl new file mode 100644 index 0000000000..545d602f40 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Back_SingleBlock_Back.spvasm.expected.glsl @@ -0,0 +1,20 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 0u; + loop { + var_1 = 1u; + } + var_1 = 5u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Continue_AfterHeader_Conditional.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Continue_AfterHeader_Conditional.spvasm.expected.glsl new file mode 100644 index 0000000000..ed3372cfa3 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Continue_AfterHeader_Conditional.spvasm.expected.glsl @@ -0,0 +1,30 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 0u; + loop { + var_1 = 1u; + var_1 = 2u; + if (true) { + var_1 = 3u; + continue; + } + var_1 = 4u; + + continuing { + var_1 = 5u; + } + } + var_1 = 6u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Continue_AfterHeader_Conditional_EmptyContinuing.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Continue_AfterHeader_Conditional_EmptyContinuing.spvasm.expected.glsl new file mode 100644 index 0000000000..167379a10e --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Continue_AfterHeader_Conditional_EmptyContinuing.spvasm.expected.glsl @@ -0,0 +1,26 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 0u; + loop { + var_1 = 1u; + var_1 = 2u; + if (true) { + var_1 = 3u; + continue; + } + var_1 = 4u; + } + var_1 = 6u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Continue_AfterHeader_Unconditional.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Continue_AfterHeader_Unconditional.spvasm.expected.glsl new file mode 100644 index 0000000000..586a7dbf95 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Continue_AfterHeader_Unconditional.spvasm.expected.glsl @@ -0,0 +1,25 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 0u; + loop { + var_1 = 1u; + var_1 = 2u; + + continuing { + var_1 = 4u; + } + } + var_1 = 5u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Continue_FromHeader.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Continue_FromHeader.spvasm.expected.glsl new file mode 100644 index 0000000000..e76fca4ede --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Continue_FromHeader.spvasm.expected.glsl @@ -0,0 +1,24 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 0u; + loop { + var_1 = 1u; + + continuing { + var_1 = 4u; + } + } + var_1 = 5u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Fallthrough_OnFalse.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Fallthrough_OnFalse.spvasm.expected.glsl new file mode 100644 index 0000000000..cc547df98b --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Fallthrough_OnFalse.spvasm.expected.glsl @@ -0,0 +1,40 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 0u; + loop { + var_1 = 1u; + var_1 = 2u; + switch(42u) { + case 40u: { + var_1 = 40u; + if (false) { + continue; + } + fallthrough; + } + case 50u: { + var_1 = 50u; + } + default: { + } + } + var_1 = 3u; + + continuing { + var_1 = 4u; + } + } + var_1 = 5u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Fallthrough_OnTrue.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Fallthrough_OnTrue.spvasm.expected.glsl new file mode 100644 index 0000000000..181cd62144 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Fallthrough_OnTrue.spvasm.expected.glsl @@ -0,0 +1,41 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 0u; + loop { + var_1 = 1u; + var_1 = 2u; + switch(42u) { + case 40u: { + var_1 = 40u; + if (false) { + } else { + continue; + } + fallthrough; + } + case 50u: { + var_1 = 50u; + } + default: { + } + } + var_1 = 3u; + + continuing { + var_1 = 4u; + } + } + var_1 = 5u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Forward_OnFalse.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Forward_OnFalse.spvasm.expected.glsl new file mode 100644 index 0000000000..bd16703885 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Forward_OnFalse.spvasm.expected.glsl @@ -0,0 +1,29 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 0u; + loop { + var_1 = 1u; + var_1 = 2u; + if (false) { + continue; + } + var_1 = 3u; + + continuing { + var_1 = 4u; + } + } + var_1 = 5u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Forward_OnTrue.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Forward_OnTrue.spvasm.expected.glsl new file mode 100644 index 0000000000..a789380931 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_Forward_OnTrue.spvasm.expected.glsl @@ -0,0 +1,30 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 0u; + loop { + var_1 = 1u; + var_1 = 2u; + if (false) { + } else { + continue; + } + var_1 = 3u; + + continuing { + var_1 = 4u; + } + } + var_1 = 5u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_IfBreak_OnFalse.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_IfBreak_OnFalse.spvasm.expected.glsl new file mode 100644 index 0000000000..ec644729a0 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_IfBreak_OnFalse.spvasm.expected.glsl @@ -0,0 +1,32 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 0u; + loop { + var_1 = 1u; + var_1 = 2u; + if (true) { + var_1 = 3u; + if (false) { + continue; + } + } + var_1 = 4u; + + continuing { + var_1 = 5u; + } + } + var_1 = 6u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_IfBreak_OnTrue.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_IfBreak_OnTrue.spvasm.expected.glsl new file mode 100644 index 0000000000..457c6ec864 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_Continue_IfBreak_OnTrue.spvasm.expected.glsl @@ -0,0 +1,33 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 0u; + loop { + var_1 = 1u; + var_1 = 2u; + if (true) { + var_1 = 3u; + if (false) { + } else { + continue; + } + } + var_1 = 4u; + + continuing { + var_1 = 5u; + } + } + var_1 = 6u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_LoopContinue_FromSwitch.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_LoopContinue_FromSwitch.spvasm.expected.glsl new file mode 100644 index 0000000000..82610e24db --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_LoopContinue_FromSwitch.spvasm.expected.glsl @@ -0,0 +1,34 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 1u; + loop { + var_1 = 2u; + var_1 = 3u; + switch(42u) { + case 40u: { + var_1 = 4u; + continue; + } + default: { + } + } + var_1 = 5u; + + continuing { + var_1 = 6u; + } + } + var_1 = 7u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_SwitchBreak_Continue_OnFalse.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_SwitchBreak_Continue_OnFalse.spvasm.expected.glsl new file mode 100644 index 0000000000..9a46eebd7e --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_SwitchBreak_Continue_OnFalse.spvasm.expected.glsl @@ -0,0 +1,37 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 1u; + loop { + var_1 = 2u; + var_1 = 3u; + switch(42u) { + case 40u: { + var_1 = 40u; + if (false) { + } else { + continue; + } + } + default: { + } + } + var_1 = 6u; + + continuing { + var_1 = 7u; + } + } + var_1 = 8u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_SwitchBreak_Continue_OnTrue.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_SwitchBreak_Continue_OnTrue.spvasm.expected.glsl new file mode 100644 index 0000000000..083e42667b --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_BranchConditional_SwitchBreak_Continue_OnTrue.spvasm.expected.glsl @@ -0,0 +1,36 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 1u; + loop { + var_1 = 2u; + var_1 = 3u; + switch(42u) { + case 40u: { + var_1 = 40u; + if (false) { + continue; + } + } + default: { + } + } + var_1 = 6u; + + continuing { + var_1 = 7u; + } + } + var_1 = 8u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Branch_BackEdge_MultiBlockLoop.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Branch_BackEdge_MultiBlockLoop.spvasm.expected.glsl new file mode 100644 index 0000000000..2efe2a8455 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Branch_BackEdge_MultiBlockLoop.spvasm.expected.glsl @@ -0,0 +1,21 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + loop { + + continuing { + var_1 = 1u; + } + } + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Branch_BackEdge_SingleBlockLoop.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Branch_BackEdge_SingleBlockLoop.spvasm.expected.glsl new file mode 100644 index 0000000000..12d2d6fd76 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Branch_BackEdge_SingleBlockLoop.spvasm.expected.glsl @@ -0,0 +1,18 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + loop { + var_1 = 1u; + } + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Branch_LoopContinue_BeforeLast.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Branch_LoopContinue_BeforeLast.spvasm.expected.glsl new file mode 100644 index 0000000000..5709df3209 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Branch_LoopContinue_BeforeLast.spvasm.expected.glsl @@ -0,0 +1,26 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + loop { + if (false) { + var_1 = 1u; + continue; + } + var_1 = 2u; + + continuing { + var_1 = 3u; + } + } + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Branch_LoopContinue_FromSwitch.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Branch_LoopContinue_FromSwitch.spvasm.expected.glsl new file mode 100644 index 0000000000..82610e24db --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Branch_LoopContinue_FromSwitch.spvasm.expected.glsl @@ -0,0 +1,34 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 1u; + loop { + var_1 = 2u; + var_1 = 3u; + switch(42u) { + case 40u: { + var_1 = 4u; + continue; + } + default: { + } + } + var_1 = 5u; + + continuing { + var_1 = 6u; + } + } + var_1 = 7u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Branch_LoopContinue_LastInLoopConstruct.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Branch_LoopContinue_LastInLoopConstruct.spvasm.expected.glsl new file mode 100644 index 0000000000..eb514eeb41 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Branch_LoopContinue_LastInLoopConstruct.spvasm.expected.glsl @@ -0,0 +1,22 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + loop { + var_1 = 1u; + + continuing { + var_1 = 2u; + } + } + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_FalseBranch_LoopContinue.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_FalseBranch_LoopContinue.spvasm.expected.glsl new file mode 100644 index 0000000000..d538de18a1 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_FalseBranch_LoopContinue.spvasm.expected.glsl @@ -0,0 +1,21 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + loop { + if (false) { + } else { + continue; + } + } + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_LoopInternallyDiverge_Simple.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_LoopInternallyDiverge_Simple.spvasm.expected.glsl new file mode 100644 index 0000000000..3122cf9e02 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_LoopInternallyDiverge_Simple.spvasm.expected.glsl @@ -0,0 +1,30 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 10u; + loop { + var_1 = 20u; + if (false) { + var_1 = 30u; + continue; + } else { + var_1 = 40u; + } + + continuing { + var_1 = 90u; + } + } + var_1 = 99u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Loop_NestedIfContinue.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Loop_NestedIfContinue.spvasm.expected.glsl new file mode 100644 index 0000000000..5709df3209 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Loop_NestedIfContinue.spvasm.expected.glsl @@ -0,0 +1,26 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + loop { + if (false) { + var_1 = 1u; + continue; + } + var_1 = 2u; + + continuing { + var_1 = 3u; + } + } + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Loop_SingleBlock_BothBackedge.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Loop_SingleBlock_BothBackedge.spvasm.expected.glsl new file mode 100644 index 0000000000..bac39a4697 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Loop_SingleBlock_BothBackedge.spvasm.expected.glsl @@ -0,0 +1,20 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 0u; + loop { + var_1 = 1u; + } + var_1 = 999u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Loop_SingleBlock_UnconditionalBackege.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Loop_SingleBlock_UnconditionalBackege.spvasm.expected.glsl new file mode 100644 index 0000000000..bac39a4697 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Loop_SingleBlock_UnconditionalBackege.spvasm.expected.glsl @@ -0,0 +1,20 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 0u; + loop { + var_1 = 1u; + } + var_1 = 999u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Loop_Unconditional_Body_ContinueNestIf.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Loop_Unconditional_Body_ContinueNestIf.spvasm.expected.glsl new file mode 100644 index 0000000000..74c752dc01 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Loop_Unconditional_Body_ContinueNestIf.spvasm.expected.glsl @@ -0,0 +1,29 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 0u; + loop { + var_1 = 1u; + var_1 = 2u; + + continuing { + var_1 = 3u; + if (true) { + var_1 = 4u; + } + var_1 = 5u; + } + } + var_1 = 999u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Loop_Unconditional_Body_MultiBlockContinue.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Loop_Unconditional_Body_MultiBlockContinue.spvasm.expected.glsl new file mode 100644 index 0000000000..13fc2c7429 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Loop_Unconditional_Body_MultiBlockContinue.spvasm.expected.glsl @@ -0,0 +1,26 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 0u; + loop { + var_1 = 1u; + var_1 = 2u; + + continuing { + var_1 = 3u; + var_1 = 4u; + } + } + var_1 = 999u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Loop_Unconditional_Body_SingleBlockContinue.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Loop_Unconditional_Body_SingleBlockContinue.spvasm.expected.glsl new file mode 100644 index 0000000000..cb60399479 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_Loop_Unconditional_Body_SingleBlockContinue.spvasm.expected.glsl @@ -0,0 +1,25 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + var_1 = 0u; + loop { + var_1 = 1u; + var_1 = 2u; + + continuing { + var_1 = 3u; + } + } + var_1 = 999u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_TrueBranch_LoopContinue.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_TrueBranch_LoopContinue.spvasm.expected.glsl new file mode 100644 index 0000000000..9de1e7e042 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_EmitBody_TrueBranch_LoopContinue.spvasm.expected.glsl @@ -0,0 +1,20 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + loop { + if (false) { + continue; + } + } + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_FindIfSelectionInternalHeaders_FalseBranch_LoopContinue_Ok.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_FindIfSelectionInternalHeaders_FalseBranch_LoopContinue_Ok.spvasm.expected.glsl new file mode 100644 index 0000000000..d538de18a1 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_FindIfSelectionInternalHeaders_FalseBranch_LoopContinue_Ok.spvasm.expected.glsl @@ -0,0 +1,21 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + loop { + if (false) { + } else { + continue; + } + } + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_FindIfSelectionInternalHeaders_TrueBranch_LoopContinue_Ok.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_FindIfSelectionInternalHeaders_TrueBranch_LoopContinue_Ok.spvasm.expected.glsl new file mode 100644 index 0000000000..9de1e7e042 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_FindIfSelectionInternalHeaders_TrueBranch_LoopContinue_Ok.spvasm.expected.glsl @@ -0,0 +1,20 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + loop { + if (false) { + continue; + } + } + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_LabelControlFlowConstructs_LoopInterallyDiverge.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_LabelControlFlowConstructs_LoopInterallyDiverge.spvasm.expected.glsl new file mode 100644 index 0000000000..9de1e7e042 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_LabelControlFlowConstructs_LoopInterallyDiverge.spvasm.expected.glsl @@ -0,0 +1,20 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + loop { + if (false) { + continue; + } + } + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserCFGTest_RegisterMerges_GoodLoopMerge_MultiBlockLoop_ContinueIsHeader.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserCFGTest_RegisterMerges_GoodLoopMerge_MultiBlockLoop_ContinueIsHeader.spvasm.expected.glsl new file mode 100644 index 0000000000..461b205de7 --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserCFGTest_RegisterMerges_GoodLoopMerge_MultiBlockLoop_ContinueIsHeader.spvasm.expected.glsl @@ -0,0 +1,17 @@ +SKIP: FAILED + + +var var_1 : u32; + +fn main_1() { + loop { + } + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserFunctionVarTest_EmitStatement_CombinatorialValue_Immediate_UsedOnceDifferentConstruct.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserFunctionVarTest_EmitStatement_CombinatorialValue_Immediate_UsedOnceDifferentConstruct.spvasm.expected.glsl new file mode 100644 index 0000000000..92f1a877ca --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserFunctionVarTest_EmitStatement_CombinatorialValue_Immediate_UsedOnceDifferentConstruct.spvasm.expected.glsl @@ -0,0 +1,29 @@ +SKIP: FAILED + + +struct S { + field0 : u32; + field1 : f32; + field2 : array; +} + +fn main_1() { + var x_25 : u32; + let x_2 : u32 = (1u + 1u); + x_25 = 1u; + loop { + + continuing { + x_25 = x_2; + } + } + x_25 = 2u; + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserFunctionVarTest_EmitStatement_Phi_ValueFromLoopBodyAndContinuing.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserFunctionVarTest_EmitStatement_Phi_ValueFromLoopBodyAndContinuing.spvasm.expected.glsl new file mode 100644 index 0000000000..1ce270819e --- /dev/null +++ b/test/unittest/reader/spirv/SpvParserFunctionVarTest_EmitStatement_Phi_ValueFromLoopBodyAndContinuing.spvasm.expected.glsl @@ -0,0 +1,46 @@ +SKIP: FAILED + + +struct S { + field0 : u32; + field1 : f32; + field2 : array; +} + +var x_1 : u32; + +var x_17 : bool; + +fn main_1() { + let x_101 : bool = x_17; + loop { + var x_2_phi : u32; + var x_5_phi : u32; + x_2_phi = 0u; + x_5_phi = 1u; + loop { + var x_7 : u32; + let x_2 : u32 = x_2_phi; + let x_5 : u32 = x_5_phi; + let x_4 : u32 = (x_2 + 1u); + let x_6 : u32 = (x_4 + 1u); + if (x_101) { + break; + } + + continuing { + x_7 = (x_4 + x_6); + x_2_phi = x_4; + x_5_phi = x_7; + } + } + } + return; +} + +@stage(fragment) +fn main() { + main_1(); +} + +error: loop does not exit diff --git a/test/unittest/reader/spirv/SpvParserTest_VectorExtractDynamic_UnsignedIndex.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserTest_VectorExtractDynamic_UnsignedIndex.spvasm.expected.glsl deleted file mode 100644 index b471ece2b5..0000000000 --- a/test/unittest/reader/spirv/SpvParserTest_VectorExtractDynamic_UnsignedIndex.spvasm.expected.glsl +++ /dev/null @@ -1,34 +0,0 @@ -SKIP: FAILED - -#version 310 es -precision mediump float; - -struct S { - vec2 field0; - uint field1; - int field2; -}; - -void main_1() { - uvec2 x_1 = uvec2(3u, 4u); - uint x_10 = x_1[3u]; - return; -} - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol() { - main_1(); - return; -} -void main() { - tint_symbol(); -} - - -Error parsing GLSL shader: -ERROR: 0:12: '[' : vector index out of range '3' -ERROR: 0:12: '' : compilation terminated -ERROR: 2 compilation errors. No code generated. - - - diff --git a/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl.expected.glsl index 0b741de7ad..5c23beb0ec 100644 --- a/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type RTArr = @stride(4) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl.expected.glsl index 93c7012eb7..4399f09319 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-apfloat-mod-zero/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl.expected.glsl index 1b8c971f8b..330e0387a2 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl:39:22 warning: use of deprecated intrinsic let x_48 : bool = (isInf(x_44) || (x_46 == 1.0)); ^^^^^ diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl.expected.glsl index e6b95ce6cd..91e5a32170 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl.expected.glsl index 0c4b966466..46d8d26e7c 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl.expected.glsl index 03e7a1598a..e342a8723c 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl.expected.glsl index 772e0cc05e..fbfe7db643 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl.expected.glsl @@ -1,5 +1,17 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.wgsl:17:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_2 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl.expected.glsl index 08ead30b4d..3fedb7e0de 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-const-folding-mod-one-one-lte/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl.expected.glsl index 44e0b9e666..40859311c7 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl.expected.glsl index 80f91e5e37..15b4081cad 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.wgsl.expected.glsl index ec7d6177ef..108a63b687 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.wgsl.expected.glsl index 5df889b0b0..7d6df8ffef 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.wgsl.expected.glsl index bd6f6a5bf2..28d936a5f6 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.wgsl.expected.glsl index b438ac44a6..68329c501d 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.wgsl.expected.glsl index 61f4a60934..2d19c3975c 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.wgsl.expected.glsl index 92875563dc..86f616c86b 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.wgsl.expected.glsl index add7f7fbff..ac54d67acf 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.wgsl.expected.glsl index 146f9a22f5..bbb0c8b44a 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.wgsl.expected.glsl index 971f64ab55..6b6d4896d1 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-acos-undefined/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-acos-undefined/0-opt.wgsl.expected.glsl index e409ce1e34..50486de39e 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-acos-undefined/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-acos-undefined/0-opt.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-acos-undefined/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-acos-undefined/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-sqrt-undefined/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-sqrt-undefined/0-opt.wgsl.expected.glsl index 6059d0481f..f8e4836d52 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-sqrt-undefined/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-sqrt-undefined/0-opt.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-sqrt-undefined/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-instruction-simplify-mod-sqrt-undefined/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.wgsl.expected.glsl index b22034fcdd..cfe03a48c2 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.wgsl.expected.glsl index 243be09b60..b6f12023c8 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.wgsl:5:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-mod-uint-bits-float/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-mod-uint-bits-float/0-opt.wgsl.expected.glsl index 6cad8e7aeb..038e115472 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-mod-uint-bits-float/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-mod-uint-bits-float/0-opt.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-mod-uint-bits-float/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.wgsl.expected.glsl index aca143249a..1bb1ef7da4 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-simplify-modulo-1/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-simplify-modulo-1/0-opt.wgsl.expected.glsl index ba526425f6..b14a632f18 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-simplify-modulo-1/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-simplify-modulo-1/0-opt.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-simplify-modulo-1/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-simplify-modulo-1/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.wgsl.expected.glsl index 675c1f71f6..cfa44f8a6b 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl.expected.glsl index 087d8484a1..44817ec70b 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl.expected.glsl @@ -1,5 +1,17 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.wgsl:13:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_2 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.wgsl.expected.glsl index 4e1a68053c..415cce0666 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.wgsl.expected.glsl index e552f1d58c..b97d86044f 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.wgsl.expected.glsl @@ -1,5 +1,13 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.wgsl:1:13 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr = @stride(16) array; + ^^^^^^ + +vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.wgsl:7:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type Arr_1 = @stride(16) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl.expected.glsl index 2a963e89a4..c32d5f9791 100644 --- a/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.wgsl:5:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type RTArr = @stride(4) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl.expected.glsl index ea4016a509..328549b602 100644 --- a/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type RTArr = @stride(4) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl.expected.glsl index d81ec782f1..8d3ebad61a 100644 --- a/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.wgsl:9:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type RTArr = @stride(4) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl.expected.glsl index 647bb19179..6c74722fa7 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.wgsl:5:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type RTArr = @stride(4) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl.expected.glsl index 4051a8974c..9a5cd5be77 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type RTArr = @stride(4) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl.expected.glsl index 00d95b5594..2db91c2207 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type RTArr = @stride(4) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl.expected.glsl index 6549a16baf..bd05f99f95 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type RTArr = @stride(4) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl.expected.glsl index b7820e5075..b26647ca88 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type RTArr = @stride(4) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl.expected.glsl index 9c107dfd7b..0de377687a 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type RTArr = @stride(4) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl.expected.glsl index c2f72f49a2..627ea87bc9 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type RTArr = @stride(4) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl.expected.glsl index 0d2cc7a78e..d7c78d4386 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type RTArr = @stride(4) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl.expected.glsl index 7c5c515f17..1bffd3de06 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type RTArr = @stride(4) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl.expected.glsl index d0da7f20b4..506dc89d4c 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type RTArr = @stride(4) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl.expected.glsl index 714c300023..acf682cd7b 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type RTArr = @stride(4) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl.expected.glsl index b49fe8952e..b7a66dd781 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl.expected.glsl @@ -1,5 +1,9 @@ SKIP: FAILED +vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type RTArr = @stride(4) array; + ^^^^^^ + #version 310 es precision mediump float; diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_store/1.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_store/1.spvasm.expected.glsl index 7f525f978b..9871941fae 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_store/1.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_store/1.spvasm.expected.glsl @@ -6,7 +6,7 @@ precision mediump float; vec4 x_2 = vec4(0.0f, 0.0f, 0.0f, 0.0f); int x_3 = 0; int x_4 = 0; -uniform highp writeonly iimage2D x_5; +uniform highp writeonly iimage2D x_5_1; void main_1() { x_4 = 1; @@ -15,7 +15,7 @@ void main_1() { int x_28 = int(x_23.y); if (((((x_27 & 1) + (x_28 & 1)) + x_3) == int(x_23.z))) { } - imageStore(x_5, ivec2(x_27, x_28), ivec4(x_27, 0, 0, 0)); + imageStore(x_5_1, ivec2(x_27, x_28), ivec4(x_27, 0, 0, 0)); return; } diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_store/1.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_store/1.wgsl.expected.glsl index 34862ac25e..a62880ecec 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_store/1.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_store/1.wgsl.expected.glsl @@ -1,8 +1,8 @@ SKIP: FAILED -vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_store/1.wgsl:27:70 warning: integral user-defined fragment inputs must have a flat interpolation attribute +vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_store/1.wgsl:27:64 warning: integral user-defined fragment inputs must have a flat interpolation attribute fn main(@builtin(position) x_2_param : vec4, @location(0) x_3_param : i32) -> main_out { - ^^^^^^^^^ + ^^^^^^^^^ #version 310 es precision mediump float; @@ -10,7 +10,7 @@ precision mediump float; vec4 x_2 = vec4(0.0f, 0.0f, 0.0f, 0.0f); int x_3 = 0; int x_4 = 0; -uniform highp writeonly iimage2D x_5; +uniform highp writeonly iimage2D x_5_1; void main_1() { x_4 = 1; @@ -19,7 +19,7 @@ void main_1() { int x_28 = int(x_23.y); if (((((x_27 & 1) + (x_28 & 1)) + x_3) == int(x_23.z))) { } - imageStore(x_5, ivec2(x_27, x_28), ivec4(x_27, 0, 0, 0)); + imageStore(x_5_1, ivec2(x_27, x_28), ivec4(x_27, 0, 0, 0)); return; } @@ -62,7 +62,7 @@ void main() { Error parsing GLSL shader: ERROR: 0:45: 'int' : must be qualified as flat in -ERROR: 0:45: '' : compilation terminated +ERROR: 0:45: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/1.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/1.wgsl.expected.glsl index 2da1cc80c4..92fc0151d3 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/1.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/1.wgsl.expected.glsl @@ -1,8 +1,8 @@ SKIP: FAILED -vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/1.wgsl:22:70 warning: integral user-defined fragment inputs must have a flat interpolation attribute +vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/1.wgsl:22:64 warning: integral user-defined fragment inputs must have a flat interpolation attribute fn main(@builtin(position) x_2_param : vec4, @location(0) x_3_param : i32) -> main_out { - ^^^^^^^^^ + ^^^^^^^^^ #version 310 es precision mediump float; @@ -58,7 +58,7 @@ void main() { Error parsing GLSL shader: ERROR: 0:41: 'int' : must be qualified as flat in -ERROR: 0:41: '' : compilation terminated +ERROR: 0:41: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write_before_terminate/1.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write_before_terminate/1.wgsl.expected.glsl index fe31b1c21e..2b3d2589d2 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write_before_terminate/1.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write_before_terminate/1.wgsl.expected.glsl @@ -1,8 +1,8 @@ SKIP: FAILED -vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write_before_terminate/1.wgsl:22:70 warning: integral user-defined fragment inputs must have a flat interpolation attribute +vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write_before_terminate/1.wgsl:22:64 warning: integral user-defined fragment inputs must have a flat interpolation attribute fn main(@builtin(position) x_2_param : vec4, @location(0) x_3_param : i32) -> main_out { - ^^^^^^^^^ + ^^^^^^^^^ #version 310 es precision mediump float; @@ -59,7 +59,7 @@ void main() { Error parsing GLSL shader: ERROR: 0:42: 'int' : must be qualified as flat in -ERROR: 0:42: '' : compilation terminated +ERROR: 0:42: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl.expected.glsl index f7d8197967..2e09134ab2 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl.expected.glsl @@ -1,8 +1,12 @@ SKIP: FAILED -vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl:33:70 warning: integral user-defined fragment inputs must have a flat interpolation attribute +vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type RTArr = @stride(4) array; + ^^^^^^ + +vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.wgsl:33:64 warning: integral user-defined fragment inputs must have a flat interpolation attribute fn main(@builtin(position) x_2_param : vec4, @location(0) x_3_param : i32) -> main_out { - ^^^^^^^^^ + ^^^^^^^^^ #version 310 es precision mediump float; @@ -67,8 +71,8 @@ void main() { Error parsing GLSL shader: -ERROR: 0:5: '' : array size required -ERROR: 0:6: '' : compilation terminated +ERROR: 0:5: '' : array size required +ERROR: 0:6: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl.expected.glsl index 6fe04b3c10..4bf4240ce6 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl.expected.glsl @@ -1,8 +1,12 @@ SKIP: FAILED -vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl:33:70 warning: integral user-defined fragment inputs must have a flat interpolation attribute +vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl:1:15 warning: use of deprecated language feature: the @stride attribute is deprecated; use a larger type if necessary +type RTArr = @stride(4) array; + ^^^^^^ + +vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.wgsl:33:64 warning: integral user-defined fragment inputs must have a flat interpolation attribute fn main(@builtin(position) x_2_param : vec4, @location(0) x_3_param : i32) -> main_out { - ^^^^^^^^^ + ^^^^^^^^^ #version 310 es precision mediump float; @@ -68,8 +72,8 @@ void main() { Error parsing GLSL shader: -ERROR: 0:5: '' : array size required -ERROR: 0:6: '' : compilation terminated +ERROR: 0:5: '' : array size required +ERROR: 0:6: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/terminate_loop/1.wgsl.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/terminate_loop/1.wgsl.expected.glsl index b9ab85df3c..464cc5a900 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/terminate_loop/1.wgsl.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/terminate_loop/1.wgsl.expected.glsl @@ -1,8 +1,8 @@ SKIP: FAILED -vk-gl-cts/spirv_assembly/instruction/terminate_invocation/terminate_loop/1.wgsl:37:70 warning: integral user-defined fragment inputs must have a flat interpolation attribute +vk-gl-cts/spirv_assembly/instruction/terminate_invocation/terminate_loop/1.wgsl:37:64 warning: integral user-defined fragment inputs must have a flat interpolation attribute fn main(@builtin(position) x_2_param : vec4, @location(0) x_3_param : i32) -> main_out { - ^^^^^^^^^ + ^^^^^^^^^ #version 310 es precision mediump float; @@ -73,7 +73,7 @@ void main() { Error parsing GLSL shader: ERROR: 0:56: 'int' : must be qualified as flat in -ERROR: 0:56: '' : compilation terminated +ERROR: 0:56: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/tools/src/cmd/test-runner/main.go b/tools/src/cmd/test-runner/main.go index 5f37e71185..71367e1c2f 100644 --- a/tools/src/cmd/test-runner/main.go +++ b/tools/src/cmd/test-runner/main.go @@ -85,7 +85,7 @@ func run() error { var maxFilenameColumnWidth int numCPU := runtime.NumCPU() fxc, verbose, generateExpected, generateSkip := false, false, false, false - flag.StringVar(&formatList, "format", "wgsl,spvasm,msl,hlsl", "comma separated list of formats to emit. Possible values are: all, wgsl, spvasm, msl, hlsl, glsl") + flag.StringVar(&formatList, "format", "all", "comma separated list of formats to emit. Possible values are: all, wgsl, spvasm, msl, hlsl, glsl") flag.StringVar(&filter, "filter", "**.wgsl, **.spvasm, **.spv", "comma separated list of glob patterns for test files") flag.StringVar(&dxcPath, "dxc", "", "path to DXC executable for validating HLSL output") flag.StringVar(&xcrunPath, "xcrun", "", "path to xcrun executable for validating MSL output") @@ -142,7 +142,8 @@ func run() error { "**.expected.wgsl", "**.expected.spvasm", "**.expected.msl", - "**.expected.hlsl" + "**.expected.hlsl", + "**.expected.glsl" ] } ]