diff --git a/src/transform/canonicalize_entry_point_io.cc b/src/transform/canonicalize_entry_point_io.cc index 88e6b1604a..974e456994 100644 --- a/src/transform/canonicalize_entry_point_io.cc +++ b/src/transform/canonicalize_entry_point_io.cc @@ -130,11 +130,14 @@ struct CanonicalizeEntryPointIO::State { /// Clones the shader IO decorations from `src`. /// @param src the decorations to clone + /// @param do_interpolate whether to clone InterpolateDecoration /// @return the cloned decorations - ast::DecorationList CloneShaderIOAttributes(const ast::DecorationList& src) { + ast::DecorationList CloneShaderIOAttributes(const ast::DecorationList& src, + bool do_interpolate) { ast::DecorationList new_decorations; for (auto* deco : src) { - if (IsShaderIODecoration(deco)) { + if (IsShaderIODecoration(deco) && + (do_interpolate || !deco->Is())) { new_decorations.push_back(ctx.Clone(deco)); } } @@ -159,7 +162,8 @@ struct CanonicalizeEntryPointIO::State { const sem::Type* type, ast::DecorationList attributes) { auto* ast_type = CreateASTTypeFor(ctx, type); - if (cfg.shader_style == ShaderStyle::kSpirv) { + if (cfg.shader_style == ShaderStyle::kSpirv || + cfg.shader_style == ShaderStyle::kGlsl) { // Vulkan requires that integer user-defined fragment inputs are // always decorated with `Flat`. // TODO(crbug.com/tint/1224): Remove this once a flat interpolation @@ -176,8 +180,15 @@ struct CanonicalizeEntryPointIO::State { attributes.push_back( ctx.dst->Disable(ast::DisabledValidation::kIgnoreStorageClass)); - // Create the global variable and use its value for the shader input. + // In GLSL, if it's a builtin, override the name with the + // corresponding gl_ builtin name + auto* builtin = ast::GetDecoration(attributes); + if (cfg.shader_style == ShaderStyle::kGlsl && builtin) { + name = GLSLBuiltinToString(builtin->builtin, func_ast->PipelineStage()); + } auto symbol = ctx.dst->Symbols().New(name); + + // Create the global variable and use its value for the shader input. const ast::Expression* value = ctx.dst->Expr(symbol); if (HasSampleMask(attributes)) { // Vulkan requires the type of a SampleMask builtin to be an array. @@ -185,6 +196,13 @@ struct CanonicalizeEntryPointIO::State { ast_type = ctx.dst->ty.array(ast_type, 1); value = ctx.dst->IndexAccessor(value, 0); } + + // In GLSL, if the type doesn't match the type of the builtin, + // insert a bitcast + if (cfg.shader_style == ShaderStyle::kGlsl && builtin && + GLSLBuiltinNeedsBitcast(builtin->builtin)) { + value = ctx.dst->Bitcast(CreateASTTypeFor(ctx, type), value); + } ctx.dst->Global(symbol, ast_type, ast::StorageClass::kInput, std::move(attributes)); return value; @@ -231,6 +249,13 @@ struct CanonicalizeEntryPointIO::State { ast::InterpolationType::kFlat, ast::InterpolationSampling::kNone)); } + // In GLSL, if it's a builtin, override the name with the + // corresponding gl_ builtin name + auto* builtin = ast::GetDecoration(attributes); + if (cfg.shader_style == ShaderStyle::kGlsl && builtin) { + name = GLSLBuiltinToString(builtin->builtin, func_ast->PipelineStage()); + } + OutputValue output; output.name = name; output.type = CreateASTTypeFor(ctx, type); @@ -279,7 +304,15 @@ struct CanonicalizeEntryPointIO::State { auto* member_ast = member->Declaration(); auto name = ctx.src->Symbols().NameFor(member_ast->symbol); - auto attributes = CloneShaderIOAttributes(member_ast->decorations); + + // In GLSL, do not add interpolation decorations on vertex input + bool do_interpolate = true; + if (cfg.shader_style == ShaderStyle::kGlsl && + func_ast->PipelineStage() == ast::PipelineStage::kVertex) { + do_interpolate = false; + } + auto attributes = + CloneShaderIOAttributes(member_ast->decorations, do_interpolate); auto* input_expr = AddInput(name, member->Type(), std::move(attributes)); inner_struct_values.push_back(input_expr); } @@ -296,6 +329,12 @@ struct CanonicalizeEntryPointIO::State { /// @param original_result the result object produced by the original function void ProcessReturnType(const sem::Type* inner_ret_type, Symbol original_result) { + bool do_interpolate = true; + // In GLSL, do not add interpolation decorations on fragment output + if (cfg.shader_style == ShaderStyle::kGlsl && + func_ast->PipelineStage() == ast::PipelineStage::kFragment) { + do_interpolate = false; + } if (auto* str = inner_ret_type->As()) { for (auto* member : str->Members()) { if (member->Type()->Is()) { @@ -305,15 +344,16 @@ struct CanonicalizeEntryPointIO::State { auto* member_ast = member->Declaration(); auto name = ctx.src->Symbols().NameFor(member_ast->symbol); - auto attributes = CloneShaderIOAttributes(member_ast->decorations); + auto attributes = + CloneShaderIOAttributes(member_ast->decorations, do_interpolate); // Extract the original structure member. AddOutput(name, member->Type(), std::move(attributes), ctx.dst->MemberAccessor(original_result, name)); } } else if (!inner_ret_type->Is()) { - auto attributes = - CloneShaderIOAttributes(func_ast->return_type_decorations); + auto attributes = CloneShaderIOAttributes( + func_ast->return_type_decorations, do_interpolate); // Propagate the non-struct return value as is. AddOutput("value", func_sem->ReturnType(), std::move(attributes), @@ -348,6 +388,15 @@ struct CanonicalizeEntryPointIO::State { {ctx.dst->Builtin(ast::Builtin::kPointSize)}, ctx.dst->Expr(1.f)); } + /// Create an expression for gl_Position.[component] + /// @param component the component of gl_Position to access + /// @returns the new expression + const ast::Expression* GLPosition(const char* component) { + Symbol pos = ctx.dst->Symbols().Register("gl_Position"); + Symbol c = ctx.dst->Symbols().Register(component); + return ctx.dst->MemberAccessor(ctx.dst->Expr(pos), ctx.dst->Expr(c)); + } + /// Create the wrapper function's struct parameter and type objects. void CreateInputStruct() { // Sort the struct members to satisfy HLSL interfacing matching rules. @@ -412,7 +461,7 @@ struct CanonicalizeEntryPointIO::State { } /// Create and assign the wrapper function's output variables. - void CreateSpirvOutputVariables() { + void CreateGlobalOutputVariables() { for (auto& outval : wrapper_output_values) { // Disable validation for use of the `output` storage class. ast::DecorationList attributes = std::move(outval.attributes); @@ -438,10 +487,17 @@ struct CanonicalizeEntryPointIO::State { // Recreate the original function without entry point attributes and call it. /// @returns the inner function call expression const ast::CallExpression* CallInnerFunction() { - // Add a suffix to the function name, as the wrapper function will take the - // original entry point name. - auto ep_name = ctx.src->Symbols().NameFor(func_ast->symbol); - auto inner_name = ctx.dst->Symbols().New(ep_name + "_inner"); + Symbol inner_name; + if (cfg.shader_style == ShaderStyle::kGlsl) { + // In GLSL, clone the original entry point name, as the wrapper will be + // called "main". + inner_name = ctx.Clone(func_ast->symbol); + } else { + // Add a suffix to the function name, as the wrapper function will take + // the original entry point name. + auto ep_name = ctx.src->Symbols().NameFor(func_ast->symbol); + inner_name = ctx.dst->Symbols().New(ep_name + "_inner"); + } // Clone everything, dropping the function and return type attributes. // The parameter attributes will have already been stripped during @@ -472,7 +528,7 @@ struct CanonicalizeEntryPointIO::State { // Exit early if there is no shader IO to handle. if (func_sem->Parameters().size() == 0 && func_sem->ReturnType()->Is() && !needs_fixed_sample_mask && - !needs_vertex_point_size) { + !needs_vertex_point_size && cfg.shader_style != ShaderStyle::kGlsl) { return; } @@ -526,8 +582,9 @@ struct CanonicalizeEntryPointIO::State { // Produce the entry point outputs, if necessary. if (!wrapper_output_values.empty()) { - if (cfg.shader_style == ShaderStyle::kSpirv) { - CreateSpirvOutputVariables(); + if (cfg.shader_style == ShaderStyle::kSpirv || + cfg.shader_style == ShaderStyle::kGlsl) { + CreateGlobalOutputVariables(); } else { auto* output_struct = CreateOutputStruct(); wrapper_ret_type = [&, output_struct] { @@ -536,9 +593,28 @@ struct CanonicalizeEntryPointIO::State { } } + if (cfg.shader_style == ShaderStyle::kGlsl && + func_ast->PipelineStage() == ast::PipelineStage::kVertex) { + auto* pos_y = GLPosition("y"); + auto* negate_pos_y = ctx.dst->create( + ast::UnaryOp::kNegation, GLPosition("y")); + wrapper_body.push_back(ctx.dst->Assign(pos_y, negate_pos_y)); + + auto* two_z = ctx.dst->Mul(ctx.dst->Expr(2.0f), GLPosition("z")); + auto* fixed_z = ctx.dst->Sub(two_z, GLPosition("w")); + wrapper_body.push_back(ctx.dst->Assign(GLPosition("z"), fixed_z)); + } + // Create the wrapper entry point function. - // Take the name of the original entry point function. - auto name = ctx.Clone(func_ast->symbol); + // For GLSL, use "main", otherwise take the name of the original + // entry point function. + Symbol name; + if (cfg.shader_style == ShaderStyle::kGlsl) { + name = ctx.dst->Symbols().New("main"); + } else { + name = ctx.Clone(func_ast->symbol); + } + auto* wrapper_func = ctx.dst->create( name, wrapper_ep_parameters, wrapper_ret_type(), ctx.dst->Block(wrapper_body), ctx.Clone(func_ast->decorations), @@ -546,6 +622,65 @@ struct CanonicalizeEntryPointIO::State { ctx.InsertAfter(ctx.src->AST().GlobalDeclarations(), func_ast, wrapper_func); } + + /// Retrieve the gl_ string corresponding to a builtin. + /// @param builtin the builtin + /// @param stage the current pipeline stage + /// @returns the gl_ string corresponding to that builtin + const char* GLSLBuiltinToString(ast::Builtin builtin, + ast::PipelineStage stage) { + switch (builtin) { + case ast::Builtin::kPosition: + switch (stage) { + case ast::PipelineStage::kVertex: + return "gl_Position"; + case ast::PipelineStage::kFragment: + return "gl_FragCoord"; + default: + return ""; + } + case ast::Builtin::kVertexIndex: + return "gl_VertexID"; + case ast::Builtin::kInstanceIndex: + return "gl_InstanceID"; + case ast::Builtin::kFrontFacing: + return "gl_FrontFacing"; + case ast::Builtin::kFragDepth: + return "gl_FragDepth"; + case ast::Builtin::kLocalInvocationId: + return "gl_LocalInvocationID"; + case ast::Builtin::kLocalInvocationIndex: + return "gl_LocalInvocationIndex"; + case ast::Builtin::kGlobalInvocationId: + return "gl_GlobalInvocationID"; + case ast::Builtin::kNumWorkgroups: + return "gl_NumWorkGroups"; + case ast::Builtin::kWorkgroupId: + return "gl_WorkGroupID"; + case ast::Builtin::kSampleIndex: + return "gl_SampleID"; + case ast::Builtin::kSampleMask: + return "gl_SampleMask"; + default: + return ""; + } + } + + /// Check if the GLSL version if a builtin doesn't match the WGSL type + /// @param builtin the WGSL builtin to check + /// @returns true if the GLSL builtin needs to be cast to the WGSL type + bool GLSLBuiltinNeedsBitcast(ast::Builtin builtin) { + switch (builtin) { + case ast::Builtin::kVertexIndex: + case ast::Builtin::kInstanceIndex: + case ast::Builtin::kSampleIndex: + case ast::Builtin::kSampleMask: + // In GLSL, these are i32, not u32. + return true; + default: + return false; + } + } }; void CanonicalizeEntryPointIO::Run(CloneContext& ctx, diff --git a/src/transform/canonicalize_entry_point_io.h b/src/transform/canonicalize_entry_point_io.h index e3c1dce25a..3e4394c838 100644 --- a/src/transform/canonicalize_entry_point_io.h +++ b/src/transform/canonicalize_entry_point_io.h @@ -90,6 +90,8 @@ class CanonicalizeEntryPointIO enum class ShaderStyle { /// Target SPIR-V (using global variables). kSpirv, + /// Target GLSL (using global variables). + kGlsl, /// Target MSL (using non-struct function parameters for builtins). kMsl, /// Target HLSL (using structures for all IO). diff --git a/src/transform/glsl.cc b/src/transform/glsl.cc index 595f2a0fd9..dde44e64e8 100644 --- a/src/transform/glsl.cc +++ b/src/transform/glsl.cc @@ -63,17 +63,13 @@ Output Glsl::Run(const Program* in, const DataMap& inputs) const { // ZeroInitWorkgroupMemory may inject new builtin parameters. manager.Add(); } - manager.Add(); - manager.Add(); - - // Running SingleEntryPoint before RemovePhonies prevents variables - // referenced only by phonies from being optimized out. Strictly - // speaking, that optimization isn't incorrect, but it prevents some - // tests (e.g., types/texture/*) from producing useful results. if (cfg && !cfg->entry_point.empty()) { manager.Add(); data.Add(cfg->entry_point); } + manager.Add(); + manager.Add(); + manager.Add(); manager.Add(); if (auto* binding_info = inputs.Get()) { @@ -100,11 +96,8 @@ Output Glsl::Run(const Program* in, const DataMap& inputs) const { manager.Add(); manager.Add(); - // For now, canonicalize to structs for all IO, as in HLSL. - // TODO(senorblanco): we could skip this by accessing global entry point - // variables directly. data.Add( - CanonicalizeEntryPointIO::ShaderStyle::kHlsl); + CanonicalizeEntryPointIO::ShaderStyle::kGlsl); auto out = manager.Run(in, data); if (!out.program.IsValid()) { return out; diff --git a/src/writer/glsl/generator_impl.cc b/src/writer/glsl/generator_impl.cc index f1e726b314..d9a9126840 100644 --- a/src/writer/glsl/generator_impl.cc +++ b/src/writer/glsl/generator_impl.cc @@ -1640,6 +1640,9 @@ bool GeneratorImpl::EmitGlobalVariable(const ast::Variable* global) { return EmitPrivateVariable(sem); case ast::StorageClass::kWorkgroup: return EmitWorkgroupVariable(sem); + case ast::StorageClass::kInput: + case ast::StorageClass::kOutput: + return EmitIOVariable(sem); default: break; } @@ -1757,78 +1760,33 @@ bool GeneratorImpl::EmitWorkgroupVariable(const sem::Variable* var) { return true; } -sem::Type* GeneratorImpl::builtin_type(ast::Builtin builtin) { - switch (builtin) { - case ast::Builtin::kPosition: { - auto* f32 = builder_.create(); - return builder_.create(f32, 4); - } - case ast::Builtin::kVertexIndex: - case ast::Builtin::kInstanceIndex: { - return builder_.create(); - } - case ast::Builtin::kFrontFacing: { - return builder_.create(); - } - case ast::Builtin::kFragDepth: { - return builder_.create(); - } - case ast::Builtin::kLocalInvocationId: - case ast::Builtin::kGlobalInvocationId: - case ast::Builtin::kNumWorkgroups: - case ast::Builtin::kWorkgroupId: { - auto* u32 = builder_.create(); - return builder_.create(u32, 3); - } - case ast::Builtin::kSampleIndex: { - return builder_.create(); - } - case ast::Builtin::kSampleMask: - default: - return nullptr; - } -} +bool GeneratorImpl::EmitIOVariable(const sem::Variable* var) { + auto* decl = var->Declaration(); -const char* GeneratorImpl::builtin_to_string(ast::Builtin builtin, - ast::PipelineStage stage) { - switch (builtin) { - case ast::Builtin::kPosition: - switch (stage) { - case ast::PipelineStage::kVertex: - return "gl_Position"; - case ast::PipelineStage::kFragment: - return "gl_FragCoord"; - default: - TINT_ICE(Writer, builder_.Diagnostics()) - << "position builtin unexpected in this pipeline stage"; - return ""; - } - case ast::Builtin::kVertexIndex: - return "gl_VertexID"; - case ast::Builtin::kInstanceIndex: - return "gl_InstanceID"; - case ast::Builtin::kFrontFacing: - return "gl_FrontFacing"; - case ast::Builtin::kFragDepth: - return "gl_FragDepth"; - case ast::Builtin::kLocalInvocationId: - return "gl_LocalInvocationID"; - case ast::Builtin::kLocalInvocationIndex: - return "gl_LocalInvocationIndex"; - case ast::Builtin::kGlobalInvocationId: - return "gl_GlobalInvocationID"; - case ast::Builtin::kNumWorkgroups: - return "gl_NumWorkGroups"; - case ast::Builtin::kWorkgroupId: - return "gl_WorkGroupID"; - case ast::Builtin::kSampleIndex: - return "gl_SampleID"; - case ast::Builtin::kSampleMask: - // FIXME: is this always available? - return "gl_SampleMask"; - default: - return ""; + // Do not emit builtin (gl_) variables. + if (ast::HasDecoration(decl->decorations)) { + return true; } + + auto out = line(); + EmitDecorations(out, decl->decorations); + EmitInterpolationQualifiers(out, decl->decorations); + + auto name = builder_.Symbols().NameFor(decl->symbol); + auto* type = var->Type()->UnwrapRef(); + if (!EmitTypeAndName(out, type, var->StorageClass(), var->Access(), name)) { + return false; + } + + if (auto* constructor = decl->constructor) { + out << " = "; + if (!EmitExpression(out, constructor)) { + return false; + } + } + + out << ";"; + return true; } void GeneratorImpl::EmitInterpolationQualifiers( @@ -1956,144 +1914,6 @@ bool GeneratorImpl::EmitEntryPointFunction(const ast::Function* func) { line() << "}"; - // Declare entry point input variables - for (auto* var : func->params) { - auto* sem = builder_.Sem().Get(var); - auto* str = sem->Type()->As(); - for (auto* member : str->Members()) { - auto out = line(); - - auto decorations = member->Declaration()->decorations; - if (ast::HasDecoration(decorations)) { - continue; - } - if (!EmitDecorations(out, decorations)) { - return false; - } - // GLSL does not support interpolation qualifiers on vertex inputs - if (func->PipelineStage() != ast::PipelineStage::kVertex) { - EmitInterpolationQualifiers(out, decorations); - } - if (!EmitTypeAndName( - out, member->Type(), ast::StorageClass::kInput, - ast::Access::kReadWrite, - builder_.Symbols().NameFor(member->Declaration()->symbol))) { - return false; - } - out << ";"; - } - } - - // Declare entry point output variables - auto* return_type = func_sem->ReturnType()->As(); - if (return_type) { - for (auto* member : return_type->Members()) { - auto out = line(); - auto decorations = member->Declaration()->decorations; - if (ast::HasDecoration(decorations)) { - continue; - } - if (!EmitDecorations(out, decorations)) { - return false; - } - // GLSL does not support interpolation qualifiers on fragment outputs - if (func->PipelineStage() != ast::PipelineStage::kFragment) { - EmitInterpolationQualifiers(out, decorations); - } - if (!EmitTypeAndName( - out, member->Type(), ast::StorageClass::kOutput, - ast::Access::kReadWrite, - builder_.Symbols().NameFor(member->Declaration()->symbol))) { - return false; - } - out << ";"; - } - } - line(); - - // Create a main() function which calls the entry point. - line() << "void main() {"; - - // Emit main function body - { - ScopedIndent si(this); - for (auto* var : func->params) { - auto* sem = builder_.Sem().Get(var); - auto* type = sem->Type(); - { - auto out = line(); - if (!EmitTypeAndName(out, type, sem->StorageClass(), sem->Access(), - "inputs")) { - return false; - } - out << ";"; - } - auto* str = type->As(); - for (auto* member : str->Members()) { - auto out = line(); - std::string name = - builder_.Symbols().NameFor(member->Declaration()->symbol); - out << "inputs." << name << " = "; - if (auto* builtin = ast::GetDecoration( - member->Declaration()->decorations)) { - if (builtin_type(builtin->builtin) != member->Type()) { - if (!EmitType(out, member->Type(), ast::StorageClass::kNone, - ast::Access::kReadWrite, "")) { - return false; - } - out << "("; - out << builtin_to_string(builtin->builtin, func->PipelineStage()); - out << ")"; - } else { - out << builtin_to_string(builtin->builtin, func->PipelineStage()); - } - } else { - out << name; - } - out << ";"; - } - } - - if (return_type) { - line() << return_type->FriendlyName(builder_.Symbols()) << " outputs;"; - } - { - auto out = line(); - if (return_type) { - out << "outputs = "; - } - out << builder_.Symbols().NameFor(func->symbol); - if (func->params.empty()) { - out << "()"; - } else { - out << "(inputs)"; - } - out << ";"; - } - - auto* str = func_sem->ReturnType()->As(); - if (str) { - for (auto* member : str->Members()) { - auto out = line(); - std::string name = - builder_.Symbols().NameFor(member->Declaration()->symbol); - if (auto* builtin = ast::GetDecoration( - member->Declaration()->decorations)) { - out << builtin_to_string(builtin->builtin, func->PipelineStage()); - } else { - out << name; - } - out << " = outputs." << name << ";"; - } - } - if (func->PipelineStage() == ast::PipelineStage::kVertex) { - line() << "gl_Position.z = 2.0 * gl_Position.z - gl_Position.w;"; - line() << "gl_Position.y = -gl_Position.y;"; - } - } - line() << "}"; - line(); - return true; } diff --git a/src/writer/glsl/generator_impl.h b/src/writer/glsl/generator_impl.h index ce6a4bb96c..0022817c13 100644 --- a/src/writer/glsl/generator_impl.h +++ b/src/writer/glsl/generator_impl.h @@ -292,6 +292,11 @@ class GeneratorImpl : public TextGenerator { /// @returns true on success bool EmitWorkgroupVariable(const sem::Variable* var); + /// Handles emitting a global variable with the input or output storage class + /// @param var the global variable + /// @returns true on success + bool EmitIOVariable(const sem::Variable* var); + /// Handles emitting interpolation qualifiers /// @param out the output of the expression stream /// @param decos the decorations diff --git a/src/writer/glsl/generator_impl_function_test.cc b/src/writer/glsl/generator_impl_function_test.cc index c4bc9bbf75..9128724573 100644 --- a/src/writer/glsl/generator_impl_function_test.cc +++ b/src/writer/glsl/generator_impl_function_test.cc @@ -103,11 +103,6 @@ precision mediump float; void func() { return; } - -void main() { - func(); -} - )"); } @@ -142,35 +137,17 @@ TEST_F(GlslGeneratorImplTest_Function, EXPECT_EQ(gen.result(), R"(#version 310 es precision mediump float; -struct tint_symbol_1 { - float foo; -}; - -struct tint_symbol_2 { - float value; -}; - -float frag_main_inner(float foo) { +layout(location = 0) in float foo_1; +layout(location = 1) out float value; +float frag_main(float foo) { return foo; } -tint_symbol_2 frag_main(tint_symbol_1 tint_symbol) { - float inner_result = frag_main_inner(tint_symbol.foo); - tint_symbol_2 wrapper_result = tint_symbol_2(0.0f); - wrapper_result.value = inner_result; - return wrapper_result; -} -layout(location = 0) in float foo; -layout(location = 1) out float value; - void main() { - tint_symbol_1 inputs; - inputs.foo = foo; - tint_symbol_2 outputs; - outputs = frag_main(inputs); - value = outputs.value; + float inner_result = frag_main(foo_1); + value = inner_result; + return; } - )"); } @@ -192,35 +169,15 @@ TEST_F(GlslGeneratorImplTest_Function, EXPECT_EQ(gen.result(), R"(#version 310 es precision mediump float; -struct tint_symbol_1 { - vec4 coord; -}; - -struct tint_symbol_2 { - float value; -}; - -float frag_main_inner(vec4 coord) { +float frag_main(vec4 coord) { return coord.x; } -tint_symbol_2 frag_main(tint_symbol_1 tint_symbol) { - float inner_result = frag_main_inner(tint_symbol.coord); - tint_symbol_2 wrapper_result = tint_symbol_2(0.0f); - wrapper_result.value = inner_result; - return wrapper_result; -} - - - void main() { - tint_symbol_1 inputs; - inputs.coord = gl_FragCoord; - tint_symbol_2 outputs; - outputs = frag_main(inputs); - gl_FragDepth = outputs.value; + float inner_result = frag_main(gl_FragCoord); + gl_FragDepth = inner_result; + return; } - )"); } @@ -266,74 +223,41 @@ TEST_F(GlslGeneratorImplTest_Function, EXPECT_EQ(gen.result(), R"(#version 310 es precision mediump float; +layout(location = 1) out float col1_1; +layout(location = 2) out float col2_1; +layout(location = 1) in float col1_2; +layout(location = 2) in float col2_2; struct Interface { vec4 pos; float col1; float col2; }; -struct tint_symbol { - float col1; - float col2; - vec4 pos; -}; - -Interface vert_main_inner() { - Interface tint_symbol_3 = Interface(vec4(0.0f, 0.0f, 0.0f, 0.0f), 0.5f, 0.25f); - return tint_symbol_3; +Interface vert_main() { + Interface tint_symbol = Interface(vec4(0.0f, 0.0f, 0.0f, 0.0f), 0.5f, 0.25f); + return tint_symbol; } -tint_symbol vert_main() { - Interface inner_result = vert_main_inner(); - tint_symbol wrapper_result = tint_symbol(0.0f, 0.0f, vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.pos = inner_result.pos; - wrapper_result.col1 = inner_result.col1; - wrapper_result.col2 = inner_result.col2; - return wrapper_result; -} -layout(location = 1) out float col1; -layout(location = 2) out float col2; - - void main() { - tint_symbol outputs; - outputs = vert_main(); - col1 = outputs.col1; - col2 = outputs.col2; - gl_Position = outputs.pos; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + Interface inner_result = vert_main(); + gl_Position = inner_result.pos; + col1_1 = inner_result.col1; + col2_1 = inner_result.col2; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - -struct tint_symbol_2 { - float col1; - float col2; - vec4 pos; -}; - -void frag_main_inner(Interface inputs) { +void frag_main(Interface inputs) { float r = inputs.col1; float g = inputs.col2; vec4 p = inputs.pos; } -void frag_main(tint_symbol_2 tint_symbol_1) { - Interface tint_symbol_4 = Interface(tint_symbol_1.pos, tint_symbol_1.col1, tint_symbol_1.col2); - frag_main_inner(tint_symbol_4); +void main_1() { + Interface tint_symbol_1 = Interface(gl_FragCoord, col1_2, col2_2); + frag_main(tint_symbol_1); return; } -layout(location = 1) in float col1; -layout(location = 2) in float col2; - - -void main() { - tint_symbol_2 inputs; - inputs.col1 = col1; - inputs.col2 = col2; - inputs.pos = gl_FragCoord; - frag_main(inputs); -} - )"); } @@ -459,11 +383,6 @@ void frag_main() { float v = sub_func(1.0f); return; } - -void main() { - frag_main(); -} - )"); } @@ -508,11 +427,6 @@ void frag_main() { float v = uniforms.coord.x; return; } - -void main() { - frag_main(); -} - )"); } @@ -566,8 +480,8 @@ void frag_main() { void main() { frag_main(); + return; } - )"); } @@ -621,8 +535,8 @@ void frag_main() { void main() { frag_main(); + return; } - )"); } @@ -672,8 +586,8 @@ void frag_main() { void main() { frag_main(); + return; } - )"); } @@ -724,8 +638,8 @@ void frag_main() { void main() { frag_main(); + return; } - )"); } @@ -778,11 +692,6 @@ void frag_main() { float v = sub_func(1.0f); return; } - -void main() { - frag_main(); -} - )"); } @@ -839,8 +748,8 @@ void frag_main() { void main() { frag_main(); + return; } - )"); } @@ -858,13 +767,12 @@ TEST_F(GlslGeneratorImplTest_Function, precision mediump float; void tint_symbol() { - return; } void main() { tint_symbol(); + return; } - )"); } @@ -885,11 +793,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { return; } - -void main() { - main(); -} - )"); } @@ -911,11 +814,6 @@ layout(local_size_x = 2, local_size_y = 4, local_size_z = 6) in; void main() { return; } - -void main() { - main(); -} - )"); } @@ -943,11 +841,6 @@ layout(local_size_x = 2, local_size_y = 3, local_size_z = 4) in; void main() { return; } - -void main() { - main(); -} - )"); } @@ -984,11 +877,6 @@ layout(local_size_x = WGSL_SPEC_CONSTANT_7, local_size_y = WGSL_SPEC_CONSTANT_8, void main() { return; } - -void main() { - main(); -} - )"); } @@ -1096,26 +984,26 @@ struct Data { layout(binding = 0) buffer Data_1 { float d; } data; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void a() { float v = data.d; return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { a(); + return; } - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void b() { float v = data.d; return; } -void main() { +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; +void main_1() { b(); + return; } - )"); } diff --git a/src/writer/glsl/generator_impl_intrinsic_test.cc b/src/writer/glsl/generator_impl_intrinsic_test.cc index 6a14bf9dd3..68f4561aad 100644 --- a/src/writer/glsl/generator_impl_intrinsic_test.cc +++ b/src/writer/glsl/generator_impl_intrinsic_test.cc @@ -399,17 +399,16 @@ float tint_degrees(float param_0) { } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void test_function() { float val = 0.0f; float tint_symbol = tint_degrees(val); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { test_function(); + return; } - )"); } @@ -429,17 +428,16 @@ vec3 tint_degrees(vec3 param_0) { } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void test_function() { vec3 val = vec3(0.0f, 0.0f, 0.0f); vec3 tint_symbol = tint_degrees(val); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { test_function(); + return; } - )"); } @@ -459,17 +457,16 @@ float tint_radians(float param_0) { } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void test_function() { float val = 0.0f; float tint_symbol = tint_radians(val); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { test_function(); + return; } - )"); } @@ -489,17 +486,16 @@ vec3 tint_radians(vec3 param_0) { } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void test_function() { vec3 val = vec3(0.0f, 0.0f, 0.0f); vec3 tint_symbol = tint_radians(val); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { test_function(); + return; } - )"); } @@ -736,16 +732,15 @@ int tint_int_dot(ivec3 a, ivec3 b) { } ivec3 v = ivec3(0, 0, 0); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void test_function() { tint_int_dot(v, v); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { test_function(); + return; } - )"); } @@ -764,16 +759,15 @@ uint tint_int_dot(uvec3 a, uvec3 b) { } uvec3 v = uvec3(0u, 0u, 0u); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void test_function() { tint_int_dot(v, v); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { test_function(); + return; } - )"); } diff --git a/src/writer/glsl/generator_impl_member_accessor_test.cc b/src/writer/glsl/generator_impl_member_accessor_test.cc index 6a5f5a8b11..b59e22ed5c 100644 --- a/src/writer/glsl/generator_impl_member_accessor_test.cc +++ b/src/writer/glsl/generator_impl_member_accessor_test.cc @@ -140,16 +140,15 @@ struct Data { }; Data str = Data(0.0f); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void test_function() { float expr = str.mem; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { test_function(); + return; } - )"); } @@ -306,13 +305,12 @@ layout(binding = 0) buffer Data_1 { } data; void tint_symbol() { data.b = mat2x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); - return; } void main() { tint_symbol(); + return; } - )"; EXPECT_EQ(gen.result(), expected); } @@ -355,13 +353,12 @@ layout(binding = 0) buffer Data_1 { } data; void tint_symbol() { float x = data.a[2][1]; - return; } void main() { tint_symbol(); + return; } - )"; EXPECT_EQ(gen.result(), expected); } @@ -402,13 +399,12 @@ layout(binding = 0) buffer Data_1 { } data; void tint_symbol() { int x = data.a[2]; - return; } void main() { tint_symbol(); + return; } - )"; EXPECT_EQ(gen.result(), expected); } @@ -450,13 +446,12 @@ layout(binding = 0) buffer Data_1 { } data; void tint_symbol() { int x = data.a[((2 + 4) - 3)]; - return; } void main() { tint_symbol(); + return; } - )"; EXPECT_EQ(gen.result(), expected); } @@ -495,13 +490,12 @@ layout(binding = 0) buffer Data_1 { } data; void tint_symbol() { data.a[2] = 2; - return; } void main() { tint_symbol(); + return; } - )"; EXPECT_EQ(gen.result(), expected); } @@ -554,13 +548,12 @@ layout(binding = 0) buffer Data_1 { } data; void tint_symbol() { vec3 x = data.c[2].b; - return; } void main() { tint_symbol(); + return; } - )"; EXPECT_EQ(gen.result(), expected); } @@ -616,13 +609,12 @@ layout(binding = 0) buffer Data_1 { } data; void tint_symbol() { vec2 x = data.c[2].b.xy; - return; } void main() { tint_symbol(); + return; } - )"; EXPECT_EQ(gen.result(), expected); } @@ -678,13 +670,12 @@ layout(binding = 0) buffer Data_1 { } data; void tint_symbol() { float x = data.c[2].b.g; - return; } void main() { tint_symbol(); + return; } - )"; EXPECT_EQ(gen.result(), expected); } @@ -740,13 +731,12 @@ layout(binding = 0) buffer Data_1 { } data; void tint_symbol() { float x = data.c[2].b[1]; - return; } void main() { tint_symbol(); + return; } - )"; EXPECT_EQ(gen.result(), expected); } @@ -798,13 +788,12 @@ layout(binding = 0) buffer Data_1 { } data; void tint_symbol() { data.c[2].b = vec3(1.0f, 2.0f, 3.0f); - return; } void main() { tint_symbol(); + return; } - )"; EXPECT_EQ(gen.result(), expected); } @@ -860,13 +849,12 @@ layout(binding = 0) buffer Data_1 { } data; void tint_symbol() { data.c[2].b.y = 1.0f; - return; } void main() { tint_symbol(); + return; } - )"; EXPECT_EQ(gen.result(), expected); } diff --git a/src/writer/glsl/generator_impl_sanitizer_test.cc b/src/writer/glsl/generator_impl_sanitizer_test.cc index abf7783c00..8c1c3c6f44 100644 --- a/src/writer/glsl/generator_impl_sanitizer_test.cc +++ b/src/writer/glsl/generator_impl_sanitizer_test.cc @@ -59,13 +59,12 @@ void a_func() { b.GetDimensions(tint_symbol_1); uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); uint len = tint_symbol_2; - return; } void main() { a_func(); + return; } - )"; EXPECT_EQ(expect, got); } @@ -109,13 +108,12 @@ void a_func() { b.GetDimensions(tint_symbol_1); uint tint_symbol_2 = ((tint_symbol_1 - 4u) / 4u); uint len = tint_symbol_2; - return; } void main() { a_func(); + return; } - )"; EXPECT_EQ(expect, got); @@ -160,13 +158,12 @@ void a_func() { b.GetDimensions(tint_symbol_1); uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); uint len = tint_symbol_2; - return; } void main() { a_func(); + return; } - )"; EXPECT_EQ(expect, got); @@ -196,13 +193,12 @@ precision mediump float; void tint_symbol() { int tint_symbol_1[4] = int[4](1, 2, 3, 4); int pos = tint_symbol_1[3]; - return; } void main() { tint_symbol(); + return; } - )"; EXPECT_EQ(expect, got); } @@ -243,13 +239,12 @@ struct S { void tint_symbol() { S tint_symbol_1 = S(1, vec3(2.0f, 3.0f, 4.0f), 4); vec3 pos = tint_symbol_1.b; - return; } void main() { tint_symbol(); + return; } - )"; EXPECT_EQ(expect, got); } @@ -284,13 +279,12 @@ precision mediump float; void tint_symbol() { int v = 0; int x = v; - return; } void main() { tint_symbol(); + return; } - )"; EXPECT_EQ(expect, got); } @@ -337,13 +331,12 @@ precision mediump float; void tint_symbol() { mat4 a[4] = mat4[4](mat4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), mat4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), mat4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), mat4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); vec4 v = a[3][2]; - return; } void main() { tint_symbol(); + return; } - )"; EXPECT_EQ(expect, got); } diff --git a/src/writer/glsl/generator_impl_test.cc b/src/writer/glsl/generator_impl_test.cc index d264afb105..ccccf6c57f 100644 --- a/src/writer/glsl/generator_impl_test.cc +++ b/src/writer/glsl/generator_impl_test.cc @@ -37,41 +37,6 @@ void my_func() { )"); } -struct GlslBuiltinData { - ast::Builtin builtin; - const char* attribute_name; -}; -inline std::ostream& operator<<(std::ostream& out, GlslBuiltinData data) { - out << data.builtin; - return out; -} -using GlslBuiltinConversionTest = TestParamHelper; -TEST_P(GlslBuiltinConversionTest, Emit) { - auto params = GetParam(); - GeneratorImpl& gen = Build(); - - EXPECT_EQ(gen.builtin_to_string(params.builtin, ast::PipelineStage::kVertex), - std::string(params.attribute_name)); -} -INSTANTIATE_TEST_SUITE_P( - GlslGeneratorImplTest, - GlslBuiltinConversionTest, - testing::Values( - GlslBuiltinData{ast::Builtin::kPosition, "gl_Position"}, - GlslBuiltinData{ast::Builtin::kVertexIndex, "gl_VertexID"}, - GlslBuiltinData{ast::Builtin::kInstanceIndex, "gl_InstanceID"}, - GlslBuiltinData{ast::Builtin::kFrontFacing, "gl_FrontFacing"}, - GlslBuiltinData{ast::Builtin::kFragDepth, "gl_FragDepth"}, - GlslBuiltinData{ast::Builtin::kLocalInvocationId, - "gl_LocalInvocationID"}, - GlslBuiltinData{ast::Builtin::kLocalInvocationIndex, - "gl_LocalInvocationIndex"}, - GlslBuiltinData{ast::Builtin::kGlobalInvocationId, - "gl_GlobalInvocationID"}, - GlslBuiltinData{ast::Builtin::kWorkgroupId, "gl_WorkGroupID"}, - GlslBuiltinData{ast::Builtin::kSampleIndex, "gl_SampleID"}, - GlslBuiltinData{ast::Builtin::kSampleMask, "gl_SampleMask"})); - } // namespace } // namespace glsl } // namespace writer diff --git a/test/access/let/matrix.spvasm.expected.glsl b/test/access/let/matrix.spvasm.expected.glsl index 09bbe7deb2..0d5280b3fc 100644 --- a/test/access/let/matrix.spvasm.expected.glsl +++ b/test/access/let/matrix.spvasm.expected.glsl @@ -6,13 +6,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/access/let/matrix.wgsl.expected.glsl b/test/access/let/matrix.wgsl.expected.glsl index e1c125da92..382315b4de 100644 --- a/test/access/let/matrix.wgsl.expected.glsl +++ b/test/access/let/matrix.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { mat3 m = mat3(vec3(1.0f, 2.0f, 3.0f), vec3(4.0f, 5.0f, 6.0f), vec3(7.0f, 8.0f, 9.0f)); vec3 v = m[1]; float f = v[1]; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/access/let/vector.spvasm.expected.glsl b/test/access/let/vector.spvasm.expected.glsl index 8d9f092830..87ed9fdd93 100644 --- a/test/access/let/vector.spvasm.expected.glsl +++ b/test/access/let/vector.spvasm.expected.glsl @@ -8,13 +8,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/access/let/vector.wgsl.expected.glsl b/test/access/let/vector.wgsl.expected.glsl index 31cc9c0338..ea163f7587 100644 --- a/test/access/let/vector.wgsl.expected.glsl +++ b/test/access/let/vector.wgsl.expected.glsl @@ -1,16 +1,15 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { vec3 v = vec3(1.0f, 2.0f, 3.0f); float scalar = v.y; vec2 swizzle2 = v.xz; vec3 swizzle3 = v.xzy; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/access/var/matrix.spvasm.expected.glsl b/test/access/var/matrix.spvasm.expected.glsl index b906e9af1e..40b5881261 100644 --- a/test/access/var/matrix.spvasm.expected.glsl +++ b/test/access/var/matrix.spvasm.expected.glsl @@ -8,13 +8,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/access/var/matrix.wgsl.expected.glsl b/test/access/var/matrix.wgsl.expected.glsl index 42db3ddbc1..62f55efbc7 100644 --- a/test/access/var/matrix.wgsl.expected.glsl +++ b/test/access/var/matrix.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { mat3 m = mat3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); vec3 v = m[1]; float f = v[1]; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/access/var/vector.spvasm.expected.glsl b/test/access/var/vector.spvasm.expected.glsl index 05991e5421..78b70c574f 100644 --- a/test/access/var/vector.spvasm.expected.glsl +++ b/test/access/var/vector.spvasm.expected.glsl @@ -11,13 +11,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/access/var/vector.wgsl.expected.glsl b/test/access/var/vector.wgsl.expected.glsl index 0d3c2334d4..1550bd932d 100644 --- a/test/access/var/vector.wgsl.expected.glsl +++ b/test/access/var/vector.wgsl.expected.glsl @@ -1,16 +1,15 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { vec3 v = vec3(0.0f, 0.0f, 0.0f); float scalar = v.y; vec2 swizzle2 = v.xz; vec3 swizzle3 = v.xzy; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/array/assign_to_function_var.wgsl.expected.glsl b/test/array/assign_to_function_var.wgsl.expected.glsl index 54f1d2147b..d127dcab54 100644 --- a/test/array/assign_to_function_var.wgsl.expected.glsl +++ b/test/array/assign_to_function_var.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { ivec4 arr[4]; }; diff --git a/test/array/assign_to_private_var.wgsl.expected.glsl b/test/array/assign_to_private_var.wgsl.expected.glsl index f3898a9369..992a8c6cc4 100644 --- a/test/array/assign_to_private_var.wgsl.expected.glsl +++ b/test/array/assign_to_private_var.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { ivec4 arr[4]; }; diff --git a/test/array/assign_to_storage_var.wgsl.expected.glsl b/test/array/assign_to_storage_var.wgsl.expected.glsl index 3ef6d59418..7df07b7511 100644 --- a/test/array/assign_to_storage_var.wgsl.expected.glsl +++ b/test/array/assign_to_storage_var.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { ivec4 arr[4]; }; diff --git a/test/array/assign_to_subexpr.wgsl.expected.glsl b/test/array/assign_to_subexpr.wgsl.expected.glsl index 0bec2421b3..7120de5a60 100644 --- a/test/array/assign_to_subexpr.wgsl.expected.glsl +++ b/test/array/assign_to_subexpr.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { int arr[4]; }; diff --git a/test/array/assign_to_workgroup_var.wgsl.expected.glsl b/test/array/assign_to_workgroup_var.wgsl.expected.glsl index 9cc8828ba4..14caa05006 100644 --- a/test/array/assign_to_workgroup_var.wgsl.expected.glsl +++ b/test/array/assign_to_workgroup_var.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { ivec4 arr[4]; }; diff --git a/test/array/function_parameter.wgsl.expected.glsl b/test/array/function_parameter.wgsl.expected.glsl index 20052981f0..17ef9c5144 100644 --- a/test/array/function_parameter.wgsl.expected.glsl +++ b/test/array/function_parameter.wgsl.expected.glsl @@ -13,7 +13,6 @@ float f3(float a[2][3][4]) { return a[1][2][3]; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { float a1[4] = float[4](0.0f, 0.0f, 0.0f, 0.0f); float a2[3][4] = float[3][4](float[4](0.0f, 0.0f, 0.0f, 0.0f), float[4](0.0f, 0.0f, 0.0f, 0.0f), float[4](0.0f, 0.0f, 0.0f, 0.0f)); @@ -21,10 +20,10 @@ void tint_symbol() { float v1 = f1(a1); float v2 = f2(a2); float v3 = f3(a3); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/array/function_return_type.wgsl.expected.glsl b/test/array/function_return_type.wgsl.expected.glsl index 565b3ce69b..ba2caec72a 100644 --- a/test/array/function_return_type.wgsl.expected.glsl +++ b/test/array/function_return_type.wgsl.expected.glsl @@ -16,15 +16,14 @@ float[2][3][4] f3() { return tint_symbol_3; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { float a1[4] = f1(); float a2[3][4] = f2(); float a3[2][3][4] = f3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/array/size.wgsl.expected.glsl b/test/array/size.wgsl.expected.glsl index 080117c0ae..762d5c84b8 100644 --- a/test/array/size.wgsl.expected.glsl +++ b/test/array/size.wgsl.expected.glsl @@ -10,10 +10,9 @@ void tint_symbol() { float unsigned_constant[4] = float[4](0.0f, 0.0f, 0.0f, 0.0f); signed_literal = unsigned_constant; signed_constant = unsigned_literal; - return; } void main() { tint_symbol(); + return; } - diff --git a/test/array/type_constructor.wgsl.expected.glsl b/test/array/type_constructor.wgsl.expected.glsl index 7f3f884d57..7a2e105bf4 100644 --- a/test/array/type_constructor.wgsl.expected.glsl +++ b/test/array/type_constructor.wgsl.expected.glsl @@ -1,7 +1,6 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { int x = 42; int empty[4] = int[4](0, 0, 0, 0); @@ -36,10 +35,10 @@ void tint_symbol() { int tint_symbol_19[4] = int[4](1, x, (x + 1), nonempty[3]); int tint_symbol_20[2][4] = int[2][4](tint_symbol_19, nested_nonempty[1][2]); int subexpr_nested_nonempty_with_expr[4] = tint_symbol_20[1]; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/benchmark/animometer.wgsl.expected.glsl b/test/benchmark/animometer.wgsl.expected.glsl index 3a6d303b05..18522205a2 100644 --- a/test/benchmark/animometer.wgsl.expected.glsl +++ b/test/benchmark/animometer.wgsl.expected.glsl @@ -3,6 +3,9 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) in vec4 position_1; +layout(location = 1) in vec4 color_1; +layout(location = 0) out vec4 v_color_1; struct Time { float value; }; @@ -32,17 +35,7 @@ struct VertexOutput { vec4 v_color; }; -struct tint_symbol_2 { - vec4 position; - vec4 color; -}; - -struct tint_symbol_3 { - vec4 v_color; - vec4 Position; -}; - -VertexOutput vert_main_inner(vec4 position, vec4 color) { +VertexOutput vert_main(vec4 position, vec4 color) { float fade = ((uniforms.scalarOffset + ((time.value * uniforms.scalar) / 10.0f)) % 1.0f); if ((fade < 0.5f)) { fade = (fade * 2.0f); @@ -62,41 +55,17 @@ VertexOutput vert_main_inner(vec4 position, vec4 color) { return tint_symbol; } -struct tint_symbol_5 { - vec4 v_color; -}; - -struct tint_symbol_6 { - vec4 value; -}; - -tint_symbol_3 vert_main(tint_symbol_2 tint_symbol_1) { - VertexOutput inner_result = vert_main_inner(tint_symbol_1.position, tint_symbol_1.color); - tint_symbol_3 wrapper_result = tint_symbol_3(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.Position = inner_result.Position; - wrapper_result.v_color = inner_result.v_color; - return wrapper_result; -} -layout(location = 0) in vec4 position; -layout(location = 1) in vec4 color; -layout(location = 0) out vec4 v_color; - - void main() { - tint_symbol_2 inputs; - inputs.position = position; - inputs.color = color; - tint_symbol_3 outputs; - outputs = vert_main(inputs); - v_color = outputs.v_color; - gl_Position = outputs.Position; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + VertexOutput inner_result = vert_main(position_1, color_1); + gl_Position = inner_result.Position; + v_color_1 = inner_result.v_color; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: -ERROR: 0:44: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump float' and a right operand of type ' const float' (or there is no acceptable conversion) -ERROR: 0:44: '' : compilation terminated +ERROR: 0:37: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump float' and a right operand of type ' const float' (or there is no acceptable conversion) +ERROR: 0:37: '' : compilation terminated ERROR: 2 compilation errors. No code generated. @@ -104,6 +73,8 @@ ERROR: 2 compilation errors. No code generated. #version 310 es precision mediump float; +layout(location = 0) in vec4 v_color_1; +layout(location = 0) out vec4 value_1; struct Time { float value; }; @@ -121,42 +92,12 @@ struct VertexOutput { vec4 v_color; }; -struct tint_symbol_2 { - vec4 position; - vec4 color; -}; - -struct tint_symbol_3 { - vec4 v_color; - vec4 Position; -}; - -struct tint_symbol_5 { - vec4 v_color; -}; - -struct tint_symbol_6 { - vec4 value; -}; - -vec4 frag_main_inner(vec4 v_color) { +vec4 frag_main(vec4 v_color) { return v_color; } -tint_symbol_6 frag_main(tint_symbol_5 tint_symbol_4) { - vec4 inner_result_1 = frag_main_inner(tint_symbol_4.v_color); - tint_symbol_6 wrapper_result_1 = tint_symbol_6(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result_1.value = inner_result_1; - return wrapper_result_1; -} -layout(location = 0) in vec4 v_color; -layout(location = 0) out vec4 value; - void main() { - tint_symbol_5 inputs; - inputs.v_color = v_color; - tint_symbol_6 outputs; - outputs = frag_main(inputs); - value = outputs.value; + vec4 inner_result = frag_main(v_color_1); + value_1 = inner_result; + return; } - diff --git a/test/benchmark/particles.wgsl.expected.glsl b/test/benchmark/particles.wgsl.expected.glsl index 1491dca128..1c82e1524d 100644 --- a/test/benchmark/particles.wgsl.expected.glsl +++ b/test/benchmark/particles.wgsl.expected.glsl @@ -3,6 +3,11 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) in vec3 position_1; +layout(location = 1) in vec4 color_1; +layout(location = 2) in vec2 quad_pos_1; +layout(location = 0) out vec4 color_2; +layout(location = 1) out vec2 quad_pos_2; struct RenderParams { mat4 modelViewProjectionMatrix; vec3 right; @@ -27,38 +32,6 @@ struct VertexOutput { vec2 quad_pos; }; -struct tint_symbol_4 { - vec3 position; - vec4 color; - vec2 quad_pos; -}; - -struct tint_symbol_5 { - vec4 color; - vec2 quad_pos; - vec4 position; -}; - -VertexOutput vs_main_inner(VertexInput tint_symbol) { - vec3 quad_pos = (mat2x3(render_params.right, render_params.up) * tint_symbol.quad_pos); - vec3 position = (tint_symbol.position + (quad_pos * 0.01f)); - VertexOutput tint_symbol_1 = VertexOutput(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec2(0.0f, 0.0f)); - tint_symbol_1.position = (render_params.modelViewProjectionMatrix * vec4(position, 1.0f)); - tint_symbol_1.color = tint_symbol.color; - tint_symbol_1.quad_pos = tint_symbol.quad_pos; - return tint_symbol_1; -} - -struct tint_symbol_7 { - vec4 color; - vec2 quad_pos; - vec4 position; -}; - -struct tint_symbol_8 { - vec4 value; -}; - struct SimulationParams { float deltaTime; vec4 seed; @@ -71,61 +44,36 @@ struct Particle { vec3 velocity; }; -struct tint_symbol_10 { - uvec3 GlobalInvocationID; -}; - struct UBO { uint width; }; -struct tint_symbol_12 { - uvec3 coord; -}; - -struct tint_symbol_14 { - uvec3 coord; -}; - -tint_symbol_5 vs_main(tint_symbol_4 tint_symbol_3) { - VertexInput tint_symbol_15 = VertexInput(tint_symbol_3.position, tint_symbol_3.color, tint_symbol_3.quad_pos); - VertexOutput inner_result = vs_main_inner(tint_symbol_15); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec2(0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.position = inner_result.position; - wrapper_result.color = inner_result.color; - wrapper_result.quad_pos = inner_result.quad_pos; - return wrapper_result; +VertexOutput vs_main(VertexInput tint_symbol) { + vec3 quad_pos = (mat2x3(render_params.right, render_params.up) * tint_symbol.quad_pos); + vec3 position = (tint_symbol.position + (quad_pos * 0.01f)); + VertexOutput tint_symbol_1 = VertexOutput(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec2(0.0f, 0.0f)); + tint_symbol_1.position = (render_params.modelViewProjectionMatrix * vec4(position, 1.0f)); + tint_symbol_1.color = tint_symbol.color; + tint_symbol_1.quad_pos = tint_symbol.quad_pos; + return tint_symbol_1; } -layout(location = 0) in vec3 position; -layout(location = 1) in vec4 color; -layout(location = 2) in vec2 quad_pos; -layout(location = 0) out vec4 color; -layout(location = 1) out vec2 quad_pos; - void main() { - tint_symbol_4 inputs; - inputs.position = position; - inputs.color = color; - inputs.quad_pos = quad_pos; - tint_symbol_5 outputs; - outputs = vs_main(inputs); - color = outputs.color; - quad_pos = outputs.quad_pos; - gl_Position = outputs.position; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + VertexInput tint_symbol_3 = VertexInput(position_1, color_1, quad_pos_1); + VertexOutput inner_result = vs_main(tint_symbol_3); + gl_Position = inner_result.position; + color_2 = inner_result.color; + quad_pos_2 = inner_result.quad_pos; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - -Error parsing GLSL shader: -ERROR: 0:100: 'color' : redefinition -ERROR: 1 compilation errors. No code generated. - - - #version 310 es precision mediump float; +layout(location = 0) in vec4 color_1; +layout(location = 1) in vec2 quad_pos_1; +layout(location = 0) out vec4 value_1; struct RenderParams { mat4 modelViewProjectionMatrix; vec3 right; @@ -144,34 +92,6 @@ struct VertexOutput { vec2 quad_pos; }; -struct tint_symbol_4 { - vec3 position; - vec4 color; - vec2 quad_pos; -}; - -struct tint_symbol_5 { - vec4 color; - vec2 quad_pos; - vec4 position; -}; - -struct tint_symbol_7 { - vec4 color; - vec2 quad_pos; - vec4 position; -}; - -struct tint_symbol_8 { - vec4 value; -}; - -vec4 fs_main_inner(VertexOutput tint_symbol) { - vec4 color = tint_symbol.color; - color.a = (color.a * max((1.0f - length(tint_symbol.quad_pos)), 0.0f)); - return color; -} - struct SimulationParams { float deltaTime; vec4 seed; @@ -184,44 +104,22 @@ struct Particle { vec3 velocity; }; -struct tint_symbol_10 { - uvec3 GlobalInvocationID; -}; - struct UBO { uint width; }; -struct tint_symbol_12 { - uvec3 coord; -}; - -struct tint_symbol_14 { - uvec3 coord; -}; - -tint_symbol_8 fs_main(tint_symbol_7 tint_symbol_6) { - VertexOutput tint_symbol_15 = VertexOutput(tint_symbol_6.position, tint_symbol_6.color, tint_symbol_6.quad_pos); - vec4 inner_result_1 = fs_main_inner(tint_symbol_15); - tint_symbol_8 wrapper_result_1 = tint_symbol_8(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result_1.value = inner_result_1; - return wrapper_result_1; +vec4 fs_main(VertexOutput tint_symbol) { + vec4 color = tint_symbol.color; + color.a = (color.a * max((1.0f - length(tint_symbol.quad_pos)), 0.0f)); + return color; } -layout(location = 0) in vec4 color; -layout(location = 1) in vec2 quad_pos; - -layout(location = 0) out vec4 value; void main() { - tint_symbol_7 inputs; - inputs.color = color; - inputs.quad_pos = quad_pos; - inputs.position = gl_FragCoord; - tint_symbol_8 outputs; - outputs = fs_main(inputs); - value = outputs.value; + VertexOutput tint_symbol_3 = VertexOutput(gl_FragCoord, color_1, quad_pos_1); + vec4 inner_result = fs_main(tint_symbol_3); + value_1 = inner_result; + return; } - #version 310 es precision mediump float; @@ -250,28 +148,6 @@ struct VertexOutput { vec2 quad_pos; }; -struct tint_symbol_4 { - vec3 position; - vec4 color; - vec2 quad_pos; -}; - -struct tint_symbol_5 { - vec4 color; - vec2 quad_pos; - vec4 position; -}; - -struct tint_symbol_7 { - vec4 color; - vec2 quad_pos; - vec4 position; -}; - -struct tint_symbol_8 { - vec4 value; -}; - struct SimulationParams { float deltaTime; vec4 seed; @@ -292,12 +168,12 @@ layout(binding = 0) uniform SimulationParams_1 { layout(binding = 1) buffer Particles_1 { Particle particles[]; } data; -struct tint_symbol_10 { - uvec3 GlobalInvocationID; +struct UBO { + uint width; }; uniform highp sampler2D tint_symbol_2_1; -void simulate_inner(uvec3 GlobalInvocationID) { +void simulate(uvec3 GlobalInvocationID) { rand_seed = ((sim_params.seed.xy + vec2(GlobalInvocationID.xy)) * sim_params.seed.zw); uint idx = GlobalInvocationID.x; Particle particle = data.particles[idx]; @@ -328,31 +204,11 @@ void simulate_inner(uvec3 GlobalInvocationID) { data.particles[idx] = particle; } -struct UBO { - uint width; -}; - -struct tint_symbol_12 { - uvec3 coord; -}; - -struct tint_symbol_14 { - uvec3 coord; -}; - layout(local_size_x = 64, local_size_y = 1, local_size_z = 1) in; -void simulate(tint_symbol_10 tint_symbol_9) { - simulate_inner(tint_symbol_9.GlobalInvocationID); +void main() { + simulate(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_10 inputs; - inputs.GlobalInvocationID = gl_GlobalInvocationID; - simulate(inputs); -} - Error parsing GLSL shader: ERROR: 0:6: 'frac' : no matching overloaded function found ERROR: 0:6: '' : compilation terminated @@ -381,28 +237,6 @@ struct VertexOutput { vec2 quad_pos; }; -struct tint_symbol_4 { - vec3 position; - vec4 color; - vec2 quad_pos; -}; - -struct tint_symbol_5 { - vec4 color; - vec2 quad_pos; - vec4 position; -}; - -struct tint_symbol_7 { - vec4 color; - vec2 quad_pos; - vec4 position; -}; - -struct tint_symbol_8 { - vec4 value; -}; - struct SimulationParams { float deltaTime; vec4 seed; @@ -415,10 +249,6 @@ struct Particle { vec3 velocity; }; -struct tint_symbol_10 { - uvec3 GlobalInvocationID; -}; - struct UBO { uint width; }; @@ -433,33 +263,17 @@ layout(binding = 4) buffer Buffer_1 { layout(binding = 5) buffer Buffer_2 { float weights[]; } buf_out; -struct tint_symbol_12 { - uvec3 coord; -}; - uniform highp sampler2D tex_in_1; -void import_level_inner(uvec3 coord) { +void import_level(uvec3 coord) { uint offset = (coord.x + (coord.y * ubo.width)); buf_out.weights[offset] = texelFetch(tex_in_1, ivec2(coord.xy), 0).w; } -struct tint_symbol_14 { - uvec3 coord; -}; - layout(local_size_x = 64, local_size_y = 1, local_size_z = 1) in; -void import_level(tint_symbol_12 tint_symbol_11) { - import_level_inner(tint_symbol_11.coord); +void main() { + import_level(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_12 inputs; - inputs.coord = gl_GlobalInvocationID; - import_level(inputs); -} - #version 310 es precision mediump float; @@ -481,28 +295,6 @@ struct VertexOutput { vec2 quad_pos; }; -struct tint_symbol_4 { - vec3 position; - vec4 color; - vec2 quad_pos; -}; - -struct tint_symbol_5 { - vec4 color; - vec2 quad_pos; - vec4 position; -}; - -struct tint_symbol_7 { - vec4 color; - vec2 quad_pos; - vec4 position; -}; - -struct tint_symbol_8 { - vec4 value; -}; - struct SimulationParams { float deltaTime; vec4 seed; @@ -515,10 +307,6 @@ struct Particle { vec3 velocity; }; -struct tint_symbol_10 { - uvec3 GlobalInvocationID; -}; - struct UBO { uint width; }; @@ -533,16 +321,8 @@ layout(binding = 4) buffer Buffer_1 { layout(binding = 5) buffer Buffer_2 { float weights[]; } buf_out; -struct tint_symbol_12 { - uvec3 coord; -}; - -struct tint_symbol_14 { - uvec3 coord; -}; - layout(rgba8) uniform highp writeonly image2D tex_out_1; -void export_level_inner(uvec3 coord) { +void export_level(uvec3 coord) { 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)); @@ -558,15 +338,7 @@ void export_level_inner(uvec3 coord) { } layout(local_size_x = 64, local_size_y = 1, local_size_z = 1) in; -void export_level(tint_symbol_14 tint_symbol_13) { - export_level_inner(tint_symbol_13.coord); +void main() { + export_level(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_14 inputs; - inputs.coord = gl_GlobalInvocationID; - export_level(inputs); -} - diff --git a/test/benchmark/shadow-fragment.wgsl.expected.glsl b/test/benchmark/shadow-fragment.wgsl.expected.glsl index 42f8da0465..54815b2f21 100644 --- a/test/benchmark/shadow-fragment.wgsl.expected.glsl +++ b/test/benchmark/shadow-fragment.wgsl.expected.glsl @@ -3,6 +3,10 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) in vec3 shadowPos_1; +layout(location = 1) in vec3 fragPos_1; +layout(location = 2) in vec3 fragNorm_1; +layout(location = 0) out vec4 value; const float shadowDepthTextureSize = 1024.0f; struct Scene { mat4 lightViewProjMatrix; @@ -24,19 +28,9 @@ struct FragmentInput { const vec3 albedo = vec3(0.899999976f, 0.899999976f, 0.899999976f); const float ambientFactor = 0.200000003f; -struct tint_symbol_3 { - vec3 shadowPos; - vec3 fragPos; - vec3 fragNorm; -}; - -struct tint_symbol_4 { - vec4 value; -}; - uniform highp sampler2D shadowMap_shadowSampler; -vec4 tint_symbol_inner(FragmentInput tint_symbol_1) { +vec4 tint_symbol(FragmentInput tint_symbol_1) { float visibility = 0.0f; float oneOverShadowDepthTextureSize = (1.0f / shadowDepthTextureSize); { @@ -55,31 +49,15 @@ vec4 tint_symbol_inner(FragmentInput tint_symbol_1) { return vec4((lightingFactor * albedo), 1.0f); } -tint_symbol_4 tint_symbol(tint_symbol_3 tint_symbol_2) { - FragmentInput tint_symbol_5 = FragmentInput(tint_symbol_2.shadowPos, tint_symbol_2.fragPos, tint_symbol_2.fragNorm); - vec4 inner_result = tint_symbol_inner(tint_symbol_5); - tint_symbol_4 wrapper_result = tint_symbol_4(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} -layout(location = 0) in vec3 shadowPos; -layout(location = 1) in vec3 fragPos; -layout(location = 2) in vec3 fragNorm; -layout(location = 0) out vec4 value; - void main() { - tint_symbol_3 inputs; - inputs.shadowPos = shadowPos; - inputs.fragPos = fragPos; - inputs.fragNorm = fragNorm; - tint_symbol_4 outputs; - outputs = tint_symbol(inputs); - value = outputs.value; + FragmentInput tint_symbol_2 = FragmentInput(shadowPos_1, fragPos_1, fragNorm_1); + vec4 inner_result = tint_symbol(tint_symbol_2); + value = inner_result; + return; } - Error parsing GLSL shader: -ERROR: 0:45: 'assign' : cannot convert from ' temp highp 4-component vector of float' to ' temp mediump float' -ERROR: 0:45: '' : compilation terminated +ERROR: 0:39: 'assign' : cannot convert from ' temp highp 4-component vector of float' to ' temp mediump float' +ERROR: 0:39: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/benchmark/simple-fragment.wgsl.expected.glsl b/test/benchmark/simple-fragment.wgsl.expected.glsl deleted file mode 100644 index 34e40b5b24..0000000000 --- a/test/benchmark/simple-fragment.wgsl.expected.glsl +++ /dev/null @@ -1,50 +0,0 @@ -SKIP: FAILED - -#version 310 es -precision mediump float; - -struct Input { - vec4 color; -}; - -struct Output { - vec4 color; -}; - -struct tint_symbol_3 { - vec4 color; -}; - -struct tint_symbol_4 { - vec4 color; -}; - -Output tint_symbol_inner(Input tint_symbol_1) { - Output tint_symbol_5 = Output(tint_symbol_1.color); - return tint_symbol_5; -} - -tint_symbol_4 tint_symbol(tint_symbol_3 tint_symbol_2) { - Input tint_symbol_6 = Input(tint_symbol_2.color); - Output inner_result = tint_symbol_inner(tint_symbol_6); - tint_symbol_4 wrapper_result = tint_symbol_4(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.color = inner_result.color; - return wrapper_result; -} -layout(location = 0) in vec4 color; -layout(location = 0) out vec4 color; - -void main() { - tint_symbol_3 inputs; - inputs.color = color; - tint_symbol_4 outputs; - outputs = tint_symbol(inputs); - color = outputs.color; -} - -Error parsing GLSL shader: -ERROR: 0:33: 'color' : redefinition -ERROR: 1 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 c12d1f170a..fd15d06d09 100644 --- a/test/benchmark/skinned-shadowed-pbr-fragment.wgsl.expected.glsl +++ b/test/benchmark/skinned-shadowed-pbr-fragment.wgsl.expected.glsl @@ -7,6 +7,17 @@ benchmark/skinned-shadowed-pbr-fragment.wgsl:51:13 warning: use of deprecated la #version 310 es precision mediump float; +layout(location = 0) in vec3 worldPos_1; +layout(location = 1) in vec3 view_1; +layout(location = 2) in vec2 texcoord_1; +layout(location = 3) in vec2 texcoord2_1; +layout(location = 4) in vec4 color_1; +layout(location = 5) in vec4 instanceColor_1; +layout(location = 6) in vec3 normal_1; +layout(location = 7) in vec3 tangent_1; +layout(location = 8) in vec3 bitangent_1; +layout(location = 0) out vec4 color_2; +layout(location = 1) out vec4 emissive_1; const float GAMMA = 2.200000048f; vec3 linearTosRGB(vec3 linear) { float INV_GAMMA = (1.0f / GAMMA); @@ -312,27 +323,9 @@ struct FragmentOutput { vec4 emissive; }; -struct tint_symbol_4 { - vec3 worldPos; - vec3 view; - vec2 texcoord; - vec2 texcoord2; - vec4 color; - vec4 instanceColor; - vec3 normal; - vec3 tangent; - vec3 bitangent; - vec4 position; -}; - -struct tint_symbol_5 { - vec4 color; - vec4 emissive; -}; - uniform highp sampler2D ssaoTexture_1; uniform highp sampler2D ssaoTexture_defaultSampler; -FragmentOutput fragmentMain_inner(VertexOutput tint_symbol) { +FragmentOutput fragmentMain(VertexOutput tint_symbol) { SurfaceInfo surface = GetSurfaceInfo(tint_symbol); vec3 Lo = vec3(0.0f, 0.0f, 0.0f); if ((globalLights.dirIntensity > 0.0f)) { @@ -370,48 +363,16 @@ FragmentOutput fragmentMain_inner(VertexOutput tint_symbol) { return tint_symbol_2; } -tint_symbol_5 fragmentMain(tint_symbol_4 tint_symbol_3) { - VertexOutput tint_symbol_6 = VertexOutput(tint_symbol_3.position, tint_symbol_3.worldPos, tint_symbol_3.view, tint_symbol_3.texcoord, tint_symbol_3.texcoord2, tint_symbol_3.color, tint_symbol_3.instanceColor, tint_symbol_3.normal, tint_symbol_3.tangent, tint_symbol_3.bitangent); - FragmentOutput inner_result = fragmentMain_inner(tint_symbol_6); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.color = inner_result.color; - wrapper_result.emissive = inner_result.emissive; - return wrapper_result; -} -layout(location = 0) in vec3 worldPos; -layout(location = 1) in vec3 view; -layout(location = 2) in vec2 texcoord; -layout(location = 3) in vec2 texcoord2; -layout(location = 4) in vec4 color; -layout(location = 5) in vec4 instanceColor; -layout(location = 6) in vec3 normal; -layout(location = 7) in vec3 tangent; -layout(location = 8) in vec3 bitangent; - -layout(location = 0) out vec4 color; -layout(location = 1) out vec4 emissive; - void main() { - tint_symbol_4 inputs; - inputs.worldPos = worldPos; - inputs.view = view; - inputs.texcoord = texcoord; - inputs.texcoord2 = texcoord2; - inputs.color = color; - inputs.instanceColor = instanceColor; - inputs.normal = normal; - inputs.tangent = tangent; - inputs.bitangent = bitangent; - inputs.position = gl_FragCoord; - tint_symbol_5 outputs; - outputs = fragmentMain(inputs); - color = outputs.color; - emissive = outputs.emissive; + VertexOutput tint_symbol_3 = VertexOutput(gl_FragCoord, worldPos_1, view_1, texcoord_1, texcoord2_1, color_1, instanceColor_1, normal_1, tangent_1, bitangent_1); + FragmentOutput inner_result = fragmentMain(tint_symbol_3); + color_2 = inner_result.color; + emissive_1 = inner_result.emissive; + return; } - Error parsing GLSL shader: -ERROR: 0:65: 'mad' : no matching overloaded function found -ERROR: 0:65: '' : compilation terminated +ERROR: 0:76: 'mad' : no matching overloaded function found +ERROR: 0:76: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/benchmark/skinned-shadowed-pbr-vertex.wgsl.expected.glsl b/test/benchmark/skinned-shadowed-pbr-vertex.wgsl.expected.glsl deleted file mode 100644 index ae182b5d53..0000000000 --- a/test/benchmark/skinned-shadowed-pbr-vertex.wgsl.expected.glsl +++ /dev/null @@ -1,185 +0,0 @@ -SKIP: FAILED - -#version 310 es -precision mediump float; - -struct VertexInput { - vec4 position; - vec3 normal; - vec4 tangent; - vec2 texcoord; - uvec4 joints; - vec4 weights; - vec4 instance0; - vec4 instance1; - vec4 instance2; - vec4 instance3; - vec4 instanceColor; -}; - -struct VertexOutput { - vec4 position; - vec3 worldPos; - vec3 view; - vec2 texcoord; - vec2 texcoord2; - vec4 color; - vec4 instanceColor; - vec3 normal; - vec3 tangent; - vec3 bitangent; -}; - -struct Camera { - mat4 projection; - mat4 inverseProjection; - mat4 view; - vec3 position; - float time; - vec2 outputSize; - float zNear; - float zFar; -}; - -layout(binding = 0) uniform Camera_1 { - mat4 projection; - mat4 inverseProjection; - mat4 view; - vec3 position; - float time; - vec2 outputSize; - float zNear; - float zFar; -} camera; - -layout(binding = 1) buffer Joints_1 { - mat4 matrices[]; -} joint; -layout(binding = 2) buffer Joints_2 { - mat4 matrices[]; -} inverseBind; -mat4 getSkinMatrix(VertexInput tint_symbol) { - mat4 joint0 = (joint.matrices[tint_symbol.joints.x] * inverseBind.matrices[tint_symbol.joints.x]); - mat4 joint1 = (joint.matrices[tint_symbol.joints.y] * inverseBind.matrices[tint_symbol.joints.y]); - mat4 joint2 = (joint.matrices[tint_symbol.joints.z] * inverseBind.matrices[tint_symbol.joints.z]); - mat4 joint3 = (joint.matrices[tint_symbol.joints.w] * inverseBind.matrices[tint_symbol.joints.w]); - mat4 skinMatrix = ((((joint0 * tint_symbol.weights.x) + (joint1 * tint_symbol.weights.y)) + (joint2 * tint_symbol.weights.z)) + (joint3 * tint_symbol.weights.w)); - return skinMatrix; -} - -struct tint_symbol_3 { - vec4 position; - vec3 normal; - vec4 tangent; - vec2 texcoord; - uvec4 joints; - vec4 weights; - vec4 instance0; - vec4 instance1; - vec4 instance2; - vec4 instance3; - vec4 instanceColor; -}; - -struct tint_symbol_4 { - vec3 worldPos; - vec3 view; - vec2 texcoord; - vec2 texcoord2; - vec4 color; - vec4 instanceColor; - vec3 normal; - vec3 tangent; - vec3 bitangent; - vec4 position; -}; - -VertexOutput vertexMain_inner(VertexInput tint_symbol) { - VertexOutput tint_symbol_1 = VertexOutput(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); - mat4 modelMatrix = getSkinMatrix(tint_symbol); - tint_symbol_1.normal = normalize((modelMatrix * vec4(tint_symbol.normal, 0.0f)).xyz); - tint_symbol_1.tangent = normalize((modelMatrix * vec4(tint_symbol.tangent.xyz, 0.0f)).xyz); - tint_symbol_1.bitangent = (cross(tint_symbol_1.normal, tint_symbol_1.tangent) * tint_symbol.tangent.w); - tint_symbol_1.color = vec4(1.0f); - tint_symbol_1.texcoord = tint_symbol.texcoord; - tint_symbol_1.instanceColor = tint_symbol.instanceColor; - vec4 modelPos = (modelMatrix * tint_symbol.position); - tint_symbol_1.worldPos = modelPos.xyz; - tint_symbol_1.view = (camera.position - modelPos.xyz); - tint_symbol_1.position = ((camera.projection * camera.view) * modelPos); - return tint_symbol_1; -} - -tint_symbol_4 vertexMain(tint_symbol_3 tint_symbol_2) { - VertexInput tint_symbol_5 = VertexInput(tint_symbol_2.position, tint_symbol_2.normal, tint_symbol_2.tangent, tint_symbol_2.texcoord, tint_symbol_2.joints, tint_symbol_2.weights, tint_symbol_2.instance0, tint_symbol_2.instance1, tint_symbol_2.instance2, tint_symbol_2.instance3, tint_symbol_2.instanceColor); - VertexOutput inner_result = vertexMain_inner(tint_symbol_5); - tint_symbol_4 wrapper_result = tint_symbol_4(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.position = inner_result.position; - wrapper_result.worldPos = inner_result.worldPos; - wrapper_result.view = inner_result.view; - wrapper_result.texcoord = inner_result.texcoord; - wrapper_result.texcoord2 = inner_result.texcoord2; - wrapper_result.color = inner_result.color; - wrapper_result.instanceColor = inner_result.instanceColor; - wrapper_result.normal = inner_result.normal; - wrapper_result.tangent = inner_result.tangent; - wrapper_result.bitangent = inner_result.bitangent; - return wrapper_result; -} -layout(location = 0) in vec4 position; -layout(location = 1) in vec3 normal; -layout(location = 2) in vec4 tangent; -layout(location = 3) in vec2 texcoord; -layout(location = 6) in uvec4 joints; -layout(location = 7) in vec4 weights; -layout(location = 8) in vec4 instance0; -layout(location = 9) in vec4 instance1; -layout(location = 10) in vec4 instance2; -layout(location = 11) in vec4 instance3; -layout(location = 12) in vec4 instanceColor; -layout(location = 0) out vec3 worldPos; -layout(location = 1) out vec3 view; -layout(location = 2) out vec2 texcoord; -layout(location = 3) out vec2 texcoord2; -layout(location = 4) out vec4 color; -layout(location = 5) out vec4 instanceColor; -layout(location = 6) out vec3 normal; -layout(location = 7) out vec3 tangent; -layout(location = 8) out vec3 bitangent; - - -void main() { - tint_symbol_3 inputs; - inputs.position = position; - inputs.normal = normal; - inputs.tangent = tangent; - inputs.texcoord = texcoord; - inputs.joints = joints; - inputs.weights = weights; - inputs.instance0 = instance0; - inputs.instance1 = instance1; - inputs.instance2 = instance2; - inputs.instance3 = instance3; - inputs.instanceColor = instanceColor; - tint_symbol_4 outputs; - outputs = vertexMain(inputs); - worldPos = outputs.worldPos; - view = outputs.view; - texcoord = outputs.texcoord; - texcoord2 = outputs.texcoord2; - color = outputs.color; - instanceColor = outputs.instanceColor; - normal = outputs.normal; - tangent = outputs.tangent; - bitangent = outputs.bitangent; - gl_Position = outputs.position; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; -} - -Error parsing GLSL shader: -ERROR: 0:140: 'texcoord' : redefinition -ERROR: 1 compilation errors. No code generated. - - - diff --git a/test/buffer/storage/dynamic_index/read.wgsl.expected.glsl b/test/buffer/storage/dynamic_index/read.wgsl.expected.glsl index def30dbef0..11436a6fb4 100644 --- a/test/buffer/storage/dynamic_index/read.wgsl.expected.glsl +++ b/test/buffer/storage/dynamic_index/read.wgsl.expected.glsl @@ -16,11 +16,7 @@ struct Inner { layout(binding = 0) buffer S_1 { Inner arr[]; } s; -struct tint_symbol_2 { - uint idx; -}; - -void tint_symbol_inner(uint idx) { +void tint_symbol(uint idx) { ivec3 a = s.arr[idx].a; int b = s.arr[idx].b; uvec3 c = s.arr[idx].c; @@ -33,15 +29,7 @@ void tint_symbol_inner(uint idx) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.idx); +void main() { + tint_symbol(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.idx = uint(gl_LocalInvocationIndex); - tint_symbol(inputs); -} - diff --git a/test/buffer/storage/dynamic_index/write.wgsl.expected.glsl b/test/buffer/storage/dynamic_index/write.wgsl.expected.glsl index 3ef8428023..3e6a2025f9 100644 --- a/test/buffer/storage/dynamic_index/write.wgsl.expected.glsl +++ b/test/buffer/storage/dynamic_index/write.wgsl.expected.glsl @@ -16,11 +16,7 @@ struct Inner { layout(binding = 0) buffer S_1 { Inner arr[]; } s; -struct tint_symbol_2 { - uint idx; -}; - -void tint_symbol_inner(uint idx) { +void tint_symbol(uint idx) { s.arr[idx].a = ivec3(0, 0, 0); s.arr[idx].b = 0; s.arr[idx].c = uvec3(0u, 0u, 0u); @@ -29,20 +25,12 @@ void tint_symbol_inner(uint idx) { s.arr[idx].f = 0.0f; s.arr[idx].g = mat2x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); s.arr[idx].h = mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); - ivec4 tint_symbol_3[4] = ivec4[4](ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0)); - s.arr[idx].i = tint_symbol_3; + ivec4 tint_symbol_1[4] = ivec4[4](ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0)); + s.arr[idx].i = tint_symbol_1; } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.idx); +void main() { + tint_symbol(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.idx = uint(gl_LocalInvocationIndex); - tint_symbol(inputs); -} - diff --git a/test/buffer/storage/static_index/read.wgsl.expected.glsl b/test/buffer/storage/static_index/read.wgsl.expected.glsl index f46725330e..3e989aa0d1 100644 --- a/test/buffer/storage/static_index/read.wgsl.expected.glsl +++ b/test/buffer/storage/static_index/read.wgsl.expected.glsl @@ -30,7 +30,6 @@ layout(binding = 0) buffer S_1 { Inner i; Inner j[4]; } s; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { ivec3 a = s.a; int b = s.b; @@ -42,10 +41,10 @@ void tint_symbol() { mat3x2 h = s.h; Inner i = s.i; Inner j[4] = s.j; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/buffer/storage/static_index/write.wgsl.expected.glsl b/test/buffer/storage/static_index/write.wgsl.expected.glsl index 364b4f0059..292daf0083 100644 --- a/test/buffer/storage/static_index/write.wgsl.expected.glsl +++ b/test/buffer/storage/static_index/write.wgsl.expected.glsl @@ -30,7 +30,6 @@ layout(binding = 0) buffer S_1 { Inner i; Inner j[4]; } s; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { s.a = ivec3(0, 0, 0); s.b = 0; @@ -44,10 +43,10 @@ void tint_symbol() { s.i = tint_symbol_1; Inner tint_symbol_2[4] = Inner[4](Inner(0), Inner(0), Inner(0), Inner(0)); s.j = tint_symbol_2; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/buffer/storage/types/array.wgsl.expected.glsl b/test/buffer/storage/types/array.wgsl.expected.glsl index 183882da2c..f93c0a45f4 100644 --- a/test/buffer/storage/types/array.wgsl.expected.glsl +++ b/test/buffer/storage/types/array.wgsl.expected.glsl @@ -11,13 +11,12 @@ layout(binding = 0) buffer tint_symbol_block_1 { layout(binding = 1) buffer tint_symbol_block_2 { float inner[4]; } tint_symbol_1; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol_2() { tint_symbol_1.inner = tint_symbol.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol_2(); + return; } - diff --git a/test/buffer/storage/types/f32.wgsl.expected.glsl b/test/buffer/storage/types/f32.wgsl.expected.glsl index 40d99f7e00..ff15000489 100644 --- a/test/buffer/storage/types/f32.wgsl.expected.glsl +++ b/test/buffer/storage/types/f32.wgsl.expected.glsl @@ -11,13 +11,12 @@ layout(binding = 0) buffer tint_symbol_block_1 { layout(binding = 1) buffer tint_symbol_block_2 { float inner; } tint_symbol_1; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol_2() { tint_symbol_1.inner = tint_symbol.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol_2(); + return; } - diff --git a/test/buffer/storage/types/i32.wgsl.expected.glsl b/test/buffer/storage/types/i32.wgsl.expected.glsl index 976c2b2430..2957e239ca 100644 --- a/test/buffer/storage/types/i32.wgsl.expected.glsl +++ b/test/buffer/storage/types/i32.wgsl.expected.glsl @@ -11,13 +11,12 @@ layout(binding = 0) buffer tint_symbol_block_1 { layout(binding = 1) buffer tint_symbol_block_2 { int inner; } tint_symbol_1; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol_2() { tint_symbol_1.inner = tint_symbol.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol_2(); + return; } - diff --git a/test/buffer/storage/types/mat2x2.wgsl.expected.glsl b/test/buffer/storage/types/mat2x2.wgsl.expected.glsl index 2e8b06a16f..39cb9fc5ad 100644 --- a/test/buffer/storage/types/mat2x2.wgsl.expected.glsl +++ b/test/buffer/storage/types/mat2x2.wgsl.expected.glsl @@ -11,13 +11,12 @@ layout(binding = 0) buffer tint_symbol_block_1 { layout(binding = 1) buffer tint_symbol_block_2 { mat2 inner; } tint_symbol_1; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol_2() { tint_symbol_1.inner = tint_symbol.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol_2(); + return; } - diff --git a/test/buffer/storage/types/mat2x3.wgsl.expected.glsl b/test/buffer/storage/types/mat2x3.wgsl.expected.glsl index c4b734824e..817129eb85 100644 --- a/test/buffer/storage/types/mat2x3.wgsl.expected.glsl +++ b/test/buffer/storage/types/mat2x3.wgsl.expected.glsl @@ -11,13 +11,12 @@ layout(binding = 0) buffer tint_symbol_block_1 { layout(binding = 1) buffer tint_symbol_block_2 { mat2x3 inner; } tint_symbol_1; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol_2() { tint_symbol_1.inner = tint_symbol.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol_2(); + return; } - diff --git a/test/buffer/storage/types/mat3x2.wgsl.expected.glsl b/test/buffer/storage/types/mat3x2.wgsl.expected.glsl index 0ec9fd8eda..9d6db45803 100644 --- a/test/buffer/storage/types/mat3x2.wgsl.expected.glsl +++ b/test/buffer/storage/types/mat3x2.wgsl.expected.glsl @@ -11,13 +11,12 @@ layout(binding = 0) buffer tint_symbol_block_1 { layout(binding = 1) buffer tint_symbol_block_2 { mat3x2 inner; } tint_symbol_1; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol_2() { tint_symbol_1.inner = tint_symbol.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol_2(); + return; } - diff --git a/test/buffer/storage/types/mat4x4.wgsl.expected.glsl b/test/buffer/storage/types/mat4x4.wgsl.expected.glsl index 4a1756aac2..4f401b0bd2 100644 --- a/test/buffer/storage/types/mat4x4.wgsl.expected.glsl +++ b/test/buffer/storage/types/mat4x4.wgsl.expected.glsl @@ -11,13 +11,12 @@ layout(binding = 0) buffer tint_symbol_block_1 { layout(binding = 1) buffer tint_symbol_block_2 { mat4 inner; } tint_symbol_1; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol_2() { tint_symbol_1.inner = tint_symbol.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol_2(); + return; } - diff --git a/test/buffer/storage/types/runtime_array.wgsl.expected.glsl b/test/buffer/storage/types/runtime_array.wgsl.expected.glsl index 2a4f200409..04989975d9 100644 --- a/test/buffer/storage/types/runtime_array.wgsl.expected.glsl +++ b/test/buffer/storage/types/runtime_array.wgsl.expected.glsl @@ -11,13 +11,12 @@ layout(binding = 0) buffer tint_symbol_block_1 { layout(binding = 1) buffer tint_symbol_block_2 { S inner[]; } tint_symbol_1; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol_2() { tint_symbol_1.inner[0] = tint_symbol.inner[0]; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol_2(); + return; } - diff --git a/test/buffer/storage/types/struct.wgsl.expected.glsl b/test/buffer/storage/types/struct.wgsl.expected.glsl index bc5bf8584b..6c17bcab54 100644 --- a/test/buffer/storage/types/struct.wgsl.expected.glsl +++ b/test/buffer/storage/types/struct.wgsl.expected.glsl @@ -17,19 +17,18 @@ layout(binding = 0) buffer S_1 { layout(binding = 1) buffer S_2 { Inner inner; } tint_symbol_1; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol_2() { tint_symbol_1 = tint_symbol; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol_2(); + return; } - Error parsing GLSL shader: -ERROR: 0:20: 'assign' : cannot convert from 'layout( binding=0 column_major shared) buffer block{layout( column_major shared) buffer structure{ global mediump float f} inner}' to 'layout( binding=1 column_major shared) buffer block{layout( column_major shared) buffer structure{ global mediump float f} inner}' -ERROR: 0:20: '' : compilation terminated +ERROR: 0:19: 'assign' : cannot convert from 'layout( binding=0 column_major shared) buffer block{layout( column_major shared) buffer structure{ global mediump float f} inner}' to 'layout( binding=1 column_major shared) buffer block{layout( column_major shared) buffer structure{ global mediump float f} inner}' +ERROR: 0:19: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/buffer/storage/types/u32.wgsl.expected.glsl b/test/buffer/storage/types/u32.wgsl.expected.glsl index 6736a08998..c029902ffb 100644 --- a/test/buffer/storage/types/u32.wgsl.expected.glsl +++ b/test/buffer/storage/types/u32.wgsl.expected.glsl @@ -11,13 +11,12 @@ layout(binding = 0) buffer tint_symbol_block_1 { layout(binding = 1) buffer tint_symbol_block_2 { uint inner; } tint_symbol_1; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol_2() { tint_symbol_1.inner = tint_symbol.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol_2(); + return; } - diff --git a/test/buffer/storage/types/vec2.wgsl.expected.glsl b/test/buffer/storage/types/vec2.wgsl.expected.glsl index ddcb7fe63f..430c76fe3d 100644 --- a/test/buffer/storage/types/vec2.wgsl.expected.glsl +++ b/test/buffer/storage/types/vec2.wgsl.expected.glsl @@ -11,13 +11,12 @@ layout(binding = 0) buffer tint_symbol_block_1 { layout(binding = 1) buffer tint_symbol_block_2 { ivec2 inner; } tint_symbol_1; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol_2() { tint_symbol_1.inner = tint_symbol.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol_2(); + return; } - diff --git a/test/buffer/storage/types/vec3.wgsl.expected.glsl b/test/buffer/storage/types/vec3.wgsl.expected.glsl index f780c9a56c..78851c655a 100644 --- a/test/buffer/storage/types/vec3.wgsl.expected.glsl +++ b/test/buffer/storage/types/vec3.wgsl.expected.glsl @@ -11,13 +11,12 @@ layout(binding = 0) buffer tint_symbol_block_1 { layout(binding = 1) buffer tint_symbol_block_2 { uvec3 inner; } tint_symbol_1; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol_2() { tint_symbol_1.inner = tint_symbol.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol_2(); + return; } - diff --git a/test/buffer/storage/types/vec4.wgsl.expected.glsl b/test/buffer/storage/types/vec4.wgsl.expected.glsl index 414bc4af05..8dc4c6edba 100644 --- a/test/buffer/storage/types/vec4.wgsl.expected.glsl +++ b/test/buffer/storage/types/vec4.wgsl.expected.glsl @@ -11,13 +11,12 @@ layout(binding = 0) buffer tint_symbol_block_1 { layout(binding = 1) buffer tint_symbol_block_2 { vec4 inner; } tint_symbol_1; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol_2() { tint_symbol_1.inner = tint_symbol.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol_2(); + return; } - diff --git a/test/buffer/uniform/dynamic_index/read.wgsl.expected.glsl b/test/buffer/uniform/dynamic_index/read.wgsl.expected.glsl index 975e4187e6..9bda0ba83f 100644 --- a/test/buffer/uniform/dynamic_index/read.wgsl.expected.glsl +++ b/test/buffer/uniform/dynamic_index/read.wgsl.expected.glsl @@ -23,11 +23,7 @@ layout(binding = 0) uniform S_1 { Inner arr[8]; } s; -struct tint_symbol_2 { - uint idx; -}; - -void tint_symbol_inner(uint idx) { +void tint_symbol(uint idx) { ivec3 a = s.arr[idx].a; int b = s.arr[idx].b; uvec3 c = s.arr[idx].c; @@ -42,15 +38,7 @@ void tint_symbol_inner(uint idx) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.idx); +void main() { + tint_symbol(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.idx = uint(gl_LocalInvocationIndex); - tint_symbol(inputs); -} - diff --git a/test/buffer/uniform/static_index/read.wgsl.expected.glsl b/test/buffer/uniform/static_index/read.wgsl.expected.glsl index e23579c32e..2e611d5beb 100644 --- a/test/buffer/uniform/static_index/read.wgsl.expected.glsl +++ b/test/buffer/uniform/static_index/read.wgsl.expected.glsl @@ -35,7 +35,6 @@ layout(binding = 0) uniform S_1 { Inner l[4]; } s; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { ivec3 a = s.a; int b = s.b; @@ -49,10 +48,10 @@ void tint_symbol() { mat3x2 j = s.j; Inner k = s.k; Inner l[4] = s.l; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/buffer/uniform/types/array.wgsl.expected.glsl b/test/buffer/uniform/types/array.wgsl.expected.glsl index 514ba1ff58..ac1d865169 100644 --- a/test/buffer/uniform/types/array.wgsl.expected.glsl +++ b/test/buffer/uniform/types/array.wgsl.expected.glsl @@ -9,13 +9,12 @@ layout(binding = 0) uniform u_block_1 { vec4 inner[4]; } u; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { vec4 x[4] = u.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/buffer/uniform/types/f32.wgsl.expected.glsl b/test/buffer/uniform/types/f32.wgsl.expected.glsl index e3b3589fdc..38061a4fa1 100644 --- a/test/buffer/uniform/types/f32.wgsl.expected.glsl +++ b/test/buffer/uniform/types/f32.wgsl.expected.glsl @@ -9,13 +9,12 @@ layout(binding = 0) uniform u_block_1 { float inner; } u; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { float x = u.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/buffer/uniform/types/i32.wgsl.expected.glsl b/test/buffer/uniform/types/i32.wgsl.expected.glsl index 6ae3def2c3..4e70136ff9 100644 --- a/test/buffer/uniform/types/i32.wgsl.expected.glsl +++ b/test/buffer/uniform/types/i32.wgsl.expected.glsl @@ -9,13 +9,12 @@ layout(binding = 0) uniform u_block_1 { int inner; } u; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { int x = u.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/buffer/uniform/types/mat2x2.wgsl.expected.glsl b/test/buffer/uniform/types/mat2x2.wgsl.expected.glsl index e09403c121..b5fc57d53e 100644 --- a/test/buffer/uniform/types/mat2x2.wgsl.expected.glsl +++ b/test/buffer/uniform/types/mat2x2.wgsl.expected.glsl @@ -9,13 +9,12 @@ layout(binding = 0) uniform u_block_1 { mat2 inner; } u; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { mat2 x = u.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/buffer/uniform/types/mat2x3.wgsl.expected.glsl b/test/buffer/uniform/types/mat2x3.wgsl.expected.glsl index fe7ef529e4..8eab60472e 100644 --- a/test/buffer/uniform/types/mat2x3.wgsl.expected.glsl +++ b/test/buffer/uniform/types/mat2x3.wgsl.expected.glsl @@ -9,13 +9,12 @@ layout(binding = 0) uniform u_block_1 { mat2x3 inner; } u; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { mat2x3 x = u.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/buffer/uniform/types/mat3x2.wgsl.expected.glsl b/test/buffer/uniform/types/mat3x2.wgsl.expected.glsl index 4b742e1319..bf8709279e 100644 --- a/test/buffer/uniform/types/mat3x2.wgsl.expected.glsl +++ b/test/buffer/uniform/types/mat3x2.wgsl.expected.glsl @@ -9,13 +9,12 @@ layout(binding = 0) uniform u_block_1 { mat3x2 inner; } u; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { mat3x2 x = u.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/buffer/uniform/types/mat4x4.wgsl.expected.glsl b/test/buffer/uniform/types/mat4x4.wgsl.expected.glsl index 0305478df5..ce20163a1a 100644 --- a/test/buffer/uniform/types/mat4x4.wgsl.expected.glsl +++ b/test/buffer/uniform/types/mat4x4.wgsl.expected.glsl @@ -9,13 +9,12 @@ layout(binding = 0) uniform u_block_1 { mat4 inner; } u; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { mat4 x = u.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/buffer/uniform/types/struct.wgsl.expected.glsl b/test/buffer/uniform/types/struct.wgsl.expected.glsl index c684ea2f8e..dd29c0e80a 100644 --- a/test/buffer/uniform/types/struct.wgsl.expected.glsl +++ b/test/buffer/uniform/types/struct.wgsl.expected.glsl @@ -15,19 +15,18 @@ layout(binding = 0) uniform S_1 { Inner inner; } u; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { S x = u; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: -ERROR: 0:18: '=' : cannot convert from 'layout( binding=0 column_major shared) uniform block{layout( column_major shared) uniform structure{ global mediump float f} inner}' to ' temp structure{ global structure{ global mediump float f} inner}' -ERROR: 0:18: '' : compilation terminated +ERROR: 0:17: '=' : cannot convert from 'layout( binding=0 column_major shared) uniform block{layout( column_major shared) uniform structure{ global mediump float f} inner}' to ' temp structure{ global structure{ global mediump float f} inner}' +ERROR: 0:17: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/buffer/uniform/types/u32.wgsl.expected.glsl b/test/buffer/uniform/types/u32.wgsl.expected.glsl index 8096438350..402bd68310 100644 --- a/test/buffer/uniform/types/u32.wgsl.expected.glsl +++ b/test/buffer/uniform/types/u32.wgsl.expected.glsl @@ -9,13 +9,12 @@ layout(binding = 0) uniform u_block_1 { uint inner; } u; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { uint x = u.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/buffer/uniform/types/vec2.wgsl.expected.glsl b/test/buffer/uniform/types/vec2.wgsl.expected.glsl index 7ca9b13aac..6b281b493a 100644 --- a/test/buffer/uniform/types/vec2.wgsl.expected.glsl +++ b/test/buffer/uniform/types/vec2.wgsl.expected.glsl @@ -9,13 +9,12 @@ layout(binding = 0) uniform u_block_1 { ivec2 inner; } u; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { ivec2 x = u.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/buffer/uniform/types/vec3.wgsl.expected.glsl b/test/buffer/uniform/types/vec3.wgsl.expected.glsl index 0aba38a679..2d6b854de5 100644 --- a/test/buffer/uniform/types/vec3.wgsl.expected.glsl +++ b/test/buffer/uniform/types/vec3.wgsl.expected.glsl @@ -9,13 +9,12 @@ layout(binding = 0) uniform u_block_1 { uvec3 inner; } u; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { uvec3 x = u.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/buffer/uniform/types/vec4.wgsl.expected.glsl b/test/buffer/uniform/types/vec4.wgsl.expected.glsl index 1cbcd11ecc..e3d8b5f474 100644 --- a/test/buffer/uniform/types/vec4.wgsl.expected.glsl +++ b/test/buffer/uniform/types/vec4.wgsl.expected.glsl @@ -9,13 +9,12 @@ layout(binding = 0) uniform u_block_1 { vec4 inner; } u; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { vec4 x = u.inner; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/chromium/1221120.wgsl.expected.glsl b/test/bug/chromium/1221120.wgsl.expected.glsl index eea151a484..288694cd37 100644 --- a/test/bug/chromium/1221120.wgsl.expected.glsl +++ b/test/bug/chromium/1221120.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const int H = 1; diff --git a/test/bug/chromium/1236161.wgsl.expected.glsl b/test/bug/chromium/1236161.wgsl.expected.glsl index fbc61f8787..d1ad034da4 100644 --- a/test/bug/chromium/1236161.wgsl.expected.glsl +++ b/test/bug/chromium/1236161.wgsl.expected.glsl @@ -20,11 +20,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void i() { float s = tint_modf(1.0f).whole; } diff --git a/test/bug/chromium/1251009.wgsl.expected.glsl b/test/bug/chromium/1251009.wgsl.expected.glsl index ab20360e8b..990aab1f74 100644 --- a/test/bug/chromium/1251009.wgsl.expected.glsl +++ b/test/bug/chromium/1251009.wgsl.expected.glsl @@ -1,6 +1,10 @@ #version 310 es precision mediump float; +layout(location = 0) in int loc0_1; +layout(location = 1) in uint loc1_1; +layout(location = 2) in uint loc1_2; +layout(location = 3) in vec4 loc3_1; struct VertexInputs0 { uint vertex_index; int loc0; @@ -11,52 +15,17 @@ struct VertexInputs1 { vec4 loc3; }; -struct tint_symbol_2 { - int loc0; - uint loc1; - uint loc1_1; - vec4 loc3; - uint vertex_index; - uint instance_index; -}; - -struct tint_symbol_3 { - vec4 value; -}; - -vec4 tint_symbol_inner(VertexInputs0 inputs0, uint loc1, uint instance_index, VertexInputs1 inputs1) { +vec4 tint_symbol(VertexInputs0 inputs0, uint loc1, uint instance_index, VertexInputs1 inputs1) { uint foo = (inputs0.vertex_index + instance_index); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) { - VertexInputs0 tint_symbol_4 = VertexInputs0(tint_symbol_1.vertex_index, tint_symbol_1.loc0); - VertexInputs1 tint_symbol_5 = VertexInputs1(tint_symbol_1.loc1_1, tint_symbol_1.loc3); - vec4 inner_result = tint_symbol_inner(tint_symbol_4, tint_symbol_1.loc1, tint_symbol_1.instance_index, tint_symbol_5); - tint_symbol_3 wrapper_result = tint_symbol_3(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} -layout(location = 0) in int loc0; -layout(location = 1) in uint loc1; -layout(location = 2) in uint loc1_1; -layout(location = 3) in vec4 loc3; - - - - void main() { - tint_symbol_2 inputs; - inputs.loc0 = loc0; - inputs.loc1 = loc1; - inputs.loc1_1 = loc1_1; - inputs.loc3 = loc3; - inputs.vertex_index = uint(gl_VertexID); - inputs.instance_index = uint(gl_InstanceID); - tint_symbol_3 outputs; - outputs = tint_symbol(inputs); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + VertexInputs0 tint_symbol_1 = VertexInputs0(uint(gl_VertexID), loc0_1); + VertexInputs1 tint_symbol_2 = VertexInputs1(loc1_2, loc3_1); + vec4 inner_result = tint_symbol(tint_symbol_1, loc1_1, uint(gl_InstanceID), tint_symbol_2); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - diff --git a/test/bug/chromium/1273230.wgsl.expected.glsl b/test/bug/chromium/1273230.wgsl.expected.glsl index f05e2a2f8e..b3db713b98 100644 --- a/test/bug/chromium/1273230.wgsl.expected.glsl +++ b/test/bug/chromium/1273230.wgsl.expected.glsl @@ -111,11 +111,7 @@ void doIgnore() { int g55 = atomicOr(LUT.values[0], 0); } -struct tint_symbol_1 { - uvec3 GlobalInvocationID; -}; - -void main_count_inner(uvec3 GlobalInvocationID) { +void main_count(uvec3 GlobalInvocationID) { uint triangleIndex = GlobalInvocationID.x; if ((triangleIndex >= uniforms.numTriangles)) { return; @@ -134,15 +130,7 @@ void main_count_inner(uvec3 GlobalInvocationID) { } layout(local_size_x = 128, local_size_y = 1, local_size_z = 1) in; -void main_count(tint_symbol_1 tint_symbol) { - main_count_inner(tint_symbol.GlobalInvocationID); +void main() { + main_count(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.GlobalInvocationID = gl_GlobalInvocationID; - main_count(inputs); -} - diff --git a/test/bug/chromium/1273451.wgsl.expected.glsl b/test/bug/chromium/1273451.wgsl.expected.glsl index 7024728317..1922ee6f31 100644 --- a/test/bug/chromium/1273451.wgsl.expected.glsl +++ b/test/bug/chromium/1273451.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct A { int a; }; diff --git a/test/bug/dawn/947.wgsl.expected.glsl b/test/bug/dawn/947.wgsl.expected.glsl index 5bb2e8684c..18ec58d066 100644 --- a/test/bug/dawn/947.wgsl.expected.glsl +++ b/test/bug/dawn/947.wgsl.expected.glsl @@ -1,6 +1,7 @@ #version 310 es precision mediump float; +layout(location = 0) out vec2 texcoords_1; struct Uniforms { vec2 u_scale; vec2 u_offset; @@ -16,16 +17,7 @@ struct VertexOutputs { vec4 position; }; -struct tint_symbol_2 { - uint VertexIndex; -}; - -struct tint_symbol_3 { - vec2 texcoords; - vec4 position; -}; - -VertexOutputs vs_main_inner(uint VertexIndex) { +VertexOutputs vs_main(uint VertexIndex) { vec2 texcoord[3] = vec2[3](vec2(-0.5f, 0.0f), vec2(1.5f, 0.0f), vec2(0.5f, 2.0f)); VertexOutputs tint_symbol = VertexOutputs(vec2(0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); tint_symbol.position = vec4(((texcoord[VertexIndex] * 2.0f) - vec2(1.0f, 1.0f)), 0.0f, 1.0f); @@ -38,39 +30,19 @@ VertexOutputs vs_main_inner(uint VertexIndex) { return tint_symbol; } -struct tint_symbol_5 { - vec2 texcoord; -}; - -struct tint_symbol_6 { - vec4 value; -}; - -tint_symbol_3 vs_main(tint_symbol_2 tint_symbol_1) { - VertexOutputs inner_result = vs_main_inner(tint_symbol_1.VertexIndex); - tint_symbol_3 wrapper_result = tint_symbol_3(vec2(0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.texcoords = inner_result.texcoords; - wrapper_result.position = inner_result.position; - return wrapper_result; -} - -layout(location = 0) out vec2 texcoords; - - void main() { - tint_symbol_2 inputs; - inputs.VertexIndex = uint(gl_VertexID); - tint_symbol_3 outputs; - outputs = vs_main(inputs); - texcoords = outputs.texcoords; - gl_Position = outputs.position; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + VertexOutputs inner_result = vs_main(uint(gl_VertexID)); + texcoords_1 = inner_result.texcoords; + gl_Position = inner_result.position; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; +layout(location = 0) in vec2 texcoord_1; +layout(location = 0) out vec4 value; struct Uniforms { vec2 u_scale; vec2 u_offset; @@ -81,26 +53,9 @@ struct VertexOutputs { vec4 position; }; -struct tint_symbol_2 { - uint VertexIndex; -}; - -struct tint_symbol_3 { - vec2 texcoords; - vec4 position; -}; - -struct tint_symbol_5 { - vec2 texcoord; -}; - -struct tint_symbol_6 { - vec4 value; -}; - uniform highp sampler2D myTexture_mySampler; -vec4 fs_main_inner(vec2 texcoord) { +vec4 fs_main(vec2 texcoord) { vec2 clampedTexcoord = clamp(texcoord, vec2(0.0f, 0.0f), vec2(1.0f, 1.0f)); if (!(all(equal(clampedTexcoord, texcoord)))) { discard; @@ -109,20 +64,8 @@ vec4 fs_main_inner(vec2 texcoord) { return srcColor; } -tint_symbol_6 fs_main(tint_symbol_5 tint_symbol_4) { - vec4 inner_result_1 = fs_main_inner(tint_symbol_4.texcoord); - tint_symbol_6 wrapper_result_1 = tint_symbol_6(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result_1.value = inner_result_1; - return wrapper_result_1; -} -layout(location = 0) in vec2 texcoord; -layout(location = 0) out vec4 value; - void main() { - tint_symbol_5 inputs; - inputs.texcoord = texcoord; - tint_symbol_6 outputs; - outputs = fs_main(inputs); - value = outputs.value; + vec4 inner_result = fs_main(texcoord_1); + value = inner_result; + return; } - diff --git a/test/bug/fxc/dyn_array_idx/read/function.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/read/function.wgsl.expected.glsl index 38dd9fbf8d..d40bfd57dc 100644 --- a/test/bug/fxc/dyn_array_idx/read/function.wgsl.expected.glsl +++ b/test/bug/fxc/dyn_array_idx/read/function.wgsl.expected.glsl @@ -20,14 +20,13 @@ struct Result { layout(binding = 1) buffer Result_1 { int tint_symbol; } result; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { S s = S(int[64](0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)); result.tint_symbol = s.data[ubo.dynamic_idx]; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/bug/fxc/dyn_array_idx/read/private.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/read/private.wgsl.expected.glsl index 63c16e0739..e2fef20adb 100644 --- a/test/bug/fxc/dyn_array_idx/read/private.wgsl.expected.glsl +++ b/test/bug/fxc/dyn_array_idx/read/private.wgsl.expected.glsl @@ -21,13 +21,12 @@ layout(binding = 1) buffer Result_1 { int tint_symbol; } result; S s = S(int[64](0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { result.tint_symbol = s.data[ubo.dynamic_idx]; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.glsl index 1bc7ef2fd3..457175efc7 100644 --- a/test/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.glsl +++ b/test/bug/fxc/dyn_array_idx/read/storage.wgsl.expected.glsl @@ -23,13 +23,12 @@ struct SSBO { layout(binding = 1) buffer SSBO_1 { int data[4]; } ssbo; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { result.tint_symbol = ssbo.data[ubo.dynamic_idx]; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.glsl index 118dd73f44..0b495f2d20 100644 --- a/test/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.glsl +++ b/test/bug/fxc/dyn_array_idx/read/uniform.wgsl.expected.glsl @@ -18,13 +18,12 @@ struct Result { layout(binding = 2) buffer Result_1 { int tint_symbol; } result; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { result.tint_symbol = ubo.data[ubo.dynamic_idx].x; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.glsl index b3052ddafb..7e4929f4e9 100644 --- a/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.glsl +++ b/test/bug/fxc/dyn_array_idx/read/workgroup.wgsl.expected.glsl @@ -21,11 +21,7 @@ layout(binding = 1) buffer Result_1 { int tint_symbol; } result; shared S s; -struct tint_symbol_2 { - uint local_invocation_index; -}; - -void f_inner(uint local_invocation_index) { +void f(uint local_invocation_index) { { for(uint idx = local_invocation_index; (idx < 64u); idx = (idx + 1u)) { uint i = idx; @@ -37,15 +33,7 @@ void f_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void f(tint_symbol_2 tint_symbol_1) { - f_inner(tint_symbol_1.local_invocation_index); +void main() { + f(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - f(inputs); -} - diff --git a/test/bug/fxc/dyn_array_idx/write/function.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/write/function.wgsl.expected.glsl index 3be6198c89..100f67b053 100644 --- a/test/bug/fxc/dyn_array_idx/write/function.wgsl.expected.glsl +++ b/test/bug/fxc/dyn_array_idx/write/function.wgsl.expected.glsl @@ -20,15 +20,14 @@ struct Result { layout(binding = 1) buffer Result_1 { int tint_symbol; } result; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { S s = S(int[64](0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)); s.data[ubo.dynamic_idx] = 1; result.tint_symbol = s.data[3]; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.glsl index ead018c6f6..997dd2e46b 100644 --- a/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.glsl +++ b/test/bug/fxc/dyn_array_idx/write/function_via_param.wgsl.expected.glsl @@ -24,15 +24,14 @@ void x(inout S p) { p.data[ubo.dynamic_idx] = 1; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { S s = S(int[64](0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)); x(s); result.tint_symbol = s.data[3]; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/bug/fxc/dyn_array_idx/write/private.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/write/private.wgsl.expected.glsl index 18c763b863..0a776e7fe9 100644 --- a/test/bug/fxc/dyn_array_idx/write/private.wgsl.expected.glsl +++ b/test/bug/fxc/dyn_array_idx/write/private.wgsl.expected.glsl @@ -21,14 +21,13 @@ layout(binding = 1) buffer Result_1 { int tint_symbol; } result; S s = S(int[64](0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0)); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { s.data[ubo.dynamic_idx] = 1; result.tint_symbol = s.data[3]; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.glsl index 61e4347199..a4c0ad3611 100644 --- a/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.glsl +++ b/test/bug/fxc/dyn_array_idx/write/private_via_param.wgsl.expected.glsl @@ -25,14 +25,13 @@ void x(inout S p) { p.data[ubo.dynamic_idx] = 1; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { x(s); result.tint_symbol = s.data[3]; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.glsl index 279d1cd6a5..aa44922afc 100644 --- a/test/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.glsl +++ b/test/bug/fxc/dyn_array_idx/write/storage.wgsl.expected.glsl @@ -23,14 +23,13 @@ struct SSBO { layout(binding = 1) buffer SSBO_1 { int data[4]; } ssbo; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ssbo.data[ubo.dynamic_idx] = 1; result.tint_symbol = ssbo.data[3]; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.glsl b/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.glsl index 2a4d1c0b82..49e6366ee0 100644 --- a/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.glsl +++ b/test/bug/fxc/dyn_array_idx/write/workgroup.wgsl.expected.glsl @@ -21,11 +21,7 @@ layout(binding = 1) buffer Result_1 { int tint_symbol; } result; shared S s; -struct tint_symbol_2 { - uint local_invocation_index; -}; - -void f_inner(uint local_invocation_index) { +void f(uint local_invocation_index) { { for(uint idx = local_invocation_index; (idx < 64u); idx = (idx + 1u)) { uint i = idx; @@ -38,15 +34,7 @@ void f_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void f(tint_symbol_2 tint_symbol_1) { - f_inner(tint_symbol_1.local_invocation_index); +void main() { + f(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - f(inputs); -} - diff --git a/test/bug/fxc/gradient_in_varying_loop/1112.wgsl.expected.glsl b/test/bug/fxc/gradient_in_varying_loop/1112.wgsl.expected.glsl index d63995b462..b11b4b2831 100644 --- a/test/bug/fxc/gradient_in_varying_loop/1112.wgsl.expected.glsl +++ b/test/bug/fxc/gradient_in_varying_loop/1112.wgsl.expected.glsl @@ -1,18 +1,12 @@ #version 310 es precision mediump float; -struct tint_symbol_2 { - vec2 vUV; -}; - -struct tint_symbol_3 { - vec4 value; -}; - +layout(location = 0) in vec2 vUV_1; +layout(location = 0) out vec4 value; uniform highp sampler2D randomTexture_Sampler; uniform highp sampler2D depthTexture_Sampler; -vec4 tint_symbol_inner(vec2 vUV) { +vec4 tint_symbol(vec2 vUV) { vec3 random = texture(randomTexture_Sampler, vUV).rgb; int i = 0; while (true) { @@ -43,20 +37,8 @@ vec4 tint_symbol_inner(vec2 vUV) { return vec4(1.0f); } -tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) { - vec4 inner_result = tint_symbol_inner(tint_symbol_1.vUV); - tint_symbol_3 wrapper_result = tint_symbol_3(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} -layout(location = 0) in vec2 vUV; -layout(location = 0) out vec4 value; - void main() { - tint_symbol_2 inputs; - inputs.vUV = vUV; - tint_symbol_3 outputs; - outputs = tint_symbol(inputs); - value = outputs.value; + vec4 inner_result = tint_symbol(vUV_1); + value = inner_result; + return; } - diff --git a/test/bug/fxc/indexed_assign_to_array_in_struct/1206.wgsl.expected.glsl b/test/bug/fxc/indexed_assign_to_array_in_struct/1206.wgsl.expected.glsl index 131bb21fc8..c2c8f93e1d 100644 --- a/test/bug/fxc/indexed_assign_to_array_in_struct/1206.wgsl.expected.glsl +++ b/test/bug/fxc/indexed_assign_to_array_in_struct/1206.wgsl.expected.glsl @@ -19,14 +19,13 @@ layout(binding = 4) uniform Simulation_1 { uint i; } sim; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { Particle particle = particles.p[0]; particle.position[sim.i] = particle.position[sim.i]; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/fxc/matrix_assignment_dynamic_index/local_assign_scalar_x.wgsl.expected.glsl b/test/bug/fxc/matrix_assignment_dynamic_index/local_assign_scalar_x.wgsl.expected.glsl index 74dc588545..7decbe8e5c 100644 --- a/test/bug/fxc/matrix_assignment_dynamic_index/local_assign_scalar_x.wgsl.expected.glsl +++ b/test/bug/fxc/matrix_assignment_dynamic_index/local_assign_scalar_x.wgsl.expected.glsl @@ -11,14 +11,13 @@ layout(binding = 4) uniform Uniforms_1 { uint j; } uniforms; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { mat2x4 m1 = mat2x4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); m1[uniforms.i][0] = 1.0f; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/fxc/matrix_assignment_dynamic_index/local_assign_scalar_xy.wgsl.expected.glsl b/test/bug/fxc/matrix_assignment_dynamic_index/local_assign_scalar_xy.wgsl.expected.glsl index b7701f1e56..9939fe9b47 100644 --- a/test/bug/fxc/matrix_assignment_dynamic_index/local_assign_scalar_xy.wgsl.expected.glsl +++ b/test/bug/fxc/matrix_assignment_dynamic_index/local_assign_scalar_xy.wgsl.expected.glsl @@ -11,14 +11,13 @@ layout(binding = 4) uniform Uniforms_1 { uint j; } uniforms; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { mat2x4 m1 = mat2x4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); m1[uniforms.i][uniforms.j] = 1.0f; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/fxc/matrix_assignment_dynamic_index/local_assign_scalar_y.wgsl.expected.glsl b/test/bug/fxc/matrix_assignment_dynamic_index/local_assign_scalar_y.wgsl.expected.glsl index 31fe4d4a7b..a9e2933d16 100644 --- a/test/bug/fxc/matrix_assignment_dynamic_index/local_assign_scalar_y.wgsl.expected.glsl +++ b/test/bug/fxc/matrix_assignment_dynamic_index/local_assign_scalar_y.wgsl.expected.glsl @@ -12,13 +12,12 @@ layout(binding = 4) uniform Uniforms_1 { } uniforms; mat2x4 m1 = mat2x4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { m1[0][uniforms.j] = 1.0f; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/fxc/matrix_assignment_dynamic_index/local_assign_vector.wgsl.expected.glsl b/test/bug/fxc/matrix_assignment_dynamic_index/local_assign_vector.wgsl.expected.glsl index 021a5958c6..049b4815e2 100644 --- a/test/bug/fxc/matrix_assignment_dynamic_index/local_assign_vector.wgsl.expected.glsl +++ b/test/bug/fxc/matrix_assignment_dynamic_index/local_assign_vector.wgsl.expected.glsl @@ -11,14 +11,13 @@ layout(binding = 4) uniform Uniforms_1 { uint j; } uniforms; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { mat2x4 m1 = mat2x4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); m1[uniforms.i] = vec4(1.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/fxc/matrix_assignment_dynamic_index/module_assign_scalar_x.wgsl.expected.glsl b/test/bug/fxc/matrix_assignment_dynamic_index/module_assign_scalar_x.wgsl.expected.glsl index 0cf6f23328..8765d835b1 100644 --- a/test/bug/fxc/matrix_assignment_dynamic_index/module_assign_scalar_x.wgsl.expected.glsl +++ b/test/bug/fxc/matrix_assignment_dynamic_index/module_assign_scalar_x.wgsl.expected.glsl @@ -12,13 +12,12 @@ layout(binding = 4) uniform Uniforms_1 { } uniforms; mat2x4 m1 = mat2x4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { m1[uniforms.i][0] = 1.0f; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/fxc/matrix_assignment_dynamic_index/module_assign_scalar_xy.wgsl.expected.glsl b/test/bug/fxc/matrix_assignment_dynamic_index/module_assign_scalar_xy.wgsl.expected.glsl index 8d28577eb1..b33ca04252 100644 --- a/test/bug/fxc/matrix_assignment_dynamic_index/module_assign_scalar_xy.wgsl.expected.glsl +++ b/test/bug/fxc/matrix_assignment_dynamic_index/module_assign_scalar_xy.wgsl.expected.glsl @@ -12,13 +12,12 @@ layout(binding = 4) uniform Uniforms_1 { } uniforms; mat2x4 m1 = mat2x4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { m1[uniforms.i][uniforms.j] = 1.0f; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/fxc/matrix_assignment_dynamic_index/module_assign_scalar_y.wgsl.expected.glsl b/test/bug/fxc/matrix_assignment_dynamic_index/module_assign_scalar_y.wgsl.expected.glsl index 31fe4d4a7b..a9e2933d16 100644 --- a/test/bug/fxc/matrix_assignment_dynamic_index/module_assign_scalar_y.wgsl.expected.glsl +++ b/test/bug/fxc/matrix_assignment_dynamic_index/module_assign_scalar_y.wgsl.expected.glsl @@ -12,13 +12,12 @@ layout(binding = 4) uniform Uniforms_1 { } uniforms; mat2x4 m1 = mat2x4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { m1[0][uniforms.j] = 1.0f; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/fxc/matrix_assignment_dynamic_index/module_assign_vector.wgsl.expected.glsl b/test/bug/fxc/matrix_assignment_dynamic_index/module_assign_vector.wgsl.expected.glsl index 3f2bbc0d7e..6c55fccd32 100644 --- a/test/bug/fxc/matrix_assignment_dynamic_index/module_assign_vector.wgsl.expected.glsl +++ b/test/bug/fxc/matrix_assignment_dynamic_index/module_assign_vector.wgsl.expected.glsl @@ -12,13 +12,12 @@ layout(binding = 4) uniform Uniforms_1 { } uniforms; mat2x4 m1 = mat2x4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { m1[uniforms.i] = vec4(1.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/fxc/vector_assignment_in_loop/loop_call_with_loop.wgsl.expected.glsl b/test/bug/fxc/vector_assignment_in_loop/loop_call_with_loop.wgsl.expected.glsl index 73303a127f..76c960acfa 100644 --- a/test/bug/fxc/vector_assignment_in_loop/loop_call_with_loop.wgsl.expected.glsl +++ b/test/bug/fxc/vector_assignment_in_loop/loop_call_with_loop.wgsl.expected.glsl @@ -16,17 +16,16 @@ void foo() { } } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { { for(int i = 0; (i < 2); i = (i + 1)) { foo(); } } - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/fxc/vector_assignment_in_loop/loop_call_with_no_loop.wgsl.expected.glsl b/test/bug/fxc/vector_assignment_in_loop/loop_call_with_no_loop.wgsl.expected.glsl index 66cdf905ac..dcec4ef752 100644 --- a/test/bug/fxc/vector_assignment_in_loop/loop_call_with_no_loop.wgsl.expected.glsl +++ b/test/bug/fxc/vector_assignment_in_loop/loop_call_with_no_loop.wgsl.expected.glsl @@ -13,17 +13,16 @@ void foo() { v2b[i] = true; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { { for(int i = 0; (i < 2); i = (i + 1)) { foo(); } } - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/fxc/vector_assignment_in_loop/loop_types_all.wgsl.expected.glsl b/test/bug/fxc/vector_assignment_in_loop/loop_types_all.wgsl.expected.glsl index d577a0b0c3..cb4d65fe5b 100644 --- a/test/bug/fxc/vector_assignment_in_loop/loop_types_all.wgsl.expected.glsl +++ b/test/bug/fxc/vector_assignment_in_loop/loop_types_all.wgsl.expected.glsl @@ -1,7 +1,6 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { vec2 v2f = vec2(0.0f, 0.0f); vec3 v3f = vec3(0.0f, 0.0f, 0.0f); @@ -31,10 +30,10 @@ void tint_symbol() { v4b[i] = true; } } - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/fxc/vector_assignment_in_loop/loop_types_repeated.wgsl.expected.glsl b/test/bug/fxc/vector_assignment_in_loop/loop_types_repeated.wgsl.expected.glsl index 70a28f6500..0ded30383f 100644 --- a/test/bug/fxc/vector_assignment_in_loop/loop_types_repeated.wgsl.expected.glsl +++ b/test/bug/fxc/vector_assignment_in_loop/loop_types_repeated.wgsl.expected.glsl @@ -1,7 +1,6 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { vec2 v2f = vec2(0.0f, 0.0f); vec2 v2f_2 = vec2(0.0f, 0.0f); @@ -23,10 +22,10 @@ void tint_symbol() { v2b_2[i] = true; } } - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/fxc/vector_assignment_in_loop/loop_types_some.wgsl.expected.glsl b/test/bug/fxc/vector_assignment_in_loop/loop_types_some.wgsl.expected.glsl index 1c080e37fe..dc948de3c4 100644 --- a/test/bug/fxc/vector_assignment_in_loop/loop_types_some.wgsl.expected.glsl +++ b/test/bug/fxc/vector_assignment_in_loop/loop_types_some.wgsl.expected.glsl @@ -1,7 +1,6 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { vec2 v2f = vec2(0.0f, 0.0f); vec3 v3f = vec3(0.0f, 0.0f, 0.0f); @@ -32,10 +31,10 @@ void tint_symbol() { v4u[i] = 1u; v3b[i] = true; v4b[i] = true; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/fxc/vector_assignment_in_loop/no_loop.wgsl.expected.glsl b/test/bug/fxc/vector_assignment_in_loop/no_loop.wgsl.expected.glsl index 32a381e3c1..6e316d9d0d 100644 --- a/test/bug/fxc/vector_assignment_in_loop/no_loop.wgsl.expected.glsl +++ b/test/bug/fxc/vector_assignment_in_loop/no_loop.wgsl.expected.glsl @@ -1,7 +1,6 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { vec2 v2f = vec2(0.0f, 0.0f); vec3 v3f = vec3(0.0f, 0.0f, 0.0f); @@ -28,10 +27,10 @@ void tint_symbol() { v2b[i] = true; v3b[i] = true; v4b[i] = true; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/tint/1046.wgsl.expected.glsl b/test/bug/tint/1046.wgsl.expected.glsl index aff09cba14..68ab31222c 100644 --- a/test/bug/tint/1046.wgsl.expected.glsl +++ b/test/bug/tint/1046.wgsl.expected.glsl @@ -1,8 +1,11 @@ -SKIP: FAILED - #version 310 es precision mediump float; +layout(location = 0) in vec4 view_position_1; +layout(location = 1) in vec4 normal_1; +layout(location = 2) in vec2 uv_1; +layout(location = 3) in vec4 color_1; +layout(location = 0) out vec4 color_2; struct PointLight { vec4 position; }; @@ -38,53 +41,15 @@ struct FragmentOutput { vec4 color; }; -struct tint_symbol_3 { - vec4 view_position; - vec4 normal; - vec2 uv; - vec4 color; - vec4 position; -}; - -struct tint_symbol_4 { - vec4 color; -}; - -FragmentOutput tint_symbol_inner(FragmentInput fragment) { +FragmentOutput tint_symbol(FragmentInput fragment) { FragmentOutput tint_symbol_1 = FragmentOutput(vec4(0.0f, 0.0f, 0.0f, 0.0f)); tint_symbol_1.color = vec4(1.0f, 0.0f, 0.0f, 1.0f); return tint_symbol_1; } -tint_symbol_4 tint_symbol(tint_symbol_3 tint_symbol_2) { - FragmentInput tint_symbol_5 = FragmentInput(tint_symbol_2.position, tint_symbol_2.view_position, tint_symbol_2.normal, tint_symbol_2.uv, tint_symbol_2.color); - FragmentOutput inner_result = tint_symbol_inner(tint_symbol_5); - tint_symbol_4 wrapper_result = tint_symbol_4(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.color = inner_result.color; - return wrapper_result; -} -layout(location = 0) in vec4 view_position; -layout(location = 1) in vec4 normal; -layout(location = 2) in vec2 uv; -layout(location = 3) in vec4 color; - -layout(location = 0) out vec4 color; - void main() { - tint_symbol_3 inputs; - inputs.view_position = view_position; - inputs.normal = normal; - inputs.uv = uv; - inputs.color = color; - inputs.position = gl_FragCoord; - tint_symbol_4 outputs; - outputs = tint_symbol(inputs); - color = outputs.color; + FragmentInput tint_symbol_2 = FragmentInput(gl_FragCoord, view_position_1, normal_1, uv_1, color_1); + FragmentOutput inner_result = tint_symbol(tint_symbol_2); + color_2 = inner_result.color; + return; } - -Error parsing GLSL shader: -ERROR: 0:69: 'color' : redefinition -ERROR: 1 compilation errors. No code generated. - - - diff --git a/test/bug/tint/1064.wgsl.expected.glsl b/test/bug/tint/1064.wgsl.expected.glsl index 2f81388c46..290d580221 100644 --- a/test/bug/tint/1064.wgsl.expected.glsl +++ b/test/bug/tint/1064.wgsl.expected.glsl @@ -14,10 +14,9 @@ void tint_symbol() { } } } - return; } void main() { tint_symbol(); + return; } - diff --git a/test/bug/tint/1076.wgsl.expected.glsl b/test/bug/tint/1076.wgsl.expected.glsl index e79fb56757..1b1ec51ee5 100644 --- a/test/bug/tint/1076.wgsl.expected.glsl +++ b/test/bug/tint/1076.wgsl.expected.glsl @@ -3,58 +3,33 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) in float a_1; +layout(location = 1) in float b_1; +layout(location = 0) out float a_2; struct FragIn { float a; uint mask; }; -struct tint_symbol_3 { - float a; - float b; - uint mask; -}; - -struct tint_symbol_4 { - float a; - uint mask; -}; - -FragIn tint_symbol_inner(FragIn tint_symbol_1, float b) { +FragIn tint_symbol(FragIn tint_symbol_1, float b) { if ((tint_symbol_1.mask == 0u)) { return tint_symbol_1; } - FragIn tint_symbol_5 = FragIn(b, 1u); - return tint_symbol_5; + FragIn tint_symbol_2 = FragIn(b, 1u); + return tint_symbol_2; } -tint_symbol_4 tint_symbol(tint_symbol_3 tint_symbol_2) { - FragIn tint_symbol_6 = FragIn(tint_symbol_2.a, tint_symbol_2.mask); - FragIn inner_result = tint_symbol_inner(tint_symbol_6, tint_symbol_2.b); - tint_symbol_4 wrapper_result = tint_symbol_4(0.0f, 0u); - wrapper_result.a = inner_result.a; - wrapper_result.mask = inner_result.mask; - return wrapper_result; -} -layout(location = 0) in float a; -layout(location = 1) in float b; - -layout(location = 0) out float a; - - void main() { - tint_symbol_3 inputs; - inputs.a = a; - inputs.b = b; - inputs.mask = uint(gl_SampleMask); - tint_symbol_4 outputs; - outputs = tint_symbol(inputs); - a = outputs.a; - gl_SampleMask = outputs.mask; + FragIn tint_symbol_3 = FragIn(a_1, uint(gl_SampleMask[0])); + FragIn inner_result = tint_symbol(tint_symbol_3, b_1); + a_2 = inner_result.a; + gl_SampleMask_1[0] = inner_result.mask; + return; } - Error parsing GLSL shader: -ERROR: 0:39: 'a' : redefinition -ERROR: 1 compilation errors. No code generated. +ERROR: 0:21: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:21: '' : compilation terminated +ERROR: 2 compilation errors. No code generated. diff --git a/test/bug/tint/1081.wgsl.expected.glsl b/test/bug/tint/1081.wgsl.expected.glsl index 57544d774c..3b4deae65b 100644 --- a/test/bug/tint/1081.wgsl.expected.glsl +++ b/test/bug/tint/1081.wgsl.expected.glsl @@ -1,6 +1,8 @@ #version 310 es precision mediump float; +layout(location = 1) flat in ivec3 x_1; +layout(location = 2) out int value; int f(int x) { if ((x == 10)) { discard; @@ -8,15 +10,7 @@ int f(int x) { return x; } -struct tint_symbol_2 { - ivec3 x; -}; - -struct tint_symbol_3 { - int value; -}; - -int tint_symbol_inner(ivec3 x) { +int tint_symbol(ivec3 x) { int y = x.x; while (true) { int r = f(y); @@ -27,20 +21,8 @@ int tint_symbol_inner(ivec3 x) { return y; } -tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) { - int inner_result = tint_symbol_inner(tint_symbol_1.x); - tint_symbol_3 wrapper_result = tint_symbol_3(0); - wrapper_result.value = inner_result; - return wrapper_result; -} -layout(location = 1) flat in ivec3 x; -layout(location = 2) out int value; - void main() { - tint_symbol_2 inputs; - inputs.x = x; - tint_symbol_3 outputs; - outputs = tint_symbol(inputs); - value = outputs.value; + int inner_result = tint_symbol(x_1); + value = inner_result; + return; } - diff --git a/test/bug/tint/1083.wgsl.expected.glsl b/test/bug/tint/1083.wgsl.expected.glsl index 8c230a243e..2d273c7ad5 100644 --- a/test/bug/tint/1083.wgsl.expected.glsl +++ b/test/bug/tint/1083.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int c = (1 / 0); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/bug/tint/1086.wgsl.expected.glsl b/test/bug/tint/1086.wgsl.expected.glsl index 0c69c4f64c..ecb7dad653 100644 --- a/test/bug/tint/1086.wgsl.expected.glsl +++ b/test/bug/tint/1086.wgsl.expected.glsl @@ -12,10 +12,9 @@ void g() { void f() { g(); - return; } void main() { f(); + return; } - diff --git a/test/bug/tint/1088.spvasm.expected.glsl b/test/bug/tint/1088.spvasm.expected.glsl index c665add474..a94d3917d6 100644 --- a/test/bug/tint/1088.spvasm.expected.glsl +++ b/test/bug/tint/1088.spvasm.expected.glsl @@ -1,6 +1,10 @@ #version 310 es precision mediump float; +layout(location = 0) in vec3 position_param_1; +layout(location = 2) in vec2 uv_param_1; +layout(location = 1) in vec3 normal_param_1; +layout(location = 0) out vec2 vUV_1_1; struct tint_padded_array_element { float el; }; @@ -53,49 +57,20 @@ struct main_out { vec2 vUV_1; }; -struct tint_symbol_3 { - vec3 position_param; - vec3 normal_param; - vec2 uv_param; -}; - -struct tint_symbol_4 { - vec2 vUV_1; - vec4 tint_symbol; -}; - -main_out tint_symbol_1_inner(vec3 position_param, vec2 uv_param, vec3 normal_param) { +main_out tint_symbol_1(vec3 position_param, vec2 uv_param, vec3 normal_param) { position = position_param; uv = uv_param; normal = normal_param; main_1(); - main_out tint_symbol_5 = main_out(tint_symbol, vUV); - return tint_symbol_5; + main_out tint_symbol_2 = main_out(tint_symbol, vUV); + return tint_symbol_2; } -tint_symbol_4 tint_symbol_1(tint_symbol_3 tint_symbol_2) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_2.position_param, tint_symbol_2.uv_param, tint_symbol_2.normal_param); - tint_symbol_4 wrapper_result = tint_symbol_4(vec2(0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.tint_symbol = inner_result.tint_symbol; - wrapper_result.vUV_1 = inner_result.vUV_1; - return wrapper_result; -} -layout(location = 0) in vec3 position_param; -layout(location = 1) in vec3 normal_param; -layout(location = 2) in vec2 uv_param; -layout(location = 0) out vec2 vUV_1; - - void main() { - tint_symbol_3 inputs; - inputs.position_param = position_param; - inputs.normal_param = normal_param; - inputs.uv_param = uv_param; - tint_symbol_4 outputs; - outputs = tint_symbol_1(inputs); - vUV_1 = outputs.vUV_1; - gl_Position = outputs.tint_symbol; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + main_out inner_result = tint_symbol_1(position_param_1, uv_param_1, normal_param_1); + gl_Position = inner_result.tint_symbol; + vUV_1_1 = inner_result.vUV_1; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - diff --git a/test/bug/tint/1113.wgsl.expected.glsl b/test/bug/tint/1113.wgsl.expected.glsl index 1fbe960101..89c5c46c23 100644 --- a/test/bug/tint/1113.wgsl.expected.glsl +++ b/test/bug/tint/1113.wgsl.expected.glsl @@ -91,11 +91,7 @@ void doIgnore() { int g55 = atomicOr(LUT.values[0], 0); } -struct tint_symbol_1 { - uvec3 GlobalInvocationID; -}; - -void main_count_inner(uvec3 GlobalInvocationID) { +void main_count(uvec3 GlobalInvocationID) { uint triangleIndex = GlobalInvocationID.x; if ((triangleIndex >= uniforms.numTriangles)) { return; @@ -119,27 +115,11 @@ void main_count_inner(uvec3 GlobalInvocationID) { } } -struct tint_symbol_3 { - uvec3 GlobalInvocationID; -}; - -struct tint_symbol_5 { - uvec3 GlobalInvocationID; -}; - layout(local_size_x = 128, local_size_y = 1, local_size_z = 1) in; -void main_count(tint_symbol_1 tint_symbol) { - main_count_inner(tint_symbol.GlobalInvocationID); +void main() { + main_count(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.GlobalInvocationID = gl_GlobalInvocationID; - main_count(inputs); -} - #version 310 es precision mediump float; @@ -211,15 +191,7 @@ void doIgnore() { int g55 = atomicOr(LUT.values[0], 0); } -struct tint_symbol_1 { - uvec3 GlobalInvocationID; -}; - -struct tint_symbol_3 { - uvec3 GlobalInvocationID; -}; - -void main_create_lut_inner(uvec3 GlobalInvocationID) { +void main_create_lut(uvec3 GlobalInvocationID) { uint voxelIndex = GlobalInvocationID.x; doIgnore(); uint maxVoxels = ((uniforms.gridSize * uniforms.gridSize) * uniforms.gridSize); @@ -234,23 +206,11 @@ void main_create_lut_inner(uvec3 GlobalInvocationID) { atomicExchange(LUT.values[voxelIndex], offset); } -struct tint_symbol_5 { - uvec3 GlobalInvocationID; -}; - layout(local_size_x = 128, local_size_y = 1, local_size_z = 1) in; -void main_create_lut(tint_symbol_3 tint_symbol_2) { - main_create_lut_inner(tint_symbol_2.GlobalInvocationID); +void main() { + main_create_lut(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_3 inputs; - inputs.GlobalInvocationID = gl_GlobalInvocationID; - main_create_lut(inputs); -} - #version 310 es precision mediump float; @@ -344,19 +304,7 @@ void doIgnore() { int g55 = atomicOr(LUT.values[0], 0); } -struct tint_symbol_1 { - uvec3 GlobalInvocationID; -}; - -struct tint_symbol_3 { - uvec3 GlobalInvocationID; -}; - -struct tint_symbol_5 { - uvec3 GlobalInvocationID; -}; - -void main_sort_triangles_inner(uvec3 GlobalInvocationID) { +void main_sort_triangles(uvec3 GlobalInvocationID) { uint triangleIndex = GlobalInvocationID.x; doIgnore(); if ((triangleIndex >= uniforms.numTriangles)) { @@ -375,15 +323,7 @@ void main_sort_triangles_inner(uvec3 GlobalInvocationID) { } layout(local_size_x = 128, local_size_y = 1, local_size_z = 1) in; -void main_sort_triangles(tint_symbol_5 tint_symbol_4) { - main_sort_triangles_inner(tint_symbol_4.GlobalInvocationID); +void main() { + main_sort_triangles(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_5 inputs; - inputs.GlobalInvocationID = gl_GlobalInvocationID; - main_sort_triangles(inputs); -} - diff --git a/test/bug/tint/1121.wgsl.expected.glsl b/test/bug/tint/1121.wgsl.expected.glsl index c656693574..667cba62b8 100644 --- a/test/bug/tint/1121.wgsl.expected.glsl +++ b/test/bug/tint/1121.wgsl.expected.glsl @@ -56,11 +56,7 @@ layout(binding = 0) uniform Uniforms_1 { vec4 fullScreenSize; } uniforms; -struct tint_symbol_4 { - uvec3 GlobalInvocationID; -}; - -void tint_symbol_2_inner(uvec3 GlobalInvocationID) { +void tint_symbol_2(uvec3 GlobalInvocationID) { uint index = GlobalInvocationID.x; if ((index >= config.numLights)) { return; @@ -141,15 +137,7 @@ void tint_symbol_2_inner(uvec3 GlobalInvocationID) { } layout(local_size_x = 64, local_size_y = 1, local_size_z = 1) in; -void tint_symbol_2(tint_symbol_4 tint_symbol_3) { - tint_symbol_2_inner(tint_symbol_3.GlobalInvocationID); +void main() { + tint_symbol_2(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_4 inputs; - inputs.GlobalInvocationID = gl_GlobalInvocationID; - tint_symbol_2(inputs); -} - diff --git a/test/bug/tint/1136.wgsl.expected.glsl b/test/bug/tint/1136.wgsl.expected.glsl index 67d68ece30..3af977094b 100644 --- a/test/bug/tint/1136.wgsl.expected.glsl +++ b/test/bug/tint/1136.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct Buffer { uint data; }; diff --git a/test/bug/tint/1321.wgsl.expected.glsl b/test/bug/tint/1321.wgsl.expected.glsl index 6bff13a666..f1b3b8b782 100644 --- a/test/bug/tint/1321.wgsl.expected.glsl +++ b/test/bug/tint/1321.wgsl.expected.glsl @@ -14,10 +14,9 @@ void tint_symbol() { break; } } - return; } void main() { tint_symbol(); + return; } - diff --git a/test/bug/tint/1369.wgsl.expected.glsl b/test/bug/tint/1369.wgsl.expected.glsl index bb2aa7542b..4d0b9b7af4 100644 --- a/test/bug/tint/1369.wgsl.expected.glsl +++ b/test/bug/tint/1369.wgsl.expected.glsl @@ -17,10 +17,9 @@ bool call_discard() { void f() { bool v = call_discard(); bool also_unreachable = false; - return; } void main() { f(); + return; } - diff --git a/test/bug/tint/1385.wgsl.expected.glsl b/test/bug/tint/1385.wgsl.expected.glsl index 9edbf0d9e2..4031ab0b03 100644 --- a/test/bug/tint/1385.wgsl.expected.glsl +++ b/test/bug/tint/1385.wgsl.expected.glsl @@ -8,13 +8,12 @@ int foo() { return data.inner[0]; } -layout(local_size_x = 16, local_size_y = 16, local_size_z = 1) in; void tint_symbol() { foo(); - return; } +layout(local_size_x = 16, local_size_y = 16, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/tint/219.spvasm.expected.glsl b/test/bug/tint/219.spvasm.expected.glsl index cd7152215b..b407ed8814 100644 --- a/test/bug/tint/219.spvasm.expected.glsl +++ b/test/bug/tint/219.spvasm.expected.glsl @@ -12,13 +12,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/tint/221.wgsl.expected.glsl b/test/bug/tint/221.wgsl.expected.glsl index 1c037d0d2d..b724d8f73f 100644 --- a/test/bug/tint/221.wgsl.expected.glsl +++ b/test/bug/tint/221.wgsl.expected.glsl @@ -10,7 +10,6 @@ layout(binding = 0) buffer Buf_1 { uint count; uint data[50]; } b; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { uint i = 0u; while (true) { @@ -34,7 +33,8 @@ void tint_symbol() { return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/tint/292.wgsl.expected.glsl b/test/bug/tint/292.wgsl.expected.glsl index 8b911115a0..26706eff2e 100644 --- a/test/bug/tint/292.wgsl.expected.glsl +++ b/test/bug/tint/292.wgsl.expected.glsl @@ -1,29 +1,16 @@ #version 310 es precision mediump float; -struct tint_symbol_1 { - vec4 value; -}; - -vec4 tint_symbol_inner() { +vec4 tint_symbol() { vec3 light = vec3(1.200000048f, 1.0f, 2.0f); vec3 negative_light = -(light); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol_1 tint_symbol() { - vec4 inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = tint_symbol(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - diff --git a/test/bug/tint/294.wgsl.expected.glsl b/test/bug/tint/294.wgsl.expected.glsl index 413229049e..4a8775978b 100644 --- a/test/bug/tint/294.wgsl.expected.glsl +++ b/test/bug/tint/294.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct Light { vec3 position; vec3 colour; diff --git a/test/bug/tint/369.wgsl.expected.glsl b/test/bug/tint/369.wgsl.expected.glsl index 2e41e9356b..f4e86cf626 100644 --- a/test/bug/tint/369.wgsl.expected.glsl +++ b/test/bug/tint/369.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { mat2 m; }; diff --git a/test/bug/tint/403.wgsl.expected.glsl b/test/bug/tint/403.wgsl.expected.glsl index a0a75b1596..99508099af 100644 --- a/test/bug/tint/403.wgsl.expected.glsl +++ b/test/bug/tint/403.wgsl.expected.glsl @@ -17,42 +17,22 @@ layout(binding = 0) uniform vertexUniformBuffer2_1 { mat2 transform2; } x_26; -struct tint_symbol_3 { - uint tint_symbol_1; -}; - -struct tint_symbol_4 { - vec4 value; -}; - -vec4 tint_symbol_inner(uint tint_symbol_1) { +vec4 tint_symbol(uint tint_symbol_1) { vec2 indexable[3] = vec2[3](vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); mat2 x_23 = x_20.transform1; mat2 x_28 = x_26.transform2; uint x_46 = tint_symbol_1; - vec2 tint_symbol_5[3] = vec2[3](vec2(-1.0f, 1.0f), vec2(1.0f, 1.0f), vec2(-1.0f, -1.0f)); - indexable = tint_symbol_5; + vec2 tint_symbol_2[3] = vec2[3](vec2(-1.0f, 1.0f), vec2(1.0f, 1.0f), vec2(-1.0f, -1.0f)); + indexable = tint_symbol_2; vec2 x_51 = indexable[x_46]; vec2 x_52 = (mat2((x_23[0u] + x_28[0u]), (x_23[1u] + x_28[1u])) * x_51); return vec4(x_52.x, x_52.y, 0.0f, 1.0f); } -tint_symbol_4 tint_symbol(tint_symbol_3 tint_symbol_2) { - vec4 inner_result = tint_symbol_inner(tint_symbol_2.tint_symbol_1); - tint_symbol_4 wrapper_result = tint_symbol_4(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - - void main() { - tint_symbol_3 inputs; - inputs.tint_symbol_1 = uint(gl_VertexID); - tint_symbol_4 outputs; - outputs = tint_symbol(inputs); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = tint_symbol(uint(gl_VertexID)); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - diff --git a/test/bug/tint/413.spvasm.expected.glsl b/test/bug/tint/413.spvasm.expected.glsl index 5b7a5dd561..0ad088bad4 100644 --- a/test/bug/tint/413.spvasm.expected.glsl +++ b/test/bug/tint/413.spvasm.expected.glsl @@ -13,13 +13,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/tint/453.wgsl.expected.glsl b/test/bug/tint/453.wgsl.expected.glsl index 2fca5d87c3..3adda5abc4 100644 --- a/test/bug/tint/453.wgsl.expected.glsl +++ b/test/bug/tint/453.wgsl.expected.glsl @@ -3,7 +3,6 @@ precision mediump float; uniform highp usampler2D Src_1; layout(r32ui) uniform highp writeonly uimage2D Dst_1; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { uvec4 srcValue = uvec4(0u, 0u, 0u, 0u); uvec4 x_22 = texelFetch(Src_1, ivec2(0, 0), 0); @@ -14,7 +13,8 @@ void tint_symbol() { return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/tint/492.wgsl.expected.glsl b/test/bug/tint/492.wgsl.expected.glsl index ecec5742ec..f4c36d61fb 100644 --- a/test/bug/tint/492.wgsl.expected.glsl +++ b/test/bug/tint/492.wgsl.expected.glsl @@ -8,13 +8,12 @@ struct S { layout(binding = 0) buffer S_1 { int a; } buf; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { buf.a = 12; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/tint/534.wgsl.expected.glsl b/test/bug/tint/534.wgsl.expected.glsl index d7ae9be0af..8521fbdfc0 100644 --- a/test/bug/tint/534.wgsl.expected.glsl +++ b/test/bug/tint/534.wgsl.expected.glsl @@ -22,13 +22,9 @@ uint ConvertToFp16FloatValue(float fp32) { return 1u; } -struct tint_symbol_3 { - uvec3 GlobalInvocationID; -}; - uniform highp sampler2D src_1; uniform highp sampler2D dst_1; -void tint_symbol_1_inner(uvec3 GlobalInvocationID) { +void tint_symbol_1(uvec3 GlobalInvocationID) { ivec2 size = textureSize(src_1, 0); ivec2 dstTexCoord = ivec2(GlobalInvocationID.xy); ivec2 srcTexCoord = dstTexCoord; @@ -59,15 +55,7 @@ void tint_symbol_1_inner(uvec3 GlobalInvocationID) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol_1(tint_symbol_3 tint_symbol_2) { - tint_symbol_1_inner(tint_symbol_2.GlobalInvocationID); +void main() { + tint_symbol_1(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_3 inputs; - inputs.GlobalInvocationID = gl_GlobalInvocationID; - tint_symbol_1(inputs); -} - diff --git a/test/bug/tint/744.wgsl.expected.glsl b/test/bug/tint/744.wgsl.expected.glsl index 37a6a7dea5..cd60eb6a33 100644 --- a/test/bug/tint/744.wgsl.expected.glsl +++ b/test/bug/tint/744.wgsl.expected.glsl @@ -22,11 +22,7 @@ layout(binding = 3) uniform Uniforms_1 { uvec2 outShape; } uniforms; -struct tint_symbol_2 { - uvec3 global_id; -}; - -void tint_symbol_inner(uvec3 global_id) { +void tint_symbol(uvec3 global_id) { uvec2 resultCell = uvec2(global_id.y, global_id.x); uint dimInner = uniforms.aShape.y; uint dimOutter = uniforms.outShape.y; @@ -43,15 +39,7 @@ void tint_symbol_inner(uvec3 global_id) { } layout(local_size_x = 2, local_size_y = 2, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.global_id); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.global_id = gl_GlobalInvocationID; - tint_symbol(inputs); -} - diff --git a/test/bug/tint/749.spvasm.expected.glsl b/test/bug/tint/749.spvasm.expected.glsl index 816362b550..61e049016d 100644 --- a/test/bug/tint/749.spvasm.expected.glsl +++ b/test/bug/tint/749.spvasm.expected.glsl @@ -1,6 +1,7 @@ #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct QuicksortObject { int numbers[10]; }; @@ -64,18 +65,18 @@ void swap_i1_i1_(inout int i, inout int j) { int x_34_save = x_33; int x_35 = obj.numbers[x_34_save]; QuicksortObject x_943 = obj; - int tint_symbol_6[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_7 = QuicksortObject(tint_symbol_6); - obj = tint_symbol_7; + int tint_symbol_3[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_4 = QuicksortObject(tint_symbol_3); + obj = tint_symbol_4; obj = x_943; vec2 x_527 = vec2(x_526.x, x_526.x); int x_36_save = x_32; vec3 x_528 = vec3(x_524.x, x_524.z, x_524.x); obj.numbers[x_36_save] = x_35; QuicksortObject x_944 = obj; - int tint_symbol_8[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_9 = QuicksortObject(tint_symbol_8); - obj = tint_symbol_9; + int tint_symbol_5[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_6 = QuicksortObject(tint_symbol_5); + obj = tint_symbol_6; obj = x_944; vec3 x_529 = vec3(x_526.y, x_526.z, x_526.x); int x_945 = i; @@ -98,9 +99,9 @@ void swap_i1_i1_(inout int i, inout int j) { obj.numbers[x_36_save] = 0; obj.numbers[x_36_save] = x_949; QuicksortObject x_950 = obj; - int tint_symbol_10[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_11 = QuicksortObject(tint_symbol_10); - obj = tint_symbol_11; + int tint_symbol_7[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_8 = QuicksortObject(tint_symbol_7); + obj = tint_symbol_8; obj = x_950; vec3 x_532 = vec3(x_528.x, x_528.y, x_528.x); int x_951 = obj.numbers[x_34_save]; @@ -156,9 +157,9 @@ int performPartition_i1_i1_(inout int l, inout int h) { vec3 x_536 = vec3(x_534.x, x_534.z, x_535.x); j_1 = 10; QuicksortObject x_960 = obj; - int tint_symbol_12[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_13 = QuicksortObject(tint_symbol_12); - obj = tint_symbol_13; + int tint_symbol_9[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_10 = QuicksortObject(tint_symbol_9); + obj = tint_symbol_10; obj = x_960; while (true) { int x_961 = pivot; @@ -173,9 +174,9 @@ int performPartition_i1_i1_(inout int l, inout int h) { pivot = x_963; x_537 = vec2(vec3(1.0f, 2.0f, 3.0f).y, vec3(1.0f, 2.0f, 3.0f).z); QuicksortObject x_964 = obj; - int tint_symbol_14[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_15 = QuicksortObject(tint_symbol_14); - obj = tint_symbol_15; + int tint_symbol_11[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_12 = QuicksortObject(tint_symbol_11); + obj = tint_symbol_12; obj = x_964; int x_56 = h; int x_965 = h; @@ -209,9 +210,9 @@ int performPartition_i1_i1_(inout int l, inout int h) { param_1 = x_971; int x_62 = obj.numbers[x_61_save]; QuicksortObject x_972 = obj; - int tint_symbol_16[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_17 = QuicksortObject(tint_symbol_16); - obj = tint_symbol_17; + int tint_symbol_13[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_14 = QuicksortObject(tint_symbol_13); + obj = tint_symbol_14; obj = x_972; int x_63 = pivot; vec2 x_540 = vec2(vec3(1.0f, 2.0f, 3.0f).y, x_534.z); @@ -269,9 +270,9 @@ int performPartition_i1_i1_(inout int l, inout int h) { param_1 = x_985; } QuicksortObject x_986 = obj; - int tint_symbol_18[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_19 = QuicksortObject(tint_symbol_18); - obj = tint_symbol_19; + int tint_symbol_15[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_16 = QuicksortObject(tint_symbol_15); + obj = tint_symbol_16; obj = x_986; { int x_987 = h; @@ -304,9 +305,9 @@ int performPartition_i1_i1_(inout int l, inout int h) { obj.numbers[x_42_save] = x_993; vec2 x_549 = vec2(x_534.x, x_534.y); QuicksortObject x_994 = obj; - int tint_symbol_20[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_21 = QuicksortObject(tint_symbol_20); - obj = tint_symbol_21; + int tint_symbol_17[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_18 = QuicksortObject(tint_symbol_17); + obj = tint_symbol_18; obj = x_994; int x_995 = h; h = 0; @@ -374,8 +375,8 @@ void quicksort_() { param_5 = x_1007; h_1 = 9; int x_1008[10] = stack; - int tint_symbol_22[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - stack = tint_symbol_22; + int tint_symbol_19[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + stack = tint_symbol_19; stack = x_1008; vec2 x_556 = vec2(vec3(1.0f, 2.0f, 3.0f).y, vec3(1.0f, 2.0f, 3.0f).y); int x_1009 = param_5; @@ -408,15 +409,15 @@ void quicksort_() { param_4 = x_1015; int x_95 = l_1; QuicksortObject x_1016 = obj; - int tint_symbol_23[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_24 = QuicksortObject(tint_symbol_23); - obj = tint_symbol_24; + int tint_symbol_20[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_21 = QuicksortObject(tint_symbol_20); + obj = tint_symbol_21; obj = x_1016; vec3 x_560 = vec3(x_559.y, x_559.x, x_557.x); int x_96_save = x_94; int x_1017[10] = stack; - int tint_symbol_25[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - stack = tint_symbol_25; + int tint_symbol_22[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + stack = tint_symbol_22; stack = x_1017; vec3 x_561 = vec3(x_556.y, x_556.y, x_556.y); int x_1018 = l_1; @@ -466,13 +467,13 @@ void quicksort_() { h_1 = 0; h_1 = x_1028; int x_1029[10] = stack; - int tint_symbol_26[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - stack = tint_symbol_26; + int tint_symbol_23[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + stack = tint_symbol_23; stack = x_1029; int x_106 = top; int x_1030[10] = stack; - int tint_symbol_27[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - stack = tint_symbol_27; + int tint_symbol_24[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + stack = tint_symbol_24; stack = x_1030; vec2 x_567 = vec2(x_558.x, x_564.z); int x_1031 = param_4; @@ -483,9 +484,9 @@ void quicksort_() { break; } QuicksortObject x_1032 = obj; - int tint_symbol_28[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_29 = QuicksortObject(tint_symbol_28); - obj = tint_symbol_29; + int tint_symbol_25[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_26 = QuicksortObject(tint_symbol_25); + obj = tint_symbol_26; obj = x_1032; vec3 x_568 = vec3(x_559.y, x_559.x, x_563.y); int x_1033 = param_4; @@ -510,8 +511,8 @@ void quicksort_() { stack[x_96_save] = x_1037; int x_111 = stack[x_110_save]; int x_1038[10] = stack; - int tint_symbol_30[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - stack = tint_symbol_30; + int tint_symbol_27[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + stack = tint_symbol_27; stack = x_1038; vec3 x_571 = vec3(x_559.y, x_559.x, x_564.y); int x_1039 = l_1; @@ -519,8 +520,8 @@ void quicksort_() { l_1 = x_1039; h_1 = x_111; int x_1040[10] = stack; - int tint_symbol_31[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - stack = tint_symbol_31; + int tint_symbol_28[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + stack = tint_symbol_28; stack = x_1040; vec2 x_572 = vec2(x_562.y, x_561.y); int x_1041 = p; @@ -611,8 +612,8 @@ void quicksort_() { stack[x_100_save] = 0; stack[x_100_save] = x_1061; int x_1062[10] = stack; - int tint_symbol_32[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - stack = tint_symbol_32; + int tint_symbol_29[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + stack = tint_symbol_29; stack = x_1062; vec2 x_584 = vec2(x_569.z, x_569.y); vec3 x_585 = vec3(x_580.y, x_577.x, x_577.x); @@ -651,8 +652,8 @@ void quicksort_() { h_1 = x_1070; top = x_133; int x_1071[10] = stack; - int tint_symbol_33[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - stack = tint_symbol_33; + int tint_symbol_30[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + stack = tint_symbol_30; stack = x_1071; int x_134 = p; vec2 x_590 = vec2(x_576.x, x_573.y); @@ -677,9 +678,9 @@ void quicksort_() { stack[x_96_save] = x_1076; vec2 x_592 = vec2(vec3(1.0f, 2.0f, 3.0f).x, vec3(1.0f, 2.0f, 3.0f).y); QuicksortObject x_1077 = obj; - int tint_symbol_34[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_35 = QuicksortObject(tint_symbol_34); - obj = tint_symbol_35; + int tint_symbol_31[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_32 = QuicksortObject(tint_symbol_31); + obj = tint_symbol_32; obj = x_1077; int x_137 = p; int x_1078 = stack[x_114_save]; @@ -744,8 +745,8 @@ void quicksort_() { vec2 x_601 = vec2(x_563.x, x_563.y); stack[x_147_save] = int((1u + uint(x_145))); int x_1093[10] = stack; - int tint_symbol_36[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - stack = tint_symbol_36; + int tint_symbol_33[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + stack = tint_symbol_33; stack = x_1093; int x_148 = top; int x_1094 = stack[x_114_save]; @@ -753,8 +754,8 @@ void quicksort_() { stack[x_114_save] = x_1094; vec2 x_602 = vec2(x_565.y, x_599.y); int x_1095[10] = stack; - int tint_symbol_37[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - stack = tint_symbol_37; + int tint_symbol_34[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + stack = tint_symbol_34; stack = x_1095; int x_149 = (x_148 + int(1u)); int x_1096 = stack[x_147_save]; @@ -789,9 +790,9 @@ void quicksort_() { l_1 = x_1103; vec2 x_604 = vec2(x_563.z, x_564.x); QuicksortObject x_1104 = obj; - int tint_symbol_38[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_39 = QuicksortObject(tint_symbol_38); - obj = tint_symbol_39; + int tint_symbol_35[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_36 = QuicksortObject(tint_symbol_35); + obj = tint_symbol_36; obj = x_1104; } } @@ -810,15 +811,15 @@ void main_1() { uv = x_717; i_2 = 0; QuicksortObject x_721 = obj; - int tint_symbol_40[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_41 = QuicksortObject(tint_symbol_40); - obj = tint_symbol_41; + int tint_symbol_37[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_38 = QuicksortObject(tint_symbol_37); + obj = tint_symbol_38; obj = x_721; if (true) { QuicksortObject x_722 = obj; - int tint_symbol_42[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_43 = QuicksortObject(tint_symbol_42); - obj = tint_symbol_43; + int tint_symbol_39[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_40 = QuicksortObject(tint_symbol_39); + obj = tint_symbol_40; obj = x_722; vec2 x_431 = vec2(vec3(1.0f, 2.0f, 3.0f).x, vec3(1.0f, 2.0f, 3.0f).x); int x_158 = i_2; @@ -830,15 +831,15 @@ void main_1() { color = x_725; vec2 x_432 = vec2(x_431.y, x_431.y); QuicksortObject x_726 = obj; - int tint_symbol_44[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_45 = QuicksortObject(tint_symbol_44); - obj = tint_symbol_45; + int tint_symbol_41[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_42 = QuicksortObject(tint_symbol_41); + obj = tint_symbol_42; obj = x_726; } QuicksortObject x_756 = obj; - int tint_symbol_46[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_47 = QuicksortObject(tint_symbol_46); - obj = tint_symbol_47; + int tint_symbol_43[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_44 = QuicksortObject(tint_symbol_43); + obj = tint_symbol_44; obj = x_756; vec2 x_446 = vec2(vec2(0.0f, 0.0f).x, vec2(0.0f, 0.0f).x); int x_757 = i_2; @@ -846,9 +847,9 @@ void main_1() { i_2 = x_757; quicksort_(); QuicksortObject x_758 = obj; - int tint_symbol_48[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_49 = QuicksortObject(tint_symbol_48); - obj = tint_symbol_49; + int tint_symbol_45[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_46 = QuicksortObject(tint_symbol_45); + obj = tint_symbol_46; obj = x_758; vec4 x_184 = tint_symbol; vec2 x_759 = uv; @@ -861,18 +862,18 @@ void main_1() { vec2 x_185 = vec2(x_184.x, x_184.y); vec3 x_448 = vec3(x_185.y, x_446.y, x_446.y); QuicksortObject x_761 = obj; - int tint_symbol_50[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_51 = QuicksortObject(tint_symbol_50); - obj = tint_symbol_51; + int tint_symbol_47[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_48 = QuicksortObject(tint_symbol_47); + obj = tint_symbol_48; obj = x_761; vec2 x_762 = uv; uv = vec2(0.0f, 0.0f); uv = x_762; vec2 x_191 = x_188.resolution; QuicksortObject x_763 = obj; - int tint_symbol_52[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_53 = QuicksortObject(tint_symbol_52); - obj = tint_symbol_53; + int tint_symbol_49[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_50 = QuicksortObject(tint_symbol_49); + obj = tint_symbol_50; obj = x_763; vec3 x_449 = vec3(x_184.y, vec3(1.0f, 2.0f, 3.0f).z, x_184.w); vec3 x_764 = color; @@ -880,9 +881,9 @@ void main_1() { color = x_764; vec2 x_192 = (x_185 / x_191); QuicksortObject x_765 = obj; - int tint_symbol_54[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_55 = QuicksortObject(tint_symbol_54); - obj = tint_symbol_55; + int tint_symbol_51[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_52 = QuicksortObject(tint_symbol_51); + obj = tint_symbol_52; obj = x_765; vec2 x_450 = vec2(x_447.x, x_185.y); vec3 x_766 = color; @@ -898,18 +899,18 @@ void main_1() { color = x_768; vec3 x_451 = vec3(x_185.x, x_185.y, x_446.y); QuicksortObject x_769 = obj; - int tint_symbol_56[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_57 = QuicksortObject(tint_symbol_56); - obj = tint_symbol_57; + int tint_symbol_53[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_54 = QuicksortObject(tint_symbol_53); + obj = tint_symbol_54; obj = x_769; int x_770 = obj.numbers[0u]; obj.numbers[0u] = 0; obj.numbers[0u] = x_770; int x_201 = obj.numbers[0u]; QuicksortObject x_771 = obj; - int tint_symbol_58[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_59 = QuicksortObject(tint_symbol_58); - obj = tint_symbol_59; + int tint_symbol_55[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_56 = QuicksortObject(tint_symbol_55); + obj = tint_symbol_56; obj = x_771; int x_772 = obj.numbers[0u]; obj.numbers[0u] = 0; @@ -923,9 +924,9 @@ void main_1() { i_2 = 0; i_2 = x_774; QuicksortObject x_775 = obj; - int tint_symbol_60[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_61 = QuicksortObject(tint_symbol_60); - obj = tint_symbol_61; + int tint_symbol_57[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_58 = QuicksortObject(tint_symbol_57); + obj = tint_symbol_58; obj = x_775; vec3 x_453 = vec3(x_451.x, x_450.x, x_450.y); color.x = (x_206 + float(x_201)); @@ -942,9 +943,9 @@ void main_1() { uv.x = 0.0f; uv.x = x_778; QuicksortObject x_779 = obj; - int tint_symbol_62[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_63 = QuicksortObject(tint_symbol_62); - obj = tint_symbol_63; + int tint_symbol_59[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_60 = QuicksortObject(tint_symbol_59); + obj = tint_symbol_60; obj = x_779; if ((x_210 > 0.25f)) { int x_780 = i_2; @@ -959,18 +960,18 @@ void main_1() { uv.x = x_782; int x_216 = obj.numbers[1]; QuicksortObject x_783 = obj; - int tint_symbol_64[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_65 = QuicksortObject(tint_symbol_64); - obj = tint_symbol_65; + int tint_symbol_61[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_62 = QuicksortObject(tint_symbol_61); + obj = tint_symbol_62; obj = x_783; vec2 x_457 = vec2(x_454.x, x_454.x); vec2 x_784 = uv; uv = vec2(0.0f, 0.0f); uv = x_784; QuicksortObject x_785 = obj; - int tint_symbol_66[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_67 = QuicksortObject(tint_symbol_66); - obj = tint_symbol_67; + int tint_symbol_63[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_64 = QuicksortObject(tint_symbol_63); + obj = tint_symbol_64; obj = x_785; vec2 x_458 = vec2(vec3(1.0f, 2.0f, 3.0f).z, vec2(0.0f, 0.0f).y); int x_786 = i_2; @@ -1088,9 +1089,9 @@ void main_1() { color.x = 0.0f; color.x = x_816; QuicksortObject x_817 = obj; - int tint_symbol_68[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_69 = QuicksortObject(tint_symbol_68); - obj = tint_symbol_69; + int tint_symbol_65[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_66 = QuicksortObject(tint_symbol_65); + obj = tint_symbol_66; obj = x_817; vec3 x_468 = vec3(x_467.x, x_467.x, x_467.x); float x_818 = uv[0]; @@ -1199,9 +1200,9 @@ void main_1() { uv[0] = x_844; vec3 x_482 = vec3(x_455.x, x_475.y, x_455.y); QuicksortObject x_845 = obj; - int tint_symbol_70[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_71 = QuicksortObject(tint_symbol_70); - obj = tint_symbol_71; + int tint_symbol_67[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_68 = QuicksortObject(tint_symbol_67); + obj = tint_symbol_68; obj = x_845; float x_846 = uv.y; uv.y = 0.0f; @@ -1272,9 +1273,9 @@ void main_1() { obj.numbers[6u] = x_863; vec2 x_490 = vec2(x_480.z, x_480.z); QuicksortObject x_864 = obj; - int tint_symbol_72[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_73 = QuicksortObject(tint_symbol_72); - obj = tint_symbol_73; + int tint_symbol_69[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_70 = QuicksortObject(tint_symbol_69); + obj = tint_symbol_70; obj = x_864; color.y = (float(x_280) + x_283); float x_865 = color.x; @@ -1291,9 +1292,9 @@ void main_1() { color.x = x_867; float x_287 = uv.y; QuicksortObject x_868 = obj; - int tint_symbol_74[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_75 = QuicksortObject(tint_symbol_74); - obj = tint_symbol_75; + int tint_symbol_71[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_72 = QuicksortObject(tint_symbol_71); + obj = tint_symbol_72; obj = x_868; vec2 x_493 = vec2(x_475.x, x_475.y); float x_869 = uv[0]; @@ -1453,9 +1454,9 @@ void main_1() { uv.x = 0.0f; uv.x = x_910; QuicksortObject x_911 = obj; - int tint_symbol_76[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_77 = QuicksortObject(tint_symbol_76); - obj = tint_symbol_77; + int tint_symbol_73[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_74 = QuicksortObject(tint_symbol_73); + obj = tint_symbol_74; obj = x_911; vec3 x_513 = vec3(x_505.z, x_505.x, x_448.x); int x_912 = obj.numbers[8]; @@ -1507,14 +1508,14 @@ void main_1() { uv.x = 0.0f; uv.x = x_923; QuicksortObject x_924 = obj; - int tint_symbol_78[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_79 = QuicksortObject(tint_symbol_78); - obj = tint_symbol_79; + int tint_symbol_75[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_76 = QuicksortObject(tint_symbol_75); + obj = tint_symbol_76; obj = x_924; QuicksortObject x_925 = obj; - int tint_symbol_80[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_81 = QuicksortObject(tint_symbol_80); - obj = tint_symbol_81; + int tint_symbol_77[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_78 = QuicksortObject(tint_symbol_77); + obj = tint_symbol_78; obj = x_925; float x_926 = color.y; color.y = 0.0f; @@ -1533,9 +1534,9 @@ void main_1() { uv.x = x_929; x_GLF_color = x_330; QuicksortObject x_930 = obj; - int tint_symbol_82[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - QuicksortObject tint_symbol_83 = QuicksortObject(tint_symbol_82); - obj = tint_symbol_83; + int tint_symbol_79[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + QuicksortObject tint_symbol_80 = QuicksortObject(tint_symbol_79); + obj = tint_symbol_80; obj = x_930; vec3 x_522 = vec3(x_330.w, x_330.y, x_493.x); float x_931 = color.x; @@ -1548,35 +1549,15 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_84 = main_out(x_GLF_color); - return tint_symbol_84; + main_out tint_symbol_81 = main_out(x_GLF_color); + return tint_symbol_81; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - diff --git a/test/bug/tint/757.wgsl.expected.glsl b/test/bug/tint/757.wgsl.expected.glsl index ffa7615dbd..fab0f573fb 100644 --- a/test/bug/tint/757.wgsl.expected.glsl +++ b/test/bug/tint/757.wgsl.expected.glsl @@ -8,12 +8,8 @@ struct Constants { layout(binding = 3) buffer Result_1 { float values[]; } result; -struct tint_symbol_2 { - uvec3 GlobalInvocationID; -}; - uniform highp sampler2DArray myTexture_1; -void tint_symbol_inner(uvec3 GlobalInvocationID) { +void tint_symbol(uvec3 GlobalInvocationID) { uint flatIndex = ((((2u * 2u) * GlobalInvocationID.z) + (2u * GlobalInvocationID.y)) + GlobalInvocationID.x); flatIndex = (flatIndex * 1u); vec4 texel = texelFetch(myTexture_1, ivec3(ivec2(GlobalInvocationID.xy), 0), 0); @@ -25,15 +21,7 @@ void tint_symbol_inner(uvec3 GlobalInvocationID) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.GlobalInvocationID); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.GlobalInvocationID = gl_GlobalInvocationID; - tint_symbol(inputs); -} - diff --git a/test/bug/tint/764.wgsl.expected.glsl b/test/bug/tint/764.wgsl.expected.glsl index b2546df3f4..521fb36f1b 100644 --- a/test/bug/tint/764.wgsl.expected.glsl +++ b/test/bug/tint/764.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { mat4 m = mat4(vec4(1.0f, 1.0f, 1.0f, 1.0f), vec4(1.0f, 1.0f, 1.0f, 1.0f), vec4(1.0f, 1.0f, 1.0f, 1.0f), vec4(1.0f, 1.0f, 1.0f, 1.0f)); vec4 v1 = m[0]; diff --git a/test/bug/tint/782.wgsl.expected.glsl b/test/bug/tint/782.wgsl.expected.glsl index 0b8c37564a..a4f1e64b31 100644 --- a/test/bug/tint/782.wgsl.expected.glsl +++ b/test/bug/tint/782.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void foo() { int explicit[2] = int[2](0, 0); int implict[2] = int[2](0, 0); diff --git a/test/bug/tint/824.wgsl.expected.glsl b/test/bug/tint/824.wgsl.expected.glsl index 43a5596a8f..e53dfa3277 100644 --- a/test/bug/tint/824.wgsl.expected.glsl +++ b/test/bug/tint/824.wgsl.expected.glsl @@ -1,22 +1,13 @@ #version 310 es precision mediump float; +layout(location = 0) out vec4 color_1; struct Output { vec4 Position; vec4 color; }; -struct tint_symbol_3 { - uint VertexIndex; - uint InstanceIndex; -}; - -struct tint_symbol_4 { - vec4 color; - vec4 Position; -}; - -Output tint_symbol_inner(uint VertexIndex, uint InstanceIndex) { +Output tint_symbol(uint VertexIndex, uint InstanceIndex) { vec2 zv[4] = vec2[4](vec2(0.200000003f, 0.200000003f), vec2(0.300000012f, 0.300000012f), vec2(-0.100000001f, -0.100000001f), vec2(1.100000024f, 1.100000024f)); float z = zv[InstanceIndex].x; Output tint_symbol_1 = Output(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); @@ -26,27 +17,11 @@ Output tint_symbol_inner(uint VertexIndex, uint InstanceIndex) { return tint_symbol_1; } -tint_symbol_4 tint_symbol(tint_symbol_3 tint_symbol_2) { - Output inner_result = tint_symbol_inner(tint_symbol_2.VertexIndex, tint_symbol_2.InstanceIndex); - tint_symbol_4 wrapper_result = tint_symbol_4(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.Position = inner_result.Position; - wrapper_result.color = inner_result.color; - return wrapper_result; -} - - -layout(location = 0) out vec4 color; - - void main() { - tint_symbol_3 inputs; - inputs.VertexIndex = uint(gl_VertexID); - inputs.InstanceIndex = uint(gl_InstanceID); - tint_symbol_4 outputs; - outputs = tint_symbol(inputs); - color = outputs.color; - gl_Position = outputs.Position; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + Output inner_result = tint_symbol(uint(gl_VertexID), uint(gl_InstanceID)); + gl_Position = inner_result.Position; + color_1 = inner_result.color; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - diff --git a/test/bug/tint/825.wgsl.expected.glsl b/test/bug/tint/825.wgsl.expected.glsl index e1d52ca4ae..a3f1fac10b 100644 --- a/test/bug/tint/825.wgsl.expected.glsl +++ b/test/bug/tint/825.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { int i = 0; int j = 0; diff --git a/test/bug/tint/827.wgsl.expected.glsl b/test/bug/tint/827.wgsl.expected.glsl index 72c1e8dbd1..9933ba5b9d 100644 --- a/test/bug/tint/827.wgsl.expected.glsl +++ b/test/bug/tint/827.wgsl.expected.glsl @@ -5,25 +5,13 @@ const uint width = 128u; layout(binding = 1) buffer Result_1 { float values[]; } result; -struct tint_symbol_2 { - uvec3 GlobalInvocationId; -}; - uniform highp sampler2D tex_1; -void tint_symbol_inner(uvec3 GlobalInvocationId) { +void tint_symbol(uvec3 GlobalInvocationId) { result.values[((GlobalInvocationId.y * width) + GlobalInvocationId.x)] = texelFetch(tex_1, ivec2(int(GlobalInvocationId.x), int(GlobalInvocationId.y)), 0).x; } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.GlobalInvocationId); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.GlobalInvocationId = gl_GlobalInvocationID; - tint_symbol(inputs); -} - diff --git a/test/bug/tint/870.spvasm.expected.glsl b/test/bug/tint/870.spvasm.expected.glsl index b6579faa37..3f0ad908e4 100644 --- a/test/bug/tint/870.spvasm.expected.glsl +++ b/test/bug/tint/870.spvasm.expected.glsl @@ -29,10 +29,9 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - diff --git a/test/bug/tint/913.wgsl.expected.glsl b/test/bug/tint/913.wgsl.expected.glsl index 5535fd9272..3d484afd89 100644 --- a/test/bug/tint/913.wgsl.expected.glsl +++ b/test/bug/tint/913.wgsl.expected.glsl @@ -24,13 +24,9 @@ bool aboutEqual(float value, float expect) { return (abs((value - expect)) < 0.001f); } -struct tint_symbol_3 { - uvec3 GlobalInvocationID; -}; - uniform highp sampler2D src_1; uniform highp sampler2D dst_1; -void tint_symbol_1_inner(uvec3 GlobalInvocationID) { +void tint_symbol_1(uvec3 GlobalInvocationID) { ivec2 srcSize = textureSize(src_1, 0); ivec2 dstSize = textureSize(dst_1, 0); uvec2 dstTexCoord = uvec2(GlobalInvocationID.xy); @@ -100,15 +96,7 @@ void tint_symbol_1_inner(uvec3 GlobalInvocationID) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol_1(tint_symbol_3 tint_symbol_2) { - tint_symbol_1_inner(tint_symbol_2.GlobalInvocationID); +void main() { + tint_symbol_1(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_3 inputs; - inputs.GlobalInvocationID = gl_GlobalInvocationID; - tint_symbol_1(inputs); -} - diff --git a/test/bug/tint/914.wgsl.expected.glsl b/test/bug/tint/914.wgsl.expected.glsl index 2c7faa5fdb..e0de0678ac 100644 --- a/test/bug/tint/914.wgsl.expected.glsl +++ b/test/bug/tint/914.wgsl.expected.glsl @@ -62,13 +62,7 @@ const uint ColPerThread = 4u; const uint TileInner = 64u; shared float mm_Asub[64][64]; shared float mm_Bsub[64][64]; -struct tint_symbol_2 { - uvec3 local_id; - uint local_invocation_index; - uvec3 global_id; -}; - -void tint_symbol_inner(uvec3 local_id, uvec3 global_id, uint local_invocation_index) { +void tint_symbol(uvec3 local_id, uvec3 global_id, uint local_invocation_index) { { for(uint idx = local_invocation_index; (idx < 4096u); idx = (idx + 256u)) { uint i = (idx / 64u); @@ -156,19 +150,7 @@ void tint_symbol_inner(uvec3 local_id, uvec3 global_id, uint local_invocation_in } layout(local_size_x = 16, local_size_y = 16, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.local_id, tint_symbol_1.global_id, tint_symbol_1.local_invocation_index); +void main() { + tint_symbol(gl_LocalInvocationID, gl_GlobalInvocationID, gl_LocalInvocationIndex); return; } - - - - -void main() { - tint_symbol_2 inputs; - inputs.local_id = gl_LocalInvocationID; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - inputs.global_id = gl_GlobalInvocationID; - tint_symbol(inputs); -} - diff --git a/test/bug/tint/922.wgsl.expected.glsl b/test/bug/tint/922.wgsl.expected.glsl index da0e4c7045..bacfe36c6b 100644 --- a/test/bug/tint/922.wgsl.expected.glsl +++ b/test/bug/tint/922.wgsl.expected.glsl @@ -1,8 +1,13 @@ -SKIP: FAILED - #version 310 es precision mediump float; +layout(location = 0) in vec3 a_Position_1; +layout(location = 1) in vec2 a_UV_1; +layout(location = 2) in vec4 a_Color_1; +layout(location = 3) in vec3 a_Normal_1; +layout(location = 4) in float a_PosMtxIdx_1; +layout(location = 0) out vec4 v_Color_1; +layout(location = 1) out vec2 v_TexCoord_1; struct Mat4x4_ { vec4 mx; vec4 my; @@ -137,67 +142,23 @@ void main1() { } } -struct tint_symbol_3 { - vec3 a_Position; - vec2 a_UV; - vec4 a_Color; - vec3 a_Normal; - float a_PosMtxIdx; -}; - -struct tint_symbol_4 { - vec4 v_Color; - vec2 v_TexCoord; - vec4 member; -}; - -VertexOutput tint_symbol_1_inner(vec3 a_Position, vec2 a_UV, vec4 a_Color, vec3 a_Normal, float a_PosMtxIdx) { +VertexOutput tint_symbol_1(vec3 a_Position, vec2 a_UV, vec4 a_Color, vec3 a_Normal, float a_PosMtxIdx) { a_Position1 = a_Position; a_UV1 = a_UV; a_Color1 = a_Color; a_Normal1 = a_Normal; a_PosMtxIdx1 = a_PosMtxIdx; main1(); - VertexOutput tint_symbol_5 = VertexOutput(v_Color, v_TexCoord, tint_symbol); - return tint_symbol_5; + VertexOutput tint_symbol_2 = VertexOutput(v_Color, v_TexCoord, tint_symbol); + return tint_symbol_2; } -tint_symbol_4 tint_symbol_1(tint_symbol_3 tint_symbol_2) { - VertexOutput inner_result = tint_symbol_1_inner(tint_symbol_2.a_Position, tint_symbol_2.a_UV, tint_symbol_2.a_Color, tint_symbol_2.a_Normal, tint_symbol_2.a_PosMtxIdx); - tint_symbol_4 wrapper_result = tint_symbol_4(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec2(0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.v_Color = inner_result.v_Color; - wrapper_result.v_TexCoord = inner_result.v_TexCoord; - wrapper_result.member = inner_result.member; - return wrapper_result; -} -layout(location = 0) in vec3 a_Position; -layout(location = 1) in vec2 a_UV; -layout(location = 2) in vec4 a_Color; -layout(location = 3) in vec3 a_Normal; -layout(location = 4) in float a_PosMtxIdx; -layout(location = 0) out vec4 v_Color; -layout(location = 1) out vec2 v_TexCoord; - - void main() { - tint_symbol_3 inputs; - inputs.a_Position = a_Position; - inputs.a_UV = a_UV; - inputs.a_Color = a_Color; - inputs.a_Normal = a_Normal; - inputs.a_PosMtxIdx = a_PosMtxIdx; - tint_symbol_4 outputs; - outputs = tint_symbol_1(inputs); - v_Color = outputs.v_Color; - v_TexCoord = outputs.v_TexCoord; - gl_Position = outputs.member; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + VertexOutput inner_result = tint_symbol_1(a_Position_1, a_UV_1, a_Color_1, a_Normal_1, a_PosMtxIdx_1); + v_Color_1 = inner_result.v_Color; + v_TexCoord_1 = inner_result.v_TexCoord; + gl_Position = inner_result.member; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - -Error parsing GLSL shader: -ERROR: 0:176: 'v_Color' : redefinition -ERROR: 1 compilation errors. No code generated. - - - diff --git a/test/bug/tint/926.wgsl.expected.glsl b/test/bug/tint/926.wgsl.expected.glsl index 525f25f647..15a518c5ca 100644 --- a/test/bug/tint/926.wgsl.expected.glsl +++ b/test/bug/tint/926.wgsl.expected.glsl @@ -9,24 +9,12 @@ layout(binding = 5) buffer DrawIndirectArgs_1 { uint vertexCount; } drawOut; uint cubeVerts = 0u; -struct tint_symbol_1 { - uvec3 global_id; -}; - -void computeMain_inner(uvec3 global_id) { +void computeMain(uvec3 global_id) { uint firstVertex = atomicAdd(drawOut.vertexCount, cubeVerts); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void computeMain(tint_symbol_1 tint_symbol) { - computeMain_inner(tint_symbol.global_id); +void main() { + computeMain(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.global_id = gl_GlobalInvocationID; - computeMain(inputs); -} - diff --git a/test/bug/tint/942.wgsl.expected.glsl b/test/bug/tint/942.wgsl.expected.glsl index e66562132d..8f85836c87 100644 --- a/test/bug/tint/942.wgsl.expected.glsl +++ b/test/bug/tint/942.wgsl.expected.glsl @@ -20,17 +20,11 @@ layout(binding = 3) uniform Flip_1 { } flip; shared vec3 tile[4][256]; -struct tint_symbol_2 { - uvec3 LocalInvocationID; - uint local_invocation_index; - uvec3 WorkGroupID; -}; - uniform highp sampler2D inputTex_1; uniform highp sampler2D inputTex_samp; layout(rgba8) uniform highp writeonly image2D outputTex_1; -void tint_symbol_inner(uvec3 WorkGroupID, uvec3 LocalInvocationID, uint local_invocation_index) { +void tint_symbol(uvec3 WorkGroupID, uvec3 LocalInvocationID, uint local_invocation_index) { { for(uint idx = local_invocation_index; (idx < 1024u); idx = (idx + 64u)) { uint i_1 = (idx / 256u); @@ -90,19 +84,7 @@ void tint_symbol_inner(uvec3 WorkGroupID, uvec3 LocalInvocationID, uint local_in } layout(local_size_x = 64, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.WorkGroupID, tint_symbol_1.LocalInvocationID, tint_symbol_1.local_invocation_index); +void main() { + tint_symbol(gl_WorkGroupID, gl_LocalInvocationID, gl_LocalInvocationIndex); return; } - - - - -void main() { - tint_symbol_2 inputs; - inputs.LocalInvocationID = gl_LocalInvocationID; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - inputs.WorkGroupID = gl_WorkGroupID; - tint_symbol(inputs); -} - diff --git a/test/bug/tint/943.spvasm.expected.glsl b/test/bug/tint/943.spvasm.expected.glsl index a834d1fe00..f88926bbfd 100644 --- a/test/bug/tint/943.spvasm.expected.glsl +++ b/test/bug/tint/943.spvasm.expected.glsl @@ -374,13 +374,7 @@ void main_1() { return; } -struct tint_symbol_6 { - uvec3 tint_symbol_3; - uint local_invocation_index; - uvec3 tint_symbol_4; -}; - -void tint_symbol_2_inner(uvec3 tint_symbol_3, uvec3 tint_symbol_4, uint local_invocation_index) { +void tint_symbol_2(uvec3 tint_symbol_3, uvec3 tint_symbol_4, uint local_invocation_index) { { uint i_1 = local_invocation_index; uint i_2 = (local_invocation_index % 1u); @@ -400,22 +394,10 @@ void tint_symbol_2_inner(uvec3 tint_symbol_3, uvec3 tint_symbol_4, uint local_in } layout(local_size_x = 1, local_size_y = 64, local_size_z = 1) in; -void tint_symbol_2(tint_symbol_6 tint_symbol_5) { - tint_symbol_2_inner(tint_symbol_5.tint_symbol_3, tint_symbol_5.tint_symbol_4, tint_symbol_5.local_invocation_index); +void main() { + tint_symbol_2(gl_LocalInvocationID, gl_GlobalInvocationID, gl_LocalInvocationIndex); return; } - - - - -void main() { - tint_symbol_6 inputs; - inputs.tint_symbol_3 = gl_LocalInvocationID; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - inputs.tint_symbol_4 = gl_GlobalInvocationID; - tint_symbol_2(inputs); -} - Error parsing GLSL shader: ERROR: 0:13: '' : array size required ERROR: 0:14: '' : compilation terminated diff --git a/test/bug/tint/948.wgsl.expected.glsl b/test/bug/tint/948.wgsl.expected.glsl index 759dcf5b83..0d2b2ceea1 100644 --- a/test/bug/tint/948.wgsl.expected.glsl +++ b/test/bug/tint/948.wgsl.expected.glsl @@ -3,6 +3,13 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 2) in vec2 tUV_param_1; +layout(location = 5) in vec2 tileID_1_param_1; +layout(location = 4) in vec2 levelUnits_param_1; +layout(location = 3) in vec2 stageUnits_1_param_1; +layout(location = 0) in vec3 vPosition_param_1; +layout(location = 1) in vec2 vUV_param_1; +layout(location = 0) out vec4 glFragColor_1_1; struct LeftOver { float time; uint padding; @@ -175,20 +182,7 @@ struct main_out { vec4 glFragColor_1; }; -struct tint_symbol_2 { - vec3 vPosition_param; - vec2 vUV_param; - vec2 tUV_param; - vec2 stageUnits_1_param; - vec2 levelUnits_param; - vec2 tileID_1_param; -}; - -struct tint_symbol_3 { - vec4 glFragColor_1; -}; - -main_out tint_symbol_inner(vec2 tUV_param, vec2 tileID_1_param, vec2 levelUnits_param, vec2 stageUnits_1_param, vec3 vPosition_param, vec2 vUV_param) { +main_out tint_symbol(vec2 tUV_param, vec2 tileID_1_param, vec2 levelUnits_param, vec2 stageUnits_1_param, vec3 vPosition_param, vec2 vUV_param) { tUV = tUV_param; tileID_1 = tileID_1_param; levelUnits = levelUnits_param; @@ -196,41 +190,19 @@ main_out tint_symbol_inner(vec2 tUV_param, vec2 tileID_1_param, vec2 levelUnits_ vPosition = vPosition_param; vUV = vUV_param; main_1(); - main_out tint_symbol_4 = main_out(glFragColor); - return tint_symbol_4; + main_out tint_symbol_1 = main_out(glFragColor); + return tint_symbol_1; } -tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) { - main_out inner_result = tint_symbol_inner(tint_symbol_1.tUV_param, tint_symbol_1.tileID_1_param, tint_symbol_1.levelUnits_param, tint_symbol_1.stageUnits_1_param, tint_symbol_1.vPosition_param, tint_symbol_1.vUV_param); - tint_symbol_3 wrapper_result = tint_symbol_3(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.glFragColor_1 = inner_result.glFragColor_1; - return wrapper_result; -} -layout(location = 0) in vec3 vPosition_param; -layout(location = 1) in vec2 vUV_param; -layout(location = 2) in vec2 tUV_param; -layout(location = 3) in vec2 stageUnits_1_param; -layout(location = 4) in vec2 levelUnits_param; -layout(location = 5) in vec2 tileID_1_param; -layout(location = 0) out vec4 glFragColor_1; - void main() { - tint_symbol_2 inputs; - inputs.vPosition_param = vPosition_param; - inputs.vUV_param = vUV_param; - inputs.tUV_param = tUV_param; - inputs.stageUnits_1_param = stageUnits_1_param; - inputs.levelUnits_param = levelUnits_param; - inputs.tileID_1_param = tileID_1_param; - tint_symbol_3 outputs; - outputs = tint_symbol(inputs); - glFragColor_1 = outputs.glFragColor_1; + main_out inner_result = tint_symbol(tUV_param_1, tileID_1_param_1, levelUnits_param_1, stageUnits_1_param_1, vPosition_param_1, vUV_param_1); + glFragColor_1_1 = inner_result.glFragColor_1; + return; } - Error parsing GLSL shader: -ERROR: 0:73: 'frac' : no matching overloaded function found -ERROR: 0:73: 'assign' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' -ERROR: 0:73: '' : compilation terminated +ERROR: 0:80: 'frac' : no matching overloaded function found +ERROR: 0:80: 'assign' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' +ERROR: 0:80: '' : compilation terminated ERROR: 3 compilation errors. No code generated. diff --git a/test/bug/tint/949.wgsl.expected.glsl b/test/bug/tint/949.wgsl.expected.glsl index a77020ef0c..f1f268f835 100644 --- a/test/bug/tint/949.wgsl.expected.glsl +++ b/test/bug/tint/949.wgsl.expected.glsl @@ -3,6 +3,11 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 1) in vec2 vMainuv_param_1; +layout(location = 0) in vec4 v_output1_param_1; +layout(location = 3) in vec2 v_uv_param_1; +layout(location = 2) in vec4 v_output2_param_1; +layout(location = 0) out vec4 glFragColor_1_1; struct lightingInfo { vec3 diffuse; vec3 specular; @@ -353,58 +358,26 @@ struct main_out { vec4 glFragColor_1; }; -struct tint_symbol_4 { - vec4 v_output1_param; - vec2 vMainuv_param; - vec4 v_output2_param; - vec2 v_uv_param; - bool tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 glFragColor_1; -}; - -main_out tint_symbol_1_inner(vec2 vMainuv_param, vec4 v_output1_param, bool tint_symbol_2, vec2 v_uv_param, vec4 v_output2_param) { +main_out tint_symbol_1(vec2 vMainuv_param, vec4 v_output1_param, bool tint_symbol_2, vec2 v_uv_param, vec4 v_output2_param) { vMainuv = vMainuv_param; v_output1 = v_output1_param; tint_symbol = tint_symbol_2; v_uv = v_uv_param; v_output2 = v_output2_param; main_1(); - main_out tint_symbol_6 = main_out(glFragColor); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(glFragColor); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.vMainuv_param, tint_symbol_3.v_output1_param, tint_symbol_3.tint_symbol_2, tint_symbol_3.v_uv_param, tint_symbol_3.v_output2_param); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.glFragColor_1 = inner_result.glFragColor_1; - return wrapper_result; -} -layout(location = 0) in vec4 v_output1_param; -layout(location = 1) in vec2 vMainuv_param; -layout(location = 2) in vec4 v_output2_param; -layout(location = 3) in vec2 v_uv_param; - -layout(location = 0) out vec4 glFragColor_1; - void main() { - tint_symbol_4 inputs; - inputs.v_output1_param = v_output1_param; - inputs.vMainuv_param = vMainuv_param; - inputs.v_output2_param = v_output2_param; - inputs.v_uv_param = v_uv_param; - inputs.tint_symbol_2 = gl_FrontFacing; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - glFragColor_1 = outputs.glFragColor_1; + main_out inner_result = tint_symbol_1(vMainuv_param_1, v_output1_param_1, gl_FrontFacing, v_uv_param_1, v_output2_param_1); + glFragColor_1_1 = inner_result.glFragColor_1; + return; } - Error parsing GLSL shader: -ERROR: 0:72: 'ddx' : no matching overloaded function found -ERROR: 0:72: 'assign' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' -ERROR: 0:72: '' : compilation terminated +ERROR: 0:77: 'ddx' : no matching overloaded function found +ERROR: 0:77: 'assign' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' +ERROR: 0:77: '' : compilation terminated ERROR: 3 compilation errors. No code generated. diff --git a/test/bug/tint/951.spvasm.expected.glsl b/test/bug/tint/951.spvasm.expected.glsl index bee1da4823..1d048c0c1d 100644 --- a/test/bug/tint/951.spvasm.expected.glsl +++ b/test/bug/tint/951.spvasm.expected.glsl @@ -78,28 +78,16 @@ void main_1() { return; } -struct tint_symbol_4 { - uvec3 tint_symbol_2; -}; - -void tint_symbol_1_inner(uvec3 tint_symbol_2) { +void tint_symbol_1(uvec3 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); } layout(local_size_x = 128, local_size_y = 1, local_size_z = 1) in; -void tint_symbol_1(tint_symbol_4 tint_symbol_3) { - tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); +void main() { + tint_symbol_1(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_GlobalInvocationID; - tint_symbol_1(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated diff --git a/test/bug/tint/959.wgsl.expected.glsl b/test/bug/tint/959.wgsl.expected.glsl index 388ba362ce..9ac597c3a9 100644 --- a/test/bug/tint/959.wgsl.expected.glsl +++ b/test/bug/tint/959.wgsl.expected.glsl @@ -62,10 +62,9 @@ layout(binding = 1) uniform S_16 { } b15; void tint_symbol() { - return; } void main() { tint_symbol(); + return; } - diff --git a/test/bug/tint/977.spvasm.expected.glsl b/test/bug/tint/977.spvasm.expected.glsl index 0cfd8e3a0f..9c8e0ab03a 100644 --- a/test/bug/tint/977.spvasm.expected.glsl +++ b/test/bug/tint/977.spvasm.expected.glsl @@ -61,28 +61,16 @@ void main_1() { return; } -struct tint_symbol_4 { - uvec3 tint_symbol_2; -}; - -void tint_symbol_1_inner(uvec3 tint_symbol_2) { +void tint_symbol_1(uvec3 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol_1(tint_symbol_4 tint_symbol_3) { - tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); +void main() { + tint_symbol_1(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_GlobalInvocationID; - tint_symbol_1(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated diff --git a/test/bug/tint/978.wgsl.expected.glsl b/test/bug/tint/978.wgsl.expected.glsl index e9785e761d..b7bebd278e 100644 --- a/test/bug/tint/978.wgsl.expected.glsl +++ b/test/bug/tint/978.wgsl.expected.glsl @@ -1,6 +1,8 @@ #version 310 es precision mediump float; +layout(location = 2) in vec2 vUv_1; +layout(location = 0) out vec4 color_1; struct FragmentInput { vec2 vUv; }; @@ -9,17 +11,9 @@ struct FragmentOutput { vec4 color; }; -struct tint_symbol_3 { - vec2 vUv; -}; - -struct tint_symbol_4 { - vec4 color; -}; - uniform highp sampler2D depthMap_texSampler; -FragmentOutput tint_symbol_inner(FragmentInput fIn) { +FragmentOutput tint_symbol(FragmentInput fIn) { float tint_symbol_1 = texture(depthMap_texSampler, fIn.vUv).x; vec3 color = vec3(tint_symbol_1, tint_symbol_1, tint_symbol_1); FragmentOutput fOut = FragmentOutput(vec4(0.0f, 0.0f, 0.0f, 0.0f)); @@ -27,21 +21,9 @@ FragmentOutput tint_symbol_inner(FragmentInput fIn) { return fOut; } -tint_symbol_4 tint_symbol(tint_symbol_3 tint_symbol_2) { - FragmentInput tint_symbol_5 = FragmentInput(tint_symbol_2.vUv); - FragmentOutput inner_result = tint_symbol_inner(tint_symbol_5); - tint_symbol_4 wrapper_result = tint_symbol_4(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.color = inner_result.color; - return wrapper_result; -} -layout(location = 2) in vec2 vUv; -layout(location = 0) out vec4 color; - void main() { - tint_symbol_3 inputs; - inputs.vUv = vUv; - tint_symbol_4 outputs; - outputs = tint_symbol(inputs); - color = outputs.color; + FragmentInput tint_symbol_2 = FragmentInput(vUv_1); + FragmentOutput inner_result = tint_symbol(tint_symbol_2); + color_1 = inner_result.color; + return; } - diff --git a/test/bug/tint/980.wgsl.expected.glsl b/test/bug/tint/980.wgsl.expected.glsl index 26f15529ce..101917637e 100644 --- a/test/bug/tint/980.wgsl.expected.glsl +++ b/test/bug/tint/980.wgsl.expected.glsl @@ -16,24 +16,12 @@ layout(binding = 0) buffer S_1 { vec3 v; uint i; } io; -struct tint_symbol_2 { - uint idx; -}; - -void tint_symbol_inner(uint idx) { +void tint_symbol(uint idx) { io.v = Bad(io.i, io.v); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.idx); +void main() { + tint_symbol(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.idx = uint(gl_LocalInvocationIndex); - tint_symbol(inputs); -} - diff --git a/test/bug/tint/990.wgsl.expected.glsl b/test/bug/tint/990.wgsl.expected.glsl index 8a446ee950..b3ba8e09d1 100644 --- a/test/bug/tint/990.wgsl.expected.glsl +++ b/test/bug/tint/990.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { int i = 0; { diff --git a/test/bug/tint/992.wgsl.expected.glsl b/test/bug/tint/992.wgsl.expected.glsl index 19b9edf259..24200d6d0e 100644 --- a/test/bug/tint/992.wgsl.expected.glsl +++ b/test/bug/tint/992.wgsl.expected.glsl @@ -1,27 +1,15 @@ #version 310 es precision mediump float; -struct tint_symbol { - vec4 value; -}; - -vec4 frag_main_inner() { +layout(location = 0) out vec4 value; +vec4 frag_main() { float b = 0.0f; vec3 v = vec3(b); return vec4(v, 1.0f); } -tint_symbol frag_main() { - vec4 inner_result = frag_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} -layout(location = 0) out vec4 value; - void main() { - tint_symbol outputs; - outputs = frag_main(); - value = outputs.value; + vec4 inner_result = frag_main(); + value = inner_result; + return; } - diff --git a/test/bug/tint/993.wgsl.expected.glsl b/test/bug/tint/993.wgsl.expected.glsl index 67a394afb0..3e60c6ebef 100644 --- a/test/bug/tint/993.wgsl.expected.glsl +++ b/test/bug/tint/993.wgsl.expected.glsl @@ -27,13 +27,12 @@ int runTest() { return atomicOr(s.data[(0u + uint(constants.zero))], 0); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { result.value = uint(runTest()); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/bug/tint/998.wgsl.expected.glsl b/test/bug/tint/998.wgsl.expected.glsl index 62e80ae4f6..688e74ad30 100644 --- a/test/bug/tint/998.wgsl.expected.glsl +++ b/test/bug/tint/998.wgsl.expected.glsl @@ -18,13 +18,12 @@ struct S { }; S s = S(uint[3](0u, 0u, 0u)); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { s.data[constants.zero] = 0u; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/expressions/binary/add/mat3x3-mat3x3/f32.wgsl.expected.glsl b/test/expressions/binary/add/mat3x3-mat3x3/f32.wgsl.expected.glsl index 88b1b8f90a..be1f423b38 100644 --- a/test/expressions/binary/add/mat3x3-mat3x3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/add/mat3x3-mat3x3/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { mat3 a = mat3(vec3(1.0f, 2.0f, 3.0f), vec3(4.0f, 5.0f, 6.0f), vec3(7.0f, 8.0f, 9.0f)); mat3 b = mat3(vec3(-1.0f, -2.0f, -3.0f), vec3(-4.0f, -5.0f, -6.0f), vec3(-7.0f, -8.0f, -9.0f)); mat3 r = (a + b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/add/scalar-scalar/f32.wgsl.expected.glsl b/test/expressions/binary/add/scalar-scalar/f32.wgsl.expected.glsl index 0b90ef15a5..183c599b87 100644 --- a/test/expressions/binary/add/scalar-scalar/f32.wgsl.expected.glsl +++ b/test/expressions/binary/add/scalar-scalar/f32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float r = (1.0f + 2.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/add/scalar-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/add/scalar-scalar/i32.wgsl.expected.glsl index 5803fdc0b2..6d7731d647 100644 --- a/test/expressions/binary/add/scalar-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/add/scalar-scalar/i32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int r = (1 + 2); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/add/scalar-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/add/scalar-scalar/u32.wgsl.expected.glsl index a7ec9570d9..db4ce4d649 100644 --- a/test/expressions/binary/add/scalar-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/add/scalar-scalar/u32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint r = (1u + 2u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/add/scalar-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/add/scalar-vec3/f32.wgsl.expected.glsl index e54fe435f6..f9982f1b43 100644 --- a/test/expressions/binary/add/scalar-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/add/scalar-vec3/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float a = 4.0f; vec3 b = vec3(1.0f, 2.0f, 3.0f); vec3 r = (a + b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/add/scalar-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/add/scalar-vec3/i32.wgsl.expected.glsl index a9808d1b23..f8c91baee2 100644 --- a/test/expressions/binary/add/scalar-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/add/scalar-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int a = 4; ivec3 b = ivec3(1, 2, 3); ivec3 r = (a + b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/add/scalar-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/add/scalar-vec3/u32.wgsl.expected.glsl index 6144b3488e..44535e41aa 100644 --- a/test/expressions/binary/add/scalar-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/add/scalar-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint a = 4u; uvec3 b = uvec3(1u, 2u, 3u); uvec3 r = (a + b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/add/vec3-scalar/f32.wgsl.expected.glsl b/test/expressions/binary/add/vec3-scalar/f32.wgsl.expected.glsl index 63461e90a0..d1bbc23017 100644 --- a/test/expressions/binary/add/vec3-scalar/f32.wgsl.expected.glsl +++ b/test/expressions/binary/add/vec3-scalar/f32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); vec3 r = (a + 4.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/add/vec3-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/add/vec3-scalar/i32.wgsl.expected.glsl index b13d477c93..0f6b433316 100644 --- a/test/expressions/binary/add/vec3-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/add/vec3-scalar/i32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 r = (a + 4); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/add/vec3-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/add/vec3-scalar/u32.wgsl.expected.glsl index b1d217ce9a..408dbb98a4 100644 --- a/test/expressions/binary/add/vec3-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/add/vec3-scalar/u32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 r = (a + 4u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/add/vec3-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/add/vec3-vec3/f32.wgsl.expected.glsl index 5afc7283b7..e20d7cccba 100644 --- a/test/expressions/binary/add/vec3-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/add/vec3-vec3/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); vec3 b = vec3(4.0f, 5.0f, 6.0f); vec3 r = (a + b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/add/vec3-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/add/vec3-vec3/i32.wgsl.expected.glsl index 14f55b4371..d3c9d1d6c7 100644 --- a/test/expressions/binary/add/vec3-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/add/vec3-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 b = ivec3(4, 5, 6); ivec3 r = (a + b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/add/vec3-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/add/vec3-vec3/u32.wgsl.expected.glsl index 9956af3466..507acf45a5 100644 --- a/test/expressions/binary/add/vec3-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/add/vec3-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 b = uvec3(4u, 5u, 6u); uvec3 r = (a + b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/bit-and/scalar-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/bit-and/scalar-scalar/i32.wgsl.expected.glsl index 4e3304123a..d02d112af6 100644 --- a/test/expressions/binary/bit-and/scalar-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/bit-and/scalar-scalar/i32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int r = (1 & 2); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/bit-and/scalar-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/bit-and/scalar-scalar/u32.wgsl.expected.glsl index ae4149da22..4d5fab3c36 100644 --- a/test/expressions/binary/bit-and/scalar-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/bit-and/scalar-scalar/u32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint r = (1u & 2u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/bit-and/vec3-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/bit-and/vec3-vec3/i32.wgsl.expected.glsl index 1091a53e0c..33d54db9b9 100644 --- a/test/expressions/binary/bit-and/vec3-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/bit-and/vec3-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 b = ivec3(4, 5, 6); ivec3 r = (a & b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/bit-and/vec3-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/bit-and/vec3-vec3/u32.wgsl.expected.glsl index d594442d3e..c7448915a5 100644 --- a/test/expressions/binary/bit-and/vec3-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/bit-and/vec3-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 b = uvec3(4u, 5u, 6u); uvec3 r = (a & b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/bit-or/scalar-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/bit-or/scalar-scalar/i32.wgsl.expected.glsl index db2479ffa8..523d2746af 100644 --- a/test/expressions/binary/bit-or/scalar-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/bit-or/scalar-scalar/i32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int r = (1 | 2); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/bit-or/scalar-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/bit-or/scalar-scalar/u32.wgsl.expected.glsl index 38b5d665a5..bf49a23796 100644 --- a/test/expressions/binary/bit-or/scalar-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/bit-or/scalar-scalar/u32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint r = (1u | 2u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/bit-or/vec3-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/bit-or/vec3-vec3/i32.wgsl.expected.glsl index 37b3d5f1d1..c534e41a95 100644 --- a/test/expressions/binary/bit-or/vec3-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/bit-or/vec3-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 b = ivec3(4, 5, 6); ivec3 r = (a | b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/bit-or/vec3-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/bit-or/vec3-vec3/u32.wgsl.expected.glsl index e938edb550..088472abcd 100644 --- a/test/expressions/binary/bit-or/vec3-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/bit-or/vec3-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 b = uvec3(4u, 5u, 6u); uvec3 r = (a | b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/bit-xor/scalar-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/bit-xor/scalar-scalar/i32.wgsl.expected.glsl index 0bf5a9e90b..9a6f59877c 100644 --- a/test/expressions/binary/bit-xor/scalar-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/bit-xor/scalar-scalar/i32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int r = (1 ^ 2); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/bit-xor/scalar-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/bit-xor/scalar-scalar/u32.wgsl.expected.glsl index 5509458b5b..258ecbe70f 100644 --- a/test/expressions/binary/bit-xor/scalar-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/bit-xor/scalar-scalar/u32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint r = (1u ^ 2u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/bit-xor/vec3-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/bit-xor/vec3-vec3/i32.wgsl.expected.glsl index 386ff248ad..26e1730a34 100644 --- a/test/expressions/binary/bit-xor/vec3-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/bit-xor/vec3-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 b = ivec3(4, 5, 6); ivec3 r = (a ^ b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/bit-xor/vec3-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/bit-xor/vec3-vec3/u32.wgsl.expected.glsl index 4b18413ec5..4cf58b182c 100644 --- a/test/expressions/binary/bit-xor/vec3-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/bit-xor/vec3-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 b = uvec3(4u, 5u, 6u); uvec3 r = (a ^ b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div/scalar-scalar/f32.wgsl.expected.glsl b/test/expressions/binary/div/scalar-scalar/f32.wgsl.expected.glsl index 9ce355250b..94a762d473 100644 --- a/test/expressions/binary/div/scalar-scalar/f32.wgsl.expected.glsl +++ b/test/expressions/binary/div/scalar-scalar/f32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float r = (1.0f / 2.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div/scalar-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/div/scalar-scalar/i32.wgsl.expected.glsl index 04a161efcd..a6234f1ec1 100644 --- a/test/expressions/binary/div/scalar-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/div/scalar-scalar/i32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int r = (1 / 2); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div/scalar-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/div/scalar-scalar/u32.wgsl.expected.glsl index 16baff5fc9..d99c8e1051 100644 --- a/test/expressions/binary/div/scalar-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/div/scalar-scalar/u32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint r = (1u / 2u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div/scalar-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/div/scalar-vec3/f32.wgsl.expected.glsl index 968e31927f..a64f12f93c 100644 --- a/test/expressions/binary/div/scalar-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/div/scalar-vec3/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float a = 4.0f; vec3 b = vec3(1.0f, 2.0f, 3.0f); vec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div/scalar-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/div/scalar-vec3/i32.wgsl.expected.glsl index 0a2c8b33be..41600438b2 100644 --- a/test/expressions/binary/div/scalar-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/div/scalar-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int a = 4; ivec3 b = ivec3(1, 2, 3); ivec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div/scalar-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/div/scalar-vec3/u32.wgsl.expected.glsl index c5ab59f8d4..9bb9d30d6e 100644 --- a/test/expressions/binary/div/scalar-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/div/scalar-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint a = 4u; uvec3 b = uvec3(1u, 2u, 3u); uvec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div/vec3-scalar/f32.wgsl.expected.glsl b/test/expressions/binary/div/vec3-scalar/f32.wgsl.expected.glsl index ce2532ee30..240d5a3946 100644 --- a/test/expressions/binary/div/vec3-scalar/f32.wgsl.expected.glsl +++ b/test/expressions/binary/div/vec3-scalar/f32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); vec3 r = (a / 4.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div/vec3-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/div/vec3-scalar/i32.wgsl.expected.glsl index 9d8ce73e95..38115e3c05 100644 --- a/test/expressions/binary/div/vec3-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/div/vec3-scalar/i32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 r = (a / 4); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div/vec3-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/div/vec3-scalar/u32.wgsl.expected.glsl index 05c23d9da6..9c76b0567e 100644 --- a/test/expressions/binary/div/vec3-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/div/vec3-scalar/u32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 r = (a / 4u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div/vec3-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/div/vec3-vec3/f32.wgsl.expected.glsl index 03e4822c14..a1bec3e5ab 100644 --- a/test/expressions/binary/div/vec3-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/div/vec3-vec3/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); vec3 b = vec3(4.0f, 5.0f, 6.0f); vec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div/vec3-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/div/vec3-vec3/i32.wgsl.expected.glsl index b25a8ae167..418690ff3c 100644 --- a/test/expressions/binary/div/vec3-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/div/vec3-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 b = ivec3(4, 5, 6); ivec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div/vec3-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/div/vec3-vec3/u32.wgsl.expected.glsl index faac29242d..8d98c77966 100644 --- a/test/expressions/binary/div/vec3-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/div/vec3-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 b = uvec3(4u, 5u, 6u); uvec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_constant/scalar-scalar/f32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_constant/scalar-scalar/f32.wgsl.expected.glsl index a9f5867fd6..54002480e0 100644 --- a/test/expressions/binary/div_by_zero/by_constant/scalar-scalar/f32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_constant/scalar-scalar/f32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float r = (1.0f / 0.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_constant/scalar-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_constant/scalar-scalar/i32.wgsl.expected.glsl index 5aecc1080f..cc3309a551 100644 --- a/test/expressions/binary/div_by_zero/by_constant/scalar-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_constant/scalar-scalar/i32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int r = (1 / 0); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_constant/scalar-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_constant/scalar-scalar/u32.wgsl.expected.glsl index 9a9100c3bc..9804a34e79 100644 --- a/test/expressions/binary/div_by_zero/by_constant/scalar-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_constant/scalar-scalar/u32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint r = (1u / 0u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_constant/scalar-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_constant/scalar-vec3/f32.wgsl.expected.glsl index 296587ec79..5400d89ee8 100644 --- a/test/expressions/binary/div_by_zero/by_constant/scalar-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_constant/scalar-vec3/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float a = 4.0f; vec3 b = vec3(0.0f, 2.0f, 0.0f); vec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_constant/scalar-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_constant/scalar-vec3/i32.wgsl.expected.glsl index 19372fd01a..7ea67c9a95 100644 --- a/test/expressions/binary/div_by_zero/by_constant/scalar-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_constant/scalar-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int a = 4; ivec3 b = ivec3(0, 2, 0); ivec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_constant/scalar-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_constant/scalar-vec3/u32.wgsl.expected.glsl index 2ca5062fae..93386d1291 100644 --- a/test/expressions/binary/div_by_zero/by_constant/scalar-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_constant/scalar-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint a = 4u; uvec3 b = uvec3(0u, 2u, 0u); uvec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_constant/vec3-scalar/f32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_constant/vec3-scalar/f32.wgsl.expected.glsl index 4e2085bd12..1bd63af094 100644 --- a/test/expressions/binary/div_by_zero/by_constant/vec3-scalar/f32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_constant/vec3-scalar/f32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); vec3 r = (a / 0.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_constant/vec3-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_constant/vec3-scalar/i32.wgsl.expected.glsl index 47945cbf6b..861e9330db 100644 --- a/test/expressions/binary/div_by_zero/by_constant/vec3-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_constant/vec3-scalar/i32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 r = (a / 0); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_constant/vec3-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_constant/vec3-scalar/u32.wgsl.expected.glsl index 0c9cf4c703..b6ec3d8378 100644 --- a/test/expressions/binary/div_by_zero/by_constant/vec3-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_constant/vec3-scalar/u32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 r = (a / 0u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_constant/vec3-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_constant/vec3-vec3/f32.wgsl.expected.glsl index fe6684dd9b..d91d8aa958 100644 --- a/test/expressions/binary/div_by_zero/by_constant/vec3-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_constant/vec3-vec3/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); vec3 b = vec3(0.0f, 5.0f, 0.0f); vec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_constant/vec3-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_constant/vec3-vec3/i32.wgsl.expected.glsl index d20b10d019..412bd3bef7 100644 --- a/test/expressions/binary/div_by_zero/by_constant/vec3-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_constant/vec3-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 b = ivec3(0, 5, 0); ivec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_constant/vec3-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_constant/vec3-vec3/u32.wgsl.expected.glsl index 3fc99d1d9c..f9b3b3e8d1 100644 --- a/test/expressions/binary/div_by_zero/by_constant/vec3-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_constant/vec3-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 b = uvec3(0u, 5u, 0u); uvec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_expression/scalar-scalar/f32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_expression/scalar-scalar/f32.wgsl.expected.glsl index 1410729698..bb9b674da4 100644 --- a/test/expressions/binary/div_by_zero/by_expression/scalar-scalar/f32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_expression/scalar-scalar/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float a = 1.0f; float b = 0.0f; float r = (a / (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_expression/scalar-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_expression/scalar-scalar/i32.wgsl.expected.glsl index 53c8ba42b3..4d6387f2d4 100644 --- a/test/expressions/binary/div_by_zero/by_expression/scalar-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_expression/scalar-scalar/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int a = 1; int b = 0; int r = (a / (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_expression/scalar-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_expression/scalar-scalar/u32.wgsl.expected.glsl index 7b857f9d13..dac49e3cd0 100644 --- a/test/expressions/binary/div_by_zero/by_expression/scalar-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_expression/scalar-scalar/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint a = 1u; uint b = 0u; uint r = (a / (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_expression/scalar-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_expression/scalar-vec3/f32.wgsl.expected.glsl index 709ea3bde5..a4a2599351 100644 --- a/test/expressions/binary/div_by_zero/by_expression/scalar-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_expression/scalar-vec3/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float a = 4.0f; vec3 b = vec3(0.0f, 2.0f, 0.0f); vec3 r = (a / (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_expression/scalar-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_expression/scalar-vec3/i32.wgsl.expected.glsl index b9172f61f2..ddc941c2a1 100644 --- a/test/expressions/binary/div_by_zero/by_expression/scalar-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_expression/scalar-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int a = 4; ivec3 b = ivec3(0, 2, 0); ivec3 r = (a / (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_expression/scalar-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_expression/scalar-vec3/u32.wgsl.expected.glsl index 9b2455b2da..6112e1793b 100644 --- a/test/expressions/binary/div_by_zero/by_expression/scalar-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_expression/scalar-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint a = 4u; uvec3 b = uvec3(0u, 2u, 0u); uvec3 r = (a / (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_expression/vec3-scalar/f32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_expression/vec3-scalar/f32.wgsl.expected.glsl index c98f287870..efe71e1678 100644 --- a/test/expressions/binary/div_by_zero/by_expression/vec3-scalar/f32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_expression/vec3-scalar/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); float b = 0.0f; vec3 r = (a / (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_expression/vec3-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_expression/vec3-scalar/i32.wgsl.expected.glsl index 3178cf289e..0cb87336da 100644 --- a/test/expressions/binary/div_by_zero/by_expression/vec3-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_expression/vec3-scalar/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); int b = 0; ivec3 r = (a / (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_expression/vec3-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_expression/vec3-scalar/u32.wgsl.expected.glsl index 00dd8758f1..f7ff68e3ac 100644 --- a/test/expressions/binary/div_by_zero/by_expression/vec3-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_expression/vec3-scalar/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uint b = 0u; uvec3 r = (a / (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_expression/vec3-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_expression/vec3-vec3/f32.wgsl.expected.glsl index 7f66bc7d8b..2cac613e88 100644 --- a/test/expressions/binary/div_by_zero/by_expression/vec3-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_expression/vec3-vec3/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); vec3 b = vec3(0.0f, 5.0f, 0.0f); vec3 r = (a / (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_expression/vec3-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_expression/vec3-vec3/i32.wgsl.expected.glsl index ff1cd8d188..12759bccf8 100644 --- a/test/expressions/binary/div_by_zero/by_expression/vec3-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_expression/vec3-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 b = ivec3(0, 5, 0); ivec3 r = (a / (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_expression/vec3-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_expression/vec3-vec3/u32.wgsl.expected.glsl index 328c0a203b..36f35b33e9 100644 --- a/test/expressions/binary/div_by_zero/by_expression/vec3-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_expression/vec3-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 b = uvec3(0u, 5u, 0u); uvec3 r = (a / (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_identifier/scalar-scalar/f32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_identifier/scalar-scalar/f32.wgsl.expected.glsl index 09ba0c8f12..e4ef44ab4d 100644 --- a/test/expressions/binary/div_by_zero/by_identifier/scalar-scalar/f32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_identifier/scalar-scalar/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float a = 1.0f; float b = 0.0f; float r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_identifier/scalar-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_identifier/scalar-scalar/i32.wgsl.expected.glsl index f545f0b1bf..3a5a1ebe7e 100644 --- a/test/expressions/binary/div_by_zero/by_identifier/scalar-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_identifier/scalar-scalar/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int a = 1; int b = 0; int r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_identifier/scalar-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_identifier/scalar-scalar/u32.wgsl.expected.glsl index 37ae0464cd..0bec649689 100644 --- a/test/expressions/binary/div_by_zero/by_identifier/scalar-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_identifier/scalar-scalar/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint a = 1u; uint b = 0u; uint r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_identifier/scalar-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_identifier/scalar-vec3/f32.wgsl.expected.glsl index 296587ec79..5400d89ee8 100644 --- a/test/expressions/binary/div_by_zero/by_identifier/scalar-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_identifier/scalar-vec3/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float a = 4.0f; vec3 b = vec3(0.0f, 2.0f, 0.0f); vec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_identifier/scalar-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_identifier/scalar-vec3/i32.wgsl.expected.glsl index 19372fd01a..7ea67c9a95 100644 --- a/test/expressions/binary/div_by_zero/by_identifier/scalar-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_identifier/scalar-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int a = 4; ivec3 b = ivec3(0, 2, 0); ivec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_identifier/scalar-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_identifier/scalar-vec3/u32.wgsl.expected.glsl index 2ca5062fae..93386d1291 100644 --- a/test/expressions/binary/div_by_zero/by_identifier/scalar-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_identifier/scalar-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint a = 4u; uvec3 b = uvec3(0u, 2u, 0u); uvec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_identifier/vec3-scalar/f32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_identifier/vec3-scalar/f32.wgsl.expected.glsl index ffa99093d3..dc75696f6e 100644 --- a/test/expressions/binary/div_by_zero/by_identifier/vec3-scalar/f32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_identifier/vec3-scalar/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); float b = 0.0f; vec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_identifier/vec3-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_identifier/vec3-scalar/i32.wgsl.expected.glsl index 58899fd117..0807c6cebc 100644 --- a/test/expressions/binary/div_by_zero/by_identifier/vec3-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_identifier/vec3-scalar/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); int b = 0; ivec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_identifier/vec3-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_identifier/vec3-scalar/u32.wgsl.expected.glsl index b1bcc1c445..221c53232a 100644 --- a/test/expressions/binary/div_by_zero/by_identifier/vec3-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_identifier/vec3-scalar/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uint b = 0u; uvec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_identifier/vec3-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_identifier/vec3-vec3/f32.wgsl.expected.glsl index fe6684dd9b..d91d8aa958 100644 --- a/test/expressions/binary/div_by_zero/by_identifier/vec3-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_identifier/vec3-vec3/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); vec3 b = vec3(0.0f, 5.0f, 0.0f); vec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_identifier/vec3-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_identifier/vec3-vec3/i32.wgsl.expected.glsl index d20b10d019..412bd3bef7 100644 --- a/test/expressions/binary/div_by_zero/by_identifier/vec3-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_identifier/vec3-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 b = ivec3(0, 5, 0); ivec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/div_by_zero/by_identifier/vec3-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/div_by_zero/by_identifier/vec3-vec3/u32.wgsl.expected.glsl index 3fc99d1d9c..f9b3b3e8d1 100644 --- a/test/expressions/binary/div_by_zero/by_identifier/vec3-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/div_by_zero/by_identifier/vec3-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 b = uvec3(0u, 5u, 0u); uvec3 r = (a / b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/left-shift/scalar-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/left-shift/scalar-scalar/i32.wgsl.expected.glsl index f57ae3659a..029afa35b0 100644 --- a/test/expressions/binary/left-shift/scalar-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/left-shift/scalar-scalar/i32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int r = (1 << 2u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/left-shift/scalar-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/left-shift/scalar-scalar/u32.wgsl.expected.glsl index 4d0d3cea79..bf173df0c8 100644 --- a/test/expressions/binary/left-shift/scalar-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/left-shift/scalar-scalar/u32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint r = (1u << 2u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/left-shift/vector-vector/i32.wgsl.expected.glsl b/test/expressions/binary/left-shift/vector-vector/i32.wgsl.expected.glsl index db0ef8fb65..38ebb2129a 100644 --- a/test/expressions/binary/left-shift/vector-vector/i32.wgsl.expected.glsl +++ b/test/expressions/binary/left-shift/vector-vector/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); uvec3 b = uvec3(4u, 5u, 6u); ivec3 r = (a << b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/left-shift/vector-vector/u32.wgsl.expected.glsl b/test/expressions/binary/left-shift/vector-vector/u32.wgsl.expected.glsl index f8866258a0..d2e81ef6fc 100644 --- a/test/expressions/binary/left-shift/vector-vector/u32.wgsl.expected.glsl +++ b/test/expressions/binary/left-shift/vector-vector/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 b = uvec3(4u, 5u, 6u); uvec3 r = (a << b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod/scalar-scalar/f32.wgsl.expected.glsl b/test/expressions/binary/mod/scalar-scalar/f32.wgsl.expected.glsl index 7587ea33db..0c9f929493 100644 --- a/test/expressions/binary/mod/scalar-scalar/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mod/scalar-scalar/f32.wgsl.expected.glsl @@ -3,19 +3,18 @@ SKIP: FAILED #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float r = (1.0f % 2.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - Error parsing GLSL shader: -ERROR: 0:6: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' const float' and a right operand of type ' const float' (or there is no acceptable conversion) -ERROR: 0:6: '' : compilation terminated +ERROR: 0:5: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' const float' and a right operand of type ' const float' (or there is no acceptable conversion) +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/expressions/binary/mod/scalar-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/mod/scalar-scalar/i32.wgsl.expected.glsl index 506196a1df..c66c552f43 100644 --- a/test/expressions/binary/mod/scalar-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/mod/scalar-scalar/i32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int r = (1 % 2); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod/scalar-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/mod/scalar-scalar/u32.wgsl.expected.glsl index 0040d2b1ca..7b67a861dd 100644 --- a/test/expressions/binary/mod/scalar-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/mod/scalar-scalar/u32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint r = (1u % 2u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod/vec3-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/mod/vec3-vec3/f32.wgsl.expected.glsl index fbf29629b3..8eb2f9959a 100644 --- a/test/expressions/binary/mod/vec3-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mod/vec3-vec3/f32.wgsl.expected.glsl @@ -3,21 +3,20 @@ SKIP: FAILED #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); vec3 b = vec3(4.0f, 5.0f, 6.0f); vec3 r = (a % b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - Error parsing GLSL shader: -ERROR: 0:8: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump 3-component vector of float' and a right operand of type ' temp mediump 3-component vector of float' (or there is no acceptable conversion) -ERROR: 0:8: '' : compilation terminated +ERROR: 0:7: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump 3-component vector of float' and a right operand of type ' temp mediump 3-component vector of float' (or there is no acceptable conversion) +ERROR: 0:7: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/expressions/binary/mod/vec3-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/mod/vec3-vec3/i32.wgsl.expected.glsl index 685f89da04..31a572b382 100644 --- a/test/expressions/binary/mod/vec3-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/mod/vec3-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 b = ivec3(4, 5, 6); ivec3 r = (a % b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod/vec3-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/mod/vec3-vec3/u32.wgsl.expected.glsl index fe2fe8888e..d034dd1e91 100644 --- a/test/expressions/binary/mod/vec3-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/mod/vec3-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 b = uvec3(4u, 5u, 6u); uvec3 r = (a % b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_constant/scalar-scalar/f32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_constant/scalar-scalar/f32.wgsl.expected.glsl index 6d3d71d6a9..5b234077b9 100644 --- a/test/expressions/binary/mod_by_zero/by_constant/scalar-scalar/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_constant/scalar-scalar/f32.wgsl.expected.glsl @@ -3,19 +3,18 @@ SKIP: FAILED #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float r = (1.0f % 0.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - Error parsing GLSL shader: -ERROR: 0:6: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' const float' and a right operand of type ' const float' (or there is no acceptable conversion) -ERROR: 0:6: '' : compilation terminated +ERROR: 0:5: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' const float' and a right operand of type ' const float' (or there is no acceptable conversion) +ERROR: 0:5: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/expressions/binary/mod_by_zero/by_constant/scalar-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_constant/scalar-scalar/i32.wgsl.expected.glsl index 6bef751c18..dabd566acc 100644 --- a/test/expressions/binary/mod_by_zero/by_constant/scalar-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_constant/scalar-scalar/i32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int r = (1 % 0); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_constant/scalar-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_constant/scalar-scalar/u32.wgsl.expected.glsl index 56ac547f16..d528f41edb 100644 --- a/test/expressions/binary/mod_by_zero/by_constant/scalar-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_constant/scalar-scalar/u32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint r = (1u % 0u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_constant/scalar-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_constant/scalar-vec3/i32.wgsl.expected.glsl index 589fb87354..1a6bb8ce36 100644 --- a/test/expressions/binary/mod_by_zero/by_constant/scalar-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_constant/scalar-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int a = 4; ivec3 b = ivec3(0, 2, 0); ivec3 r = (a % b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_constant/scalar-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_constant/scalar-vec3/u32.wgsl.expected.glsl index a4b1c8039d..271cddc0d9 100644 --- a/test/expressions/binary/mod_by_zero/by_constant/scalar-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_constant/scalar-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint a = 4u; uvec3 b = uvec3(0u, 2u, 0u); uvec3 r = (a % b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_constant/vec3-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_constant/vec3-scalar/i32.wgsl.expected.glsl index 1c492a50d7..7437dc01e9 100644 --- a/test/expressions/binary/mod_by_zero/by_constant/vec3-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_constant/vec3-scalar/i32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 r = (a % 0); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_constant/vec3-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_constant/vec3-scalar/u32.wgsl.expected.glsl index 6a048ef869..61a8568900 100644 --- a/test/expressions/binary/mod_by_zero/by_constant/vec3-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_constant/vec3-scalar/u32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 r = (a % 0u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_constant/vec3-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_constant/vec3-vec3/f32.wgsl.expected.glsl index 9a5fc61164..7f4bf3f8a6 100644 --- a/test/expressions/binary/mod_by_zero/by_constant/vec3-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_constant/vec3-vec3/f32.wgsl.expected.glsl @@ -3,21 +3,20 @@ SKIP: FAILED #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); vec3 b = vec3(0.0f, 5.0f, 0.0f); vec3 r = (a % b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - Error parsing GLSL shader: -ERROR: 0:8: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump 3-component vector of float' and a right operand of type ' temp mediump 3-component vector of float' (or there is no acceptable conversion) -ERROR: 0:8: '' : compilation terminated +ERROR: 0:7: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump 3-component vector of float' and a right operand of type ' temp mediump 3-component vector of float' (or there is no acceptable conversion) +ERROR: 0:7: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/expressions/binary/mod_by_zero/by_constant/vec3-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_constant/vec3-vec3/i32.wgsl.expected.glsl index d7abe79c0d..f3dbd2b609 100644 --- a/test/expressions/binary/mod_by_zero/by_constant/vec3-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_constant/vec3-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 b = ivec3(0, 5, 0); ivec3 r = (a % b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_constant/vec3-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_constant/vec3-vec3/u32.wgsl.expected.glsl index dd411f1abd..5b66d7f6a4 100644 --- a/test/expressions/binary/mod_by_zero/by_constant/vec3-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_constant/vec3-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 b = uvec3(0u, 5u, 0u); uvec3 r = (a % b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_expression/scalar-scalar/f32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_expression/scalar-scalar/f32.wgsl.expected.glsl index 14d3b41064..ace928945d 100644 --- a/test/expressions/binary/mod_by_zero/by_expression/scalar-scalar/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_expression/scalar-scalar/f32.wgsl.expected.glsl @@ -3,21 +3,20 @@ SKIP: FAILED #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float a = 1.0f; float b = 0.0f; float r = (a % (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - Error parsing GLSL shader: -ERROR: 0:8: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump float' and a right operand of type ' temp mediump float' (or there is no acceptable conversion) -ERROR: 0:8: '' : compilation terminated +ERROR: 0:7: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump float' and a right operand of type ' temp mediump float' (or there is no acceptable conversion) +ERROR: 0:7: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/expressions/binary/mod_by_zero/by_expression/scalar-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_expression/scalar-scalar/i32.wgsl.expected.glsl index 501dc92623..d88e2eb68b 100644 --- a/test/expressions/binary/mod_by_zero/by_expression/scalar-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_expression/scalar-scalar/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int a = 1; int b = 0; int r = (a % (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_expression/scalar-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_expression/scalar-scalar/u32.wgsl.expected.glsl index 988e967768..95a44aed3c 100644 --- a/test/expressions/binary/mod_by_zero/by_expression/scalar-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_expression/scalar-scalar/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint a = 1u; uint b = 0u; uint r = (a % (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/i32.wgsl.expected.glsl index 97ce0fa590..54ae1ef7fb 100644 --- a/test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int a = 4; ivec3 b = ivec3(0, 2, 0); ivec3 r = (a % (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/u32.wgsl.expected.glsl index 9bd7ffb130..4658c32338 100644 --- a/test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_expression/scalar-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint a = 4u; uvec3 b = uvec3(0u, 2u, 0u); uvec3 r = (a % (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_expression/vec3-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_expression/vec3-scalar/i32.wgsl.expected.glsl index e0a0c0574e..deb241ff03 100644 --- a/test/expressions/binary/mod_by_zero/by_expression/vec3-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_expression/vec3-scalar/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); int b = 0; ivec3 r = (a % (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_expression/vec3-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_expression/vec3-scalar/u32.wgsl.expected.glsl index 7e5a571891..55bd606326 100644 --- a/test/expressions/binary/mod_by_zero/by_expression/vec3-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_expression/vec3-scalar/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uint b = 0u; uvec3 r = (a % (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_expression/vec3-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_expression/vec3-vec3/f32.wgsl.expected.glsl index 4c2f21f8a8..5925f91391 100644 --- a/test/expressions/binary/mod_by_zero/by_expression/vec3-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_expression/vec3-vec3/f32.wgsl.expected.glsl @@ -3,21 +3,20 @@ SKIP: FAILED #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); vec3 b = vec3(0.0f, 5.0f, 0.0f); vec3 r = (a % (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - Error parsing GLSL shader: -ERROR: 0:8: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump 3-component vector of float' and a right operand of type ' temp mediump 3-component vector of float' (or there is no acceptable conversion) -ERROR: 0:8: '' : compilation terminated +ERROR: 0:7: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump 3-component vector of float' and a right operand of type ' temp mediump 3-component vector of float' (or there is no acceptable conversion) +ERROR: 0:7: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/expressions/binary/mod_by_zero/by_expression/vec3-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_expression/vec3-vec3/i32.wgsl.expected.glsl index 70a09f5733..96da4e0e98 100644 --- a/test/expressions/binary/mod_by_zero/by_expression/vec3-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_expression/vec3-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 b = ivec3(0, 5, 0); ivec3 r = (a % (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_expression/vec3-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_expression/vec3-vec3/u32.wgsl.expected.glsl index aea88973f6..f866539983 100644 --- a/test/expressions/binary/mod_by_zero/by_expression/vec3-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_expression/vec3-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 b = uvec3(0u, 5u, 0u); uvec3 r = (a % (b + b)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_identifier/scalar-scalar/f32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_identifier/scalar-scalar/f32.wgsl.expected.glsl index 29fd5fe804..34a9692139 100644 --- a/test/expressions/binary/mod_by_zero/by_identifier/scalar-scalar/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_identifier/scalar-scalar/f32.wgsl.expected.glsl @@ -3,21 +3,20 @@ SKIP: FAILED #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float a = 1.0f; float b = 0.0f; float r = (a % b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - Error parsing GLSL shader: -ERROR: 0:8: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump float' and a right operand of type ' temp mediump float' (or there is no acceptable conversion) -ERROR: 0:8: '' : compilation terminated +ERROR: 0:7: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump float' and a right operand of type ' temp mediump float' (or there is no acceptable conversion) +ERROR: 0:7: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/expressions/binary/mod_by_zero/by_identifier/scalar-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_identifier/scalar-scalar/i32.wgsl.expected.glsl index 1b64b4a7dd..3ca21249ac 100644 --- a/test/expressions/binary/mod_by_zero/by_identifier/scalar-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_identifier/scalar-scalar/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int a = 1; int b = 0; int r = (a % b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_identifier/scalar-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_identifier/scalar-scalar/u32.wgsl.expected.glsl index eca91f8a50..d97b5e93f8 100644 --- a/test/expressions/binary/mod_by_zero/by_identifier/scalar-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_identifier/scalar-scalar/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint a = 1u; uint b = 0u; uint r = (a % b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_identifier/scalar-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_identifier/scalar-vec3/i32.wgsl.expected.glsl index 589fb87354..1a6bb8ce36 100644 --- a/test/expressions/binary/mod_by_zero/by_identifier/scalar-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_identifier/scalar-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int a = 4; ivec3 b = ivec3(0, 2, 0); ivec3 r = (a % b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_identifier/scalar-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_identifier/scalar-vec3/u32.wgsl.expected.glsl index a4b1c8039d..271cddc0d9 100644 --- a/test/expressions/binary/mod_by_zero/by_identifier/scalar-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_identifier/scalar-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint a = 4u; uvec3 b = uvec3(0u, 2u, 0u); uvec3 r = (a % b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_identifier/vec3-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_identifier/vec3-scalar/i32.wgsl.expected.glsl index 797a0d72e9..c9a16dc327 100644 --- a/test/expressions/binary/mod_by_zero/by_identifier/vec3-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_identifier/vec3-scalar/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); int b = 0; ivec3 r = (a % b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_identifier/vec3-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_identifier/vec3-scalar/u32.wgsl.expected.glsl index 241eab3b0e..4f670644e3 100644 --- a/test/expressions/binary/mod_by_zero/by_identifier/vec3-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_identifier/vec3-scalar/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uint b = 0u; uvec3 r = (a % b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_identifier/vec3-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_identifier/vec3-vec3/f32.wgsl.expected.glsl index 9a5fc61164..7f4bf3f8a6 100644 --- a/test/expressions/binary/mod_by_zero/by_identifier/vec3-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_identifier/vec3-vec3/f32.wgsl.expected.glsl @@ -3,21 +3,20 @@ SKIP: FAILED #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); vec3 b = vec3(0.0f, 5.0f, 0.0f); vec3 r = (a % b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - Error parsing GLSL shader: -ERROR: 0:8: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump 3-component vector of float' and a right operand of type ' temp mediump 3-component vector of float' (or there is no acceptable conversion) -ERROR: 0:8: '' : compilation terminated +ERROR: 0:7: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump 3-component vector of float' and a right operand of type ' temp mediump 3-component vector of float' (or there is no acceptable conversion) +ERROR: 0:7: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/expressions/binary/mod_by_zero/by_identifier/vec3-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_identifier/vec3-vec3/i32.wgsl.expected.glsl index d7abe79c0d..f3dbd2b609 100644 --- a/test/expressions/binary/mod_by_zero/by_identifier/vec3-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_identifier/vec3-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 b = ivec3(0, 5, 0); ivec3 r = (a % b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mod_by_zero/by_identifier/vec3-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/mod_by_zero/by_identifier/vec3-vec3/u32.wgsl.expected.glsl index dd411f1abd..5b66d7f6a4 100644 --- a/test/expressions/binary/mod_by_zero/by_identifier/vec3-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/mod_by_zero/by_identifier/vec3-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 b = uvec3(0u, 5u, 0u); uvec3 r = (a % b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mul/mat2x4-mat4x2/f32.wgsl.expected.glsl b/test/expressions/binary/mul/mat2x4-mat4x2/f32.wgsl.expected.glsl index e37618dbda..b5b4e36d87 100644 --- a/test/expressions/binary/mul/mat2x4-mat4x2/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/mat2x4-mat4x2/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { mat2x4 a = mat2x4(vec4(1.0f, 2.0f, 3.0f, 4.0f), vec4(5.0f, 6.0f, 7.0f, 8.0f)); mat4x2 b = mat4x2(vec2(-1.0f, -2.0f), vec2(-3.0f, -4.0f), vec2(-5.0f, -6.0f), vec2(-7.0f, -8.0f)); mat4 r = (a * b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mul/mat3x2-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/mul/mat3x2-vec3/f32.wgsl.expected.glsl index 16350dc303..c998d8f983 100644 --- a/test/expressions/binary/mul/mat3x2-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/mat3x2-vec3/f32.wgsl.expected.glsl @@ -13,10 +13,9 @@ layout(binding = 0) uniform S_1 { void tint_symbol() { vec2 x = (data.matrix * data.vector); - return; } void main() { tint_symbol(); + return; } - diff --git a/test/expressions/binary/mul/mat3x3-mat3x3/f32.wgsl.expected.glsl b/test/expressions/binary/mul/mat3x3-mat3x3/f32.wgsl.expected.glsl index dec5c80e98..4d766f44f6 100644 --- a/test/expressions/binary/mul/mat3x3-mat3x3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/mat3x3-mat3x3/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { mat3 a = mat3(vec3(1.0f, 2.0f, 3.0f), vec3(4.0f, 5.0f, 6.0f), vec3(7.0f, 8.0f, 9.0f)); mat3 b = mat3(vec3(-1.0f, -2.0f, -3.0f), vec3(-4.0f, -5.0f, -6.0f), vec3(-7.0f, -8.0f, -9.0f)); mat3 r = (a * b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mul/mat3x3-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/mul/mat3x3-vec3/f32.wgsl.expected.glsl index 65c991c6df..42cee27835 100644 --- a/test/expressions/binary/mul/mat3x3-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/mat3x3-vec3/f32.wgsl.expected.glsl @@ -13,10 +13,9 @@ layout(binding = 0) uniform S_1 { void tint_symbol() { vec3 x = (data.matrix * data.vector); - return; } void main() { tint_symbol(); + return; } - diff --git a/test/expressions/binary/mul/mat4x2-mat2x4/f32.wgsl.expected.glsl b/test/expressions/binary/mul/mat4x2-mat2x4/f32.wgsl.expected.glsl index 92bdac6abf..1c8e788572 100644 --- a/test/expressions/binary/mul/mat4x2-mat2x4/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/mat4x2-mat2x4/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { mat4x2 a = mat4x2(vec2(-1.0f, -2.0f), vec2(-3.0f, -4.0f), vec2(-5.0f, -6.0f), vec2(-7.0f, -8.0f)); mat2x4 b = mat2x4(vec4(1.0f, 2.0f, 3.0f, 4.0f), vec4(5.0f, 6.0f, 7.0f, 8.0f)); mat2 r = (a * b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mul/scalar-scalar/f32.wgsl.expected.glsl b/test/expressions/binary/mul/scalar-scalar/f32.wgsl.expected.glsl index 094d946c79..5b0cfc375e 100644 --- a/test/expressions/binary/mul/scalar-scalar/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/scalar-scalar/f32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float r = (1.0f * 2.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mul/scalar-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/mul/scalar-scalar/i32.wgsl.expected.glsl index 6fcda38d17..d5e721ec7f 100644 --- a/test/expressions/binary/mul/scalar-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/scalar-scalar/i32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int r = (1 * 2); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mul/scalar-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/mul/scalar-scalar/u32.wgsl.expected.glsl index 6bc63617f5..0eabde4be6 100644 --- a/test/expressions/binary/mul/scalar-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/scalar-scalar/u32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint r = (1u * 2u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mul/scalar-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/mul/scalar-vec3/f32.wgsl.expected.glsl index 1e77318491..4548728536 100644 --- a/test/expressions/binary/mul/scalar-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/scalar-vec3/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float a = 4.0f; vec3 b = vec3(1.0f, 2.0f, 3.0f); vec3 r = (a * b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mul/scalar-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/mul/scalar-vec3/i32.wgsl.expected.glsl index 9ccdf10fab..db11eae247 100644 --- a/test/expressions/binary/mul/scalar-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/scalar-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int a = 4; ivec3 b = ivec3(1, 2, 3); ivec3 r = (a * b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mul/scalar-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/mul/scalar-vec3/u32.wgsl.expected.glsl index 95d55a2db4..882ad1d12b 100644 --- a/test/expressions/binary/mul/scalar-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/scalar-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint a = 4u; uvec3 b = uvec3(1u, 2u, 3u); uvec3 r = (a * b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mul/vec3-mat3x3/f32.wgsl.expected.glsl b/test/expressions/binary/mul/vec3-mat3x3/f32.wgsl.expected.glsl index 19b9f4285f..200be2bc75 100644 --- a/test/expressions/binary/mul/vec3-mat3x3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/vec3-mat3x3/f32.wgsl.expected.glsl @@ -13,10 +13,9 @@ layout(binding = 0) uniform S_1 { void tint_symbol() { vec3 x = (data.vector * data.matrix); - return; } void main() { tint_symbol(); + return; } - diff --git a/test/expressions/binary/mul/vec3-mat4x3/f32.wgsl.expected.glsl b/test/expressions/binary/mul/vec3-mat4x3/f32.wgsl.expected.glsl index 889c660056..0cd32b80b5 100644 --- a/test/expressions/binary/mul/vec3-mat4x3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/vec3-mat4x3/f32.wgsl.expected.glsl @@ -13,10 +13,9 @@ layout(binding = 0) uniform S_1 { void tint_symbol() { vec4 x = (data.vector * data.matrix); - return; } void main() { tint_symbol(); + return; } - diff --git a/test/expressions/binary/mul/vec3-scalar/f32.wgsl.expected.glsl b/test/expressions/binary/mul/vec3-scalar/f32.wgsl.expected.glsl index a96dd5bb95..8b4e0fc58a 100644 --- a/test/expressions/binary/mul/vec3-scalar/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/vec3-scalar/f32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); vec3 r = (a * 4.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mul/vec3-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/mul/vec3-scalar/i32.wgsl.expected.glsl index 83736fb202..1b3730949b 100644 --- a/test/expressions/binary/mul/vec3-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/vec3-scalar/i32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 r = (a * 4); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mul/vec3-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/mul/vec3-scalar/u32.wgsl.expected.glsl index d08bd4ac6a..b2ff4f4269 100644 --- a/test/expressions/binary/mul/vec3-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/vec3-scalar/u32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 r = (a * 4u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mul/vec3-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/mul/vec3-vec3/f32.wgsl.expected.glsl index e99d96fe61..19089fed11 100644 --- a/test/expressions/binary/mul/vec3-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/vec3-vec3/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); vec3 b = vec3(4.0f, 5.0f, 6.0f); vec3 r = (a * b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mul/vec3-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/mul/vec3-vec3/i32.wgsl.expected.glsl index 2af834dd5a..27771dbe22 100644 --- a/test/expressions/binary/mul/vec3-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/vec3-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 b = ivec3(4, 5, 6); ivec3 r = (a * b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/mul/vec3-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/mul/vec3-vec3/u32.wgsl.expected.glsl index 889cd57dbe..0d3ea99191 100644 --- a/test/expressions/binary/mul/vec3-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/mul/vec3-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 b = uvec3(4u, 5u, 6u); uvec3 r = (a * b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/right-shift/scalar-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/right-shift/scalar-scalar/i32.wgsl.expected.glsl index 6d118f1159..8b43a7cad6 100644 --- a/test/expressions/binary/right-shift/scalar-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/right-shift/scalar-scalar/i32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int r = (1 >> 2u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/right-shift/scalar-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/right-shift/scalar-scalar/u32.wgsl.expected.glsl index bd44d7dc71..4a2e559a94 100644 --- a/test/expressions/binary/right-shift/scalar-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/right-shift/scalar-scalar/u32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint r = (1u >> 2u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/right-shift/vector-vector/i32.wgsl.expected.glsl b/test/expressions/binary/right-shift/vector-vector/i32.wgsl.expected.glsl index 1429a39339..512471cee5 100644 --- a/test/expressions/binary/right-shift/vector-vector/i32.wgsl.expected.glsl +++ b/test/expressions/binary/right-shift/vector-vector/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); uvec3 b = uvec3(4u, 5u, 6u); ivec3 r = (a >> b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/right-shift/vector-vector/u32.wgsl.expected.glsl b/test/expressions/binary/right-shift/vector-vector/u32.wgsl.expected.glsl index 7c63c6d71a..0eb8bd2e6f 100644 --- a/test/expressions/binary/right-shift/vector-vector/u32.wgsl.expected.glsl +++ b/test/expressions/binary/right-shift/vector-vector/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 b = uvec3(4u, 5u, 6u); uvec3 r = (a >> b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/sub/mat3x3-mat3x3/f32.wgsl.expected.glsl b/test/expressions/binary/sub/mat3x3-mat3x3/f32.wgsl.expected.glsl index 92c2f6cfc3..2f6c87860a 100644 --- a/test/expressions/binary/sub/mat3x3-mat3x3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/sub/mat3x3-mat3x3/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { mat3 a = mat3(vec3(1.0f, 2.0f, 3.0f), vec3(4.0f, 5.0f, 6.0f), vec3(7.0f, 8.0f, 9.0f)); mat3 b = mat3(vec3(-1.0f, -2.0f, -3.0f), vec3(-4.0f, -5.0f, -6.0f), vec3(-7.0f, -8.0f, -9.0f)); mat3 r = (a - b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/sub/scalar-scalar/f32.wgsl.expected.glsl b/test/expressions/binary/sub/scalar-scalar/f32.wgsl.expected.glsl index 7b84b8f664..53d90c0dad 100644 --- a/test/expressions/binary/sub/scalar-scalar/f32.wgsl.expected.glsl +++ b/test/expressions/binary/sub/scalar-scalar/f32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float r = (1.0f - 2.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/sub/scalar-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/sub/scalar-scalar/i32.wgsl.expected.glsl index f0334a1f28..73f08c9f30 100644 --- a/test/expressions/binary/sub/scalar-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/sub/scalar-scalar/i32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int r = (1 - 2); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/sub/scalar-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/sub/scalar-scalar/u32.wgsl.expected.glsl index d4f1aff92a..65df051711 100644 --- a/test/expressions/binary/sub/scalar-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/sub/scalar-scalar/u32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint r = (1u - 2u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/sub/scalar-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/sub/scalar-vec3/f32.wgsl.expected.glsl index 9e497a0a36..38c4ce4d1b 100644 --- a/test/expressions/binary/sub/scalar-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/sub/scalar-vec3/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float a = 4.0f; vec3 b = vec3(1.0f, 2.0f, 3.0f); vec3 r = (a - b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/sub/scalar-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/sub/scalar-vec3/i32.wgsl.expected.glsl index f655d71483..97f7684a1f 100644 --- a/test/expressions/binary/sub/scalar-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/sub/scalar-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int a = 4; ivec3 b = ivec3(1, 2, 3); ivec3 r = (a - b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/sub/scalar-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/sub/scalar-vec3/u32.wgsl.expected.glsl index 1474d6cbee..754277ddd3 100644 --- a/test/expressions/binary/sub/scalar-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/sub/scalar-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint a = 4u; uvec3 b = uvec3(1u, 2u, 3u); uvec3 r = (a - b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/sub/vec3-scalar/f32.wgsl.expected.glsl b/test/expressions/binary/sub/vec3-scalar/f32.wgsl.expected.glsl index dbfdc7891a..9019a0beff 100644 --- a/test/expressions/binary/sub/vec3-scalar/f32.wgsl.expected.glsl +++ b/test/expressions/binary/sub/vec3-scalar/f32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); vec3 r = (a - 4.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/sub/vec3-scalar/i32.wgsl.expected.glsl b/test/expressions/binary/sub/vec3-scalar/i32.wgsl.expected.glsl index 1d34062a97..49f7efecb9 100644 --- a/test/expressions/binary/sub/vec3-scalar/i32.wgsl.expected.glsl +++ b/test/expressions/binary/sub/vec3-scalar/i32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 r = (a - 4); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/sub/vec3-scalar/u32.wgsl.expected.glsl b/test/expressions/binary/sub/vec3-scalar/u32.wgsl.expected.glsl index 35eed7d1ff..5d045e5ae7 100644 --- a/test/expressions/binary/sub/vec3-scalar/u32.wgsl.expected.glsl +++ b/test/expressions/binary/sub/vec3-scalar/u32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 r = (a - 4u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/sub/vec3-vec3/f32.wgsl.expected.glsl b/test/expressions/binary/sub/vec3-vec3/f32.wgsl.expected.glsl index 2f73e34149..00c7356f7d 100644 --- a/test/expressions/binary/sub/vec3-vec3/f32.wgsl.expected.glsl +++ b/test/expressions/binary/sub/vec3-vec3/f32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); vec3 b = vec3(4.0f, 5.0f, 6.0f); vec3 r = (a - b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/sub/vec3-vec3/i32.wgsl.expected.glsl b/test/expressions/binary/sub/vec3-vec3/i32.wgsl.expected.glsl index 8869edf9f7..87d13eaf86 100644 --- a/test/expressions/binary/sub/vec3-vec3/i32.wgsl.expected.glsl +++ b/test/expressions/binary/sub/vec3-vec3/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 b = ivec3(4, 5, 6); ivec3 r = (a - b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/binary/sub/vec3-vec3/u32.wgsl.expected.glsl b/test/expressions/binary/sub/vec3-vec3/u32.wgsl.expected.glsl index 64053c8f35..56169469e1 100644 --- a/test/expressions/binary/sub/vec3-vec3/u32.wgsl.expected.glsl +++ b/test/expressions/binary/sub/vec3-vec3/u32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 b = uvec3(4u, 5u, 6u); uvec3 r = (a - b); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/scalar/f32-f32.wgsl.expected.glsl b/test/expressions/bitcast/scalar/f32-f32.wgsl.expected.glsl index 16f1b8985b..9fdde49487 100644 --- a/test/expressions/bitcast/scalar/f32-f32.wgsl.expected.glsl +++ b/test/expressions/bitcast/scalar/f32-f32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float b = 1.0f; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/scalar/f32-i32.wgsl.expected.glsl b/test/expressions/bitcast/scalar/f32-i32.wgsl.expected.glsl index 2b275349a6..e0625279d3 100644 --- a/test/expressions/bitcast/scalar/f32-i32.wgsl.expected.glsl +++ b/test/expressions/bitcast/scalar/f32-i32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int b = floatBitsToInt(1.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/scalar/f32-u32.wgsl.expected.glsl b/test/expressions/bitcast/scalar/f32-u32.wgsl.expected.glsl index e73f2a1a61..d2cfdb149d 100644 --- a/test/expressions/bitcast/scalar/f32-u32.wgsl.expected.glsl +++ b/test/expressions/bitcast/scalar/f32-u32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint b = floatBitsToUint(1.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/scalar/i32-f32.wgsl.expected.glsl b/test/expressions/bitcast/scalar/i32-f32.wgsl.expected.glsl index 1dc97ed155..007638419b 100644 --- a/test/expressions/bitcast/scalar/i32-f32.wgsl.expected.glsl +++ b/test/expressions/bitcast/scalar/i32-f32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float b = intBitsToFloat(1); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/scalar/i32-i32.wgsl.expected.glsl b/test/expressions/bitcast/scalar/i32-i32.wgsl.expected.glsl index 5b18f96c11..d0566e5183 100644 --- a/test/expressions/bitcast/scalar/i32-i32.wgsl.expected.glsl +++ b/test/expressions/bitcast/scalar/i32-i32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int b = 1; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/scalar/i32-u32.wgsl.expected.glsl b/test/expressions/bitcast/scalar/i32-u32.wgsl.expected.glsl index d17ef1ba65..de9c43df28 100644 --- a/test/expressions/bitcast/scalar/i32-u32.wgsl.expected.glsl +++ b/test/expressions/bitcast/scalar/i32-u32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint b = uint(1); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/scalar/i32min-u32.wgsl.expected.glsl b/test/expressions/bitcast/scalar/i32min-u32.wgsl.expected.glsl index fe0dbfb18f..4b25ee989e 100644 --- a/test/expressions/bitcast/scalar/i32min-u32.wgsl.expected.glsl +++ b/test/expressions/bitcast/scalar/i32min-u32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint b = uint(-2147483648); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/scalar/u32-f32.wgsl.expected.glsl b/test/expressions/bitcast/scalar/u32-f32.wgsl.expected.glsl index 35a3458db0..cc7e675f25 100644 --- a/test/expressions/bitcast/scalar/u32-f32.wgsl.expected.glsl +++ b/test/expressions/bitcast/scalar/u32-f32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { float b = uintBitsToFloat(1u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/scalar/u32-i32.wgsl.expected.glsl b/test/expressions/bitcast/scalar/u32-i32.wgsl.expected.glsl index 8a046682d9..506bd4adc0 100644 --- a/test/expressions/bitcast/scalar/u32-i32.wgsl.expected.glsl +++ b/test/expressions/bitcast/scalar/u32-i32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int b = int(1u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/scalar/u32-u32.wgsl.expected.glsl b/test/expressions/bitcast/scalar/u32-u32.wgsl.expected.glsl index 2e0049a8dc..f99a671e60 100644 --- a/test/expressions/bitcast/scalar/u32-u32.wgsl.expected.glsl +++ b/test/expressions/bitcast/scalar/u32-u32.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uint b = 1u; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/vector/f32-f32.wgsl.expected.glsl b/test/expressions/bitcast/vector/f32-f32.wgsl.expected.glsl index 79506a25b3..a6bb513bf7 100644 --- a/test/expressions/bitcast/vector/f32-f32.wgsl.expected.glsl +++ b/test/expressions/bitcast/vector/f32-f32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); vec3 b = a; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/vector/f32-i32.wgsl.expected.glsl b/test/expressions/bitcast/vector/f32-i32.wgsl.expected.glsl index 8905d2cd86..1c3d70efde 100644 --- a/test/expressions/bitcast/vector/f32-i32.wgsl.expected.glsl +++ b/test/expressions/bitcast/vector/f32-i32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); ivec3 b = floatBitsToInt(a); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/vector/f32-u32.wgsl.expected.glsl b/test/expressions/bitcast/vector/f32-u32.wgsl.expected.glsl index 3df55ecfa3..38310cf646 100644 --- a/test/expressions/bitcast/vector/f32-u32.wgsl.expected.glsl +++ b/test/expressions/bitcast/vector/f32-u32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { vec3 a = vec3(1.0f, 2.0f, 3.0f); uvec3 b = floatBitsToUint(a); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/vector/i32-f32.wgsl.expected.glsl b/test/expressions/bitcast/vector/i32-f32.wgsl.expected.glsl index 7b652bff5c..2482e5e982 100644 --- a/test/expressions/bitcast/vector/i32-f32.wgsl.expected.glsl +++ b/test/expressions/bitcast/vector/i32-f32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); vec3 b = intBitsToFloat(a); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/vector/i32-i32.wgsl.expected.glsl b/test/expressions/bitcast/vector/i32-i32.wgsl.expected.glsl index 1c28025d81..614e64aa83 100644 --- a/test/expressions/bitcast/vector/i32-i32.wgsl.expected.glsl +++ b/test/expressions/bitcast/vector/i32-i32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); ivec3 b = a; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/vector/i32-u32.wgsl.expected.glsl b/test/expressions/bitcast/vector/i32-u32.wgsl.expected.glsl index 9115f4a28e..9b3a5ccca4 100644 --- a/test/expressions/bitcast/vector/i32-u32.wgsl.expected.glsl +++ b/test/expressions/bitcast/vector/i32-u32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { ivec3 a = ivec3(1, 2, 3); uvec3 b = uvec3(a); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/vector/u32-f32.wgsl.expected.glsl b/test/expressions/bitcast/vector/u32-f32.wgsl.expected.glsl index 9d1ac80bcf..cca9ce9533 100644 --- a/test/expressions/bitcast/vector/u32-f32.wgsl.expected.glsl +++ b/test/expressions/bitcast/vector/u32-f32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); vec3 b = uintBitsToFloat(a); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/vector/u32-i32.wgsl.expected.glsl b/test/expressions/bitcast/vector/u32-i32.wgsl.expected.glsl index fec22555a6..8f690932b3 100644 --- a/test/expressions/bitcast/vector/u32-i32.wgsl.expected.glsl +++ b/test/expressions/bitcast/vector/u32-i32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); ivec3 b = ivec3(a); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/bitcast/vector/u32-u32.wgsl.expected.glsl b/test/expressions/bitcast/vector/u32-u32.wgsl.expected.glsl index da18fc080b..a8fd047cdd 100644 --- a/test/expressions/bitcast/vector/u32-u32.wgsl.expected.glsl +++ b/test/expressions/bitcast/vector/u32-u32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { uvec3 a = uvec3(1u, 2u, 3u); uvec3 b = a; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/expressions/index/let/let/literal/array.wgsl.expected.glsl b/test/expressions/index/let/let/literal/array.wgsl.expected.glsl index 2225238006..2c57161fb0 100644 --- a/test/expressions/index/let/let/literal/array.wgsl.expected.glsl +++ b/test/expressions/index/let/let/literal/array.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int f() { int a[8] = int[8](1, 2, 3, 4, 5, 6, 7, 8); return a[1]; diff --git a/test/expressions/index/let/let/literal/matrix.wgsl.expected.glsl b/test/expressions/index/let/let/literal/matrix.wgsl.expected.glsl index a0ebffd30a..c3c6f8375c 100644 --- a/test/expressions/index/let/let/literal/matrix.wgsl.expected.glsl +++ b/test/expressions/index/let/let/literal/matrix.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - vec3 f() { mat3 m = mat3(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f); return m[1]; diff --git a/test/expressions/index/let/let/literal/vector.wgsl.expected.glsl b/test/expressions/index/let/let/literal/vector.wgsl.expected.glsl index 5d98a7679a..42517d3e75 100644 --- a/test/expressions/index/let/let/literal/vector.wgsl.expected.glsl +++ b/test/expressions/index/let/let/literal/vector.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - float f() { vec3 v = vec3(1.0f, 2.0f, 3.0f); return v[1]; diff --git a/test/expressions/index/let/let/param/array.wgsl.expected.glsl b/test/expressions/index/let/let/param/array.wgsl.expected.glsl index 88547d53cd..831e77b58a 100644 --- a/test/expressions/index/let/let/param/array.wgsl.expected.glsl +++ b/test/expressions/index/let/let/param/array.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int f(int x) { int a[8] = int[8](1, 2, 3, 4, 5, 6, 7, 8); return a[x]; diff --git a/test/expressions/index/let/let/param/matrix.wgsl.expected.glsl b/test/expressions/index/let/let/param/matrix.wgsl.expected.glsl index 32e6a8bded..e9221710f8 100644 --- a/test/expressions/index/let/let/param/matrix.wgsl.expected.glsl +++ b/test/expressions/index/let/let/param/matrix.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - vec3 f(int x) { mat3 m = mat3(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f); return m[x]; diff --git a/test/expressions/index/let/let/param/vector.wgsl.expected.glsl b/test/expressions/index/let/let/param/vector.wgsl.expected.glsl index cad5646001..3f437d3f86 100644 --- a/test/expressions/index/let/let/param/vector.wgsl.expected.glsl +++ b/test/expressions/index/let/let/param/vector.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - float f(int x) { vec3 v = vec3(1.0f, 2.0f, 3.0f); return v[x]; diff --git a/test/expressions/index/let/literal/array.wgsl.expected.glsl b/test/expressions/index/let/literal/array.wgsl.expected.glsl index 2225238006..2c57161fb0 100644 --- a/test/expressions/index/let/literal/array.wgsl.expected.glsl +++ b/test/expressions/index/let/literal/array.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int f() { int a[8] = int[8](1, 2, 3, 4, 5, 6, 7, 8); return a[1]; diff --git a/test/expressions/index/let/literal/matrix.wgsl.expected.glsl b/test/expressions/index/let/literal/matrix.wgsl.expected.glsl index a0ebffd30a..c3c6f8375c 100644 --- a/test/expressions/index/let/literal/matrix.wgsl.expected.glsl +++ b/test/expressions/index/let/literal/matrix.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - vec3 f() { mat3 m = mat3(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f); return m[1]; diff --git a/test/expressions/index/let/literal/vector.wgsl.expected.glsl b/test/expressions/index/let/literal/vector.wgsl.expected.glsl index 5d98a7679a..42517d3e75 100644 --- a/test/expressions/index/let/literal/vector.wgsl.expected.glsl +++ b/test/expressions/index/let/literal/vector.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - float f() { vec3 v = vec3(1.0f, 2.0f, 3.0f); return v[1]; diff --git a/test/expressions/index/let/param/array.wgsl.expected.glsl b/test/expressions/index/let/param/array.wgsl.expected.glsl index 17f4054493..9b9cb7a8e9 100644 --- a/test/expressions/index/let/param/array.wgsl.expected.glsl +++ b/test/expressions/index/let/param/array.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int f(int i) { int a[8] = int[8](1, 2, 3, 4, 5, 6, 7, 8); return a[i]; diff --git a/test/expressions/index/let/param/matrix.wgsl.expected.glsl b/test/expressions/index/let/param/matrix.wgsl.expected.glsl index e1500945f6..56877ba6ef 100644 --- a/test/expressions/index/let/param/matrix.wgsl.expected.glsl +++ b/test/expressions/index/let/param/matrix.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - vec3 f(int i) { mat3 m = mat3(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f); return m[i]; diff --git a/test/expressions/index/let/param/vector.wgsl.expected.glsl b/test/expressions/index/let/param/vector.wgsl.expected.glsl index e4da58cb36..82f3ce96b2 100644 --- a/test/expressions/index/let/param/vector.wgsl.expected.glsl +++ b/test/expressions/index/let/param/vector.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - float f(int i) { vec3 v = vec3(1.0f, 2.0f, 3.0f); return v[i]; diff --git a/test/expressions/index/let/var/literal/array.wgsl.expected.glsl b/test/expressions/index/let/var/literal/array.wgsl.expected.glsl index 2225238006..2c57161fb0 100644 --- a/test/expressions/index/let/var/literal/array.wgsl.expected.glsl +++ b/test/expressions/index/let/var/literal/array.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int f() { int a[8] = int[8](1, 2, 3, 4, 5, 6, 7, 8); return a[1]; diff --git a/test/expressions/index/let/var/literal/matrix.wgsl.expected.glsl b/test/expressions/index/let/var/literal/matrix.wgsl.expected.glsl index a0ebffd30a..c3c6f8375c 100644 --- a/test/expressions/index/let/var/literal/matrix.wgsl.expected.glsl +++ b/test/expressions/index/let/var/literal/matrix.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - vec3 f() { mat3 m = mat3(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f); return m[1]; diff --git a/test/expressions/index/let/var/literal/vector.wgsl.expected.glsl b/test/expressions/index/let/var/literal/vector.wgsl.expected.glsl index 5d98a7679a..42517d3e75 100644 --- a/test/expressions/index/let/var/literal/vector.wgsl.expected.glsl +++ b/test/expressions/index/let/var/literal/vector.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - float f() { vec3 v = vec3(1.0f, 2.0f, 3.0f); return v[1]; diff --git a/test/expressions/index/var/let/literal/array.wgsl.expected.glsl b/test/expressions/index/var/let/literal/array.wgsl.expected.glsl index 2225238006..2c57161fb0 100644 --- a/test/expressions/index/var/let/literal/array.wgsl.expected.glsl +++ b/test/expressions/index/var/let/literal/array.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int f() { int a[8] = int[8](1, 2, 3, 4, 5, 6, 7, 8); return a[1]; diff --git a/test/expressions/index/var/let/literal/matrix.wgsl.expected.glsl b/test/expressions/index/var/let/literal/matrix.wgsl.expected.glsl index a0ebffd30a..c3c6f8375c 100644 --- a/test/expressions/index/var/let/literal/matrix.wgsl.expected.glsl +++ b/test/expressions/index/var/let/literal/matrix.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - vec3 f() { mat3 m = mat3(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f); return m[1]; diff --git a/test/expressions/index/var/let/literal/vector.wgsl.expected.glsl b/test/expressions/index/var/let/literal/vector.wgsl.expected.glsl index 5d98a7679a..42517d3e75 100644 --- a/test/expressions/index/var/let/literal/vector.wgsl.expected.glsl +++ b/test/expressions/index/var/let/literal/vector.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - float f() { vec3 v = vec3(1.0f, 2.0f, 3.0f); return v[1]; diff --git a/test/expressions/index/var/let/param/array.wgsl.expected.glsl b/test/expressions/index/var/let/param/array.wgsl.expected.glsl index 88547d53cd..831e77b58a 100644 --- a/test/expressions/index/var/let/param/array.wgsl.expected.glsl +++ b/test/expressions/index/var/let/param/array.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int f(int x) { int a[8] = int[8](1, 2, 3, 4, 5, 6, 7, 8); return a[x]; diff --git a/test/expressions/index/var/let/param/matrix.wgsl.expected.glsl b/test/expressions/index/var/let/param/matrix.wgsl.expected.glsl index 32e6a8bded..e9221710f8 100644 --- a/test/expressions/index/var/let/param/matrix.wgsl.expected.glsl +++ b/test/expressions/index/var/let/param/matrix.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - vec3 f(int x) { mat3 m = mat3(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f); return m[x]; diff --git a/test/expressions/index/var/let/param/vector.wgsl.expected.glsl b/test/expressions/index/var/let/param/vector.wgsl.expected.glsl index cad5646001..3f437d3f86 100644 --- a/test/expressions/index/var/let/param/vector.wgsl.expected.glsl +++ b/test/expressions/index/var/let/param/vector.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - float f(int x) { vec3 v = vec3(1.0f, 2.0f, 3.0f); return v[x]; diff --git a/test/expressions/index/var/literal/array.wgsl.expected.glsl b/test/expressions/index/var/literal/array.wgsl.expected.glsl index 2225238006..2c57161fb0 100644 --- a/test/expressions/index/var/literal/array.wgsl.expected.glsl +++ b/test/expressions/index/var/literal/array.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int f() { int a[8] = int[8](1, 2, 3, 4, 5, 6, 7, 8); return a[1]; diff --git a/test/expressions/index/var/literal/matrix.wgsl.expected.glsl b/test/expressions/index/var/literal/matrix.wgsl.expected.glsl index a0ebffd30a..c3c6f8375c 100644 --- a/test/expressions/index/var/literal/matrix.wgsl.expected.glsl +++ b/test/expressions/index/var/literal/matrix.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - vec3 f() { mat3 m = mat3(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f); return m[1]; diff --git a/test/expressions/index/var/literal/vector.wgsl.expected.glsl b/test/expressions/index/var/literal/vector.wgsl.expected.glsl index 5d98a7679a..42517d3e75 100644 --- a/test/expressions/index/var/literal/vector.wgsl.expected.glsl +++ b/test/expressions/index/var/literal/vector.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - float f() { vec3 v = vec3(1.0f, 2.0f, 3.0f); return v[1]; diff --git a/test/expressions/index/var/param/array.wgsl.expected.glsl b/test/expressions/index/var/param/array.wgsl.expected.glsl index 17f4054493..9b9cb7a8e9 100644 --- a/test/expressions/index/var/param/array.wgsl.expected.glsl +++ b/test/expressions/index/var/param/array.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int f(int i) { int a[8] = int[8](1, 2, 3, 4, 5, 6, 7, 8); return a[i]; diff --git a/test/expressions/index/var/param/matrix.wgsl.expected.glsl b/test/expressions/index/var/param/matrix.wgsl.expected.glsl index e1500945f6..56877ba6ef 100644 --- a/test/expressions/index/var/param/matrix.wgsl.expected.glsl +++ b/test/expressions/index/var/param/matrix.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - vec3 f(int i) { mat3 m = mat3(1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f); return m[i]; diff --git a/test/expressions/index/var/param/vector.wgsl.expected.glsl b/test/expressions/index/var/param/vector.wgsl.expected.glsl index e4da58cb36..82f3ce96b2 100644 --- a/test/expressions/index/var/param/vector.wgsl.expected.glsl +++ b/test/expressions/index/var/param/vector.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - float f(int i) { vec3 v = vec3(1.0f, 2.0f, 3.0f); return v[i]; diff --git a/test/expressions/literals/-inf.spvasm.expected.glsl b/test/expressions/literals/-inf.spvasm.expected.glsl index 78232f11f4..e1caa5435c 100644 --- a/test/expressions/literals/-inf.spvasm.expected.glsl +++ b/test/expressions/literals/-inf.spvasm.expected.glsl @@ -1,6 +1,7 @@ #version 310 es precision mediump float; +layout(location = 0) out vec4 out_var_SV_TARGET_1_1; vec4 out_var_SV_TARGET = vec4(0.0f, 0.0f, 0.0f, 0.0f); void main_1() { out_var_SV_TARGET = vec4(uintBitsToFloat(0xff800000u), uintBitsToFloat(0xff800000u), uintBitsToFloat(0xff800000u), uintBitsToFloat(0xff800000u)); @@ -11,27 +12,14 @@ struct main_out { vec4 out_var_SV_TARGET_1; }; -struct tint_symbol_1 { - vec4 out_var_SV_TARGET_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(out_var_SV_TARGET); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(out_var_SV_TARGET); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.out_var_SV_TARGET_1 = inner_result.out_var_SV_TARGET_1; - return wrapper_result; -} -layout(location = 0) out vec4 out_var_SV_TARGET_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - out_var_SV_TARGET_1 = outputs.out_var_SV_TARGET_1; + main_out inner_result = tint_symbol(); + out_var_SV_TARGET_1_1 = inner_result.out_var_SV_TARGET_1; + return; } - diff --git a/test/expressions/literals/inf.spvasm.expected.glsl b/test/expressions/literals/inf.spvasm.expected.glsl index 022c655e30..637b87c984 100644 --- a/test/expressions/literals/inf.spvasm.expected.glsl +++ b/test/expressions/literals/inf.spvasm.expected.glsl @@ -1,6 +1,7 @@ #version 310 es precision mediump float; +layout(location = 0) out vec4 out_var_SV_TARGET_1_1; vec4 out_var_SV_TARGET = vec4(0.0f, 0.0f, 0.0f, 0.0f); void main_1() { out_var_SV_TARGET = vec4(uintBitsToFloat(0x7f800000u), uintBitsToFloat(0x7f800000u), uintBitsToFloat(0x7f800000u), uintBitsToFloat(0x7f800000u)); @@ -11,27 +12,14 @@ struct main_out { vec4 out_var_SV_TARGET_1; }; -struct tint_symbol_1 { - vec4 out_var_SV_TARGET_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(out_var_SV_TARGET); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(out_var_SV_TARGET); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.out_var_SV_TARGET_1 = inner_result.out_var_SV_TARGET_1; - return wrapper_result; -} -layout(location = 0) out vec4 out_var_SV_TARGET_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - out_var_SV_TARGET_1 = outputs.out_var_SV_TARGET_1; + main_out inner_result = tint_symbol(); + out_var_SV_TARGET_1_1 = inner_result.out_var_SV_TARGET_1; + return; } - diff --git a/test/expressions/literals/intmin.wgsl.expected.glsl b/test/expressions/literals/intmin.wgsl.expected.glsl index 89d8f8f17f..b7eb43ada5 100644 --- a/test/expressions/literals/intmin.wgsl.expected.glsl +++ b/test/expressions/literals/intmin.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int add_int_min_explicit() { int a = -2147483648; int b = (a + 1); diff --git a/test/expressions/literals/nan.spvasm.expected.glsl b/test/expressions/literals/nan.spvasm.expected.glsl index 96d9709771..c78cc6f8c8 100644 --- a/test/expressions/literals/nan.spvasm.expected.glsl +++ b/test/expressions/literals/nan.spvasm.expected.glsl @@ -1,6 +1,7 @@ #version 310 es precision mediump float; +layout(location = 0) out vec4 out_var_SV_TARGET_1_1; vec4 out_var_SV_TARGET = vec4(0.0f, 0.0f, 0.0f, 0.0f); void main_1() { out_var_SV_TARGET = vec4(uintBitsToFloat(0x7fc00000u), uintBitsToFloat(0x7fc00000u), uintBitsToFloat(0x7fc00000u), uintBitsToFloat(0x7fc00000u)); @@ -11,27 +12,14 @@ struct main_out { vec4 out_var_SV_TARGET_1; }; -struct tint_symbol_1 { - vec4 out_var_SV_TARGET_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(out_var_SV_TARGET); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(out_var_SV_TARGET); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.out_var_SV_TARGET_1 = inner_result.out_var_SV_TARGET_1; - return wrapper_result; -} -layout(location = 0) out vec4 out_var_SV_TARGET_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - out_var_SV_TARGET_1 = outputs.out_var_SV_TARGET_1; + main_out inner_result = tint_symbol(); + out_var_SV_TARGET_1_1 = inner_result.out_var_SV_TARGET_1; + return; } - diff --git a/test/expressions/splat/call/bool.wgsl.expected.glsl b/test/expressions/splat/call/bool.wgsl.expected.glsl index 02056af6e1..16633feb15 100644 --- a/test/expressions/splat/call/bool.wgsl.expected.glsl +++ b/test/expressions/splat/call/bool.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - bool get_bool() { return true; } diff --git a/test/expressions/splat/call/f32.wgsl.expected.glsl b/test/expressions/splat/call/f32.wgsl.expected.glsl index 3bd3b4d420..dc1186cee6 100644 --- a/test/expressions/splat/call/f32.wgsl.expected.glsl +++ b/test/expressions/splat/call/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - float get_f32() { return 1.0f; } diff --git a/test/expressions/splat/call/i32.wgsl.expected.glsl b/test/expressions/splat/call/i32.wgsl.expected.glsl index 03c2a0c06c..02f78de764 100644 --- a/test/expressions/splat/call/i32.wgsl.expected.glsl +++ b/test/expressions/splat/call/i32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int get_i32() { return 1; } diff --git a/test/expressions/splat/call/u32.wgsl.expected.glsl b/test/expressions/splat/call/u32.wgsl.expected.glsl index 62f5fe2a94..90eda55644 100644 --- a/test/expressions/splat/call/u32.wgsl.expected.glsl +++ b/test/expressions/splat/call/u32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - uint get_u32() { return 1u; } diff --git a/test/expressions/splat/expression/bool.wgsl.expected.glsl b/test/expressions/splat/expression/bool.wgsl.expected.glsl index d9c81de1a1..ca80c8a3ad 100644 --- a/test/expressions/splat/expression/bool.wgsl.expected.glsl +++ b/test/expressions/splat/expression/bool.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { bool tint_tmp = true; if (!tint_tmp) { diff --git a/test/expressions/splat/expression/f32.wgsl.expected.glsl b/test/expressions/splat/expression/f32.wgsl.expected.glsl index 3facaa348c..d2bb8bcf9b 100644 --- a/test/expressions/splat/expression/f32.wgsl.expected.glsl +++ b/test/expressions/splat/expression/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { vec2 v2 = vec2((1.0f + 2.0f)); vec3 v3 = vec3((1.0f + 2.0f)); diff --git a/test/expressions/splat/expression/i32.wgsl.expected.glsl b/test/expressions/splat/expression/i32.wgsl.expected.glsl index cf07c63aac..82a2959310 100644 --- a/test/expressions/splat/expression/i32.wgsl.expected.glsl +++ b/test/expressions/splat/expression/i32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { ivec2 v2 = ivec2((1 + 2)); ivec3 v3 = ivec3((1 + 2)); diff --git a/test/expressions/splat/expression/u32.wgsl.expected.glsl b/test/expressions/splat/expression/u32.wgsl.expected.glsl index 2b80e5f1b3..8e0524465a 100644 --- a/test/expressions/splat/expression/u32.wgsl.expected.glsl +++ b/test/expressions/splat/expression/u32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { uvec2 v2 = uvec2((1u + 2u)); uvec3 v3 = uvec3((1u + 2u)); diff --git a/test/expressions/splat/immediate/bool.wgsl.expected.glsl b/test/expressions/splat/immediate/bool.wgsl.expected.glsl index fb64865db8..0ec75bc305 100644 --- a/test/expressions/splat/immediate/bool.wgsl.expected.glsl +++ b/test/expressions/splat/immediate/bool.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { bvec2 v2 = bvec2(true); bvec3 v3 = bvec3(true); diff --git a/test/expressions/splat/immediate/f32.wgsl.expected.glsl b/test/expressions/splat/immediate/f32.wgsl.expected.glsl index e5bd309c79..701284525f 100644 --- a/test/expressions/splat/immediate/f32.wgsl.expected.glsl +++ b/test/expressions/splat/immediate/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { vec2 v2 = vec2(1.0f); vec3 v3 = vec3(1.0f); diff --git a/test/expressions/splat/immediate/i32.wgsl.expected.glsl b/test/expressions/splat/immediate/i32.wgsl.expected.glsl index a693e22999..2e4a6a573f 100644 --- a/test/expressions/splat/immediate/i32.wgsl.expected.glsl +++ b/test/expressions/splat/immediate/i32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { ivec2 v2 = ivec2(1); ivec3 v3 = ivec3(1); diff --git a/test/expressions/splat/immediate/u32.wgsl.expected.glsl b/test/expressions/splat/immediate/u32.wgsl.expected.glsl index b0a88ab14e..3c529d10d1 100644 --- a/test/expressions/splat/immediate/u32.wgsl.expected.glsl +++ b/test/expressions/splat/immediate/u32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { uvec2 v2 = uvec2(1u); uvec3 v3 = uvec3(1u); diff --git a/test/expressions/splat/var/bool.wgsl.expected.glsl b/test/expressions/splat/var/bool.wgsl.expected.glsl index e0488a10aa..924011bdc7 100644 --- a/test/expressions/splat/var/bool.wgsl.expected.glsl +++ b/test/expressions/splat/var/bool.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { bool tint_tmp = true; if (!tint_tmp) { diff --git a/test/expressions/splat/var/f32.wgsl.expected.glsl b/test/expressions/splat/var/f32.wgsl.expected.glsl index 92b82c88a3..40b8340ffd 100644 --- a/test/expressions/splat/var/f32.wgsl.expected.glsl +++ b/test/expressions/splat/var/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { float v = (1.0f + 2.0f); vec2 v2 = vec2(v); diff --git a/test/expressions/splat/var/i32.wgsl.expected.glsl b/test/expressions/splat/var/i32.wgsl.expected.glsl index e55c53bec8..faa54097eb 100644 --- a/test/expressions/splat/var/i32.wgsl.expected.glsl +++ b/test/expressions/splat/var/i32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { int v = (1 + 2); ivec2 v2 = ivec2(v); diff --git a/test/expressions/splat/var/u32.wgsl.expected.glsl b/test/expressions/splat/var/u32.wgsl.expected.glsl index 5b0bdfd89f..3d0927b8db 100644 --- a/test/expressions/splat/var/u32.wgsl.expected.glsl +++ b/test/expressions/splat/var/u32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { uint v = (1u + 2u); uvec2 v2 = uvec2(v); diff --git a/test/expressions/splat/with_swizzle/f32.wgsl.expected.glsl b/test/expressions/splat/with_swizzle/f32.wgsl.expected.glsl index 6bfa65d0b5..db23e588e2 100644 --- a/test/expressions/splat/with_swizzle/f32.wgsl.expected.glsl +++ b/test/expressions/splat/with_swizzle/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { float a = vec2(1.0f).y; float b = vec3(1.0f).z; diff --git a/test/expressions/swizzle/read/packed_vec3/f32.wgsl.expected.glsl b/test/expressions/swizzle/read/packed_vec3/f32.wgsl.expected.glsl index 7d88333c43..eb59c12c63 100644 --- a/test/expressions/swizzle/read/packed_vec3/f32.wgsl.expected.glsl +++ b/test/expressions/swizzle/read/packed_vec3/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { vec3 v; }; diff --git a/test/expressions/swizzle/read/packed_vec3/i32.wgsl.expected.glsl b/test/expressions/swizzle/read/packed_vec3/i32.wgsl.expected.glsl index 2f1d6f3811..8454ca3ec4 100644 --- a/test/expressions/swizzle/read/packed_vec3/i32.wgsl.expected.glsl +++ b/test/expressions/swizzle/read/packed_vec3/i32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { ivec3 v; }; diff --git a/test/expressions/swizzle/read/packed_vec3/u32.wgsl.expected.glsl b/test/expressions/swizzle/read/packed_vec3/u32.wgsl.expected.glsl index b26c59b24d..ce95fc9b38 100644 --- a/test/expressions/swizzle/read/packed_vec3/u32.wgsl.expected.glsl +++ b/test/expressions/swizzle/read/packed_vec3/u32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { uvec3 v; }; diff --git a/test/expressions/swizzle/read/vec3/f32.wgsl.expected.glsl b/test/expressions/swizzle/read/vec3/f32.wgsl.expected.glsl index b4a830772c..5f295d0023 100644 --- a/test/expressions/swizzle/read/vec3/f32.wgsl.expected.glsl +++ b/test/expressions/swizzle/read/vec3/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { vec3 v; }; diff --git a/test/expressions/swizzle/read/vec3/i32.wgsl.expected.glsl b/test/expressions/swizzle/read/vec3/i32.wgsl.expected.glsl index 94182557e0..9f30906188 100644 --- a/test/expressions/swizzle/read/vec3/i32.wgsl.expected.glsl +++ b/test/expressions/swizzle/read/vec3/i32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { ivec3 v; }; diff --git a/test/expressions/swizzle/read/vec3/u32.wgsl.expected.glsl b/test/expressions/swizzle/read/vec3/u32.wgsl.expected.glsl index 6b8eddc82f..fa3357dc6b 100644 --- a/test/expressions/swizzle/read/vec3/u32.wgsl.expected.glsl +++ b/test/expressions/swizzle/read/vec3/u32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { uvec3 v; }; diff --git a/test/expressions/swizzle/write/packed_vec3/f32.wgsl.expected.glsl b/test/expressions/swizzle/write/packed_vec3/f32.wgsl.expected.glsl index 4aa813a935..b04cc88a20 100644 --- a/test/expressions/swizzle/write/packed_vec3/f32.wgsl.expected.glsl +++ b/test/expressions/swizzle/write/packed_vec3/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { vec3 v; }; diff --git a/test/expressions/swizzle/write/packed_vec3/i32.wgsl.expected.glsl b/test/expressions/swizzle/write/packed_vec3/i32.wgsl.expected.glsl index 8eafeb8637..b50dd2e3e0 100644 --- a/test/expressions/swizzle/write/packed_vec3/i32.wgsl.expected.glsl +++ b/test/expressions/swizzle/write/packed_vec3/i32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { ivec3 v; }; diff --git a/test/expressions/swizzle/write/packed_vec3/u32.wgsl.expected.glsl b/test/expressions/swizzle/write/packed_vec3/u32.wgsl.expected.glsl index 741633cb31..6a8666cbc1 100644 --- a/test/expressions/swizzle/write/packed_vec3/u32.wgsl.expected.glsl +++ b/test/expressions/swizzle/write/packed_vec3/u32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { uvec3 v; }; diff --git a/test/expressions/swizzle/write/vec3/f32.wgsl.expected.glsl b/test/expressions/swizzle/write/vec3/f32.wgsl.expected.glsl index cee44acff1..e8e796e274 100644 --- a/test/expressions/swizzle/write/vec3/f32.wgsl.expected.glsl +++ b/test/expressions/swizzle/write/vec3/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { vec3 v; }; diff --git a/test/expressions/swizzle/write/vec3/i32.wgsl.expected.glsl b/test/expressions/swizzle/write/vec3/i32.wgsl.expected.glsl index 112ae4158c..3e37362db7 100644 --- a/test/expressions/swizzle/write/vec3/i32.wgsl.expected.glsl +++ b/test/expressions/swizzle/write/vec3/i32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { ivec3 v; }; diff --git a/test/expressions/swizzle/write/vec3/u32.wgsl.expected.glsl b/test/expressions/swizzle/write/vec3/u32.wgsl.expected.glsl index 436eff0e5c..577feebe85 100644 --- a/test/expressions/swizzle/write/vec3/u32.wgsl.expected.glsl +++ b/test/expressions/swizzle/write/vec3/u32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { uvec3 v; }; diff --git a/test/expressions/type_ctor/mat2x2/explicit/scalars/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat2x2/explicit/scalars/f32.wgsl.expected.glsl index f2b52ac540..92979b1da0 100644 --- a/test/expressions/type_ctor/mat2x2/explicit/scalars/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat2x2/explicit/scalars/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat2 m = mat2(0.0f, 1.0f, 2.0f, 3.0f); diff --git a/test/expressions/type_ctor/mat2x2/explicit/vectors/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat2x2/explicit/vectors/f32.wgsl.expected.glsl index 06c93e9af5..515cbea21f 100644 --- a/test/expressions/type_ctor/mat2x2/explicit/vectors/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat2x2/explicit/vectors/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f)); diff --git a/test/expressions/type_ctor/mat2x2/inferred/scalars/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat2x2/inferred/scalars/f32.wgsl.expected.glsl index f2b52ac540..92979b1da0 100644 --- a/test/expressions/type_ctor/mat2x2/inferred/scalars/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat2x2/inferred/scalars/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat2 m = mat2(0.0f, 1.0f, 2.0f, 3.0f); diff --git a/test/expressions/type_ctor/mat2x2/inferred/vectors/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat2x2/inferred/vectors/f32.wgsl.expected.glsl index 06c93e9af5..515cbea21f 100644 --- a/test/expressions/type_ctor/mat2x2/inferred/vectors/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat2x2/inferred/vectors/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat2 m = mat2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f)); diff --git a/test/expressions/type_ctor/mat2x3/explicit/scalars/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat2x3/explicit/scalars/f32.wgsl.expected.glsl index 04b32b61a1..86412dbc43 100644 --- a/test/expressions/type_ctor/mat2x3/explicit/scalars/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat2x3/explicit/scalars/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat2x3 m = mat2x3(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f); diff --git a/test/expressions/type_ctor/mat2x3/explicit/vectors/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat2x3/explicit/vectors/f32.wgsl.expected.glsl index c78cd8d3b2..13f37ecb5e 100644 --- a/test/expressions/type_ctor/mat2x3/explicit/vectors/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat2x3/explicit/vectors/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f)); diff --git a/test/expressions/type_ctor/mat2x3/inferred/scalars/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat2x3/inferred/scalars/f32.wgsl.expected.glsl index 04b32b61a1..86412dbc43 100644 --- a/test/expressions/type_ctor/mat2x3/inferred/scalars/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat2x3/inferred/scalars/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat2x3 m = mat2x3(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f); diff --git a/test/expressions/type_ctor/mat2x3/inferred/vectors/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat2x3/inferred/vectors/f32.wgsl.expected.glsl index c78cd8d3b2..13f37ecb5e 100644 --- a/test/expressions/type_ctor/mat2x3/inferred/vectors/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat2x3/inferred/vectors/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat2x3 m = mat2x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f)); diff --git a/test/expressions/type_ctor/mat2x4/explicit/scalars/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat2x4/explicit/scalars/f32.wgsl.expected.glsl index 122dc445ff..35bc633b5d 100644 --- a/test/expressions/type_ctor/mat2x4/explicit/scalars/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat2x4/explicit/scalars/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat2x4 m = mat2x4(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f); diff --git a/test/expressions/type_ctor/mat2x4/explicit/vectors/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat2x4/explicit/vectors/f32.wgsl.expected.glsl index 801356aa97..34fe0f3234 100644 --- a/test/expressions/type_ctor/mat2x4/explicit/vectors/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat2x4/explicit/vectors/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat2x4 m = mat2x4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f)); diff --git a/test/expressions/type_ctor/mat2x4/inferred/scalars/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat2x4/inferred/scalars/f32.wgsl.expected.glsl index 122dc445ff..35bc633b5d 100644 --- a/test/expressions/type_ctor/mat2x4/inferred/scalars/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat2x4/inferred/scalars/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat2x4 m = mat2x4(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f); diff --git a/test/expressions/type_ctor/mat2x4/inferred/vectors/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat2x4/inferred/vectors/f32.wgsl.expected.glsl index 801356aa97..34fe0f3234 100644 --- a/test/expressions/type_ctor/mat2x4/inferred/vectors/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat2x4/inferred/vectors/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat2x4 m = mat2x4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f)); diff --git a/test/expressions/type_ctor/mat3x2/explicit/scalars/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat3x2/explicit/scalars/f32.wgsl.expected.glsl index 55235ae0fe..6f17570f26 100644 --- a/test/expressions/type_ctor/mat3x2/explicit/scalars/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat3x2/explicit/scalars/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat3x2 m = mat3x2(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f); diff --git a/test/expressions/type_ctor/mat3x2/explicit/vectors/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat3x2/explicit/vectors/f32.wgsl.expected.glsl index 6bedaa5eea..ddeadd0203 100644 --- a/test/expressions/type_ctor/mat3x2/explicit/vectors/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat3x2/explicit/vectors/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat3x2 m = mat3x2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f), vec2(4.0f, 5.0f)); diff --git a/test/expressions/type_ctor/mat3x2/inferred/scalars/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat3x2/inferred/scalars/f32.wgsl.expected.glsl index 55235ae0fe..6f17570f26 100644 --- a/test/expressions/type_ctor/mat3x2/inferred/scalars/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat3x2/inferred/scalars/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat3x2 m = mat3x2(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f); diff --git a/test/expressions/type_ctor/mat3x2/inferred/vectors/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat3x2/inferred/vectors/f32.wgsl.expected.glsl index 6bedaa5eea..ddeadd0203 100644 --- a/test/expressions/type_ctor/mat3x2/inferred/vectors/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat3x2/inferred/vectors/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat3x2 m = mat3x2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f), vec2(4.0f, 5.0f)); diff --git a/test/expressions/type_ctor/mat3x3/explicit/scalars/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat3x3/explicit/scalars/f32.wgsl.expected.glsl index a71208184e..a0f6c5cebe 100644 --- a/test/expressions/type_ctor/mat3x3/explicit/scalars/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat3x3/explicit/scalars/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat3 m = mat3(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f); diff --git a/test/expressions/type_ctor/mat3x3/explicit/vectors/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat3x3/explicit/vectors/f32.wgsl.expected.glsl index cbf652b660..a1ad3fcae4 100644 --- a/test/expressions/type_ctor/mat3x3/explicit/vectors/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat3x3/explicit/vectors/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat3 m = mat3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f), vec3(6.0f, 7.0f, 8.0f)); diff --git a/test/expressions/type_ctor/mat3x3/inferred/scalars/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat3x3/inferred/scalars/f32.wgsl.expected.glsl index a71208184e..a0f6c5cebe 100644 --- a/test/expressions/type_ctor/mat3x3/inferred/scalars/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat3x3/inferred/scalars/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat3 m = mat3(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f); diff --git a/test/expressions/type_ctor/mat3x3/inferred/vectors/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat3x3/inferred/vectors/f32.wgsl.expected.glsl index cbf652b660..a1ad3fcae4 100644 --- a/test/expressions/type_ctor/mat3x3/inferred/vectors/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat3x3/inferred/vectors/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat3 m = mat3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f), vec3(6.0f, 7.0f, 8.0f)); diff --git a/test/expressions/type_ctor/mat3x4/explicit/scalars/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat3x4/explicit/scalars/f32.wgsl.expected.glsl index 7cb85e1cb3..6fde07865f 100644 --- a/test/expressions/type_ctor/mat3x4/explicit/scalars/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat3x4/explicit/scalars/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat3x4 m = mat3x4(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f); diff --git a/test/expressions/type_ctor/mat3x4/explicit/vectors/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat3x4/explicit/vectors/f32.wgsl.expected.glsl index 84ba7f120a..9643577af2 100644 --- a/test/expressions/type_ctor/mat3x4/explicit/vectors/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat3x4/explicit/vectors/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat3x4 m = mat3x4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f), vec4(8.0f, 9.0f, 10.0f, 11.0f)); diff --git a/test/expressions/type_ctor/mat3x4/inferred/scalars/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat3x4/inferred/scalars/f32.wgsl.expected.glsl index 7cb85e1cb3..6fde07865f 100644 --- a/test/expressions/type_ctor/mat3x4/inferred/scalars/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat3x4/inferred/scalars/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat3x4 m = mat3x4(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f); diff --git a/test/expressions/type_ctor/mat3x4/inferred/vectors/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat3x4/inferred/vectors/f32.wgsl.expected.glsl index 84ba7f120a..9643577af2 100644 --- a/test/expressions/type_ctor/mat3x4/inferred/vectors/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat3x4/inferred/vectors/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat3x4 m = mat3x4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f), vec4(8.0f, 9.0f, 10.0f, 11.0f)); diff --git a/test/expressions/type_ctor/mat4x2/explicit/scalars/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat4x2/explicit/scalars/f32.wgsl.expected.glsl index 402014f33f..78e98c01a5 100644 --- a/test/expressions/type_ctor/mat4x2/explicit/scalars/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat4x2/explicit/scalars/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat4x2 m = mat4x2(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f); diff --git a/test/expressions/type_ctor/mat4x2/explicit/vectors/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat4x2/explicit/vectors/f32.wgsl.expected.glsl index bae5a652e2..ddec8a9c4e 100644 --- a/test/expressions/type_ctor/mat4x2/explicit/vectors/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat4x2/explicit/vectors/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat4x2 m = mat4x2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f), vec2(4.0f, 5.0f), vec2(6.0f, 7.0f)); diff --git a/test/expressions/type_ctor/mat4x2/inferred/scalars/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat4x2/inferred/scalars/f32.wgsl.expected.glsl index 402014f33f..78e98c01a5 100644 --- a/test/expressions/type_ctor/mat4x2/inferred/scalars/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat4x2/inferred/scalars/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat4x2 m = mat4x2(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f); diff --git a/test/expressions/type_ctor/mat4x2/inferred/vectors/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat4x2/inferred/vectors/f32.wgsl.expected.glsl index bae5a652e2..ddec8a9c4e 100644 --- a/test/expressions/type_ctor/mat4x2/inferred/vectors/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat4x2/inferred/vectors/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat4x2 m = mat4x2(vec2(0.0f, 1.0f), vec2(2.0f, 3.0f), vec2(4.0f, 5.0f), vec2(6.0f, 7.0f)); diff --git a/test/expressions/type_ctor/mat4x3/explicit/scalars/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat4x3/explicit/scalars/f32.wgsl.expected.glsl index 115a5727e7..f4bcaf0503 100644 --- a/test/expressions/type_ctor/mat4x3/explicit/scalars/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat4x3/explicit/scalars/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat4x3 m = mat4x3(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f); diff --git a/test/expressions/type_ctor/mat4x3/explicit/vectors/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat4x3/explicit/vectors/f32.wgsl.expected.glsl index f5559a8a9e..4771ae35e7 100644 --- a/test/expressions/type_ctor/mat4x3/explicit/vectors/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat4x3/explicit/vectors/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat4x3 m = mat4x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f), vec3(6.0f, 7.0f, 8.0f), vec3(9.0f, 10.0f, 11.0f)); diff --git a/test/expressions/type_ctor/mat4x3/inferred/scalars/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat4x3/inferred/scalars/f32.wgsl.expected.glsl index 115a5727e7..f4bcaf0503 100644 --- a/test/expressions/type_ctor/mat4x3/inferred/scalars/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat4x3/inferred/scalars/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat4x3 m = mat4x3(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f); diff --git a/test/expressions/type_ctor/mat4x3/inferred/vectors/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat4x3/inferred/vectors/f32.wgsl.expected.glsl index f5559a8a9e..4771ae35e7 100644 --- a/test/expressions/type_ctor/mat4x3/inferred/vectors/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat4x3/inferred/vectors/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat4x3 m = mat4x3(vec3(0.0f, 1.0f, 2.0f), vec3(3.0f, 4.0f, 5.0f), vec3(6.0f, 7.0f, 8.0f), vec3(9.0f, 10.0f, 11.0f)); diff --git a/test/expressions/type_ctor/mat4x4/explicit/scalars/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat4x4/explicit/scalars/f32.wgsl.expected.glsl index 5a35fcee15..c6993a3f13 100644 --- a/test/expressions/type_ctor/mat4x4/explicit/scalars/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat4x4/explicit/scalars/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat4 m = mat4(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f); diff --git a/test/expressions/type_ctor/mat4x4/explicit/vectors/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat4x4/explicit/vectors/f32.wgsl.expected.glsl index 155df1e119..77abecf4db 100644 --- a/test/expressions/type_ctor/mat4x4/explicit/vectors/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat4x4/explicit/vectors/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat4 m = mat4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f), vec4(8.0f, 9.0f, 10.0f, 11.0f), vec4(12.0f, 13.0f, 14.0f, 15.0f)); diff --git a/test/expressions/type_ctor/mat4x4/inferred/scalars/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat4x4/inferred/scalars/f32.wgsl.expected.glsl index 5a35fcee15..c6993a3f13 100644 --- a/test/expressions/type_ctor/mat4x4/inferred/scalars/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat4x4/inferred/scalars/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat4 m = mat4(0.0f, 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f, 9.0f, 10.0f, 11.0f, 12.0f, 13.0f, 14.0f, 15.0f); diff --git a/test/expressions/type_ctor/mat4x4/inferred/vectors/f32.wgsl.expected.glsl b/test/expressions/type_ctor/mat4x4/inferred/vectors/f32.wgsl.expected.glsl index 155df1e119..77abecf4db 100644 --- a/test/expressions/type_ctor/mat4x4/inferred/vectors/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/mat4x4/inferred/vectors/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const mat4 m = mat4(vec4(0.0f, 1.0f, 2.0f, 3.0f), vec4(4.0f, 5.0f, 6.0f, 7.0f), vec4(8.0f, 9.0f, 10.0f, 11.0f), vec4(12.0f, 13.0f, 14.0f, 15.0f)); diff --git a/test/expressions/type_ctor/vec2/explicit/bool.wgsl.expected.glsl b/test/expressions/type_ctor/vec2/explicit/bool.wgsl.expected.glsl index 5f0a93c429..53db389eb7 100644 --- a/test/expressions/type_ctor/vec2/explicit/bool.wgsl.expected.glsl +++ b/test/expressions/type_ctor/vec2/explicit/bool.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const bvec2 v = bvec2(false, true); diff --git a/test/expressions/type_ctor/vec2/explicit/f32.wgsl.expected.glsl b/test/expressions/type_ctor/vec2/explicit/f32.wgsl.expected.glsl index 82f16fa511..c340fede69 100644 --- a/test/expressions/type_ctor/vec2/explicit/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/vec2/explicit/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const vec2 v = vec2(0.0f, 1.0f); diff --git a/test/expressions/type_ctor/vec2/explicit/i32.wgsl.expected.glsl b/test/expressions/type_ctor/vec2/explicit/i32.wgsl.expected.glsl index b96b5c7f13..2d59050c98 100644 --- a/test/expressions/type_ctor/vec2/explicit/i32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/vec2/explicit/i32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const ivec2 v = ivec2(0, 1); diff --git a/test/expressions/type_ctor/vec2/explicit/u32.wgsl.expected.glsl b/test/expressions/type_ctor/vec2/explicit/u32.wgsl.expected.glsl index 682a6c044d..743b58033b 100644 --- a/test/expressions/type_ctor/vec2/explicit/u32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/vec2/explicit/u32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const uvec2 v = uvec2(0u, 1u); diff --git a/test/expressions/type_ctor/vec2/inferred/bool.wgsl.expected.glsl b/test/expressions/type_ctor/vec2/inferred/bool.wgsl.expected.glsl index 5f0a93c429..53db389eb7 100644 --- a/test/expressions/type_ctor/vec2/inferred/bool.wgsl.expected.glsl +++ b/test/expressions/type_ctor/vec2/inferred/bool.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const bvec2 v = bvec2(false, true); diff --git a/test/expressions/type_ctor/vec2/inferred/f32.wgsl.expected.glsl b/test/expressions/type_ctor/vec2/inferred/f32.wgsl.expected.glsl index 82f16fa511..c340fede69 100644 --- a/test/expressions/type_ctor/vec2/inferred/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/vec2/inferred/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const vec2 v = vec2(0.0f, 1.0f); diff --git a/test/expressions/type_ctor/vec2/inferred/i32.wgsl.expected.glsl b/test/expressions/type_ctor/vec2/inferred/i32.wgsl.expected.glsl index b96b5c7f13..2d59050c98 100644 --- a/test/expressions/type_ctor/vec2/inferred/i32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/vec2/inferred/i32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const ivec2 v = ivec2(0, 1); diff --git a/test/expressions/type_ctor/vec2/inferred/u32.wgsl.expected.glsl b/test/expressions/type_ctor/vec2/inferred/u32.wgsl.expected.glsl index 682a6c044d..743b58033b 100644 --- a/test/expressions/type_ctor/vec2/inferred/u32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/vec2/inferred/u32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const uvec2 v = uvec2(0u, 1u); diff --git a/test/expressions/type_ctor/vec3/explicit/bool.wgsl.expected.glsl b/test/expressions/type_ctor/vec3/explicit/bool.wgsl.expected.glsl index 148321aa2b..f8392fa439 100644 --- a/test/expressions/type_ctor/vec3/explicit/bool.wgsl.expected.glsl +++ b/test/expressions/type_ctor/vec3/explicit/bool.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const bvec3 v = bvec3(false, true, false); diff --git a/test/expressions/type_ctor/vec3/explicit/f32.wgsl.expected.glsl b/test/expressions/type_ctor/vec3/explicit/f32.wgsl.expected.glsl index 4918115298..78cfca3c77 100644 --- a/test/expressions/type_ctor/vec3/explicit/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/vec3/explicit/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const vec3 v = vec3(0.0f, 1.0f, 2.0f); diff --git a/test/expressions/type_ctor/vec3/explicit/i32.wgsl.expected.glsl b/test/expressions/type_ctor/vec3/explicit/i32.wgsl.expected.glsl index 7958518998..3b8d407042 100644 --- a/test/expressions/type_ctor/vec3/explicit/i32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/vec3/explicit/i32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const ivec3 v = ivec3(0, 1, 2); diff --git a/test/expressions/type_ctor/vec3/explicit/u32.wgsl.expected.glsl b/test/expressions/type_ctor/vec3/explicit/u32.wgsl.expected.glsl index aa7de930f9..3f48c28ba0 100644 --- a/test/expressions/type_ctor/vec3/explicit/u32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/vec3/explicit/u32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const uvec3 v = uvec3(0u, 1u, 2u); diff --git a/test/expressions/type_ctor/vec4/explicit/bool.wgsl.expected.glsl b/test/expressions/type_ctor/vec4/explicit/bool.wgsl.expected.glsl index a93f549176..8ff5927ef9 100644 --- a/test/expressions/type_ctor/vec4/explicit/bool.wgsl.expected.glsl +++ b/test/expressions/type_ctor/vec4/explicit/bool.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const bvec4 v = bvec4(false, true, false, true); diff --git a/test/expressions/type_ctor/vec4/explicit/f32.wgsl.expected.glsl b/test/expressions/type_ctor/vec4/explicit/f32.wgsl.expected.glsl index 35b45c10e0..7833b9ef4b 100644 --- a/test/expressions/type_ctor/vec4/explicit/f32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/vec4/explicit/f32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const vec4 v = vec4(0.0f, 1.0f, 2.0f, 3.0f); diff --git a/test/expressions/type_ctor/vec4/explicit/i32.wgsl.expected.glsl b/test/expressions/type_ctor/vec4/explicit/i32.wgsl.expected.glsl index a57259445e..8f18e6fd61 100644 --- a/test/expressions/type_ctor/vec4/explicit/i32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/vec4/explicit/i32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const ivec4 v = ivec4(0, 1, 2, 3); diff --git a/test/expressions/type_ctor/vec4/explicit/u32.wgsl.expected.glsl b/test/expressions/type_ctor/vec4/explicit/u32.wgsl.expected.glsl index aa3aca876f..6f3e96a8d8 100644 --- a/test/expressions/type_ctor/vec4/explicit/u32.wgsl.expected.glsl +++ b/test/expressions/type_ctor/vec4/explicit/u32.wgsl.expected.glsl @@ -5,9 +5,4 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const uvec4 v = uvec4(0u, 1u, 2u, 3u); diff --git a/test/expressions/unary/complement/complement.wgsl.expected.glsl b/test/expressions/unary/complement/complement.wgsl.expected.glsl index 5bec84b383..e32ab124b4 100644 --- a/test/expressions/unary/complement/complement.wgsl.expected.glsl +++ b/test/expressions/unary/complement/complement.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int i(int x) { return ~(x); } diff --git a/test/expressions/unary/negate/negate.wgsl.expected.glsl b/test/expressions/unary/negate/negate.wgsl.expected.glsl index d964058cb0..f1ffb81217 100644 --- a/test/expressions/unary/negate/negate.wgsl.expected.glsl +++ b/test/expressions/unary/negate/negate.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int i(int x) { return -(x); } diff --git a/test/expressions/zero_init/array/bool.wgsl.expected.glsl b/test/expressions/zero_init/array/bool.wgsl.expected.glsl index 2d7cab4f7f..8463695314 100644 --- a/test/expressions/zero_init/array/bool.wgsl.expected.glsl +++ b/test/expressions/zero_init/array/bool.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { bool v[4] = bool[4](false, false, false, false); } diff --git a/test/expressions/zero_init/array/f32.wgsl.expected.glsl b/test/expressions/zero_init/array/f32.wgsl.expected.glsl index 7022024f21..fb9331f22c 100644 --- a/test/expressions/zero_init/array/f32.wgsl.expected.glsl +++ b/test/expressions/zero_init/array/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { float v[4] = float[4](0.0f, 0.0f, 0.0f, 0.0f); } diff --git a/test/expressions/zero_init/array/i32.wgsl.expected.glsl b/test/expressions/zero_init/array/i32.wgsl.expected.glsl index 41cfbb6f54..50e3677e06 100644 --- a/test/expressions/zero_init/array/i32.wgsl.expected.glsl +++ b/test/expressions/zero_init/array/i32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { int v[4] = int[4](0, 0, 0, 0); } diff --git a/test/expressions/zero_init/array/struct.wgsl.expected.glsl b/test/expressions/zero_init/array/struct.wgsl.expected.glsl index 89eed928c3..778e1aeb16 100644 --- a/test/expressions/zero_init/array/struct.wgsl.expected.glsl +++ b/test/expressions/zero_init/array/struct.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { int i; uint u; diff --git a/test/expressions/zero_init/array/u32.wgsl.expected.glsl b/test/expressions/zero_init/array/u32.wgsl.expected.glsl index f78daa68b0..98e243ca44 100644 --- a/test/expressions/zero_init/array/u32.wgsl.expected.glsl +++ b/test/expressions/zero_init/array/u32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { uint v[4] = uint[4](0u, 0u, 0u, 0u); } diff --git a/test/expressions/zero_init/mat2x2/f32.wgsl.expected.glsl b/test/expressions/zero_init/mat2x2/f32.wgsl.expected.glsl index 517a2a791f..9f518ca234 100644 --- a/test/expressions/zero_init/mat2x2/f32.wgsl.expected.glsl +++ b/test/expressions/zero_init/mat2x2/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { mat2 v = mat2(0.0f, 0.0f, 0.0f, 0.0f); } diff --git a/test/expressions/zero_init/mat2x3/f32.wgsl.expected.glsl b/test/expressions/zero_init/mat2x3/f32.wgsl.expected.glsl index 7fa2090513..0165c1ff6d 100644 --- a/test/expressions/zero_init/mat2x3/f32.wgsl.expected.glsl +++ b/test/expressions/zero_init/mat2x3/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { mat2x3 v = mat2x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); } diff --git a/test/expressions/zero_init/mat2x4/f32.wgsl.expected.glsl b/test/expressions/zero_init/mat2x4/f32.wgsl.expected.glsl index 1abeed6b16..ce479c3ea5 100644 --- a/test/expressions/zero_init/mat2x4/f32.wgsl.expected.glsl +++ b/test/expressions/zero_init/mat2x4/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { mat2x4 v = mat2x4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); } diff --git a/test/expressions/zero_init/mat3x2/f32.wgsl.expected.glsl b/test/expressions/zero_init/mat3x2/f32.wgsl.expected.glsl index 40e1a7f28a..fb67a2d9ac 100644 --- a/test/expressions/zero_init/mat3x2/f32.wgsl.expected.glsl +++ b/test/expressions/zero_init/mat3x2/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { mat3x2 v = mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); } diff --git a/test/expressions/zero_init/mat3x3/f32.wgsl.expected.glsl b/test/expressions/zero_init/mat3x3/f32.wgsl.expected.glsl index cfd03bb284..5310b754e6 100644 --- a/test/expressions/zero_init/mat3x3/f32.wgsl.expected.glsl +++ b/test/expressions/zero_init/mat3x3/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { mat3 v = mat3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); } diff --git a/test/expressions/zero_init/mat3x4/f32.wgsl.expected.glsl b/test/expressions/zero_init/mat3x4/f32.wgsl.expected.glsl index 979ea88188..dd175f9bf8 100644 --- a/test/expressions/zero_init/mat3x4/f32.wgsl.expected.glsl +++ b/test/expressions/zero_init/mat3x4/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { mat3x4 v = mat3x4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); } diff --git a/test/expressions/zero_init/mat4x2/f32.wgsl.expected.glsl b/test/expressions/zero_init/mat4x2/f32.wgsl.expected.glsl index 2d5d77a65d..0f2b794148 100644 --- a/test/expressions/zero_init/mat4x2/f32.wgsl.expected.glsl +++ b/test/expressions/zero_init/mat4x2/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { mat4x2 v = mat4x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); } diff --git a/test/expressions/zero_init/mat4x3/f32.wgsl.expected.glsl b/test/expressions/zero_init/mat4x3/f32.wgsl.expected.glsl index 7a71b37a21..28efe1aa4c 100644 --- a/test/expressions/zero_init/mat4x3/f32.wgsl.expected.glsl +++ b/test/expressions/zero_init/mat4x3/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { mat4x3 v = mat4x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); } diff --git a/test/expressions/zero_init/mat4x4/f32.wgsl.expected.glsl b/test/expressions/zero_init/mat4x4/f32.wgsl.expected.glsl index 1f94079dca..c31c7214ca 100644 --- a/test/expressions/zero_init/mat4x4/f32.wgsl.expected.glsl +++ b/test/expressions/zero_init/mat4x4/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { mat4 v = mat4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); } diff --git a/test/expressions/zero_init/scalar/bool.wgsl.expected.glsl b/test/expressions/zero_init/scalar/bool.wgsl.expected.glsl index a7f7c2df40..e8f01b5703 100644 --- a/test/expressions/zero_init/scalar/bool.wgsl.expected.glsl +++ b/test/expressions/zero_init/scalar/bool.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { bool v = false; } diff --git a/test/expressions/zero_init/scalar/f32.wgsl.expected.glsl b/test/expressions/zero_init/scalar/f32.wgsl.expected.glsl index e0fa8afe93..bd43369da2 100644 --- a/test/expressions/zero_init/scalar/f32.wgsl.expected.glsl +++ b/test/expressions/zero_init/scalar/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { float v = 0.0f; } diff --git a/test/expressions/zero_init/scalar/i32.wgsl.expected.glsl b/test/expressions/zero_init/scalar/i32.wgsl.expected.glsl index e2e115e24c..255d2f8544 100644 --- a/test/expressions/zero_init/scalar/i32.wgsl.expected.glsl +++ b/test/expressions/zero_init/scalar/i32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { int v = 0; } diff --git a/test/expressions/zero_init/scalar/u32.wgsl.expected.glsl b/test/expressions/zero_init/scalar/u32.wgsl.expected.glsl index 29a2c66b2e..09d837d089 100644 --- a/test/expressions/zero_init/scalar/u32.wgsl.expected.glsl +++ b/test/expressions/zero_init/scalar/u32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { uint v = 0u; } diff --git a/test/expressions/zero_init/struct/array.wgsl.expected.glsl b/test/expressions/zero_init/struct/array.wgsl.expected.glsl index b51d09b1fd..cce4114bf6 100644 --- a/test/expressions/zero_init/struct/array.wgsl.expected.glsl +++ b/test/expressions/zero_init/struct/array.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { float a[4]; }; diff --git a/test/expressions/zero_init/struct/scalar.wgsl.expected.glsl b/test/expressions/zero_init/struct/scalar.wgsl.expected.glsl index 7c2cf98c48..1b3576baa6 100644 --- a/test/expressions/zero_init/struct/scalar.wgsl.expected.glsl +++ b/test/expressions/zero_init/struct/scalar.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { int i; uint u; diff --git a/test/expressions/zero_init/vec2/bool.wgsl.expected.glsl b/test/expressions/zero_init/vec2/bool.wgsl.expected.glsl index 73bbf51454..35b4dcbeb1 100644 --- a/test/expressions/zero_init/vec2/bool.wgsl.expected.glsl +++ b/test/expressions/zero_init/vec2/bool.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { bvec2 v = bvec2(false, false); } diff --git a/test/expressions/zero_init/vec2/f32.wgsl.expected.glsl b/test/expressions/zero_init/vec2/f32.wgsl.expected.glsl index 7e166622c3..51e9cb8acc 100644 --- a/test/expressions/zero_init/vec2/f32.wgsl.expected.glsl +++ b/test/expressions/zero_init/vec2/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { vec2 v = vec2(0.0f, 0.0f); } diff --git a/test/expressions/zero_init/vec2/i32.wgsl.expected.glsl b/test/expressions/zero_init/vec2/i32.wgsl.expected.glsl index 7d201b3b32..ce483b6a4f 100644 --- a/test/expressions/zero_init/vec2/i32.wgsl.expected.glsl +++ b/test/expressions/zero_init/vec2/i32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { ivec2 v = ivec2(0, 0); } diff --git a/test/expressions/zero_init/vec2/u32.wgsl.expected.glsl b/test/expressions/zero_init/vec2/u32.wgsl.expected.glsl index eb07fe3581..749cdc7b01 100644 --- a/test/expressions/zero_init/vec2/u32.wgsl.expected.glsl +++ b/test/expressions/zero_init/vec2/u32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { uvec2 v = uvec2(0u, 0u); } diff --git a/test/expressions/zero_init/vec3/bool.wgsl.expected.glsl b/test/expressions/zero_init/vec3/bool.wgsl.expected.glsl index fe628456d2..678919bc10 100644 --- a/test/expressions/zero_init/vec3/bool.wgsl.expected.glsl +++ b/test/expressions/zero_init/vec3/bool.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { bvec3 v = bvec3(false, false, false); } diff --git a/test/expressions/zero_init/vec3/f32.wgsl.expected.glsl b/test/expressions/zero_init/vec3/f32.wgsl.expected.glsl index 03af60bc89..5468322cd9 100644 --- a/test/expressions/zero_init/vec3/f32.wgsl.expected.glsl +++ b/test/expressions/zero_init/vec3/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { vec3 v = vec3(0.0f, 0.0f, 0.0f); } diff --git a/test/expressions/zero_init/vec3/i32.wgsl.expected.glsl b/test/expressions/zero_init/vec3/i32.wgsl.expected.glsl index c99c12d905..b489724a1d 100644 --- a/test/expressions/zero_init/vec3/i32.wgsl.expected.glsl +++ b/test/expressions/zero_init/vec3/i32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { ivec3 v = ivec3(0, 0, 0); } diff --git a/test/expressions/zero_init/vec3/u32.wgsl.expected.glsl b/test/expressions/zero_init/vec3/u32.wgsl.expected.glsl index 9ea7708222..dd49140a8d 100644 --- a/test/expressions/zero_init/vec3/u32.wgsl.expected.glsl +++ b/test/expressions/zero_init/vec3/u32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { uvec3 v = uvec3(0u, 0u, 0u); } diff --git a/test/expressions/zero_init/vec4/bool.wgsl.expected.glsl b/test/expressions/zero_init/vec4/bool.wgsl.expected.glsl index 31e837df85..0177ac8c0b 100644 --- a/test/expressions/zero_init/vec4/bool.wgsl.expected.glsl +++ b/test/expressions/zero_init/vec4/bool.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { bvec4 v = bvec4(false, false, false, false); } diff --git a/test/expressions/zero_init/vec4/f32.wgsl.expected.glsl b/test/expressions/zero_init/vec4/f32.wgsl.expected.glsl index 049ff2349d..839fe03be6 100644 --- a/test/expressions/zero_init/vec4/f32.wgsl.expected.glsl +++ b/test/expressions/zero_init/vec4/f32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { vec4 v = vec4(0.0f, 0.0f, 0.0f, 0.0f); } diff --git a/test/expressions/zero_init/vec4/i32.wgsl.expected.glsl b/test/expressions/zero_init/vec4/i32.wgsl.expected.glsl index 354ec54724..8c06b10773 100644 --- a/test/expressions/zero_init/vec4/i32.wgsl.expected.glsl +++ b/test/expressions/zero_init/vec4/i32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { ivec4 v = ivec4(0, 0, 0, 0); } diff --git a/test/expressions/zero_init/vec4/u32.wgsl.expected.glsl b/test/expressions/zero_init/vec4/u32.wgsl.expected.glsl index d2e1db5fab..18cde8f6d9 100644 --- a/test/expressions/zero_init/vec4/u32.wgsl.expected.glsl +++ b/test/expressions/zero_init/vec4/u32.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { uvec4 v = uvec4(0u, 0u, 0u, 0u); } diff --git a/test/identifiers/underscore/double/alias.wgsl.expected.glsl b/test/identifiers/underscore/double/alias.wgsl.expected.glsl index e4a9a6bd0b..302a366b76 100644 --- a/test/identifiers/underscore/double/alias.wgsl.expected.glsl +++ b/test/identifiers/underscore/double/alias.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { int c = 0; int d = 0; diff --git a/test/identifiers/underscore/double/fn.wgsl.expected.glsl b/test/identifiers/underscore/double/fn.wgsl.expected.glsl index 7db0e21139..6ff4ef573e 100644 --- a/test/identifiers/underscore/double/fn.wgsl.expected.glsl +++ b/test/identifiers/underscore/double/fn.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void a() { } diff --git a/test/identifiers/underscore/double/let.wgsl.expected.glsl b/test/identifiers/underscore/double/let.wgsl.expected.glsl index 78fedf755d..0adb0dac47 100644 --- a/test/identifiers/underscore/double/let.wgsl.expected.glsl +++ b/test/identifiers/underscore/double/let.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const int a = 1; const int a__ = 2; void f() { diff --git a/test/identifiers/underscore/double/parameter.wgsl.expected.glsl b/test/identifiers/underscore/double/parameter.wgsl.expected.glsl index e1b6103dc4..55acbfa7c0 100644 --- a/test/identifiers/underscore/double/parameter.wgsl.expected.glsl +++ b/test/identifiers/underscore/double/parameter.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f(int a__) { int b = a__; } diff --git a/test/identifiers/underscore/double/struct.wgsl.expected.glsl b/test/identifiers/underscore/double/struct.wgsl.expected.glsl index 55043ebaec..d397b8d825 100644 --- a/test/identifiers/underscore/double/struct.wgsl.expected.glsl +++ b/test/identifiers/underscore/double/struct.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct a { int b; }; diff --git a/test/identifiers/underscore/double/var.wgsl.expected.glsl b/test/identifiers/underscore/double/var.wgsl.expected.glsl index 0a28a9e395..29bf5e7d58 100644 --- a/test/identifiers/underscore/double/var.wgsl.expected.glsl +++ b/test/identifiers/underscore/double/var.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int a = 1; int a__ = 2; void f() { diff --git a/test/identifiers/underscore/prefix/lower/alias.wgsl.expected.glsl b/test/identifiers/underscore/prefix/lower/alias.wgsl.expected.glsl index e4a9a6bd0b..302a366b76 100644 --- a/test/identifiers/underscore/prefix/lower/alias.wgsl.expected.glsl +++ b/test/identifiers/underscore/prefix/lower/alias.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { int c = 0; int d = 0; diff --git a/test/identifiers/underscore/prefix/lower/fn.wgsl.expected.glsl b/test/identifiers/underscore/prefix/lower/fn.wgsl.expected.glsl index 17482fdcf0..874eea19f9 100644 --- a/test/identifiers/underscore/prefix/lower/fn.wgsl.expected.glsl +++ b/test/identifiers/underscore/prefix/lower/fn.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void a() { } diff --git a/test/identifiers/underscore/prefix/lower/let.wgsl.expected.glsl b/test/identifiers/underscore/prefix/lower/let.wgsl.expected.glsl index f4f4bead32..4729815439 100644 --- a/test/identifiers/underscore/prefix/lower/let.wgsl.expected.glsl +++ b/test/identifiers/underscore/prefix/lower/let.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const int a = 1; const int _a = 2; void f() { diff --git a/test/identifiers/underscore/prefix/lower/parameter.wgsl.expected.glsl b/test/identifiers/underscore/prefix/lower/parameter.wgsl.expected.glsl index e87ca0b6b4..a0f0b09779 100644 --- a/test/identifiers/underscore/prefix/lower/parameter.wgsl.expected.glsl +++ b/test/identifiers/underscore/prefix/lower/parameter.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f(int _a) { int b = _a; } diff --git a/test/identifiers/underscore/prefix/lower/struct.wgsl.expected.glsl b/test/identifiers/underscore/prefix/lower/struct.wgsl.expected.glsl index 1ff7bdc7f4..501dd3117d 100644 --- a/test/identifiers/underscore/prefix/lower/struct.wgsl.expected.glsl +++ b/test/identifiers/underscore/prefix/lower/struct.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct a { int b; }; diff --git a/test/identifiers/underscore/prefix/lower/var.wgsl.expected.glsl b/test/identifiers/underscore/prefix/lower/var.wgsl.expected.glsl index db69473ae0..a81fcaab82 100644 --- a/test/identifiers/underscore/prefix/lower/var.wgsl.expected.glsl +++ b/test/identifiers/underscore/prefix/lower/var.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int a = 1; int _a = 2; void f() { diff --git a/test/identifiers/underscore/prefix/upper/alias.wgsl.expected.glsl b/test/identifiers/underscore/prefix/upper/alias.wgsl.expected.glsl index e4a9a6bd0b..302a366b76 100644 --- a/test/identifiers/underscore/prefix/upper/alias.wgsl.expected.glsl +++ b/test/identifiers/underscore/prefix/upper/alias.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { int c = 0; int d = 0; diff --git a/test/identifiers/underscore/prefix/upper/fn.wgsl.expected.glsl b/test/identifiers/underscore/prefix/upper/fn.wgsl.expected.glsl index 3088dd6415..a1c003b00c 100644 --- a/test/identifiers/underscore/prefix/upper/fn.wgsl.expected.glsl +++ b/test/identifiers/underscore/prefix/upper/fn.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void A() { } diff --git a/test/identifiers/underscore/prefix/upper/let.wgsl.expected.glsl b/test/identifiers/underscore/prefix/upper/let.wgsl.expected.glsl index de02479cb1..68e9d79be7 100644 --- a/test/identifiers/underscore/prefix/upper/let.wgsl.expected.glsl +++ b/test/identifiers/underscore/prefix/upper/let.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - const int A = 1; const int _A = 2; void f() { diff --git a/test/identifiers/underscore/prefix/upper/parameter.wgsl.expected.glsl b/test/identifiers/underscore/prefix/upper/parameter.wgsl.expected.glsl index 7b37d8f8c3..ea2409e121 100644 --- a/test/identifiers/underscore/prefix/upper/parameter.wgsl.expected.glsl +++ b/test/identifiers/underscore/prefix/upper/parameter.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f(int _A) { int B = _A; } diff --git a/test/identifiers/underscore/prefix/upper/struct.wgsl.expected.glsl b/test/identifiers/underscore/prefix/upper/struct.wgsl.expected.glsl index 8334244e49..09ea4e0d0b 100644 --- a/test/identifiers/underscore/prefix/upper/struct.wgsl.expected.glsl +++ b/test/identifiers/underscore/prefix/upper/struct.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct A { int B; }; diff --git a/test/identifiers/underscore/prefix/upper/var.wgsl.expected.glsl b/test/identifiers/underscore/prefix/upper/var.wgsl.expected.glsl index 8285b2a656..12474b5c61 100644 --- a/test/identifiers/underscore/prefix/upper/var.wgsl.expected.glsl +++ b/test/identifiers/underscore/prefix/upper/var.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int A = 1; int _A = 2; void f() { diff --git a/test/intrinsics/arrayLength/complex_via_let.wgsl.expected.glsl b/test/intrinsics/arrayLength/complex_via_let.wgsl.expected.glsl index b3f0b74fda..f05ef5affa 100644 --- a/test/intrinsics/arrayLength/complex_via_let.wgsl.expected.glsl +++ b/test/intrinsics/arrayLength/complex_via_let.wgsl.expected.glsl @@ -6,22 +6,21 @@ precision mediump float; layout(binding = 0) buffer S_1 { int a[]; } G; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { uint tint_symbol_2 = 0u; G.GetDimensions(tint_symbol_2); uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); uint l1 = tint_symbol_3; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: -ERROR: 0:10: 'GetDimensions' : no such field in structure -ERROR: 0:10: '' : compilation terminated +ERROR: 0:9: 'GetDimensions' : no such field in structure +ERROR: 0:9: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/intrinsics/arrayLength/complex_via_let_no_struct.wgsl.expected.glsl b/test/intrinsics/arrayLength/complex_via_let_no_struct.wgsl.expected.glsl index 36ad7bdd9b..fa8116800b 100644 --- a/test/intrinsics/arrayLength/complex_via_let_no_struct.wgsl.expected.glsl +++ b/test/intrinsics/arrayLength/complex_via_let_no_struct.wgsl.expected.glsl @@ -6,22 +6,21 @@ precision mediump float; layout(binding = 0) buffer G_block_1 { int inner[]; } G; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { uint tint_symbol_2 = 0u; G.inner.GetDimensions(tint_symbol_2); uint tint_symbol_3 = (tint_symbol_2 / 4u); uint l1 = tint_symbol_3; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: -ERROR: 0:10: '.' : cannot apply to an array: GetDimensions -ERROR: 0:10: '' : compilation terminated +ERROR: 0:9: '.' : cannot apply to an array: GetDimensions +ERROR: 0:9: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/intrinsics/arrayLength/deprecated.wgsl.expected.glsl b/test/intrinsics/arrayLength/deprecated.wgsl.expected.glsl index 86ee59c1ef..833412f140 100644 --- a/test/intrinsics/arrayLength/deprecated.wgsl.expected.glsl +++ b/test/intrinsics/arrayLength/deprecated.wgsl.expected.glsl @@ -6,23 +6,22 @@ precision mediump float; layout(binding = 0) buffer S_1 { int a[]; } G; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { uint tint_symbol_2 = 0u; G.GetDimensions(tint_symbol_2); uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); uint l1 = tint_symbol_3; uint l2 = tint_symbol_3; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: -ERROR: 0:10: 'GetDimensions' : no such field in structure -ERROR: 0:10: '' : compilation terminated +ERROR: 0:9: 'GetDimensions' : no such field in structure +ERROR: 0:9: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/intrinsics/arrayLength/simple.wgsl.expected.glsl b/test/intrinsics/arrayLength/simple.wgsl.expected.glsl index b3f0b74fda..f05ef5affa 100644 --- a/test/intrinsics/arrayLength/simple.wgsl.expected.glsl +++ b/test/intrinsics/arrayLength/simple.wgsl.expected.glsl @@ -6,22 +6,21 @@ precision mediump float; layout(binding = 0) buffer S_1 { int a[]; } G; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { uint tint_symbol_2 = 0u; G.GetDimensions(tint_symbol_2); uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); uint l1 = tint_symbol_3; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: -ERROR: 0:10: 'GetDimensions' : no such field in structure -ERROR: 0:10: '' : compilation terminated +ERROR: 0:9: 'GetDimensions' : no such field in structure +ERROR: 0:9: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/intrinsics/arrayLength/simple_no_struct.wgsl.expected.glsl b/test/intrinsics/arrayLength/simple_no_struct.wgsl.expected.glsl index 36ad7bdd9b..fa8116800b 100644 --- a/test/intrinsics/arrayLength/simple_no_struct.wgsl.expected.glsl +++ b/test/intrinsics/arrayLength/simple_no_struct.wgsl.expected.glsl @@ -6,22 +6,21 @@ precision mediump float; layout(binding = 0) buffer G_block_1 { int inner[]; } G; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { uint tint_symbol_2 = 0u; G.inner.GetDimensions(tint_symbol_2); uint tint_symbol_3 = (tint_symbol_2 / 4u); uint l1 = tint_symbol_3; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: -ERROR: 0:10: '.' : cannot apply to an array: GetDimensions -ERROR: 0:10: '' : compilation terminated +ERROR: 0:9: '.' : cannot apply to an array: GetDimensions +ERROR: 0:9: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/intrinsics/arrayLength/via_let.wgsl.expected.glsl b/test/intrinsics/arrayLength/via_let.wgsl.expected.glsl index b3f0b74fda..f05ef5affa 100644 --- a/test/intrinsics/arrayLength/via_let.wgsl.expected.glsl +++ b/test/intrinsics/arrayLength/via_let.wgsl.expected.glsl @@ -6,22 +6,21 @@ precision mediump float; layout(binding = 0) buffer S_1 { int a[]; } G; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { uint tint_symbol_2 = 0u; G.GetDimensions(tint_symbol_2); uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); uint l1 = tint_symbol_3; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: -ERROR: 0:10: 'GetDimensions' : no such field in structure -ERROR: 0:10: '' : compilation terminated +ERROR: 0:9: 'GetDimensions' : no such field in structure +ERROR: 0:9: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/intrinsics/arrayLength/via_let_complex.wgsl.expected.glsl b/test/intrinsics/arrayLength/via_let_complex.wgsl.expected.glsl index b3f0b74fda..f05ef5affa 100644 --- a/test/intrinsics/arrayLength/via_let_complex.wgsl.expected.glsl +++ b/test/intrinsics/arrayLength/via_let_complex.wgsl.expected.glsl @@ -6,22 +6,21 @@ precision mediump float; layout(binding = 0) buffer S_1 { int a[]; } G; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { uint tint_symbol_2 = 0u; G.GetDimensions(tint_symbol_2); uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); uint l1 = tint_symbol_3; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: -ERROR: 0:10: 'GetDimensions' : no such field in structure -ERROR: 0:10: '' : compilation terminated +ERROR: 0:9: 'GetDimensions' : no such field in structure +ERROR: 0:9: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/intrinsics/arrayLength/via_let_complex_no_struct.wgsl.expected.glsl b/test/intrinsics/arrayLength/via_let_complex_no_struct.wgsl.expected.glsl index 36ad7bdd9b..fa8116800b 100644 --- a/test/intrinsics/arrayLength/via_let_complex_no_struct.wgsl.expected.glsl +++ b/test/intrinsics/arrayLength/via_let_complex_no_struct.wgsl.expected.glsl @@ -6,22 +6,21 @@ precision mediump float; layout(binding = 0) buffer G_block_1 { int inner[]; } G; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { uint tint_symbol_2 = 0u; G.inner.GetDimensions(tint_symbol_2); uint tint_symbol_3 = (tint_symbol_2 / 4u); uint l1 = tint_symbol_3; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: -ERROR: 0:10: '.' : cannot apply to an array: GetDimensions -ERROR: 0:10: '' : compilation terminated +ERROR: 0:9: '.' : cannot apply to an array: GetDimensions +ERROR: 0:9: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/intrinsics/arrayLength/via_let_no_struct.wgsl.expected.glsl b/test/intrinsics/arrayLength/via_let_no_struct.wgsl.expected.glsl index 36ad7bdd9b..fa8116800b 100644 --- a/test/intrinsics/arrayLength/via_let_no_struct.wgsl.expected.glsl +++ b/test/intrinsics/arrayLength/via_let_no_struct.wgsl.expected.glsl @@ -6,22 +6,21 @@ precision mediump float; layout(binding = 0) buffer G_block_1 { int inner[]; } G; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { uint tint_symbol_2 = 0u; G.inner.GetDimensions(tint_symbol_2); uint tint_symbol_3 = (tint_symbol_2 / 4u); uint l1 = tint_symbol_3; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: -ERROR: 0:10: '.' : cannot apply to an array: GetDimensions -ERROR: 0:10: '' : compilation terminated +ERROR: 0:9: '.' : cannot apply to an array: GetDimensions +ERROR: 0:9: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/intrinsics/degrees.spvasm.expected.glsl b/test/intrinsics/degrees.spvasm.expected.glsl index 75129595be..f73c198ae8 100644 --- a/test/intrinsics/degrees.spvasm.expected.glsl +++ b/test/intrinsics/degrees.spvasm.expected.glsl @@ -14,13 +14,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/intrinsics/frexp.wgsl.expected.glsl b/test/intrinsics/frexp.wgsl.expected.glsl index cf882c2979..7cbc601125 100644 --- a/test/intrinsics/frexp.wgsl.expected.glsl +++ b/test/intrinsics/frexp.wgsl.expected.glsl @@ -16,18 +16,17 @@ frexp_result tint_frexp(float param_0) { } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { frexp_result res = tint_frexp(1.230000019f); int tint_symbol_1 = res.exp; float sig = res.sig; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:11: 'frexp' : no matching overloaded function found ERROR: 0:11: '' : compilation terminated diff --git a/test/intrinsics/gen/abs/002533.wgsl.expected.glsl b/test/intrinsics/gen/abs/002533.wgsl.expected.glsl index 7506230d7f..0e261618fd 100644 --- a/test/intrinsics/gen/abs/002533.wgsl.expected.glsl +++ b/test/intrinsics/gen/abs/002533.wgsl.expected.glsl @@ -5,31 +5,18 @@ void abs_002533() { vec4 res = abs(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { abs_002533(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void abs_002533() { vec4 res = abs(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { abs_002533(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void abs_002533() { vec4 res = abs(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { abs_002533(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/abs/005174.wgsl.expected.glsl b/test/intrinsics/gen/abs/005174.wgsl.expected.glsl index 937d4f030b..dfd8b54eca 100644 --- a/test/intrinsics/gen/abs/005174.wgsl.expected.glsl +++ b/test/intrinsics/gen/abs/005174.wgsl.expected.glsl @@ -5,31 +5,18 @@ void abs_005174() { vec3 res = abs(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { abs_005174(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void abs_005174() { vec3 res = abs(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { abs_005174(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void abs_005174() { vec3 res = abs(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { abs_005174(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/abs/1ce782.wgsl.expected.glsl b/test/intrinsics/gen/abs/1ce782.wgsl.expected.glsl index d3ffa08672..7cfa4b0a38 100644 --- a/test/intrinsics/gen/abs/1ce782.wgsl.expected.glsl +++ b/test/intrinsics/gen/abs/1ce782.wgsl.expected.glsl @@ -7,31 +7,18 @@ void abs_1ce782() { uvec4 res = abs(uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { abs_1ce782(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'abs' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 4-component vector of uint' @@ -47,19 +34,14 @@ void abs_1ce782() { uvec4 res = abs(uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { abs_1ce782(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'abs' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of uint' @@ -75,20 +57,15 @@ void abs_1ce782() { uvec4 res = abs(uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { abs_1ce782(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'abs' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 4-component vector of uint' diff --git a/test/intrinsics/gen/abs/1e9d53.wgsl.expected.glsl b/test/intrinsics/gen/abs/1e9d53.wgsl.expected.glsl index 5fdaf61276..cc54c23899 100644 --- a/test/intrinsics/gen/abs/1e9d53.wgsl.expected.glsl +++ b/test/intrinsics/gen/abs/1e9d53.wgsl.expected.glsl @@ -5,31 +5,18 @@ void abs_1e9d53() { vec2 res = abs(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { abs_1e9d53(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void abs_1e9d53() { vec2 res = abs(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { abs_1e9d53(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void abs_1e9d53() { vec2 res = abs(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { abs_1e9d53(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/abs/467cd1.wgsl.expected.glsl b/test/intrinsics/gen/abs/467cd1.wgsl.expected.glsl index fe400bb4dc..f929fe2dbc 100644 --- a/test/intrinsics/gen/abs/467cd1.wgsl.expected.glsl +++ b/test/intrinsics/gen/abs/467cd1.wgsl.expected.glsl @@ -7,31 +7,18 @@ void abs_467cd1() { uint res = abs(1u); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { abs_467cd1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'abs' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp uint' @@ -47,19 +34,14 @@ void abs_467cd1() { uint res = abs(1u); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { abs_467cd1(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'abs' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump uint' @@ -75,20 +57,15 @@ void abs_467cd1() { uint res = abs(1u); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { abs_467cd1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'abs' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp uint' diff --git a/test/intrinsics/gen/abs/4ad288.wgsl.expected.glsl b/test/intrinsics/gen/abs/4ad288.wgsl.expected.glsl index 8e239127d1..eaadad8163 100644 --- a/test/intrinsics/gen/abs/4ad288.wgsl.expected.glsl +++ b/test/intrinsics/gen/abs/4ad288.wgsl.expected.glsl @@ -5,31 +5,18 @@ void abs_4ad288() { int res = abs(1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { abs_4ad288(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void abs_4ad288() { int res = abs(1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { abs_4ad288(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void abs_4ad288() { int res = abs(1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { abs_4ad288(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/abs/5ad50a.wgsl.expected.glsl b/test/intrinsics/gen/abs/5ad50a.wgsl.expected.glsl index 3c90e55b8a..709618d483 100644 --- a/test/intrinsics/gen/abs/5ad50a.wgsl.expected.glsl +++ b/test/intrinsics/gen/abs/5ad50a.wgsl.expected.glsl @@ -5,31 +5,18 @@ void abs_5ad50a() { ivec3 res = abs(ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { abs_5ad50a(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void abs_5ad50a() { ivec3 res = abs(ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { abs_5ad50a(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void abs_5ad50a() { ivec3 res = abs(ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { abs_5ad50a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/abs/7326de.wgsl.expected.glsl b/test/intrinsics/gen/abs/7326de.wgsl.expected.glsl index 149dfb523f..7b5c7ddae1 100644 --- a/test/intrinsics/gen/abs/7326de.wgsl.expected.glsl +++ b/test/intrinsics/gen/abs/7326de.wgsl.expected.glsl @@ -7,31 +7,18 @@ void abs_7326de() { uvec3 res = abs(uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { abs_7326de(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'abs' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 3-component vector of uint' @@ -47,19 +34,14 @@ void abs_7326de() { uvec3 res = abs(uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { abs_7326de(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'abs' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of uint' @@ -75,20 +57,15 @@ void abs_7326de() { uvec3 res = abs(uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { abs_7326de(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'abs' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 3-component vector of uint' diff --git a/test/intrinsics/gen/abs/7f28e6.wgsl.expected.glsl b/test/intrinsics/gen/abs/7f28e6.wgsl.expected.glsl index 61a6d18103..1b1f376d0a 100644 --- a/test/intrinsics/gen/abs/7f28e6.wgsl.expected.glsl +++ b/test/intrinsics/gen/abs/7f28e6.wgsl.expected.glsl @@ -7,31 +7,18 @@ void abs_7f28e6() { uvec2 res = abs(uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { abs_7f28e6(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'abs' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 2-component vector of uint' @@ -47,19 +34,14 @@ void abs_7f28e6() { uvec2 res = abs(uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { abs_7f28e6(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'abs' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of uint' @@ -75,20 +57,15 @@ void abs_7f28e6() { uvec2 res = abs(uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { abs_7f28e6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'abs' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 2-component vector of uint' diff --git a/test/intrinsics/gen/abs/7faa9e.wgsl.expected.glsl b/test/intrinsics/gen/abs/7faa9e.wgsl.expected.glsl index 668bba904d..3a4930f3e6 100644 --- a/test/intrinsics/gen/abs/7faa9e.wgsl.expected.glsl +++ b/test/intrinsics/gen/abs/7faa9e.wgsl.expected.glsl @@ -5,31 +5,18 @@ void abs_7faa9e() { ivec2 res = abs(ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { abs_7faa9e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void abs_7faa9e() { ivec2 res = abs(ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { abs_7faa9e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void abs_7faa9e() { ivec2 res = abs(ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { abs_7faa9e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/abs/9c80a6.wgsl.expected.glsl b/test/intrinsics/gen/abs/9c80a6.wgsl.expected.glsl index c396532718..ef48036db2 100644 --- a/test/intrinsics/gen/abs/9c80a6.wgsl.expected.glsl +++ b/test/intrinsics/gen/abs/9c80a6.wgsl.expected.glsl @@ -5,31 +5,18 @@ void abs_9c80a6() { ivec4 res = abs(ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { abs_9c80a6(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void abs_9c80a6() { ivec4 res = abs(ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { abs_9c80a6(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void abs_9c80a6() { ivec4 res = abs(ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { abs_9c80a6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/abs/b96037.wgsl.expected.glsl b/test/intrinsics/gen/abs/b96037.wgsl.expected.glsl index f5d5e91c33..61e09f2bae 100644 --- a/test/intrinsics/gen/abs/b96037.wgsl.expected.glsl +++ b/test/intrinsics/gen/abs/b96037.wgsl.expected.glsl @@ -5,31 +5,18 @@ void abs_b96037() { float res = abs(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { abs_b96037(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void abs_b96037() { float res = abs(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { abs_b96037(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void abs_b96037() { float res = abs(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { abs_b96037(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/acos/489247.wgsl.expected.glsl b/test/intrinsics/gen/acos/489247.wgsl.expected.glsl index 9b74954c0a..cdaf0f404d 100644 --- a/test/intrinsics/gen/acos/489247.wgsl.expected.glsl +++ b/test/intrinsics/gen/acos/489247.wgsl.expected.glsl @@ -5,31 +5,18 @@ void acos_489247() { float res = acos(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { acos_489247(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void acos_489247() { float res = acos(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { acos_489247(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void acos_489247() { float res = acos(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { acos_489247(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/acos/8e2acf.wgsl.expected.glsl b/test/intrinsics/gen/acos/8e2acf.wgsl.expected.glsl index e6d69bd5ca..30c87b8c42 100644 --- a/test/intrinsics/gen/acos/8e2acf.wgsl.expected.glsl +++ b/test/intrinsics/gen/acos/8e2acf.wgsl.expected.glsl @@ -5,31 +5,18 @@ void acos_8e2acf() { vec4 res = acos(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { acos_8e2acf(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void acos_8e2acf() { vec4 res = acos(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { acos_8e2acf(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void acos_8e2acf() { vec4 res = acos(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { acos_8e2acf(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/acos/a610c4.wgsl.expected.glsl b/test/intrinsics/gen/acos/a610c4.wgsl.expected.glsl index 20c61a6a42..b913253b48 100644 --- a/test/intrinsics/gen/acos/a610c4.wgsl.expected.glsl +++ b/test/intrinsics/gen/acos/a610c4.wgsl.expected.glsl @@ -5,31 +5,18 @@ void acos_a610c4() { vec3 res = acos(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { acos_a610c4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void acos_a610c4() { vec3 res = acos(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { acos_a610c4(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void acos_a610c4() { vec3 res = acos(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { acos_a610c4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/acos/dfc915.wgsl.expected.glsl b/test/intrinsics/gen/acos/dfc915.wgsl.expected.glsl index 5d54b67031..bed98775d0 100644 --- a/test/intrinsics/gen/acos/dfc915.wgsl.expected.glsl +++ b/test/intrinsics/gen/acos/dfc915.wgsl.expected.glsl @@ -5,31 +5,18 @@ void acos_dfc915() { vec2 res = acos(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { acos_dfc915(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void acos_dfc915() { vec2 res = acos(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { acos_dfc915(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void acos_dfc915() { vec2 res = acos(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { acos_dfc915(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/all/353d6a.wgsl.expected.glsl b/test/intrinsics/gen/all/353d6a.wgsl.expected.glsl index 293dff0e94..2f202ff92f 100644 --- a/test/intrinsics/gen/all/353d6a.wgsl.expected.glsl +++ b/test/intrinsics/gen/all/353d6a.wgsl.expected.glsl @@ -7,31 +7,18 @@ void all_353d6a() { bool res = all(false); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { all_353d6a(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'all' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp bool' @@ -47,19 +34,14 @@ void all_353d6a() { bool res = all(false); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { all_353d6a(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'all' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp bool' @@ -75,20 +57,15 @@ void all_353d6a() { bool res = all(false); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { all_353d6a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'all' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp bool' diff --git a/test/intrinsics/gen/all/986c7b.wgsl.expected.glsl b/test/intrinsics/gen/all/986c7b.wgsl.expected.glsl index 0e91cf6bb1..b4083b8220 100644 --- a/test/intrinsics/gen/all/986c7b.wgsl.expected.glsl +++ b/test/intrinsics/gen/all/986c7b.wgsl.expected.glsl @@ -5,31 +5,18 @@ void all_986c7b() { bool res = all(bvec4(false, false, false, false)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { all_986c7b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void all_986c7b() { bool res = all(bvec4(false, false, false, false)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { all_986c7b(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void all_986c7b() { bool res = all(bvec4(false, false, false, false)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { all_986c7b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/all/bd2dba.wgsl.expected.glsl b/test/intrinsics/gen/all/bd2dba.wgsl.expected.glsl index 111a40ae97..65cdde629b 100644 --- a/test/intrinsics/gen/all/bd2dba.wgsl.expected.glsl +++ b/test/intrinsics/gen/all/bd2dba.wgsl.expected.glsl @@ -5,31 +5,18 @@ void all_bd2dba() { bool res = all(bvec3(false, false, false)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { all_bd2dba(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void all_bd2dba() { bool res = all(bvec3(false, false, false)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { all_bd2dba(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void all_bd2dba() { bool res = all(bvec3(false, false, false)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { all_bd2dba(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/all/f46790.wgsl.expected.glsl b/test/intrinsics/gen/all/f46790.wgsl.expected.glsl index ca1909a252..e664e3912a 100644 --- a/test/intrinsics/gen/all/f46790.wgsl.expected.glsl +++ b/test/intrinsics/gen/all/f46790.wgsl.expected.glsl @@ -5,31 +5,18 @@ void all_f46790() { bool res = all(bvec2(false, false)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { all_f46790(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void all_f46790() { bool res = all(bvec2(false, false)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { all_f46790(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void all_f46790() { bool res = all(bvec2(false, false)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { all_f46790(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/any/083428.wgsl.expected.glsl b/test/intrinsics/gen/any/083428.wgsl.expected.glsl index 0e3b9abf24..3cbe6b39f8 100644 --- a/test/intrinsics/gen/any/083428.wgsl.expected.glsl +++ b/test/intrinsics/gen/any/083428.wgsl.expected.glsl @@ -5,31 +5,18 @@ void any_083428() { bool res = any(bvec4(false, false, false, false)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { any_083428(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void any_083428() { bool res = any(bvec4(false, false, false, false)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { any_083428(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void any_083428() { bool res = any(bvec4(false, false, false, false)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { any_083428(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/any/0e3e58.wgsl.expected.glsl b/test/intrinsics/gen/any/0e3e58.wgsl.expected.glsl index e2b970876c..8d2b2997fd 100644 --- a/test/intrinsics/gen/any/0e3e58.wgsl.expected.glsl +++ b/test/intrinsics/gen/any/0e3e58.wgsl.expected.glsl @@ -5,31 +5,18 @@ void any_0e3e58() { bool res = any(bvec2(false, false)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { any_0e3e58(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void any_0e3e58() { bool res = any(bvec2(false, false)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { any_0e3e58(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void any_0e3e58() { bool res = any(bvec2(false, false)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { any_0e3e58(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/any/2ab91a.wgsl.expected.glsl b/test/intrinsics/gen/any/2ab91a.wgsl.expected.glsl index fcfa374c87..8fe07e6b37 100644 --- a/test/intrinsics/gen/any/2ab91a.wgsl.expected.glsl +++ b/test/intrinsics/gen/any/2ab91a.wgsl.expected.glsl @@ -7,31 +7,18 @@ void any_2ab91a() { bool res = any(false); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { any_2ab91a(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'any' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp bool' @@ -47,19 +34,14 @@ void any_2ab91a() { bool res = any(false); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { any_2ab91a(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'any' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp bool' @@ -75,20 +57,15 @@ void any_2ab91a() { bool res = any(false); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { any_2ab91a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'any' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp bool' diff --git a/test/intrinsics/gen/any/e755c1.wgsl.expected.glsl b/test/intrinsics/gen/any/e755c1.wgsl.expected.glsl index a729c5c49b..1f443e4e2e 100644 --- a/test/intrinsics/gen/any/e755c1.wgsl.expected.glsl +++ b/test/intrinsics/gen/any/e755c1.wgsl.expected.glsl @@ -5,31 +5,18 @@ void any_e755c1() { bool res = any(bvec3(false, false, false)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { any_e755c1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void any_e755c1() { bool res = any(bvec3(false, false, false)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { any_e755c1(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void any_e755c1() { bool res = any(bvec3(false, false, false)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { any_e755c1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/arrayLength/1588cd.wgsl.expected.glsl b/test/intrinsics/gen/arrayLength/1588cd.wgsl.expected.glsl index 6b1d6e3caf..e825ee32f2 100644 --- a/test/intrinsics/gen/arrayLength/1588cd.wgsl.expected.glsl +++ b/test/intrinsics/gen/arrayLength/1588cd.wgsl.expected.glsl @@ -7,37 +7,24 @@ layout(binding = 1) buffer SB_RO_1 { int arg_0[]; } sb_ro; void arrayLength_1588cd() { - uint tint_symbol_2 = 0u; - sb_ro.GetDimensions(tint_symbol_2); - uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); - uint res = tint_symbol_3; + uint tint_symbol_1 = 0u; + sb_ro.GetDimensions(tint_symbol_1); + uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); + uint res = tint_symbol_2; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { arrayLength_1588cd(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'GetDimensions' : no such field in structure ERROR: 0:9: '' : compilation terminated @@ -52,25 +39,20 @@ layout(binding = 1) buffer SB_RO_1 { int arg_0[]; } sb_ro; void arrayLength_1588cd() { - uint tint_symbol_2 = 0u; - sb_ro.GetDimensions(tint_symbol_2); - uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); - uint res = tint_symbol_3; + uint tint_symbol_1 = 0u; + sb_ro.GetDimensions(tint_symbol_1); + uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); + uint res = tint_symbol_2; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { arrayLength_1588cd(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'GetDimensions' : no such field in structure ERROR: 0:9: '' : compilation terminated @@ -85,26 +67,21 @@ layout(binding = 1) buffer SB_RO_1 { int arg_0[]; } sb_ro; void arrayLength_1588cd() { - uint tint_symbol_2 = 0u; - sb_ro.GetDimensions(tint_symbol_2); - uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); - uint res = tint_symbol_3; + uint tint_symbol_1 = 0u; + sb_ro.GetDimensions(tint_symbol_1); + uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); + uint res = tint_symbol_2; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { arrayLength_1588cd(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'GetDimensions' : no such field in structure ERROR: 0:9: '' : compilation terminated diff --git a/test/intrinsics/gen/arrayLength/61b1c7.wgsl.expected.glsl b/test/intrinsics/gen/arrayLength/61b1c7.wgsl.expected.glsl index 452afabd34..04d2a2d800 100644 --- a/test/intrinsics/gen/arrayLength/61b1c7.wgsl.expected.glsl +++ b/test/intrinsics/gen/arrayLength/61b1c7.wgsl.expected.glsl @@ -7,37 +7,24 @@ layout(binding = 0) buffer SB_RW_1 { int arg_0[]; } sb_rw; void arrayLength_61b1c7() { - uint tint_symbol_2 = 0u; - sb_rw.GetDimensions(tint_symbol_2); - uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); - uint res = tint_symbol_3; + uint tint_symbol_1 = 0u; + sb_rw.GetDimensions(tint_symbol_1); + uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); + uint res = tint_symbol_2; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { arrayLength_61b1c7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'GetDimensions' : no such field in structure ERROR: 0:9: '' : compilation terminated @@ -52,25 +39,20 @@ layout(binding = 0) buffer SB_RW_1 { int arg_0[]; } sb_rw; void arrayLength_61b1c7() { - uint tint_symbol_2 = 0u; - sb_rw.GetDimensions(tint_symbol_2); - uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); - uint res = tint_symbol_3; + uint tint_symbol_1 = 0u; + sb_rw.GetDimensions(tint_symbol_1); + uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); + uint res = tint_symbol_2; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { arrayLength_61b1c7(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'GetDimensions' : no such field in structure ERROR: 0:9: '' : compilation terminated @@ -85,26 +67,21 @@ layout(binding = 0) buffer SB_RW_1 { int arg_0[]; } sb_rw; void arrayLength_61b1c7() { - uint tint_symbol_2 = 0u; - sb_rw.GetDimensions(tint_symbol_2); - uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); - uint res = tint_symbol_3; + uint tint_symbol_1 = 0u; + sb_rw.GetDimensions(tint_symbol_1); + uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); + uint res = tint_symbol_2; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { arrayLength_61b1c7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'GetDimensions' : no such field in structure ERROR: 0:9: '' : compilation terminated diff --git a/test/intrinsics/gen/arrayLength/a0f5ca.wgsl.expected.glsl b/test/intrinsics/gen/arrayLength/a0f5ca.wgsl.expected.glsl index 8c76c142c2..371149b7ac 100644 --- a/test/intrinsics/gen/arrayLength/a0f5ca.wgsl.expected.glsl +++ b/test/intrinsics/gen/arrayLength/a0f5ca.wgsl.expected.glsl @@ -7,37 +7,24 @@ layout(binding = 1) buffer SB_RO_1 { float arg_0[]; } sb_ro; void arrayLength_a0f5ca() { - uint tint_symbol_2 = 0u; - sb_ro.GetDimensions(tint_symbol_2); - uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); - uint res = tint_symbol_3; + uint tint_symbol_1 = 0u; + sb_ro.GetDimensions(tint_symbol_1); + uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); + uint res = tint_symbol_2; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { arrayLength_a0f5ca(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'GetDimensions' : no such field in structure ERROR: 0:9: '' : compilation terminated @@ -52,25 +39,20 @@ layout(binding = 1) buffer SB_RO_1 { float arg_0[]; } sb_ro; void arrayLength_a0f5ca() { - uint tint_symbol_2 = 0u; - sb_ro.GetDimensions(tint_symbol_2); - uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); - uint res = tint_symbol_3; + uint tint_symbol_1 = 0u; + sb_ro.GetDimensions(tint_symbol_1); + uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); + uint res = tint_symbol_2; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { arrayLength_a0f5ca(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'GetDimensions' : no such field in structure ERROR: 0:9: '' : compilation terminated @@ -85,26 +67,21 @@ layout(binding = 1) buffer SB_RO_1 { float arg_0[]; } sb_ro; void arrayLength_a0f5ca() { - uint tint_symbol_2 = 0u; - sb_ro.GetDimensions(tint_symbol_2); - uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); - uint res = tint_symbol_3; + uint tint_symbol_1 = 0u; + sb_ro.GetDimensions(tint_symbol_1); + uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); + uint res = tint_symbol_2; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { arrayLength_a0f5ca(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'GetDimensions' : no such field in structure ERROR: 0:9: '' : compilation terminated diff --git a/test/intrinsics/gen/arrayLength/cdd123.wgsl.expected.glsl b/test/intrinsics/gen/arrayLength/cdd123.wgsl.expected.glsl index fa58e97aa0..3b943830fb 100644 --- a/test/intrinsics/gen/arrayLength/cdd123.wgsl.expected.glsl +++ b/test/intrinsics/gen/arrayLength/cdd123.wgsl.expected.glsl @@ -7,37 +7,24 @@ layout(binding = 0) buffer SB_RW_1 { float arg_0[]; } sb_rw; void arrayLength_cdd123() { - uint tint_symbol_2 = 0u; - sb_rw.GetDimensions(tint_symbol_2); - uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); - uint res = tint_symbol_3; + uint tint_symbol_1 = 0u; + sb_rw.GetDimensions(tint_symbol_1); + uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); + uint res = tint_symbol_2; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { arrayLength_cdd123(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'GetDimensions' : no such field in structure ERROR: 0:9: '' : compilation terminated @@ -52,25 +39,20 @@ layout(binding = 0) buffer SB_RW_1 { float arg_0[]; } sb_rw; void arrayLength_cdd123() { - uint tint_symbol_2 = 0u; - sb_rw.GetDimensions(tint_symbol_2); - uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); - uint res = tint_symbol_3; + uint tint_symbol_1 = 0u; + sb_rw.GetDimensions(tint_symbol_1); + uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); + uint res = tint_symbol_2; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { arrayLength_cdd123(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'GetDimensions' : no such field in structure ERROR: 0:9: '' : compilation terminated @@ -85,26 +67,21 @@ layout(binding = 0) buffer SB_RW_1 { float arg_0[]; } sb_rw; void arrayLength_cdd123() { - uint tint_symbol_2 = 0u; - sb_rw.GetDimensions(tint_symbol_2); - uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); - uint res = tint_symbol_3; + uint tint_symbol_1 = 0u; + sb_rw.GetDimensions(tint_symbol_1); + uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); + uint res = tint_symbol_2; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { arrayLength_cdd123(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'GetDimensions' : no such field in structure ERROR: 0:9: '' : compilation terminated diff --git a/test/intrinsics/gen/arrayLength/cfca0a.wgsl.expected.glsl b/test/intrinsics/gen/arrayLength/cfca0a.wgsl.expected.glsl index 5ac52d7b3e..a58d7138fc 100644 --- a/test/intrinsics/gen/arrayLength/cfca0a.wgsl.expected.glsl +++ b/test/intrinsics/gen/arrayLength/cfca0a.wgsl.expected.glsl @@ -7,37 +7,24 @@ layout(binding = 1) buffer SB_RO_1 { uint arg_0[]; } sb_ro; void arrayLength_cfca0a() { - uint tint_symbol_2 = 0u; - sb_ro.GetDimensions(tint_symbol_2); - uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); - uint res = tint_symbol_3; + uint tint_symbol_1 = 0u; + sb_ro.GetDimensions(tint_symbol_1); + uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); + uint res = tint_symbol_2; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { arrayLength_cfca0a(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'GetDimensions' : no such field in structure ERROR: 0:9: '' : compilation terminated @@ -52,25 +39,20 @@ layout(binding = 1) buffer SB_RO_1 { uint arg_0[]; } sb_ro; void arrayLength_cfca0a() { - uint tint_symbol_2 = 0u; - sb_ro.GetDimensions(tint_symbol_2); - uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); - uint res = tint_symbol_3; + uint tint_symbol_1 = 0u; + sb_ro.GetDimensions(tint_symbol_1); + uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); + uint res = tint_symbol_2; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { arrayLength_cfca0a(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'GetDimensions' : no such field in structure ERROR: 0:9: '' : compilation terminated @@ -85,26 +67,21 @@ layout(binding = 1) buffer SB_RO_1 { uint arg_0[]; } sb_ro; void arrayLength_cfca0a() { - uint tint_symbol_2 = 0u; - sb_ro.GetDimensions(tint_symbol_2); - uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); - uint res = tint_symbol_3; + uint tint_symbol_1 = 0u; + sb_ro.GetDimensions(tint_symbol_1); + uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); + uint res = tint_symbol_2; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { arrayLength_cfca0a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'GetDimensions' : no such field in structure ERROR: 0:9: '' : compilation terminated diff --git a/test/intrinsics/gen/arrayLength/eb510f.wgsl.expected.glsl b/test/intrinsics/gen/arrayLength/eb510f.wgsl.expected.glsl index 006963f474..758a7c47b9 100644 --- a/test/intrinsics/gen/arrayLength/eb510f.wgsl.expected.glsl +++ b/test/intrinsics/gen/arrayLength/eb510f.wgsl.expected.glsl @@ -7,37 +7,24 @@ layout(binding = 0) buffer SB_RW_1 { uint arg_0[]; } sb_rw; void arrayLength_eb510f() { - uint tint_symbol_2 = 0u; - sb_rw.GetDimensions(tint_symbol_2); - uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); - uint res = tint_symbol_3; + uint tint_symbol_1 = 0u; + sb_rw.GetDimensions(tint_symbol_1); + uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); + uint res = tint_symbol_2; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { arrayLength_eb510f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'GetDimensions' : no such field in structure ERROR: 0:9: '' : compilation terminated @@ -52,25 +39,20 @@ layout(binding = 0) buffer SB_RW_1 { uint arg_0[]; } sb_rw; void arrayLength_eb510f() { - uint tint_symbol_2 = 0u; - sb_rw.GetDimensions(tint_symbol_2); - uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); - uint res = tint_symbol_3; + uint tint_symbol_1 = 0u; + sb_rw.GetDimensions(tint_symbol_1); + uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); + uint res = tint_symbol_2; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { arrayLength_eb510f(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'GetDimensions' : no such field in structure ERROR: 0:9: '' : compilation terminated @@ -85,26 +67,21 @@ layout(binding = 0) buffer SB_RW_1 { uint arg_0[]; } sb_rw; void arrayLength_eb510f() { - uint tint_symbol_2 = 0u; - sb_rw.GetDimensions(tint_symbol_2); - uint tint_symbol_3 = ((tint_symbol_2 - 0u) / 4u); - uint res = tint_symbol_3; + uint tint_symbol_1 = 0u; + sb_rw.GetDimensions(tint_symbol_1); + uint tint_symbol_2 = ((tint_symbol_1 - 0u) / 4u); + uint res = tint_symbol_2; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { arrayLength_eb510f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'GetDimensions' : no such field in structure ERROR: 0:9: '' : compilation terminated diff --git a/test/intrinsics/gen/asin/064953.wgsl.expected.glsl b/test/intrinsics/gen/asin/064953.wgsl.expected.glsl index 6f9fb5fd2d..c4e492ab82 100644 --- a/test/intrinsics/gen/asin/064953.wgsl.expected.glsl +++ b/test/intrinsics/gen/asin/064953.wgsl.expected.glsl @@ -5,31 +5,18 @@ void asin_064953() { vec4 res = asin(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { asin_064953(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void asin_064953() { vec4 res = asin(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { asin_064953(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void asin_064953() { vec4 res = asin(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { asin_064953(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/asin/7b6a44.wgsl.expected.glsl b/test/intrinsics/gen/asin/7b6a44.wgsl.expected.glsl index 3cb463d399..a92e9b08d6 100644 --- a/test/intrinsics/gen/asin/7b6a44.wgsl.expected.glsl +++ b/test/intrinsics/gen/asin/7b6a44.wgsl.expected.glsl @@ -5,31 +5,18 @@ void asin_7b6a44() { vec2 res = asin(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { asin_7b6a44(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void asin_7b6a44() { vec2 res = asin(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { asin_7b6a44(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void asin_7b6a44() { vec2 res = asin(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { asin_7b6a44(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/asin/8cd9c9.wgsl.expected.glsl b/test/intrinsics/gen/asin/8cd9c9.wgsl.expected.glsl index 26ae9688f9..a53d17c930 100644 --- a/test/intrinsics/gen/asin/8cd9c9.wgsl.expected.glsl +++ b/test/intrinsics/gen/asin/8cd9c9.wgsl.expected.glsl @@ -5,31 +5,18 @@ void asin_8cd9c9() { vec3 res = asin(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { asin_8cd9c9(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void asin_8cd9c9() { vec3 res = asin(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { asin_8cd9c9(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void asin_8cd9c9() { vec3 res = asin(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { asin_8cd9c9(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/asin/c0c272.wgsl.expected.glsl b/test/intrinsics/gen/asin/c0c272.wgsl.expected.glsl index 46b4799d64..1b61048167 100644 --- a/test/intrinsics/gen/asin/c0c272.wgsl.expected.glsl +++ b/test/intrinsics/gen/asin/c0c272.wgsl.expected.glsl @@ -5,31 +5,18 @@ void asin_c0c272() { float res = asin(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { asin_c0c272(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void asin_c0c272() { float res = asin(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { asin_c0c272(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void asin_c0c272() { float res = asin(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { asin_c0c272(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atan/02979a.wgsl.expected.glsl b/test/intrinsics/gen/atan/02979a.wgsl.expected.glsl index db1ced4d99..350248a70b 100644 --- a/test/intrinsics/gen/atan/02979a.wgsl.expected.glsl +++ b/test/intrinsics/gen/atan/02979a.wgsl.expected.glsl @@ -5,31 +5,18 @@ void atan_02979a() { float res = atan(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { atan_02979a(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void atan_02979a() { float res = atan(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { atan_02979a(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void atan_02979a() { float res = atan(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atan_02979a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atan/331e6d.wgsl.expected.glsl b/test/intrinsics/gen/atan/331e6d.wgsl.expected.glsl index 1f9b3f4232..6aae2b6685 100644 --- a/test/intrinsics/gen/atan/331e6d.wgsl.expected.glsl +++ b/test/intrinsics/gen/atan/331e6d.wgsl.expected.glsl @@ -5,31 +5,18 @@ void atan_331e6d() { vec3 res = atan(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { atan_331e6d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void atan_331e6d() { vec3 res = atan(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { atan_331e6d(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void atan_331e6d() { vec3 res = atan(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atan_331e6d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atan/a8b696.wgsl.expected.glsl b/test/intrinsics/gen/atan/a8b696.wgsl.expected.glsl index 68eeb28b73..6cadae4b90 100644 --- a/test/intrinsics/gen/atan/a8b696.wgsl.expected.glsl +++ b/test/intrinsics/gen/atan/a8b696.wgsl.expected.glsl @@ -5,31 +5,18 @@ void atan_a8b696() { vec4 res = atan(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { atan_a8b696(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void atan_a8b696() { vec4 res = atan(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { atan_a8b696(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void atan_a8b696() { vec4 res = atan(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atan_a8b696(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atan/ad96e4.wgsl.expected.glsl b/test/intrinsics/gen/atan/ad96e4.wgsl.expected.glsl index 80f0885242..f4a56869e9 100644 --- a/test/intrinsics/gen/atan/ad96e4.wgsl.expected.glsl +++ b/test/intrinsics/gen/atan/ad96e4.wgsl.expected.glsl @@ -5,31 +5,18 @@ void atan_ad96e4() { vec2 res = atan(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { atan_ad96e4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void atan_ad96e4() { vec2 res = atan(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { atan_ad96e4(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void atan_ad96e4() { vec2 res = atan(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atan_ad96e4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atan2/57fb13.wgsl.expected.glsl b/test/intrinsics/gen/atan2/57fb13.wgsl.expected.glsl index c81d3b3c7b..5846e6fa8a 100644 --- a/test/intrinsics/gen/atan2/57fb13.wgsl.expected.glsl +++ b/test/intrinsics/gen/atan2/57fb13.wgsl.expected.glsl @@ -5,31 +5,18 @@ void atan2_57fb13() { vec2 res = atan(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { atan2_57fb13(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void atan2_57fb13() { vec2 res = atan(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { atan2_57fb13(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void atan2_57fb13() { vec2 res = atan(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atan2_57fb13(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atan2/96057c.wgsl.expected.glsl b/test/intrinsics/gen/atan2/96057c.wgsl.expected.glsl index 12b8b57e38..0bfac0c61c 100644 --- a/test/intrinsics/gen/atan2/96057c.wgsl.expected.glsl +++ b/test/intrinsics/gen/atan2/96057c.wgsl.expected.glsl @@ -5,31 +5,18 @@ void atan2_96057c() { float res = atan(1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { atan2_96057c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void atan2_96057c() { float res = atan(1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { atan2_96057c(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void atan2_96057c() { float res = atan(1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atan2_96057c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atan2/a70d0d.wgsl.expected.glsl b/test/intrinsics/gen/atan2/a70d0d.wgsl.expected.glsl index ca014e6877..6a9fa45b06 100644 --- a/test/intrinsics/gen/atan2/a70d0d.wgsl.expected.glsl +++ b/test/intrinsics/gen/atan2/a70d0d.wgsl.expected.glsl @@ -5,31 +5,18 @@ void atan2_a70d0d() { vec3 res = atan(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { atan2_a70d0d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void atan2_a70d0d() { vec3 res = atan(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { atan2_a70d0d(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void atan2_a70d0d() { vec3 res = atan(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atan2_a70d0d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atan2/ae713e.wgsl.expected.glsl b/test/intrinsics/gen/atan2/ae713e.wgsl.expected.glsl index 58481e67e9..1f50d8b5cb 100644 --- a/test/intrinsics/gen/atan2/ae713e.wgsl.expected.glsl +++ b/test/intrinsics/gen/atan2/ae713e.wgsl.expected.glsl @@ -5,31 +5,18 @@ void atan2_ae713e() { vec4 res = atan(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { atan2_ae713e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void atan2_ae713e() { vec4 res = atan(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { atan2_ae713e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void atan2_ae713e() { vec4 res = atan(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atan2_ae713e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicAdd/794055.wgsl.expected.glsl b/test/intrinsics/gen/atomicAdd/794055.wgsl.expected.glsl index 715d36dd7e..8a41180da5 100644 --- a/test/intrinsics/gen/atomicAdd/794055.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicAdd/794055.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicAdd_794055() { int res = atomicAdd(arg_0, 1); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicAdd/8a199a.wgsl.expected.glsl b/test/intrinsics/gen/atomicAdd/8a199a.wgsl.expected.glsl index a718035619..90a451a7ff 100644 --- a/test/intrinsics/gen/atomicAdd/8a199a.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicAdd/8a199a.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicAdd_8a199a() { void fragment_main() { atomicAdd_8a199a(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicAdd_8a199a() { uint res = atomicAdd(sb_rw.arg_0, 1u); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicAdd_8a199a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicAdd/d32fe4.wgsl.expected.glsl b/test/intrinsics/gen/atomicAdd/d32fe4.wgsl.expected.glsl index 6f142ad70f..df84fccd32 100644 --- a/test/intrinsics/gen/atomicAdd/d32fe4.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicAdd/d32fe4.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicAdd_d32fe4() { void fragment_main() { atomicAdd_d32fe4(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicAdd_d32fe4() { int res = atomicAdd(sb_rw.arg_0, 1); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicAdd_d32fe4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicAdd/d5db1d.wgsl.expected.glsl b/test/intrinsics/gen/atomicAdd/d5db1d.wgsl.expected.glsl index 77ff3ccdbb..e172f7bd11 100644 --- a/test/intrinsics/gen/atomicAdd/d5db1d.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicAdd/d5db1d.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicAdd_d5db1d() { uint res = atomicAdd(arg_0, 1u); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0u); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicAnd/152966.wgsl.expected.glsl b/test/intrinsics/gen/atomicAnd/152966.wgsl.expected.glsl index cb8b590492..18330ed759 100644 --- a/test/intrinsics/gen/atomicAnd/152966.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicAnd/152966.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicAnd_152966() { void fragment_main() { atomicAnd_152966(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicAnd_152966() { int res = atomicAnd(sb_rw.arg_0, 1); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicAnd_152966(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicAnd/34edd3.wgsl.expected.glsl b/test/intrinsics/gen/atomicAnd/34edd3.wgsl.expected.glsl index 893ba81787..eabffe0cf0 100644 --- a/test/intrinsics/gen/atomicAnd/34edd3.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicAnd/34edd3.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicAnd_34edd3() { uint res = atomicAnd(arg_0, 1u); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0u); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicAnd/45a819.wgsl.expected.glsl b/test/intrinsics/gen/atomicAnd/45a819.wgsl.expected.glsl index 29566d1f48..b95352050c 100644 --- a/test/intrinsics/gen/atomicAnd/45a819.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicAnd/45a819.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicAnd_45a819() { int res = atomicAnd(arg_0, 1); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicAnd/85a8d9.wgsl.expected.glsl b/test/intrinsics/gen/atomicAnd/85a8d9.wgsl.expected.glsl index 9260151490..63cfda0e0a 100644 --- a/test/intrinsics/gen/atomicAnd/85a8d9.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicAnd/85a8d9.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicAnd_85a8d9() { void fragment_main() { atomicAnd_85a8d9(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicAnd_85a8d9() { uint res = atomicAnd(sb_rw.arg_0, 1u); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicAnd_85a8d9(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicCompareExchangeWeak/12871c.wgsl.expected.glsl b/test/intrinsics/gen/atomicCompareExchangeWeak/12871c.wgsl.expected.glsl index 3d91ea5a05..718abd16f8 100644 --- a/test/intrinsics/gen/atomicCompareExchangeWeak/12871c.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicCompareExchangeWeak/12871c.wgsl.expected.glsl @@ -22,13 +22,12 @@ void atomicCompareExchangeWeak_12871c() { void fragment_main() { atomicCompareExchangeWeak_12871c(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -51,13 +50,12 @@ void atomicCompareExchangeWeak_12871c() { ivec2 res = tint_atomicCompareExchangeWeak(sb_rw.arg_0, 1, 1); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicCompareExchangeWeak_12871c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicCompareExchangeWeak/6673da.wgsl.expected.glsl b/test/intrinsics/gen/atomicCompareExchangeWeak/6673da.wgsl.expected.glsl index dd307ae28e..58433a27a6 100644 --- a/test/intrinsics/gen/atomicCompareExchangeWeak/6673da.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicCompareExchangeWeak/6673da.wgsl.expected.glsl @@ -22,13 +22,12 @@ void atomicCompareExchangeWeak_6673da() { void fragment_main() { atomicCompareExchangeWeak_6673da(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -51,13 +50,12 @@ void atomicCompareExchangeWeak_6673da() { uvec2 res = tint_atomicCompareExchangeWeak(sb_rw.arg_0, 1u, 1u); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicCompareExchangeWeak_6673da(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicCompareExchangeWeak/89ea3b.wgsl.expected.glsl b/test/intrinsics/gen/atomicCompareExchangeWeak/89ea3b.wgsl.expected.glsl index fc9c6e65e1..bbe2a57d39 100644 --- a/test/intrinsics/gen/atomicCompareExchangeWeak/89ea3b.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicCompareExchangeWeak/89ea3b.wgsl.expected.glsl @@ -14,11 +14,7 @@ void atomicCompareExchangeWeak_89ea3b() { ivec2 res = tint_atomicCompareExchangeWeak(arg_0, 1, 1); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0); } @@ -27,15 +23,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicCompareExchangeWeak/b2ab2c.wgsl.expected.glsl b/test/intrinsics/gen/atomicCompareExchangeWeak/b2ab2c.wgsl.expected.glsl index 01162d84f6..8bf8acb8db 100644 --- a/test/intrinsics/gen/atomicCompareExchangeWeak/b2ab2c.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicCompareExchangeWeak/b2ab2c.wgsl.expected.glsl @@ -14,11 +14,7 @@ void atomicCompareExchangeWeak_b2ab2c() { uvec2 res = tint_atomicCompareExchangeWeak(arg_0, 1u, 1u); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0u); } @@ -27,15 +23,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicExchange/0a5dca.wgsl.expected.glsl b/test/intrinsics/gen/atomicExchange/0a5dca.wgsl.expected.glsl index ceb8f2c587..2dfde42ec7 100644 --- a/test/intrinsics/gen/atomicExchange/0a5dca.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicExchange/0a5dca.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicExchange_0a5dca() { uint res = atomicExchange(arg_0, 1u); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0u); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicExchange/d59712.wgsl.expected.glsl b/test/intrinsics/gen/atomicExchange/d59712.wgsl.expected.glsl index c8aeb19195..144ff7fb88 100644 --- a/test/intrinsics/gen/atomicExchange/d59712.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicExchange/d59712.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicExchange_d59712() { void fragment_main() { atomicExchange_d59712(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicExchange_d59712() { uint res = atomicExchange(sb_rw.arg_0, 1u); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicExchange_d59712(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicExchange/e114ba.wgsl.expected.glsl b/test/intrinsics/gen/atomicExchange/e114ba.wgsl.expected.glsl index 02874faaa1..ddc73bf31b 100644 --- a/test/intrinsics/gen/atomicExchange/e114ba.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicExchange/e114ba.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicExchange_e114ba() { int res = atomicExchange(arg_0, 1); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicExchange/f2e22f.wgsl.expected.glsl b/test/intrinsics/gen/atomicExchange/f2e22f.wgsl.expected.glsl index 89206ebe1c..cad28eb703 100644 --- a/test/intrinsics/gen/atomicExchange/f2e22f.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicExchange/f2e22f.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicExchange_f2e22f() { void fragment_main() { atomicExchange_f2e22f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicExchange_f2e22f() { int res = atomicExchange(sb_rw.arg_0, 1); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicExchange_f2e22f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicLoad/0806ad.wgsl.expected.glsl b/test/intrinsics/gen/atomicLoad/0806ad.wgsl.expected.glsl index e8ec1aaafa..a76e496339 100644 --- a/test/intrinsics/gen/atomicLoad/0806ad.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicLoad/0806ad.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicLoad_0806ad() { void fragment_main() { atomicLoad_0806ad(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicLoad_0806ad() { int res = atomicOr(sb_rw.arg_0, 0); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicLoad_0806ad(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicLoad/361bf1.wgsl.expected.glsl b/test/intrinsics/gen/atomicLoad/361bf1.wgsl.expected.glsl index ec67ef64e6..f69415711c 100644 --- a/test/intrinsics/gen/atomicLoad/361bf1.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicLoad/361bf1.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicLoad_361bf1() { uint res = atomicOr(arg_0, 0u); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0u); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicLoad/afcc03.wgsl.expected.glsl b/test/intrinsics/gen/atomicLoad/afcc03.wgsl.expected.glsl index f4c5fdcad8..5623e5a65f 100644 --- a/test/intrinsics/gen/atomicLoad/afcc03.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicLoad/afcc03.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicLoad_afcc03() { int res = atomicOr(arg_0, 0); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicLoad/fe6cc3.wgsl.expected.glsl b/test/intrinsics/gen/atomicLoad/fe6cc3.wgsl.expected.glsl index 315bfe3b89..b7a75c02fc 100644 --- a/test/intrinsics/gen/atomicLoad/fe6cc3.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicLoad/fe6cc3.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicLoad_fe6cc3() { void fragment_main() { atomicLoad_fe6cc3(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicLoad_fe6cc3() { uint res = atomicOr(sb_rw.arg_0, 0u); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicLoad_fe6cc3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicMax/51b9be.wgsl.expected.glsl b/test/intrinsics/gen/atomicMax/51b9be.wgsl.expected.glsl index 2a92b96976..16d8fb416c 100644 --- a/test/intrinsics/gen/atomicMax/51b9be.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicMax/51b9be.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicMax_51b9be() { void fragment_main() { atomicMax_51b9be(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicMax_51b9be() { uint res = atomicMax(sb_rw.arg_0, 1u); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicMax_51b9be(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicMax/92aa72.wgsl.expected.glsl b/test/intrinsics/gen/atomicMax/92aa72.wgsl.expected.glsl index 953c280998..9811e873a5 100644 --- a/test/intrinsics/gen/atomicMax/92aa72.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicMax/92aa72.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicMax_92aa72() { void fragment_main() { atomicMax_92aa72(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicMax_92aa72() { int res = atomicMax(sb_rw.arg_0, 1); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicMax_92aa72(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicMax/a89cc3.wgsl.expected.glsl b/test/intrinsics/gen/atomicMax/a89cc3.wgsl.expected.glsl index bda8cf5a50..9721ba0987 100644 --- a/test/intrinsics/gen/atomicMax/a89cc3.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicMax/a89cc3.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicMax_a89cc3() { int res = atomicMax(arg_0, 1); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicMax/beccfc.wgsl.expected.glsl b/test/intrinsics/gen/atomicMax/beccfc.wgsl.expected.glsl index 7ff699c224..02c3171730 100644 --- a/test/intrinsics/gen/atomicMax/beccfc.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicMax/beccfc.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicMax_beccfc() { uint res = atomicMax(arg_0, 1u); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0u); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicMin/278235.wgsl.expected.glsl b/test/intrinsics/gen/atomicMin/278235.wgsl.expected.glsl index 924c3e5652..4e84d71f03 100644 --- a/test/intrinsics/gen/atomicMin/278235.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicMin/278235.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicMin_278235() { int res = atomicMin(arg_0, 1); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicMin/69d383.wgsl.expected.glsl b/test/intrinsics/gen/atomicMin/69d383.wgsl.expected.glsl index f872cf38d0..6dfcb0d7ee 100644 --- a/test/intrinsics/gen/atomicMin/69d383.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicMin/69d383.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicMin_69d383() { uint res = atomicMin(arg_0, 1u); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0u); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicMin/8e38dc.wgsl.expected.glsl b/test/intrinsics/gen/atomicMin/8e38dc.wgsl.expected.glsl index 3ef1cad890..43a6e16a51 100644 --- a/test/intrinsics/gen/atomicMin/8e38dc.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicMin/8e38dc.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicMin_8e38dc() { void fragment_main() { atomicMin_8e38dc(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicMin_8e38dc() { int res = atomicMin(sb_rw.arg_0, 1); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicMin_8e38dc(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicMin/c67a74.wgsl.expected.glsl b/test/intrinsics/gen/atomicMin/c67a74.wgsl.expected.glsl index 007cfa1451..42143c6c3a 100644 --- a/test/intrinsics/gen/atomicMin/c67a74.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicMin/c67a74.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicMin_c67a74() { void fragment_main() { atomicMin_c67a74(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicMin_c67a74() { uint res = atomicMin(sb_rw.arg_0, 1u); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicMin_c67a74(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicOr/5e3d61.wgsl.expected.glsl b/test/intrinsics/gen/atomicOr/5e3d61.wgsl.expected.glsl index 2da57b8f6d..7e349a9777 100644 --- a/test/intrinsics/gen/atomicOr/5e3d61.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicOr/5e3d61.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicOr_5e3d61() { uint res = atomicOr(arg_0, 1u); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0u); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicOr/5e95d4.wgsl.expected.glsl b/test/intrinsics/gen/atomicOr/5e95d4.wgsl.expected.glsl index e0066d77a1..ecde95d195 100644 --- a/test/intrinsics/gen/atomicOr/5e95d4.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicOr/5e95d4.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicOr_5e95d4() { void fragment_main() { atomicOr_5e95d4(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicOr_5e95d4() { uint res = atomicOr(sb_rw.arg_0, 1u); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicOr_5e95d4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicOr/8d96a0.wgsl.expected.glsl b/test/intrinsics/gen/atomicOr/8d96a0.wgsl.expected.glsl index 6e2be736f5..049e08938d 100644 --- a/test/intrinsics/gen/atomicOr/8d96a0.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicOr/8d96a0.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicOr_8d96a0() { void fragment_main() { atomicOr_8d96a0(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicOr_8d96a0() { int res = atomicOr(sb_rw.arg_0, 1); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicOr_8d96a0(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicOr/d09248.wgsl.expected.glsl b/test/intrinsics/gen/atomicOr/d09248.wgsl.expected.glsl index c2ab6caf95..5d831d1a98 100644 --- a/test/intrinsics/gen/atomicOr/d09248.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicOr/d09248.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicOr_d09248() { int res = atomicOr(arg_0, 1); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicStore/726882.wgsl.expected.glsl b/test/intrinsics/gen/atomicStore/726882.wgsl.expected.glsl index 4810df6bd1..29be3dc1a4 100644 --- a/test/intrinsics/gen/atomicStore/726882.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicStore/726882.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicStore_726882() { atomicExchange(arg_0, 1u); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0u); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicStore/8bea94.wgsl.expected.glsl b/test/intrinsics/gen/atomicStore/8bea94.wgsl.expected.glsl index 5c11b81278..d24fcba8fd 100644 --- a/test/intrinsics/gen/atomicStore/8bea94.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicStore/8bea94.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicStore_8bea94() { atomicExchange(arg_0, 1); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicStore/cdc29e.wgsl.expected.glsl b/test/intrinsics/gen/atomicStore/cdc29e.wgsl.expected.glsl index 1e0429dc9a..d31459dccb 100644 --- a/test/intrinsics/gen/atomicStore/cdc29e.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicStore/cdc29e.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicStore_cdc29e() { void fragment_main() { atomicStore_cdc29e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicStore_cdc29e() { atomicExchange(sb_rw.arg_0, 1u); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicStore_cdc29e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicStore/d1e9a6.wgsl.expected.glsl b/test/intrinsics/gen/atomicStore/d1e9a6.wgsl.expected.glsl index ac7fa98a6f..7f0ccd6aa4 100644 --- a/test/intrinsics/gen/atomicStore/d1e9a6.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicStore/d1e9a6.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicStore_d1e9a6() { void fragment_main() { atomicStore_d1e9a6(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicStore_d1e9a6() { atomicExchange(sb_rw.arg_0, 1); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicStore_d1e9a6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicSub/051100.wgsl.expected.glsl b/test/intrinsics/gen/atomicSub/051100.wgsl.expected.glsl index bc8a2ee13e..bf4dc0313d 100644 --- a/test/intrinsics/gen/atomicSub/051100.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicSub/051100.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicSub_051100() { void fragment_main() { atomicSub_051100(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicSub_051100() { int res = atomicAdd(sb_rw.arg_0, 1); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicSub_051100(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicSub/0d26c2.wgsl.expected.glsl b/test/intrinsics/gen/atomicSub/0d26c2.wgsl.expected.glsl index f17a4f3a5e..63ebf58314 100644 --- a/test/intrinsics/gen/atomicSub/0d26c2.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicSub/0d26c2.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicSub_0d26c2() { uint res = atomicAdd(arg_0, 1u); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0u); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicSub/15bfc9.wgsl.expected.glsl b/test/intrinsics/gen/atomicSub/15bfc9.wgsl.expected.glsl index 118bcedf8f..82d64e27f3 100644 --- a/test/intrinsics/gen/atomicSub/15bfc9.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicSub/15bfc9.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicSub_15bfc9() { void fragment_main() { atomicSub_15bfc9(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicSub_15bfc9() { uint res = atomicAdd(sb_rw.arg_0, 1u); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicSub_15bfc9(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicSub/77883a.wgsl.expected.glsl b/test/intrinsics/gen/atomicSub/77883a.wgsl.expected.glsl index c8331da0cc..7c136f55ba 100644 --- a/test/intrinsics/gen/atomicSub/77883a.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicSub/77883a.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicSub_77883a() { int res = atomicAdd(arg_0, 1); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicXor/54510e.wgsl.expected.glsl b/test/intrinsics/gen/atomicXor/54510e.wgsl.expected.glsl index 931dcf11e8..6353458cbc 100644 --- a/test/intrinsics/gen/atomicXor/54510e.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicXor/54510e.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicXor_54510e() { void fragment_main() { atomicXor_54510e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicXor_54510e() { uint res = atomicXor(sb_rw.arg_0, 1u); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicXor_54510e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicXor/75dc95.wgsl.expected.glsl b/test/intrinsics/gen/atomicXor/75dc95.wgsl.expected.glsl index 464b9e796b..15b9972f0c 100644 --- a/test/intrinsics/gen/atomicXor/75dc95.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicXor/75dc95.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicXor_75dc95() { int res = atomicXor(arg_0, 1); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/atomicXor/c1b78c.wgsl.expected.glsl b/test/intrinsics/gen/atomicXor/c1b78c.wgsl.expected.glsl index f91c27bbea..f48a364db7 100644 --- a/test/intrinsics/gen/atomicXor/c1b78c.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicXor/c1b78c.wgsl.expected.glsl @@ -14,13 +14,12 @@ void atomicXor_c1b78c() { void fragment_main() { atomicXor_c1b78c(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -35,13 +34,12 @@ void atomicXor_c1b78c() { int res = atomicXor(sb_rw.arg_0, 1); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { atomicXor_c1b78c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/atomicXor/c8e6be.wgsl.expected.glsl b/test/intrinsics/gen/atomicXor/c8e6be.wgsl.expected.glsl index 209ec0bb1b..6d3a6f79ed 100644 --- a/test/intrinsics/gen/atomicXor/c8e6be.wgsl.expected.glsl +++ b/test/intrinsics/gen/atomicXor/c8e6be.wgsl.expected.glsl @@ -6,11 +6,7 @@ void atomicXor_c8e6be() { uint res = atomicXor(arg_0, 1u); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void compute_main_inner(uint local_invocation_index) { +void compute_main(uint local_invocation_index) { { atomicExchange(arg_0, 0u); } @@ -19,15 +15,7 @@ void compute_main_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void compute_main(tint_symbol_1 tint_symbol) { - compute_main_inner(tint_symbol.local_invocation_index); +void main() { + compute_main(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - compute_main(inputs); -} - diff --git a/test/intrinsics/gen/ceil/34064b.wgsl.expected.glsl b/test/intrinsics/gen/ceil/34064b.wgsl.expected.glsl index 7fb4dc55bb..4e1806e7a8 100644 --- a/test/intrinsics/gen/ceil/34064b.wgsl.expected.glsl +++ b/test/intrinsics/gen/ceil/34064b.wgsl.expected.glsl @@ -5,31 +5,18 @@ void ceil_34064b() { vec3 res = ceil(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { ceil_34064b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void ceil_34064b() { vec3 res = ceil(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { ceil_34064b(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void ceil_34064b() { vec3 res = ceil(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { ceil_34064b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/ceil/678655.wgsl.expected.glsl b/test/intrinsics/gen/ceil/678655.wgsl.expected.glsl index bf97f9654e..e66c6eaf56 100644 --- a/test/intrinsics/gen/ceil/678655.wgsl.expected.glsl +++ b/test/intrinsics/gen/ceil/678655.wgsl.expected.glsl @@ -5,31 +5,18 @@ void ceil_678655() { float res = ceil(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { ceil_678655(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void ceil_678655() { float res = ceil(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { ceil_678655(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void ceil_678655() { float res = ceil(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { ceil_678655(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/ceil/96f597.wgsl.expected.glsl b/test/intrinsics/gen/ceil/96f597.wgsl.expected.glsl index 52ced7b207..5ca7044f71 100644 --- a/test/intrinsics/gen/ceil/96f597.wgsl.expected.glsl +++ b/test/intrinsics/gen/ceil/96f597.wgsl.expected.glsl @@ -5,31 +5,18 @@ void ceil_96f597() { vec2 res = ceil(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { ceil_96f597(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void ceil_96f597() { vec2 res = ceil(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { ceil_96f597(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void ceil_96f597() { vec2 res = ceil(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { ceil_96f597(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/ceil/b74c16.wgsl.expected.glsl b/test/intrinsics/gen/ceil/b74c16.wgsl.expected.glsl index 1a3cac6977..b020c55d0e 100644 --- a/test/intrinsics/gen/ceil/b74c16.wgsl.expected.glsl +++ b/test/intrinsics/gen/ceil/b74c16.wgsl.expected.glsl @@ -5,31 +5,18 @@ void ceil_b74c16() { vec4 res = ceil(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { ceil_b74c16(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void ceil_b74c16() { vec4 res = ceil(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { ceil_b74c16(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void ceil_b74c16() { vec4 res = ceil(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { ceil_b74c16(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/clamp/0acf8f.wgsl.expected.glsl b/test/intrinsics/gen/clamp/0acf8f.wgsl.expected.glsl index 103572cf6c..8c38d2ae12 100644 --- a/test/intrinsics/gen/clamp/0acf8f.wgsl.expected.glsl +++ b/test/intrinsics/gen/clamp/0acf8f.wgsl.expected.glsl @@ -5,31 +5,18 @@ void clamp_0acf8f() { vec2 res = clamp(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { clamp_0acf8f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void clamp_0acf8f() { vec2 res = clamp(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { clamp_0acf8f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void clamp_0acf8f() { vec2 res = clamp(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { clamp_0acf8f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/clamp/1a32e3.wgsl.expected.glsl b/test/intrinsics/gen/clamp/1a32e3.wgsl.expected.glsl index a2abc658c3..5f87b77f94 100644 --- a/test/intrinsics/gen/clamp/1a32e3.wgsl.expected.glsl +++ b/test/intrinsics/gen/clamp/1a32e3.wgsl.expected.glsl @@ -5,31 +5,18 @@ void clamp_1a32e3() { ivec4 res = clamp(ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { clamp_1a32e3(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void clamp_1a32e3() { ivec4 res = clamp(ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { clamp_1a32e3(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void clamp_1a32e3() { ivec4 res = clamp(ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { clamp_1a32e3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/clamp/2bd567.wgsl.expected.glsl b/test/intrinsics/gen/clamp/2bd567.wgsl.expected.glsl index 73faf97553..59947a6e4a 100644 --- a/test/intrinsics/gen/clamp/2bd567.wgsl.expected.glsl +++ b/test/intrinsics/gen/clamp/2bd567.wgsl.expected.glsl @@ -5,31 +5,18 @@ void clamp_2bd567() { float res = clamp(1.0f, 1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { clamp_2bd567(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void clamp_2bd567() { float res = clamp(1.0f, 1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { clamp_2bd567(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void clamp_2bd567() { float res = clamp(1.0f, 1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { clamp_2bd567(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/clamp/2bde41.wgsl.expected.glsl b/test/intrinsics/gen/clamp/2bde41.wgsl.expected.glsl index ed22707804..2739432334 100644 --- a/test/intrinsics/gen/clamp/2bde41.wgsl.expected.glsl +++ b/test/intrinsics/gen/clamp/2bde41.wgsl.expected.glsl @@ -5,31 +5,18 @@ void clamp_2bde41() { vec4 res = clamp(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { clamp_2bde41(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void clamp_2bde41() { vec4 res = clamp(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { clamp_2bde41(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void clamp_2bde41() { vec4 res = clamp(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { clamp_2bde41(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/clamp/548fc7.wgsl.expected.glsl b/test/intrinsics/gen/clamp/548fc7.wgsl.expected.glsl index 9bdda9e235..4986e4532d 100644 --- a/test/intrinsics/gen/clamp/548fc7.wgsl.expected.glsl +++ b/test/intrinsics/gen/clamp/548fc7.wgsl.expected.glsl @@ -5,31 +5,18 @@ void clamp_548fc7() { uvec3 res = clamp(uvec3(0u, 0u, 0u), uvec3(0u, 0u, 0u), uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { clamp_548fc7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void clamp_548fc7() { uvec3 res = clamp(uvec3(0u, 0u, 0u), uvec3(0u, 0u, 0u), uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { clamp_548fc7(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void clamp_548fc7() { uvec3 res = clamp(uvec3(0u, 0u, 0u), uvec3(0u, 0u, 0u), uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { clamp_548fc7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/clamp/5f0819.wgsl.expected.glsl b/test/intrinsics/gen/clamp/5f0819.wgsl.expected.glsl index 42ae5f6343..1068aebe1c 100644 --- a/test/intrinsics/gen/clamp/5f0819.wgsl.expected.glsl +++ b/test/intrinsics/gen/clamp/5f0819.wgsl.expected.glsl @@ -5,31 +5,18 @@ void clamp_5f0819() { ivec3 res = clamp(ivec3(0, 0, 0), ivec3(0, 0, 0), ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { clamp_5f0819(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void clamp_5f0819() { ivec3 res = clamp(ivec3(0, 0, 0), ivec3(0, 0, 0), ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { clamp_5f0819(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void clamp_5f0819() { ivec3 res = clamp(ivec3(0, 0, 0), ivec3(0, 0, 0), ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { clamp_5f0819(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/clamp/6c1749.wgsl.expected.glsl b/test/intrinsics/gen/clamp/6c1749.wgsl.expected.glsl index 37b11b6a8a..2f4bb90334 100644 --- a/test/intrinsics/gen/clamp/6c1749.wgsl.expected.glsl +++ b/test/intrinsics/gen/clamp/6c1749.wgsl.expected.glsl @@ -5,31 +5,18 @@ void clamp_6c1749() { ivec2 res = clamp(ivec2(0, 0), ivec2(0, 0), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { clamp_6c1749(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void clamp_6c1749() { ivec2 res = clamp(ivec2(0, 0), ivec2(0, 0), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { clamp_6c1749(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void clamp_6c1749() { ivec2 res = clamp(ivec2(0, 0), ivec2(0, 0), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { clamp_6c1749(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/clamp/7706d7.wgsl.expected.glsl b/test/intrinsics/gen/clamp/7706d7.wgsl.expected.glsl index 2b225ed01a..1786de2588 100644 --- a/test/intrinsics/gen/clamp/7706d7.wgsl.expected.glsl +++ b/test/intrinsics/gen/clamp/7706d7.wgsl.expected.glsl @@ -5,31 +5,18 @@ void clamp_7706d7() { uvec2 res = clamp(uvec2(0u, 0u), uvec2(0u, 0u), uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { clamp_7706d7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void clamp_7706d7() { uvec2 res = clamp(uvec2(0u, 0u), uvec2(0u, 0u), uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { clamp_7706d7(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void clamp_7706d7() { uvec2 res = clamp(uvec2(0u, 0u), uvec2(0u, 0u), uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { clamp_7706d7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/clamp/867397.wgsl.expected.glsl b/test/intrinsics/gen/clamp/867397.wgsl.expected.glsl index 7f078f6106..722a50b8da 100644 --- a/test/intrinsics/gen/clamp/867397.wgsl.expected.glsl +++ b/test/intrinsics/gen/clamp/867397.wgsl.expected.glsl @@ -5,31 +5,18 @@ void clamp_867397() { vec3 res = clamp(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { clamp_867397(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void clamp_867397() { vec3 res = clamp(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { clamp_867397(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void clamp_867397() { vec3 res = clamp(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { clamp_867397(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/clamp/a2de25.wgsl.expected.glsl b/test/intrinsics/gen/clamp/a2de25.wgsl.expected.glsl index dc2ca1eccc..8a62404809 100644 --- a/test/intrinsics/gen/clamp/a2de25.wgsl.expected.glsl +++ b/test/intrinsics/gen/clamp/a2de25.wgsl.expected.glsl @@ -5,31 +5,18 @@ void clamp_a2de25() { uint res = clamp(1u, 1u, 1u); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { clamp_a2de25(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void clamp_a2de25() { uint res = clamp(1u, 1u, 1u); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { clamp_a2de25(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void clamp_a2de25() { uint res = clamp(1u, 1u, 1u); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { clamp_a2de25(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/clamp/b07c65.wgsl.expected.glsl b/test/intrinsics/gen/clamp/b07c65.wgsl.expected.glsl index a9e6199868..ece23a694f 100644 --- a/test/intrinsics/gen/clamp/b07c65.wgsl.expected.glsl +++ b/test/intrinsics/gen/clamp/b07c65.wgsl.expected.glsl @@ -5,31 +5,18 @@ void clamp_b07c65() { int res = clamp(1, 1, 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { clamp_b07c65(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void clamp_b07c65() { int res = clamp(1, 1, 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { clamp_b07c65(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void clamp_b07c65() { int res = clamp(1, 1, 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { clamp_b07c65(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/clamp/bd43ce.wgsl.expected.glsl b/test/intrinsics/gen/clamp/bd43ce.wgsl.expected.glsl index 8cde9f3bda..5206a82eac 100644 --- a/test/intrinsics/gen/clamp/bd43ce.wgsl.expected.glsl +++ b/test/intrinsics/gen/clamp/bd43ce.wgsl.expected.glsl @@ -5,31 +5,18 @@ void clamp_bd43ce() { uvec4 res = clamp(uvec4(0u, 0u, 0u, 0u), uvec4(0u, 0u, 0u, 0u), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { clamp_bd43ce(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void clamp_bd43ce() { uvec4 res = clamp(uvec4(0u, 0u, 0u, 0u), uvec4(0u, 0u, 0u, 0u), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { clamp_bd43ce(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void clamp_bd43ce() { uvec4 res = clamp(uvec4(0u, 0u, 0u, 0u), uvec4(0u, 0u, 0u, 0u), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { clamp_bd43ce(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/cos/16dc15.wgsl.expected.glsl b/test/intrinsics/gen/cos/16dc15.wgsl.expected.glsl index 68bc55b379..9f3d3d94b0 100644 --- a/test/intrinsics/gen/cos/16dc15.wgsl.expected.glsl +++ b/test/intrinsics/gen/cos/16dc15.wgsl.expected.glsl @@ -5,31 +5,18 @@ void cos_16dc15() { vec3 res = cos(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { cos_16dc15(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void cos_16dc15() { vec3 res = cos(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { cos_16dc15(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void cos_16dc15() { vec3 res = cos(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { cos_16dc15(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/cos/29d66d.wgsl.expected.glsl b/test/intrinsics/gen/cos/29d66d.wgsl.expected.glsl index 775dbf3a9e..6a2cdd0095 100644 --- a/test/intrinsics/gen/cos/29d66d.wgsl.expected.glsl +++ b/test/intrinsics/gen/cos/29d66d.wgsl.expected.glsl @@ -5,31 +5,18 @@ void cos_29d66d() { vec4 res = cos(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { cos_29d66d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void cos_29d66d() { vec4 res = cos(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { cos_29d66d(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void cos_29d66d() { vec4 res = cos(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { cos_29d66d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/cos/c3b486.wgsl.expected.glsl b/test/intrinsics/gen/cos/c3b486.wgsl.expected.glsl index 49b902e19b..b1c05c51e9 100644 --- a/test/intrinsics/gen/cos/c3b486.wgsl.expected.glsl +++ b/test/intrinsics/gen/cos/c3b486.wgsl.expected.glsl @@ -5,31 +5,18 @@ void cos_c3b486() { vec2 res = cos(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { cos_c3b486(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void cos_c3b486() { vec2 res = cos(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { cos_c3b486(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void cos_c3b486() { vec2 res = cos(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { cos_c3b486(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/cos/c5c28e.wgsl.expected.glsl b/test/intrinsics/gen/cos/c5c28e.wgsl.expected.glsl index bd2d098f86..5a3dc8712f 100644 --- a/test/intrinsics/gen/cos/c5c28e.wgsl.expected.glsl +++ b/test/intrinsics/gen/cos/c5c28e.wgsl.expected.glsl @@ -5,31 +5,18 @@ void cos_c5c28e() { float res = cos(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { cos_c5c28e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void cos_c5c28e() { float res = cos(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { cos_c5c28e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void cos_c5c28e() { float res = cos(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { cos_c5c28e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/cosh/377652.wgsl.expected.glsl b/test/intrinsics/gen/cosh/377652.wgsl.expected.glsl index 7771255669..37e79fb3ba 100644 --- a/test/intrinsics/gen/cosh/377652.wgsl.expected.glsl +++ b/test/intrinsics/gen/cosh/377652.wgsl.expected.glsl @@ -5,31 +5,18 @@ void cosh_377652() { vec3 res = cosh(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { cosh_377652(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void cosh_377652() { vec3 res = cosh(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { cosh_377652(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void cosh_377652() { vec3 res = cosh(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { cosh_377652(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/cosh/c13756.wgsl.expected.glsl b/test/intrinsics/gen/cosh/c13756.wgsl.expected.glsl index 475471e990..e142266b11 100644 --- a/test/intrinsics/gen/cosh/c13756.wgsl.expected.glsl +++ b/test/intrinsics/gen/cosh/c13756.wgsl.expected.glsl @@ -5,31 +5,18 @@ void cosh_c13756() { vec2 res = cosh(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { cosh_c13756(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void cosh_c13756() { vec2 res = cosh(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { cosh_c13756(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void cosh_c13756() { vec2 res = cosh(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { cosh_c13756(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/cosh/da92dd.wgsl.expected.glsl b/test/intrinsics/gen/cosh/da92dd.wgsl.expected.glsl index 76744dd4e4..0e4ce95c48 100644 --- a/test/intrinsics/gen/cosh/da92dd.wgsl.expected.glsl +++ b/test/intrinsics/gen/cosh/da92dd.wgsl.expected.glsl @@ -5,31 +5,18 @@ void cosh_da92dd() { float res = cosh(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { cosh_da92dd(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void cosh_da92dd() { float res = cosh(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { cosh_da92dd(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void cosh_da92dd() { float res = cosh(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { cosh_da92dd(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/cosh/e0c1de.wgsl.expected.glsl b/test/intrinsics/gen/cosh/e0c1de.wgsl.expected.glsl index 7e6890ea47..9b4cf6cbdd 100644 --- a/test/intrinsics/gen/cosh/e0c1de.wgsl.expected.glsl +++ b/test/intrinsics/gen/cosh/e0c1de.wgsl.expected.glsl @@ -5,31 +5,18 @@ void cosh_e0c1de() { vec4 res = cosh(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { cosh_e0c1de(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void cosh_e0c1de() { vec4 res = cosh(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { cosh_e0c1de(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void cosh_e0c1de() { vec4 res = cosh(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { cosh_e0c1de(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/countOneBits/0d0e46.wgsl.expected.glsl b/test/intrinsics/gen/countOneBits/0d0e46.wgsl.expected.glsl index dec129c511..f799d3cd26 100644 --- a/test/intrinsics/gen/countOneBits/0d0e46.wgsl.expected.glsl +++ b/test/intrinsics/gen/countOneBits/0d0e46.wgsl.expected.glsl @@ -7,31 +7,18 @@ void countOneBits_0d0e46() { uvec4 res = countbits(uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { countOneBits_0d0e46(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 4-component vector of uint' @@ -47,19 +34,14 @@ void countOneBits_0d0e46() { uvec4 res = countbits(uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { countOneBits_0d0e46(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of uint' @@ -75,20 +57,15 @@ void countOneBits_0d0e46() { uvec4 res = countbits(uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { countOneBits_0d0e46(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 4-component vector of uint' diff --git a/test/intrinsics/gen/countOneBits/0f7980.wgsl.expected.glsl b/test/intrinsics/gen/countOneBits/0f7980.wgsl.expected.glsl index 15fdfffaf9..09551c3bd6 100644 --- a/test/intrinsics/gen/countOneBits/0f7980.wgsl.expected.glsl +++ b/test/intrinsics/gen/countOneBits/0f7980.wgsl.expected.glsl @@ -7,31 +7,18 @@ void countOneBits_0f7980() { ivec4 res = countbits(ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { countOneBits_0f7980(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 4-component vector of int' @@ -47,19 +34,14 @@ void countOneBits_0f7980() { ivec4 res = countbits(ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { countOneBits_0f7980(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of int' @@ -75,20 +57,15 @@ void countOneBits_0f7980() { ivec4 res = countbits(ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { countOneBits_0f7980(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 4-component vector of int' diff --git a/test/intrinsics/gen/countOneBits/65d2ae.wgsl.expected.glsl b/test/intrinsics/gen/countOneBits/65d2ae.wgsl.expected.glsl index 7baeb627f6..038da22f95 100644 --- a/test/intrinsics/gen/countOneBits/65d2ae.wgsl.expected.glsl +++ b/test/intrinsics/gen/countOneBits/65d2ae.wgsl.expected.glsl @@ -7,31 +7,18 @@ void countOneBits_65d2ae() { ivec3 res = countbits(ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { countOneBits_65d2ae(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 3-component vector of int' @@ -47,19 +34,14 @@ void countOneBits_65d2ae() { ivec3 res = countbits(ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { countOneBits_65d2ae(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of int' @@ -75,20 +57,15 @@ void countOneBits_65d2ae() { ivec3 res = countbits(ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { countOneBits_65d2ae(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 3-component vector of int' diff --git a/test/intrinsics/gen/countOneBits/690cfc.wgsl.expected.glsl b/test/intrinsics/gen/countOneBits/690cfc.wgsl.expected.glsl index c876810b4d..268f4a807b 100644 --- a/test/intrinsics/gen/countOneBits/690cfc.wgsl.expected.glsl +++ b/test/intrinsics/gen/countOneBits/690cfc.wgsl.expected.glsl @@ -7,31 +7,18 @@ void countOneBits_690cfc() { uvec3 res = countbits(uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { countOneBits_690cfc(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 3-component vector of uint' @@ -47,19 +34,14 @@ void countOneBits_690cfc() { uvec3 res = countbits(uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { countOneBits_690cfc(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of uint' @@ -75,20 +57,15 @@ void countOneBits_690cfc() { uvec3 res = countbits(uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { countOneBits_690cfc(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 3-component vector of uint' diff --git a/test/intrinsics/gen/countOneBits/94fd81.wgsl.expected.glsl b/test/intrinsics/gen/countOneBits/94fd81.wgsl.expected.glsl index 08a12e8cef..631db9a563 100644 --- a/test/intrinsics/gen/countOneBits/94fd81.wgsl.expected.glsl +++ b/test/intrinsics/gen/countOneBits/94fd81.wgsl.expected.glsl @@ -7,31 +7,18 @@ void countOneBits_94fd81() { uvec2 res = countbits(uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { countOneBits_94fd81(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 2-component vector of uint' @@ -47,19 +34,14 @@ void countOneBits_94fd81() { uvec2 res = countbits(uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { countOneBits_94fd81(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of uint' @@ -75,20 +57,15 @@ void countOneBits_94fd81() { uvec2 res = countbits(uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { countOneBits_94fd81(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 2-component vector of uint' diff --git a/test/intrinsics/gen/countOneBits/ae44f9.wgsl.expected.glsl b/test/intrinsics/gen/countOneBits/ae44f9.wgsl.expected.glsl index 851ae3392c..9286553d58 100644 --- a/test/intrinsics/gen/countOneBits/ae44f9.wgsl.expected.glsl +++ b/test/intrinsics/gen/countOneBits/ae44f9.wgsl.expected.glsl @@ -7,31 +7,18 @@ void countOneBits_ae44f9() { uint res = countbits(1u); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { countOneBits_ae44f9(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp uint' @@ -47,19 +34,14 @@ void countOneBits_ae44f9() { uint res = countbits(1u); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { countOneBits_ae44f9(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump uint' @@ -75,20 +57,15 @@ void countOneBits_ae44f9() { uint res = countbits(1u); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { countOneBits_ae44f9(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp uint' diff --git a/test/intrinsics/gen/countOneBits/af90e2.wgsl.expected.glsl b/test/intrinsics/gen/countOneBits/af90e2.wgsl.expected.glsl index 80fe35ec3a..d1907d4d99 100644 --- a/test/intrinsics/gen/countOneBits/af90e2.wgsl.expected.glsl +++ b/test/intrinsics/gen/countOneBits/af90e2.wgsl.expected.glsl @@ -7,31 +7,18 @@ void countOneBits_af90e2() { ivec2 res = countbits(ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { countOneBits_af90e2(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 2-component vector of int' @@ -47,19 +34,14 @@ void countOneBits_af90e2() { ivec2 res = countbits(ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { countOneBits_af90e2(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of int' @@ -75,20 +57,15 @@ void countOneBits_af90e2() { ivec2 res = countbits(ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { countOneBits_af90e2(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 2-component vector of int' diff --git a/test/intrinsics/gen/countOneBits/fd88b2.wgsl.expected.glsl b/test/intrinsics/gen/countOneBits/fd88b2.wgsl.expected.glsl index 0ef55de856..b2342c0ae6 100644 --- a/test/intrinsics/gen/countOneBits/fd88b2.wgsl.expected.glsl +++ b/test/intrinsics/gen/countOneBits/fd88b2.wgsl.expected.glsl @@ -7,31 +7,18 @@ void countOneBits_fd88b2() { int res = countbits(1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { countOneBits_fd88b2(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp int' @@ -47,19 +34,14 @@ void countOneBits_fd88b2() { int res = countbits(1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { countOneBits_fd88b2(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -75,20 +57,15 @@ void countOneBits_fd88b2() { int res = countbits(1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { countOneBits_fd88b2(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'countbits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/cross/041cb0.wgsl.expected.glsl b/test/intrinsics/gen/cross/041cb0.wgsl.expected.glsl index 64fad74400..cf3ac75c30 100644 --- a/test/intrinsics/gen/cross/041cb0.wgsl.expected.glsl +++ b/test/intrinsics/gen/cross/041cb0.wgsl.expected.glsl @@ -5,31 +5,18 @@ void cross_041cb0() { vec3 res = cross(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { cross_041cb0(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void cross_041cb0() { vec3 res = cross(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { cross_041cb0(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void cross_041cb0() { vec3 res = cross(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { cross_041cb0(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/degrees/0d170c.wgsl.expected.glsl b/test/intrinsics/gen/degrees/0d170c.wgsl.expected.glsl index 55c0c7a62b..2f888430cb 100644 --- a/test/intrinsics/gen/degrees/0d170c.wgsl.expected.glsl +++ b/test/intrinsics/gen/degrees/0d170c.wgsl.expected.glsl @@ -10,31 +10,18 @@ void degrees_0d170c() { vec4 res = tint_degrees(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { degrees_0d170c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -47,19 +34,14 @@ void degrees_0d170c() { vec4 res = tint_degrees(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { degrees_0d170c(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -72,17 +54,12 @@ void degrees_0d170c() { vec4 res = tint_degrees(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { degrees_0d170c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/degrees/1ad5df.wgsl.expected.glsl b/test/intrinsics/gen/degrees/1ad5df.wgsl.expected.glsl index dd18b3bd30..6e29dfcc0f 100644 --- a/test/intrinsics/gen/degrees/1ad5df.wgsl.expected.glsl +++ b/test/intrinsics/gen/degrees/1ad5df.wgsl.expected.glsl @@ -10,31 +10,18 @@ void degrees_1ad5df() { vec2 res = tint_degrees(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { degrees_1ad5df(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -47,19 +34,14 @@ void degrees_1ad5df() { vec2 res = tint_degrees(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { degrees_1ad5df(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -72,17 +54,12 @@ void degrees_1ad5df() { vec2 res = tint_degrees(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { degrees_1ad5df(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/degrees/2af623.wgsl.expected.glsl b/test/intrinsics/gen/degrees/2af623.wgsl.expected.glsl index 447c7986f0..265886103e 100644 --- a/test/intrinsics/gen/degrees/2af623.wgsl.expected.glsl +++ b/test/intrinsics/gen/degrees/2af623.wgsl.expected.glsl @@ -10,31 +10,18 @@ void degrees_2af623() { vec3 res = tint_degrees(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { degrees_2af623(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -47,19 +34,14 @@ void degrees_2af623() { vec3 res = tint_degrees(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { degrees_2af623(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -72,17 +54,12 @@ void degrees_2af623() { vec3 res = tint_degrees(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { degrees_2af623(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/degrees/51f705.wgsl.expected.glsl b/test/intrinsics/gen/degrees/51f705.wgsl.expected.glsl index 5135deb8db..373fffb05f 100644 --- a/test/intrinsics/gen/degrees/51f705.wgsl.expected.glsl +++ b/test/intrinsics/gen/degrees/51f705.wgsl.expected.glsl @@ -10,31 +10,18 @@ void degrees_51f705() { float res = tint_degrees(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { degrees_51f705(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -47,19 +34,14 @@ void degrees_51f705() { float res = tint_degrees(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { degrees_51f705(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -72,17 +54,12 @@ void degrees_51f705() { float res = tint_degrees(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { degrees_51f705(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/determinant/2b62ba.wgsl.expected.glsl b/test/intrinsics/gen/determinant/2b62ba.wgsl.expected.glsl index b72337e733..4d8147aa31 100644 --- a/test/intrinsics/gen/determinant/2b62ba.wgsl.expected.glsl +++ b/test/intrinsics/gen/determinant/2b62ba.wgsl.expected.glsl @@ -5,31 +5,18 @@ void determinant_2b62ba() { float res = determinant(mat3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { determinant_2b62ba(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void determinant_2b62ba() { float res = determinant(mat3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { determinant_2b62ba(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void determinant_2b62ba() { float res = determinant(mat3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { determinant_2b62ba(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/determinant/a0a87c.wgsl.expected.glsl b/test/intrinsics/gen/determinant/a0a87c.wgsl.expected.glsl index f8b510f302..f2a5f4e1c3 100644 --- a/test/intrinsics/gen/determinant/a0a87c.wgsl.expected.glsl +++ b/test/intrinsics/gen/determinant/a0a87c.wgsl.expected.glsl @@ -5,31 +5,18 @@ void determinant_a0a87c() { float res = determinant(mat4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { determinant_a0a87c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void determinant_a0a87c() { float res = determinant(mat4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { determinant_a0a87c(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void determinant_a0a87c() { float res = determinant(mat4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { determinant_a0a87c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/determinant/e19305.wgsl.expected.glsl b/test/intrinsics/gen/determinant/e19305.wgsl.expected.glsl index fc322436b9..474b17932f 100644 --- a/test/intrinsics/gen/determinant/e19305.wgsl.expected.glsl +++ b/test/intrinsics/gen/determinant/e19305.wgsl.expected.glsl @@ -5,31 +5,18 @@ void determinant_e19305() { float res = determinant(mat2(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { determinant_e19305(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void determinant_e19305() { float res = determinant(mat2(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { determinant_e19305(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void determinant_e19305() { float res = determinant(mat2(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { determinant_e19305(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/distance/0657d4.wgsl.expected.glsl b/test/intrinsics/gen/distance/0657d4.wgsl.expected.glsl index a3c576e786..d0d4773d83 100644 --- a/test/intrinsics/gen/distance/0657d4.wgsl.expected.glsl +++ b/test/intrinsics/gen/distance/0657d4.wgsl.expected.glsl @@ -5,31 +5,18 @@ void distance_0657d4() { float res = distance(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { distance_0657d4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void distance_0657d4() { float res = distance(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { distance_0657d4(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void distance_0657d4() { float res = distance(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { distance_0657d4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/distance/9646ea.wgsl.expected.glsl b/test/intrinsics/gen/distance/9646ea.wgsl.expected.glsl index 092483257d..2b4b8d4da1 100644 --- a/test/intrinsics/gen/distance/9646ea.wgsl.expected.glsl +++ b/test/intrinsics/gen/distance/9646ea.wgsl.expected.glsl @@ -5,31 +5,18 @@ void distance_9646ea() { float res = distance(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { distance_9646ea(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void distance_9646ea() { float res = distance(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { distance_9646ea(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void distance_9646ea() { float res = distance(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { distance_9646ea(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/distance/aa4055.wgsl.expected.glsl b/test/intrinsics/gen/distance/aa4055.wgsl.expected.glsl index 9d95357962..a49d96f684 100644 --- a/test/intrinsics/gen/distance/aa4055.wgsl.expected.glsl +++ b/test/intrinsics/gen/distance/aa4055.wgsl.expected.glsl @@ -5,31 +5,18 @@ void distance_aa4055() { float res = distance(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { distance_aa4055(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void distance_aa4055() { float res = distance(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { distance_aa4055(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void distance_aa4055() { float res = distance(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { distance_aa4055(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/distance/cfed73.wgsl.expected.glsl b/test/intrinsics/gen/distance/cfed73.wgsl.expected.glsl index 5b5a6bf53a..b6471a66c8 100644 --- a/test/intrinsics/gen/distance/cfed73.wgsl.expected.glsl +++ b/test/intrinsics/gen/distance/cfed73.wgsl.expected.glsl @@ -5,31 +5,18 @@ void distance_cfed73() { float res = distance(1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { distance_cfed73(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void distance_cfed73() { float res = distance(1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { distance_cfed73(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void distance_cfed73() { float res = distance(1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { distance_cfed73(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/dot/0c577b.wgsl.expected.glsl b/test/intrinsics/gen/dot/0c577b.wgsl.expected.glsl index 27d3e7a778..13a2f4e933 100644 --- a/test/intrinsics/gen/dot/0c577b.wgsl.expected.glsl +++ b/test/intrinsics/gen/dot/0c577b.wgsl.expected.glsl @@ -5,31 +5,18 @@ void dot_0c577b() { float res = dot(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { dot_0c577b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void dot_0c577b() { float res = dot(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { dot_0c577b(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void dot_0c577b() { float res = dot(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { dot_0c577b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/dot/7548a0.wgsl.expected.glsl b/test/intrinsics/gen/dot/7548a0.wgsl.expected.glsl index 66d877d559..3c224765fb 100644 --- a/test/intrinsics/gen/dot/7548a0.wgsl.expected.glsl +++ b/test/intrinsics/gen/dot/7548a0.wgsl.expected.glsl @@ -9,31 +9,18 @@ void dot_7548a0() { uint res = tint_int_dot(uvec3(0u, 0u, 0u), uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { dot_7548a0(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -45,19 +32,14 @@ void dot_7548a0() { uint res = tint_int_dot(uvec3(0u, 0u, 0u), uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { dot_7548a0(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -69,17 +51,12 @@ void dot_7548a0() { uint res = tint_int_dot(uvec3(0u, 0u, 0u), uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { dot_7548a0(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/dot/883f0e.wgsl.expected.glsl b/test/intrinsics/gen/dot/883f0e.wgsl.expected.glsl index f58fa99615..32578f4ceb 100644 --- a/test/intrinsics/gen/dot/883f0e.wgsl.expected.glsl +++ b/test/intrinsics/gen/dot/883f0e.wgsl.expected.glsl @@ -5,31 +5,18 @@ void dot_883f0e() { float res = dot(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { dot_883f0e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void dot_883f0e() { float res = dot(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { dot_883f0e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void dot_883f0e() { float res = dot(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { dot_883f0e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/dot/97c7ee.wgsl.expected.glsl b/test/intrinsics/gen/dot/97c7ee.wgsl.expected.glsl index 090d24214d..92ff745e6c 100644 --- a/test/intrinsics/gen/dot/97c7ee.wgsl.expected.glsl +++ b/test/intrinsics/gen/dot/97c7ee.wgsl.expected.glsl @@ -9,31 +9,18 @@ void dot_97c7ee() { uint res = tint_int_dot(uvec2(0u, 0u), uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { dot_97c7ee(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -45,19 +32,14 @@ void dot_97c7ee() { uint res = tint_int_dot(uvec2(0u, 0u), uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { dot_97c7ee(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -69,17 +51,12 @@ void dot_97c7ee() { uint res = tint_int_dot(uvec2(0u, 0u), uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { dot_97c7ee(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/dot/ba4246.wgsl.expected.glsl b/test/intrinsics/gen/dot/ba4246.wgsl.expected.glsl index f8c73a8eef..0c6c0258f3 100644 --- a/test/intrinsics/gen/dot/ba4246.wgsl.expected.glsl +++ b/test/intrinsics/gen/dot/ba4246.wgsl.expected.glsl @@ -5,31 +5,18 @@ void dot_ba4246() { float res = dot(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { dot_ba4246(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void dot_ba4246() { float res = dot(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { dot_ba4246(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void dot_ba4246() { float res = dot(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { dot_ba4246(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/dot/e994c7.wgsl.expected.glsl b/test/intrinsics/gen/dot/e994c7.wgsl.expected.glsl index 058ea47de7..5916d1aa0b 100644 --- a/test/intrinsics/gen/dot/e994c7.wgsl.expected.glsl +++ b/test/intrinsics/gen/dot/e994c7.wgsl.expected.glsl @@ -9,31 +9,18 @@ void dot_e994c7() { uint res = tint_int_dot(uvec4(0u, 0u, 0u, 0u), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { dot_e994c7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -45,19 +32,14 @@ void dot_e994c7() { uint res = tint_int_dot(uvec4(0u, 0u, 0u, 0u), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { dot_e994c7(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -69,17 +51,12 @@ void dot_e994c7() { uint res = tint_int_dot(uvec4(0u, 0u, 0u, 0u), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { dot_e994c7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/dot/ef6b1d.wgsl.expected.glsl b/test/intrinsics/gen/dot/ef6b1d.wgsl.expected.glsl index da0f7b0546..34d8bf5c9f 100644 --- a/test/intrinsics/gen/dot/ef6b1d.wgsl.expected.glsl +++ b/test/intrinsics/gen/dot/ef6b1d.wgsl.expected.glsl @@ -9,31 +9,18 @@ void dot_ef6b1d() { int res = tint_int_dot(ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { dot_ef6b1d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -45,19 +32,14 @@ void dot_ef6b1d() { int res = tint_int_dot(ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { dot_ef6b1d(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -69,17 +51,12 @@ void dot_ef6b1d() { int res = tint_int_dot(ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { dot_ef6b1d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/dot/f1312c.wgsl.expected.glsl b/test/intrinsics/gen/dot/f1312c.wgsl.expected.glsl index 66e776ee48..f217684eb6 100644 --- a/test/intrinsics/gen/dot/f1312c.wgsl.expected.glsl +++ b/test/intrinsics/gen/dot/f1312c.wgsl.expected.glsl @@ -9,31 +9,18 @@ void dot_f1312c() { int res = tint_int_dot(ivec3(0, 0, 0), ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { dot_f1312c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -45,19 +32,14 @@ void dot_f1312c() { int res = tint_int_dot(ivec3(0, 0, 0), ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { dot_f1312c(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -69,17 +51,12 @@ void dot_f1312c() { int res = tint_int_dot(ivec3(0, 0, 0), ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { dot_f1312c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/dot/fc5f7c.wgsl.expected.glsl b/test/intrinsics/gen/dot/fc5f7c.wgsl.expected.glsl index 339737255b..5ad787d5f4 100644 --- a/test/intrinsics/gen/dot/fc5f7c.wgsl.expected.glsl +++ b/test/intrinsics/gen/dot/fc5f7c.wgsl.expected.glsl @@ -9,31 +9,18 @@ void dot_fc5f7c() { int res = tint_int_dot(ivec2(0, 0), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { dot_fc5f7c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -45,19 +32,14 @@ void dot_fc5f7c() { int res = tint_int_dot(ivec2(0, 0), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { dot_fc5f7c(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -69,17 +51,12 @@ void dot_fc5f7c() { int res = tint_int_dot(ivec2(0, 0), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { dot_fc5f7c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/dpdx/0763f7.wgsl.expected.glsl b/test/intrinsics/gen/dpdx/0763f7.wgsl.expected.glsl index 375163218b..aa208f6e40 100644 --- a/test/intrinsics/gen/dpdx/0763f7.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdx/0763f7.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdx_0763f7() { void fragment_main() { dpdx_0763f7(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddx' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' diff --git a/test/intrinsics/gen/dpdx/99edb1.wgsl.expected.glsl b/test/intrinsics/gen/dpdx/99edb1.wgsl.expected.glsl index 3ed75b42fd..b13abffe61 100644 --- a/test/intrinsics/gen/dpdx/99edb1.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdx/99edb1.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdx_99edb1() { void fragment_main() { dpdx_99edb1(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddx' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' diff --git a/test/intrinsics/gen/dpdx/c487fa.wgsl.expected.glsl b/test/intrinsics/gen/dpdx/c487fa.wgsl.expected.glsl index 3c5dee07fe..26f405aa2f 100644 --- a/test/intrinsics/gen/dpdx/c487fa.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdx/c487fa.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdx_c487fa() { void fragment_main() { dpdx_c487fa(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddx' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' diff --git a/test/intrinsics/gen/dpdx/e263de.wgsl.expected.glsl b/test/intrinsics/gen/dpdx/e263de.wgsl.expected.glsl index 974858772d..7f76d6cd89 100644 --- a/test/intrinsics/gen/dpdx/e263de.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdx/e263de.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdx_e263de() { void fragment_main() { dpdx_e263de(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddx' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/dpdxCoarse/029152.wgsl.expected.glsl b/test/intrinsics/gen/dpdxCoarse/029152.wgsl.expected.glsl index 312c91d106..2f6680f035 100644 --- a/test/intrinsics/gen/dpdxCoarse/029152.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdxCoarse/029152.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdxCoarse_029152() { void fragment_main() { dpdxCoarse_029152(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddx_coarse' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/dpdxCoarse/9581cf.wgsl.expected.glsl b/test/intrinsics/gen/dpdxCoarse/9581cf.wgsl.expected.glsl index 5144cdc9b1..3b186ca353 100644 --- a/test/intrinsics/gen/dpdxCoarse/9581cf.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdxCoarse/9581cf.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdxCoarse_9581cf() { void fragment_main() { dpdxCoarse_9581cf(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddx_coarse' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' diff --git a/test/intrinsics/gen/dpdxCoarse/c28641.wgsl.expected.glsl b/test/intrinsics/gen/dpdxCoarse/c28641.wgsl.expected.glsl index 316a7409ed..ffd01adddf 100644 --- a/test/intrinsics/gen/dpdxCoarse/c28641.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdxCoarse/c28641.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdxCoarse_c28641() { void fragment_main() { dpdxCoarse_c28641(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddx_coarse' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' diff --git a/test/intrinsics/gen/dpdxCoarse/f64d7b.wgsl.expected.glsl b/test/intrinsics/gen/dpdxCoarse/f64d7b.wgsl.expected.glsl index 165c98ae90..4b28cfd9f4 100644 --- a/test/intrinsics/gen/dpdxCoarse/f64d7b.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdxCoarse/f64d7b.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdxCoarse_f64d7b() { void fragment_main() { dpdxCoarse_f64d7b(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddx_coarse' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' diff --git a/test/intrinsics/gen/dpdxFine/8c5069.wgsl.expected.glsl b/test/intrinsics/gen/dpdxFine/8c5069.wgsl.expected.glsl index 9849f53467..bc8ba98250 100644 --- a/test/intrinsics/gen/dpdxFine/8c5069.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdxFine/8c5069.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdxFine_8c5069() { void fragment_main() { dpdxFine_8c5069(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddx_fine' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' diff --git a/test/intrinsics/gen/dpdxFine/9631de.wgsl.expected.glsl b/test/intrinsics/gen/dpdxFine/9631de.wgsl.expected.glsl index 1b7f55c81f..dfa83bbe4a 100644 --- a/test/intrinsics/gen/dpdxFine/9631de.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdxFine/9631de.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdxFine_9631de() { void fragment_main() { dpdxFine_9631de(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddx_fine' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' diff --git a/test/intrinsics/gen/dpdxFine/f401a2.wgsl.expected.glsl b/test/intrinsics/gen/dpdxFine/f401a2.wgsl.expected.glsl index e808df6c6d..6772e227af 100644 --- a/test/intrinsics/gen/dpdxFine/f401a2.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdxFine/f401a2.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdxFine_f401a2() { void fragment_main() { dpdxFine_f401a2(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddx_fine' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/dpdxFine/f92fb6.wgsl.expected.glsl b/test/intrinsics/gen/dpdxFine/f92fb6.wgsl.expected.glsl index 4148812a90..93a16c62f7 100644 --- a/test/intrinsics/gen/dpdxFine/f92fb6.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdxFine/f92fb6.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdxFine_f92fb6() { void fragment_main() { dpdxFine_f92fb6(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddx_fine' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' diff --git a/test/intrinsics/gen/dpdy/699a05.wgsl.expected.glsl b/test/intrinsics/gen/dpdy/699a05.wgsl.expected.glsl index 5af0963bef..8c51b3193e 100644 --- a/test/intrinsics/gen/dpdy/699a05.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdy/699a05.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdy_699a05() { void fragment_main() { dpdy_699a05(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddy' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' diff --git a/test/intrinsics/gen/dpdy/7f8d84.wgsl.expected.glsl b/test/intrinsics/gen/dpdy/7f8d84.wgsl.expected.glsl index 83f914922c..3436842902 100644 --- a/test/intrinsics/gen/dpdy/7f8d84.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdy/7f8d84.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdy_7f8d84() { void fragment_main() { dpdy_7f8d84(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddy' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/dpdy/a8b56e.wgsl.expected.glsl b/test/intrinsics/gen/dpdy/a8b56e.wgsl.expected.glsl index 77cb3360e9..e0e1546505 100644 --- a/test/intrinsics/gen/dpdy/a8b56e.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdy/a8b56e.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdy_a8b56e() { void fragment_main() { dpdy_a8b56e(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddy' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' diff --git a/test/intrinsics/gen/dpdy/feb40f.wgsl.expected.glsl b/test/intrinsics/gen/dpdy/feb40f.wgsl.expected.glsl index 93993fb7e5..9a3c7a4e3d 100644 --- a/test/intrinsics/gen/dpdy/feb40f.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdy/feb40f.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdy_feb40f() { void fragment_main() { dpdy_feb40f(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddy' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' diff --git a/test/intrinsics/gen/dpdyCoarse/3e1ab4.wgsl.expected.glsl b/test/intrinsics/gen/dpdyCoarse/3e1ab4.wgsl.expected.glsl index acc10ce72d..0c6f009b77 100644 --- a/test/intrinsics/gen/dpdyCoarse/3e1ab4.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdyCoarse/3e1ab4.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdyCoarse_3e1ab4() { void fragment_main() { dpdyCoarse_3e1ab4(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddy_coarse' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' diff --git a/test/intrinsics/gen/dpdyCoarse/445d24.wgsl.expected.glsl b/test/intrinsics/gen/dpdyCoarse/445d24.wgsl.expected.glsl index faccad9f7c..5b059cd48f 100644 --- a/test/intrinsics/gen/dpdyCoarse/445d24.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdyCoarse/445d24.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdyCoarse_445d24() { void fragment_main() { dpdyCoarse_445d24(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddy_coarse' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' diff --git a/test/intrinsics/gen/dpdyCoarse/870a7e.wgsl.expected.glsl b/test/intrinsics/gen/dpdyCoarse/870a7e.wgsl.expected.glsl index 42ddd725ea..95d1c3188b 100644 --- a/test/intrinsics/gen/dpdyCoarse/870a7e.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdyCoarse/870a7e.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdyCoarse_870a7e() { void fragment_main() { dpdyCoarse_870a7e(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddy_coarse' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/dpdyCoarse/ae1873.wgsl.expected.glsl b/test/intrinsics/gen/dpdyCoarse/ae1873.wgsl.expected.glsl index 9d4bb1c3d2..b9a2ea4b2a 100644 --- a/test/intrinsics/gen/dpdyCoarse/ae1873.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdyCoarse/ae1873.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdyCoarse_ae1873() { void fragment_main() { dpdyCoarse_ae1873(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddy_coarse' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' diff --git a/test/intrinsics/gen/dpdyFine/1fb7ab.wgsl.expected.glsl b/test/intrinsics/gen/dpdyFine/1fb7ab.wgsl.expected.glsl index 339d3866b9..b041522b86 100644 --- a/test/intrinsics/gen/dpdyFine/1fb7ab.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdyFine/1fb7ab.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdyFine_1fb7ab() { void fragment_main() { dpdyFine_1fb7ab(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddy_fine' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' diff --git a/test/intrinsics/gen/dpdyFine/6eb673.wgsl.expected.glsl b/test/intrinsics/gen/dpdyFine/6eb673.wgsl.expected.glsl index f616661353..9b7fd4cc1f 100644 --- a/test/intrinsics/gen/dpdyFine/6eb673.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdyFine/6eb673.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdyFine_6eb673() { void fragment_main() { dpdyFine_6eb673(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddy_fine' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/dpdyFine/d0a648.wgsl.expected.glsl b/test/intrinsics/gen/dpdyFine/d0a648.wgsl.expected.glsl index ad7595638b..8f516951c7 100644 --- a/test/intrinsics/gen/dpdyFine/d0a648.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdyFine/d0a648.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdyFine_d0a648() { void fragment_main() { dpdyFine_d0a648(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddy_fine' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' diff --git a/test/intrinsics/gen/dpdyFine/df33aa.wgsl.expected.glsl b/test/intrinsics/gen/dpdyFine/df33aa.wgsl.expected.glsl index c0cad99393..7f081dd92f 100644 --- a/test/intrinsics/gen/dpdyFine/df33aa.wgsl.expected.glsl +++ b/test/intrinsics/gen/dpdyFine/df33aa.wgsl.expected.glsl @@ -9,13 +9,12 @@ void dpdyFine_df33aa() { void fragment_main() { dpdyFine_df33aa(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddy_fine' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' diff --git a/test/intrinsics/gen/exp/0f70eb.wgsl.expected.glsl b/test/intrinsics/gen/exp/0f70eb.wgsl.expected.glsl index 14b34b1e46..feae4f54f0 100644 --- a/test/intrinsics/gen/exp/0f70eb.wgsl.expected.glsl +++ b/test/intrinsics/gen/exp/0f70eb.wgsl.expected.glsl @@ -5,31 +5,18 @@ void exp_0f70eb() { vec4 res = exp(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { exp_0f70eb(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void exp_0f70eb() { vec4 res = exp(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { exp_0f70eb(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void exp_0f70eb() { vec4 res = exp(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { exp_0f70eb(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/exp/1951e7.wgsl.expected.glsl b/test/intrinsics/gen/exp/1951e7.wgsl.expected.glsl index 62d16d53c2..d2e216a277 100644 --- a/test/intrinsics/gen/exp/1951e7.wgsl.expected.glsl +++ b/test/intrinsics/gen/exp/1951e7.wgsl.expected.glsl @@ -5,31 +5,18 @@ void exp_1951e7() { vec2 res = exp(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { exp_1951e7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void exp_1951e7() { vec2 res = exp(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { exp_1951e7(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void exp_1951e7() { vec2 res = exp(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { exp_1951e7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/exp/771fd2.wgsl.expected.glsl b/test/intrinsics/gen/exp/771fd2.wgsl.expected.glsl index 721e5dc76d..d5b5e7390f 100644 --- a/test/intrinsics/gen/exp/771fd2.wgsl.expected.glsl +++ b/test/intrinsics/gen/exp/771fd2.wgsl.expected.glsl @@ -5,31 +5,18 @@ void exp_771fd2() { float res = exp(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { exp_771fd2(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void exp_771fd2() { float res = exp(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { exp_771fd2(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void exp_771fd2() { float res = exp(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { exp_771fd2(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/exp/d98450.wgsl.expected.glsl b/test/intrinsics/gen/exp/d98450.wgsl.expected.glsl index acca67dd1b..52d707b361 100644 --- a/test/intrinsics/gen/exp/d98450.wgsl.expected.glsl +++ b/test/intrinsics/gen/exp/d98450.wgsl.expected.glsl @@ -5,31 +5,18 @@ void exp_d98450() { vec3 res = exp(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { exp_d98450(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void exp_d98450() { vec3 res = exp(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { exp_d98450(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void exp_d98450() { vec3 res = exp(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { exp_d98450(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/exp2/1f8680.wgsl.expected.glsl b/test/intrinsics/gen/exp2/1f8680.wgsl.expected.glsl index a05fac60f9..b9556d1cee 100644 --- a/test/intrinsics/gen/exp2/1f8680.wgsl.expected.glsl +++ b/test/intrinsics/gen/exp2/1f8680.wgsl.expected.glsl @@ -5,31 +5,18 @@ void exp2_1f8680() { vec3 res = exp2(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { exp2_1f8680(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void exp2_1f8680() { vec3 res = exp2(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { exp2_1f8680(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void exp2_1f8680() { vec3 res = exp2(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { exp2_1f8680(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/exp2/a9d0a7.wgsl.expected.glsl b/test/intrinsics/gen/exp2/a9d0a7.wgsl.expected.glsl index 0a6862d08e..52ec60449f 100644 --- a/test/intrinsics/gen/exp2/a9d0a7.wgsl.expected.glsl +++ b/test/intrinsics/gen/exp2/a9d0a7.wgsl.expected.glsl @@ -5,31 +5,18 @@ void exp2_a9d0a7() { vec4 res = exp2(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { exp2_a9d0a7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void exp2_a9d0a7() { vec4 res = exp2(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { exp2_a9d0a7(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void exp2_a9d0a7() { vec4 res = exp2(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { exp2_a9d0a7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/exp2/d6777c.wgsl.expected.glsl b/test/intrinsics/gen/exp2/d6777c.wgsl.expected.glsl index 6cdab4d16e..f6f2d259a6 100644 --- a/test/intrinsics/gen/exp2/d6777c.wgsl.expected.glsl +++ b/test/intrinsics/gen/exp2/d6777c.wgsl.expected.glsl @@ -5,31 +5,18 @@ void exp2_d6777c() { vec2 res = exp2(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { exp2_d6777c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void exp2_d6777c() { vec2 res = exp2(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { exp2_d6777c(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void exp2_d6777c() { vec2 res = exp2(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { exp2_d6777c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/exp2/dea523.wgsl.expected.glsl b/test/intrinsics/gen/exp2/dea523.wgsl.expected.glsl index f929267021..5b667d2878 100644 --- a/test/intrinsics/gen/exp2/dea523.wgsl.expected.glsl +++ b/test/intrinsics/gen/exp2/dea523.wgsl.expected.glsl @@ -5,31 +5,18 @@ void exp2_dea523() { float res = exp2(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { exp2_dea523(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void exp2_dea523() { float res = exp2(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { exp2_dea523(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void exp2_dea523() { float res = exp2(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { exp2_dea523(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/faceForward/5afbd5.wgsl.expected.glsl b/test/intrinsics/gen/faceForward/5afbd5.wgsl.expected.glsl index 4a9bdc4845..2e59bb7c6d 100644 --- a/test/intrinsics/gen/faceForward/5afbd5.wgsl.expected.glsl +++ b/test/intrinsics/gen/faceForward/5afbd5.wgsl.expected.glsl @@ -5,31 +5,18 @@ void faceForward_5afbd5() { vec3 res = faceforward(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { faceForward_5afbd5(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void faceForward_5afbd5() { vec3 res = faceforward(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { faceForward_5afbd5(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void faceForward_5afbd5() { vec3 res = faceforward(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { faceForward_5afbd5(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/faceForward/b316e5.wgsl.expected.glsl b/test/intrinsics/gen/faceForward/b316e5.wgsl.expected.glsl index 6fccb43ab3..412620d4a3 100644 --- a/test/intrinsics/gen/faceForward/b316e5.wgsl.expected.glsl +++ b/test/intrinsics/gen/faceForward/b316e5.wgsl.expected.glsl @@ -5,31 +5,18 @@ void faceForward_b316e5() { vec4 res = faceforward(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { faceForward_b316e5(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void faceForward_b316e5() { vec4 res = faceforward(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { faceForward_b316e5(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void faceForward_b316e5() { vec4 res = faceforward(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { faceForward_b316e5(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/faceForward/e6908b.wgsl.expected.glsl b/test/intrinsics/gen/faceForward/e6908b.wgsl.expected.glsl index 80375c86f8..bb60c46e3d 100644 --- a/test/intrinsics/gen/faceForward/e6908b.wgsl.expected.glsl +++ b/test/intrinsics/gen/faceForward/e6908b.wgsl.expected.glsl @@ -5,31 +5,18 @@ void faceForward_e6908b() { vec2 res = faceforward(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { faceForward_e6908b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void faceForward_e6908b() { vec2 res = faceforward(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { faceForward_e6908b(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void faceForward_e6908b() { vec2 res = faceforward(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { faceForward_e6908b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/floor/3bccc4.wgsl.expected.glsl b/test/intrinsics/gen/floor/3bccc4.wgsl.expected.glsl index e3ece5a65d..e13ffb3580 100644 --- a/test/intrinsics/gen/floor/3bccc4.wgsl.expected.glsl +++ b/test/intrinsics/gen/floor/3bccc4.wgsl.expected.glsl @@ -5,31 +5,18 @@ void floor_3bccc4() { vec4 res = floor(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { floor_3bccc4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void floor_3bccc4() { vec4 res = floor(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { floor_3bccc4(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void floor_3bccc4() { vec4 res = floor(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { floor_3bccc4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/floor/5fc9ac.wgsl.expected.glsl b/test/intrinsics/gen/floor/5fc9ac.wgsl.expected.glsl index d0cfbad6d5..2bdf291256 100644 --- a/test/intrinsics/gen/floor/5fc9ac.wgsl.expected.glsl +++ b/test/intrinsics/gen/floor/5fc9ac.wgsl.expected.glsl @@ -5,31 +5,18 @@ void floor_5fc9ac() { vec2 res = floor(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { floor_5fc9ac(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void floor_5fc9ac() { vec2 res = floor(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { floor_5fc9ac(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void floor_5fc9ac() { vec2 res = floor(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { floor_5fc9ac(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/floor/60d7ea.wgsl.expected.glsl b/test/intrinsics/gen/floor/60d7ea.wgsl.expected.glsl index 25c718c07b..2261630d81 100644 --- a/test/intrinsics/gen/floor/60d7ea.wgsl.expected.glsl +++ b/test/intrinsics/gen/floor/60d7ea.wgsl.expected.glsl @@ -5,31 +5,18 @@ void floor_60d7ea() { vec3 res = floor(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { floor_60d7ea(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void floor_60d7ea() { vec3 res = floor(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { floor_60d7ea(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void floor_60d7ea() { vec3 res = floor(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { floor_60d7ea(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/floor/66f154.wgsl.expected.glsl b/test/intrinsics/gen/floor/66f154.wgsl.expected.glsl index 708bc0626d..bbc4dc1aa8 100644 --- a/test/intrinsics/gen/floor/66f154.wgsl.expected.glsl +++ b/test/intrinsics/gen/floor/66f154.wgsl.expected.glsl @@ -5,31 +5,18 @@ void floor_66f154() { float res = floor(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { floor_66f154(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void floor_66f154() { float res = floor(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { floor_66f154(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void floor_66f154() { float res = floor(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { floor_66f154(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/fma/26a7a9.wgsl.expected.glsl b/test/intrinsics/gen/fma/26a7a9.wgsl.expected.glsl index 6a1c015803..99f7db0629 100644 --- a/test/intrinsics/gen/fma/26a7a9.wgsl.expected.glsl +++ b/test/intrinsics/gen/fma/26a7a9.wgsl.expected.glsl @@ -7,31 +7,18 @@ void fma_26a7a9() { vec2 res = mad(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { fma_26a7a9(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'mad' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' @@ -47,19 +34,14 @@ void fma_26a7a9() { vec2 res = mad(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { fma_26a7a9(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'mad' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' @@ -75,20 +57,15 @@ void fma_26a7a9() { vec2 res = mad(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { fma_26a7a9(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'mad' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' diff --git a/test/intrinsics/gen/fma/6a3283.wgsl.expected.glsl b/test/intrinsics/gen/fma/6a3283.wgsl.expected.glsl index 8b2530b389..3d1103f927 100644 --- a/test/intrinsics/gen/fma/6a3283.wgsl.expected.glsl +++ b/test/intrinsics/gen/fma/6a3283.wgsl.expected.glsl @@ -7,31 +7,18 @@ void fma_6a3283() { vec4 res = mad(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { fma_6a3283(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'mad' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' @@ -47,19 +34,14 @@ void fma_6a3283() { vec4 res = mad(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { fma_6a3283(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'mad' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' @@ -75,20 +57,15 @@ void fma_6a3283() { vec4 res = mad(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { fma_6a3283(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'mad' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' diff --git a/test/intrinsics/gen/fma/c10ba3.wgsl.expected.glsl b/test/intrinsics/gen/fma/c10ba3.wgsl.expected.glsl index 0d07f7bbf8..cb9db2d0ba 100644 --- a/test/intrinsics/gen/fma/c10ba3.wgsl.expected.glsl +++ b/test/intrinsics/gen/fma/c10ba3.wgsl.expected.glsl @@ -7,31 +7,18 @@ void fma_c10ba3() { float res = mad(1.0f, 1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { fma_c10ba3(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'mad' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated @@ -46,19 +33,14 @@ void fma_c10ba3() { float res = mad(1.0f, 1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { fma_c10ba3(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'mad' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated @@ -73,20 +55,15 @@ void fma_c10ba3() { float res = mad(1.0f, 1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { fma_c10ba3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'mad' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/fma/e17c5c.wgsl.expected.glsl b/test/intrinsics/gen/fma/e17c5c.wgsl.expected.glsl index a380e52552..cfe2ccde95 100644 --- a/test/intrinsics/gen/fma/e17c5c.wgsl.expected.glsl +++ b/test/intrinsics/gen/fma/e17c5c.wgsl.expected.glsl @@ -7,31 +7,18 @@ void fma_e17c5c() { vec3 res = mad(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { fma_e17c5c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'mad' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' @@ -47,19 +34,14 @@ void fma_e17c5c() { vec3 res = mad(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { fma_e17c5c(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'mad' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' @@ -75,20 +57,15 @@ void fma_e17c5c() { vec3 res = mad(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { fma_e17c5c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'mad' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' diff --git a/test/intrinsics/gen/fract/8bc1e9.wgsl.expected.glsl b/test/intrinsics/gen/fract/8bc1e9.wgsl.expected.glsl index a8aa37036a..fc0b2aa0f0 100644 --- a/test/intrinsics/gen/fract/8bc1e9.wgsl.expected.glsl +++ b/test/intrinsics/gen/fract/8bc1e9.wgsl.expected.glsl @@ -7,31 +7,18 @@ void fract_8bc1e9() { vec4 res = frac(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { fract_8bc1e9(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'frac' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' @@ -47,19 +34,14 @@ void fract_8bc1e9() { vec4 res = frac(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { fract_8bc1e9(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'frac' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' @@ -75,20 +57,15 @@ void fract_8bc1e9() { vec4 res = frac(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { fract_8bc1e9(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'frac' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' diff --git a/test/intrinsics/gen/fract/943cb1.wgsl.expected.glsl b/test/intrinsics/gen/fract/943cb1.wgsl.expected.glsl index 3940b2d62d..0e981315b8 100644 --- a/test/intrinsics/gen/fract/943cb1.wgsl.expected.glsl +++ b/test/intrinsics/gen/fract/943cb1.wgsl.expected.glsl @@ -7,31 +7,18 @@ void fract_943cb1() { vec2 res = frac(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { fract_943cb1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'frac' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' @@ -47,19 +34,14 @@ void fract_943cb1() { vec2 res = frac(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { fract_943cb1(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'frac' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' @@ -75,20 +57,15 @@ void fract_943cb1() { vec2 res = frac(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { fract_943cb1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'frac' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' diff --git a/test/intrinsics/gen/fract/a49758.wgsl.expected.glsl b/test/intrinsics/gen/fract/a49758.wgsl.expected.glsl index 52044439ae..b69fb8f0da 100644 --- a/test/intrinsics/gen/fract/a49758.wgsl.expected.glsl +++ b/test/intrinsics/gen/fract/a49758.wgsl.expected.glsl @@ -7,31 +7,18 @@ void fract_a49758() { vec3 res = frac(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { fract_a49758(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'frac' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' @@ -47,19 +34,14 @@ void fract_a49758() { vec3 res = frac(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { fract_a49758(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'frac' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' @@ -75,20 +57,15 @@ void fract_a49758() { vec3 res = frac(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { fract_a49758(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'frac' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' diff --git a/test/intrinsics/gen/fract/fa5c71.wgsl.expected.glsl b/test/intrinsics/gen/fract/fa5c71.wgsl.expected.glsl index 3fadefa246..7811e566b0 100644 --- a/test/intrinsics/gen/fract/fa5c71.wgsl.expected.glsl +++ b/test/intrinsics/gen/fract/fa5c71.wgsl.expected.glsl @@ -7,31 +7,18 @@ void fract_fa5c71() { float res = frac(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { fract_fa5c71(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'frac' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated @@ -46,19 +33,14 @@ void fract_fa5c71() { float res = frac(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { fract_fa5c71(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'frac' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated @@ -73,20 +55,15 @@ void fract_fa5c71() { float res = frac(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { fract_fa5c71(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'frac' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/frexp/368997.wgsl.expected.glsl b/test/intrinsics/gen/frexp/368997.wgsl.expected.glsl index a1f31eab7d..47ed17db34 100644 --- a/test/intrinsics/gen/frexp/368997.wgsl.expected.glsl +++ b/test/intrinsics/gen/frexp/368997.wgsl.expected.glsl @@ -20,31 +20,18 @@ void frexp_368997() { frexp_result_vec3 res = tint_frexp(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { frexp_368997(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:10: 'float3' : undeclared identifier ERROR: 0:10: '' : compilation terminated @@ -72,19 +59,14 @@ void frexp_368997() { frexp_result_vec3 res = tint_frexp(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { frexp_368997(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:10: 'float3' : undeclared identifier ERROR: 0:10: '' : compilation terminated @@ -112,20 +94,15 @@ void frexp_368997() { frexp_result_vec3 res = tint_frexp(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { frexp_368997(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:10: 'float3' : undeclared identifier ERROR: 0:10: '' : compilation terminated diff --git a/test/intrinsics/gen/frexp/3c4f48.wgsl.expected.glsl b/test/intrinsics/gen/frexp/3c4f48.wgsl.expected.glsl index 8e0f6fdfa9..aa6d873b3e 100644 --- a/test/intrinsics/gen/frexp/3c4f48.wgsl.expected.glsl +++ b/test/intrinsics/gen/frexp/3c4f48.wgsl.expected.glsl @@ -20,31 +20,18 @@ void frexp_3c4f48() { frexp_result_vec4 res = tint_frexp(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { frexp_3c4f48(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:10: 'float4' : undeclared identifier ERROR: 0:10: '' : compilation terminated @@ -72,19 +59,14 @@ void frexp_3c4f48() { frexp_result_vec4 res = tint_frexp(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { frexp_3c4f48(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:10: 'float4' : undeclared identifier ERROR: 0:10: '' : compilation terminated @@ -112,20 +94,15 @@ void frexp_3c4f48() { frexp_result_vec4 res = tint_frexp(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { frexp_3c4f48(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:10: 'float4' : undeclared identifier ERROR: 0:10: '' : compilation terminated diff --git a/test/intrinsics/gen/frexp/4bdfc7.wgsl.expected.glsl b/test/intrinsics/gen/frexp/4bdfc7.wgsl.expected.glsl index 2acbc9f008..05a976e1bd 100644 --- a/test/intrinsics/gen/frexp/4bdfc7.wgsl.expected.glsl +++ b/test/intrinsics/gen/frexp/4bdfc7.wgsl.expected.glsl @@ -20,31 +20,18 @@ void frexp_4bdfc7() { frexp_result_vec2 res = tint_frexp(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { frexp_4bdfc7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:10: 'float2' : undeclared identifier ERROR: 0:10: '' : compilation terminated @@ -72,19 +59,14 @@ void frexp_4bdfc7() { frexp_result_vec2 res = tint_frexp(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { frexp_4bdfc7(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:10: 'float2' : undeclared identifier ERROR: 0:10: '' : compilation terminated @@ -112,20 +94,15 @@ void frexp_4bdfc7() { frexp_result_vec2 res = tint_frexp(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { frexp_4bdfc7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:10: 'float2' : undeclared identifier ERROR: 0:10: '' : compilation terminated diff --git a/test/intrinsics/gen/frexp/eabd40.wgsl.expected.glsl b/test/intrinsics/gen/frexp/eabd40.wgsl.expected.glsl index 6892c1a0ef..0efc2dbb21 100644 --- a/test/intrinsics/gen/frexp/eabd40.wgsl.expected.glsl +++ b/test/intrinsics/gen/frexp/eabd40.wgsl.expected.glsl @@ -20,31 +20,18 @@ void frexp_eabd40() { frexp_result res = tint_frexp(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { frexp_eabd40(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:11: 'frexp' : no matching overloaded function found ERROR: 0:11: '' : compilation terminated @@ -72,19 +59,14 @@ void frexp_eabd40() { frexp_result res = tint_frexp(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { frexp_eabd40(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:11: 'frexp' : no matching overloaded function found ERROR: 0:11: '' : compilation terminated @@ -112,20 +94,15 @@ void frexp_eabd40() { frexp_result res = tint_frexp(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { frexp_eabd40(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:11: 'frexp' : no matching overloaded function found ERROR: 0:11: '' : compilation terminated diff --git a/test/intrinsics/gen/fwidth/5d1b39.wgsl.expected.glsl b/test/intrinsics/gen/fwidth/5d1b39.wgsl.expected.glsl index 34122c57f2..c804d0bc43 100644 --- a/test/intrinsics/gen/fwidth/5d1b39.wgsl.expected.glsl +++ b/test/intrinsics/gen/fwidth/5d1b39.wgsl.expected.glsl @@ -7,10 +7,9 @@ void fwidth_5d1b39() { void fragment_main() { fwidth_5d1b39(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/fwidth/b83ebb.wgsl.expected.glsl b/test/intrinsics/gen/fwidth/b83ebb.wgsl.expected.glsl index ec1ced884c..29d50bc444 100644 --- a/test/intrinsics/gen/fwidth/b83ebb.wgsl.expected.glsl +++ b/test/intrinsics/gen/fwidth/b83ebb.wgsl.expected.glsl @@ -7,10 +7,9 @@ void fwidth_b83ebb() { void fragment_main() { fwidth_b83ebb(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/fwidth/d2ab9a.wgsl.expected.glsl b/test/intrinsics/gen/fwidth/d2ab9a.wgsl.expected.glsl index 91563b72aa..db40ca0726 100644 --- a/test/intrinsics/gen/fwidth/d2ab9a.wgsl.expected.glsl +++ b/test/intrinsics/gen/fwidth/d2ab9a.wgsl.expected.glsl @@ -7,10 +7,9 @@ void fwidth_d2ab9a() { void fragment_main() { fwidth_d2ab9a(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/fwidth/df38ef.wgsl.expected.glsl b/test/intrinsics/gen/fwidth/df38ef.wgsl.expected.glsl index 43676d1e90..170e9b2364 100644 --- a/test/intrinsics/gen/fwidth/df38ef.wgsl.expected.glsl +++ b/test/intrinsics/gen/fwidth/df38ef.wgsl.expected.glsl @@ -7,10 +7,9 @@ void fwidth_df38ef() { void fragment_main() { fwidth_df38ef(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/fwidthCoarse/159c8a.wgsl.expected.glsl b/test/intrinsics/gen/fwidthCoarse/159c8a.wgsl.expected.glsl index 135ec350fe..e5d5b6ff87 100644 --- a/test/intrinsics/gen/fwidthCoarse/159c8a.wgsl.expected.glsl +++ b/test/intrinsics/gen/fwidthCoarse/159c8a.wgsl.expected.glsl @@ -7,10 +7,9 @@ void fwidthCoarse_159c8a() { void fragment_main() { fwidthCoarse_159c8a(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/fwidthCoarse/1e59d9.wgsl.expected.glsl b/test/intrinsics/gen/fwidthCoarse/1e59d9.wgsl.expected.glsl index 62de671cd4..6ec03b5281 100644 --- a/test/intrinsics/gen/fwidthCoarse/1e59d9.wgsl.expected.glsl +++ b/test/intrinsics/gen/fwidthCoarse/1e59d9.wgsl.expected.glsl @@ -7,10 +7,9 @@ void fwidthCoarse_1e59d9() { void fragment_main() { fwidthCoarse_1e59d9(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/fwidthCoarse/4e4fc4.wgsl.expected.glsl b/test/intrinsics/gen/fwidthCoarse/4e4fc4.wgsl.expected.glsl index a7780a7d53..1c54caa8e8 100644 --- a/test/intrinsics/gen/fwidthCoarse/4e4fc4.wgsl.expected.glsl +++ b/test/intrinsics/gen/fwidthCoarse/4e4fc4.wgsl.expected.glsl @@ -7,10 +7,9 @@ void fwidthCoarse_4e4fc4() { void fragment_main() { fwidthCoarse_4e4fc4(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/fwidthCoarse/e653f7.wgsl.expected.glsl b/test/intrinsics/gen/fwidthCoarse/e653f7.wgsl.expected.glsl index 27c6a7c507..8676a07d8c 100644 --- a/test/intrinsics/gen/fwidthCoarse/e653f7.wgsl.expected.glsl +++ b/test/intrinsics/gen/fwidthCoarse/e653f7.wgsl.expected.glsl @@ -7,10 +7,9 @@ void fwidthCoarse_e653f7() { void fragment_main() { fwidthCoarse_e653f7(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/fwidthFine/523fdc.wgsl.expected.glsl b/test/intrinsics/gen/fwidthFine/523fdc.wgsl.expected.glsl index 456f35c0f1..bd41be7d72 100644 --- a/test/intrinsics/gen/fwidthFine/523fdc.wgsl.expected.glsl +++ b/test/intrinsics/gen/fwidthFine/523fdc.wgsl.expected.glsl @@ -7,10 +7,9 @@ void fwidthFine_523fdc() { void fragment_main() { fwidthFine_523fdc(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/fwidthFine/68f4ef.wgsl.expected.glsl b/test/intrinsics/gen/fwidthFine/68f4ef.wgsl.expected.glsl index 871b6a6742..c300adb383 100644 --- a/test/intrinsics/gen/fwidthFine/68f4ef.wgsl.expected.glsl +++ b/test/intrinsics/gen/fwidthFine/68f4ef.wgsl.expected.glsl @@ -7,10 +7,9 @@ void fwidthFine_68f4ef() { void fragment_main() { fwidthFine_68f4ef(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/fwidthFine/f1742d.wgsl.expected.glsl b/test/intrinsics/gen/fwidthFine/f1742d.wgsl.expected.glsl index 8244f2fbd0..51d07305fd 100644 --- a/test/intrinsics/gen/fwidthFine/f1742d.wgsl.expected.glsl +++ b/test/intrinsics/gen/fwidthFine/f1742d.wgsl.expected.glsl @@ -7,10 +7,9 @@ void fwidthFine_f1742d() { void fragment_main() { fwidthFine_f1742d(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/fwidthFine/ff6aa0.wgsl.expected.glsl b/test/intrinsics/gen/fwidthFine/ff6aa0.wgsl.expected.glsl index 7fc286d2ad..024943b072 100644 --- a/test/intrinsics/gen/fwidthFine/ff6aa0.wgsl.expected.glsl +++ b/test/intrinsics/gen/fwidthFine/ff6aa0.wgsl.expected.glsl @@ -7,10 +7,9 @@ void fwidthFine_ff6aa0() { void fragment_main() { fwidthFine_ff6aa0(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.glsl b/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.glsl index 9fbab2cc15..8f90b5221e 100644 --- a/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.glsl +++ b/test/intrinsics/gen/ignore/51aeb7.wgsl.expected.glsl @@ -9,31 +9,18 @@ void ignore_51aeb7() { 1; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { ignore_51aeb7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void ignore_51aeb7() { 1; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { ignore_51aeb7(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -61,17 +43,12 @@ void ignore_51aeb7() { 1; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { ignore_51aeb7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/ignore/6698df.wgsl.expected.glsl b/test/intrinsics/gen/ignore/6698df.wgsl.expected.glsl index 455f5b2582..1806507634 100644 --- a/test/intrinsics/gen/ignore/6698df.wgsl.expected.glsl +++ b/test/intrinsics/gen/ignore/6698df.wgsl.expected.glsl @@ -9,31 +9,18 @@ void ignore_6698df() { 1u; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { ignore_6698df(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void ignore_6698df() { 1u; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { ignore_6698df(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -61,17 +43,12 @@ void ignore_6698df() { 1u; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { ignore_6698df(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.glsl b/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.glsl index c68bffc2dc..77c9713c84 100644 --- a/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.glsl +++ b/test/intrinsics/gen/ignore/d91a2f.wgsl.expected.glsl @@ -9,31 +9,18 @@ void ignore_d91a2f() { 1.0f; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { ignore_d91a2f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void ignore_d91a2f() { 1.0f; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { ignore_d91a2f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -61,17 +43,12 @@ void ignore_d91a2f() { 1.0f; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { ignore_d91a2f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/ignore/f414a6.wgsl.expected.glsl b/test/intrinsics/gen/ignore/f414a6.wgsl.expected.glsl index 63c111f5cd..0a47e1e2d0 100644 --- a/test/intrinsics/gen/ignore/f414a6.wgsl.expected.glsl +++ b/test/intrinsics/gen/ignore/f414a6.wgsl.expected.glsl @@ -9,31 +9,18 @@ void ignore_f414a6() { false; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { ignore_f414a6(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void ignore_f414a6() { false; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { ignore_f414a6(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -61,17 +43,12 @@ void ignore_f414a6() { false; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { ignore_f414a6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/inverseSqrt/84407e.wgsl.expected.glsl b/test/intrinsics/gen/inverseSqrt/84407e.wgsl.expected.glsl index 64218af9cc..a06ac8ab5e 100644 --- a/test/intrinsics/gen/inverseSqrt/84407e.wgsl.expected.glsl +++ b/test/intrinsics/gen/inverseSqrt/84407e.wgsl.expected.glsl @@ -7,31 +7,18 @@ void inverseSqrt_84407e() { float res = rsqrt(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { inverseSqrt_84407e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'rsqrt' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated @@ -46,19 +33,14 @@ void inverseSqrt_84407e() { float res = rsqrt(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { inverseSqrt_84407e(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'rsqrt' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated @@ -73,20 +55,15 @@ void inverseSqrt_84407e() { float res = rsqrt(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { inverseSqrt_84407e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'rsqrt' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/inverseSqrt/8f2bd2.wgsl.expected.glsl b/test/intrinsics/gen/inverseSqrt/8f2bd2.wgsl.expected.glsl index 2e339a43c7..a19226974f 100644 --- a/test/intrinsics/gen/inverseSqrt/8f2bd2.wgsl.expected.glsl +++ b/test/intrinsics/gen/inverseSqrt/8f2bd2.wgsl.expected.glsl @@ -7,31 +7,18 @@ void inverseSqrt_8f2bd2() { vec2 res = rsqrt(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { inverseSqrt_8f2bd2(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'rsqrt' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' @@ -47,19 +34,14 @@ void inverseSqrt_8f2bd2() { vec2 res = rsqrt(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { inverseSqrt_8f2bd2(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'rsqrt' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' @@ -75,20 +57,15 @@ void inverseSqrt_8f2bd2() { vec2 res = rsqrt(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { inverseSqrt_8f2bd2(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'rsqrt' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' diff --git a/test/intrinsics/gen/inverseSqrt/b197b1.wgsl.expected.glsl b/test/intrinsics/gen/inverseSqrt/b197b1.wgsl.expected.glsl index 44afddedcc..e5e100e0dd 100644 --- a/test/intrinsics/gen/inverseSqrt/b197b1.wgsl.expected.glsl +++ b/test/intrinsics/gen/inverseSqrt/b197b1.wgsl.expected.glsl @@ -7,31 +7,18 @@ void inverseSqrt_b197b1() { vec3 res = rsqrt(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { inverseSqrt_b197b1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'rsqrt' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' @@ -47,19 +34,14 @@ void inverseSqrt_b197b1() { vec3 res = rsqrt(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { inverseSqrt_b197b1(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'rsqrt' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' @@ -75,20 +57,15 @@ void inverseSqrt_b197b1() { vec3 res = rsqrt(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { inverseSqrt_b197b1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'rsqrt' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' diff --git a/test/intrinsics/gen/inverseSqrt/c22347.wgsl.expected.glsl b/test/intrinsics/gen/inverseSqrt/c22347.wgsl.expected.glsl index f9371f768a..109f22205a 100644 --- a/test/intrinsics/gen/inverseSqrt/c22347.wgsl.expected.glsl +++ b/test/intrinsics/gen/inverseSqrt/c22347.wgsl.expected.glsl @@ -7,31 +7,18 @@ void inverseSqrt_c22347() { vec4 res = rsqrt(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { inverseSqrt_c22347(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'rsqrt' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' @@ -47,19 +34,14 @@ void inverseSqrt_c22347() { vec4 res = rsqrt(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { inverseSqrt_c22347(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'rsqrt' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' @@ -75,20 +57,15 @@ void inverseSqrt_c22347() { vec4 res = rsqrt(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { inverseSqrt_c22347(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'rsqrt' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' diff --git a/test/intrinsics/gen/isFinite/34d32b.wgsl.expected.glsl b/test/intrinsics/gen/isFinite/34d32b.wgsl.expected.glsl index 9c34884666..e8a8c27450 100644 --- a/test/intrinsics/gen/isFinite/34d32b.wgsl.expected.glsl +++ b/test/intrinsics/gen/isFinite/34d32b.wgsl.expected.glsl @@ -11,31 +11,18 @@ void isFinite_34d32b() { bvec2 res = isfinite(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { isFinite_34d32b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp 2-component vector of bool' @@ -51,19 +38,14 @@ void isFinite_34d32b() { bvec2 res = isfinite(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { isFinite_34d32b(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp 2-component vector of bool' @@ -79,20 +61,15 @@ void isFinite_34d32b() { bvec2 res = isfinite(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { isFinite_34d32b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp 2-component vector of bool' diff --git a/test/intrinsics/gen/isFinite/426f9f.wgsl.expected.glsl b/test/intrinsics/gen/isFinite/426f9f.wgsl.expected.glsl index 47a43a4c1c..0669ad2204 100644 --- a/test/intrinsics/gen/isFinite/426f9f.wgsl.expected.glsl +++ b/test/intrinsics/gen/isFinite/426f9f.wgsl.expected.glsl @@ -11,31 +11,18 @@ void isFinite_426f9f() { bool res = isfinite(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { isFinite_426f9f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp bool' @@ -51,19 +38,14 @@ void isFinite_426f9f() { bool res = isfinite(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { isFinite_426f9f(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp bool' @@ -79,20 +61,15 @@ void isFinite_426f9f() { bool res = isfinite(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { isFinite_426f9f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp bool' diff --git a/test/intrinsics/gen/isFinite/8a23ad.wgsl.expected.glsl b/test/intrinsics/gen/isFinite/8a23ad.wgsl.expected.glsl index 8486ac9f17..beb55f0a8c 100644 --- a/test/intrinsics/gen/isFinite/8a23ad.wgsl.expected.glsl +++ b/test/intrinsics/gen/isFinite/8a23ad.wgsl.expected.glsl @@ -11,31 +11,18 @@ void isFinite_8a23ad() { bvec3 res = isfinite(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { isFinite_8a23ad(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp 3-component vector of bool' @@ -51,19 +38,14 @@ void isFinite_8a23ad() { bvec3 res = isfinite(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { isFinite_8a23ad(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp 3-component vector of bool' @@ -79,20 +61,15 @@ void isFinite_8a23ad() { bvec3 res = isfinite(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { isFinite_8a23ad(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp 3-component vector of bool' diff --git a/test/intrinsics/gen/isFinite/f31987.wgsl.expected.glsl b/test/intrinsics/gen/isFinite/f31987.wgsl.expected.glsl index a2870a9237..aaf60d186f 100644 --- a/test/intrinsics/gen/isFinite/f31987.wgsl.expected.glsl +++ b/test/intrinsics/gen/isFinite/f31987.wgsl.expected.glsl @@ -11,31 +11,18 @@ void isFinite_f31987() { bvec4 res = isfinite(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { isFinite_f31987(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp 4-component vector of bool' @@ -51,19 +38,14 @@ void isFinite_f31987() { bvec4 res = isfinite(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { isFinite_f31987(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp 4-component vector of bool' @@ -79,20 +61,15 @@ void isFinite_f31987() { bvec4 res = isfinite(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { isFinite_f31987(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'isfinite' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp 4-component vector of bool' diff --git a/test/intrinsics/gen/isInf/666f2a.wgsl.expected.glsl b/test/intrinsics/gen/isInf/666f2a.wgsl.expected.glsl index 36f99fe51d..0daf17d9a7 100644 --- a/test/intrinsics/gen/isInf/666f2a.wgsl.expected.glsl +++ b/test/intrinsics/gen/isInf/666f2a.wgsl.expected.glsl @@ -9,31 +9,18 @@ void isInf_666f2a() { bvec3 res = isinf(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { isInf_666f2a(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void isInf_666f2a() { bvec3 res = isinf(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { isInf_666f2a(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -61,17 +43,12 @@ void isInf_666f2a() { bvec3 res = isinf(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { isInf_666f2a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/isInf/7bd98f.wgsl.expected.glsl b/test/intrinsics/gen/isInf/7bd98f.wgsl.expected.glsl index 56e4d76ed2..b4790ba1af 100644 --- a/test/intrinsics/gen/isInf/7bd98f.wgsl.expected.glsl +++ b/test/intrinsics/gen/isInf/7bd98f.wgsl.expected.glsl @@ -9,31 +9,18 @@ void isInf_7bd98f() { bool res = isinf(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { isInf_7bd98f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void isInf_7bd98f() { bool res = isinf(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { isInf_7bd98f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -61,17 +43,12 @@ void isInf_7bd98f() { bool res = isinf(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { isInf_7bd98f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/isInf/7e81b5.wgsl.expected.glsl b/test/intrinsics/gen/isInf/7e81b5.wgsl.expected.glsl index a1c971ab13..0ed29fdd05 100644 --- a/test/intrinsics/gen/isInf/7e81b5.wgsl.expected.glsl +++ b/test/intrinsics/gen/isInf/7e81b5.wgsl.expected.glsl @@ -9,31 +9,18 @@ void isInf_7e81b5() { bvec4 res = isinf(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { isInf_7e81b5(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void isInf_7e81b5() { bvec4 res = isinf(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { isInf_7e81b5(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -61,17 +43,12 @@ void isInf_7e81b5() { bvec4 res = isinf(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { isInf_7e81b5(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/isInf/a46d6f.wgsl.expected.glsl b/test/intrinsics/gen/isInf/a46d6f.wgsl.expected.glsl index 7c0559f3af..78a4a3affe 100644 --- a/test/intrinsics/gen/isInf/a46d6f.wgsl.expected.glsl +++ b/test/intrinsics/gen/isInf/a46d6f.wgsl.expected.glsl @@ -9,31 +9,18 @@ void isInf_a46d6f() { bvec2 res = isinf(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { isInf_a46d6f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void isInf_a46d6f() { bvec2 res = isinf(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { isInf_a46d6f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -61,17 +43,12 @@ void isInf_a46d6f() { bvec2 res = isinf(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { isInf_a46d6f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/isNan/1280ab.wgsl.expected.glsl b/test/intrinsics/gen/isNan/1280ab.wgsl.expected.glsl index 9221d99d9b..3ca91afc2e 100644 --- a/test/intrinsics/gen/isNan/1280ab.wgsl.expected.glsl +++ b/test/intrinsics/gen/isNan/1280ab.wgsl.expected.glsl @@ -9,31 +9,18 @@ void isNan_1280ab() { bvec3 res = isnan(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { isNan_1280ab(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void isNan_1280ab() { bvec3 res = isnan(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { isNan_1280ab(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -61,17 +43,12 @@ void isNan_1280ab() { bvec3 res = isnan(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { isNan_1280ab(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/isNan/4d280d.wgsl.expected.glsl b/test/intrinsics/gen/isNan/4d280d.wgsl.expected.glsl index ea662da3d3..61f66001c9 100644 --- a/test/intrinsics/gen/isNan/4d280d.wgsl.expected.glsl +++ b/test/intrinsics/gen/isNan/4d280d.wgsl.expected.glsl @@ -9,31 +9,18 @@ void isNan_4d280d() { bvec4 res = isnan(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { isNan_4d280d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void isNan_4d280d() { bvec4 res = isnan(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { isNan_4d280d(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -61,17 +43,12 @@ void isNan_4d280d() { bvec4 res = isnan(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { isNan_4d280d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/isNan/67ecd3.wgsl.expected.glsl b/test/intrinsics/gen/isNan/67ecd3.wgsl.expected.glsl index 5fae942ad8..d0a67e5ce3 100644 --- a/test/intrinsics/gen/isNan/67ecd3.wgsl.expected.glsl +++ b/test/intrinsics/gen/isNan/67ecd3.wgsl.expected.glsl @@ -9,31 +9,18 @@ void isNan_67ecd3() { bvec2 res = isnan(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { isNan_67ecd3(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void isNan_67ecd3() { bvec2 res = isnan(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { isNan_67ecd3(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -61,17 +43,12 @@ void isNan_67ecd3() { bvec2 res = isnan(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { isNan_67ecd3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/isNan/e4978e.wgsl.expected.glsl b/test/intrinsics/gen/isNan/e4978e.wgsl.expected.glsl index 81a59dae5e..9f74dfead1 100644 --- a/test/intrinsics/gen/isNan/e4978e.wgsl.expected.glsl +++ b/test/intrinsics/gen/isNan/e4978e.wgsl.expected.glsl @@ -9,31 +9,18 @@ void isNan_e4978e() { bool res = isnan(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { isNan_e4978e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void isNan_e4978e() { bool res = isnan(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { isNan_e4978e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -61,17 +43,12 @@ void isNan_e4978e() { bool res = isnan(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { isNan_e4978e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/isNormal/863dcd.wgsl.expected.glsl b/test/intrinsics/gen/isNormal/863dcd.wgsl.expected.glsl index 6b4953edff..45a8806d97 100644 --- a/test/intrinsics/gen/isNormal/863dcd.wgsl.expected.glsl +++ b/test/intrinsics/gen/isNormal/863dcd.wgsl.expected.glsl @@ -18,31 +18,18 @@ void isNormal_863dcd() { bvec4 res = tint_isNormal(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { isNormal_863dcd(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint4' : undeclared identifier ERROR: 0:5: '' : compilation terminated @@ -64,19 +51,14 @@ void isNormal_863dcd() { bvec4 res = tint_isNormal(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { isNormal_863dcd(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint4' : undeclared identifier ERROR: 0:5: '' : compilation terminated @@ -98,20 +80,15 @@ void isNormal_863dcd() { bvec4 res = tint_isNormal(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { isNormal_863dcd(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint4' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/isNormal/b00ab1.wgsl.expected.glsl b/test/intrinsics/gen/isNormal/b00ab1.wgsl.expected.glsl index 09a02d18d9..038cf35478 100644 --- a/test/intrinsics/gen/isNormal/b00ab1.wgsl.expected.glsl +++ b/test/intrinsics/gen/isNormal/b00ab1.wgsl.expected.glsl @@ -18,31 +18,18 @@ void isNormal_b00ab1() { bvec2 res = tint_isNormal(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { isNormal_b00ab1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint2' : undeclared identifier ERROR: 0:5: '' : compilation terminated @@ -64,19 +51,14 @@ void isNormal_b00ab1() { bvec2 res = tint_isNormal(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { isNormal_b00ab1(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint2' : undeclared identifier ERROR: 0:5: '' : compilation terminated @@ -98,20 +80,15 @@ void isNormal_b00ab1() { bvec2 res = tint_isNormal(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { isNormal_b00ab1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint2' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/isNormal/c286b7.wgsl.expected.glsl b/test/intrinsics/gen/isNormal/c286b7.wgsl.expected.glsl index 959e3d4932..4215a0e1ca 100644 --- a/test/intrinsics/gen/isNormal/c286b7.wgsl.expected.glsl +++ b/test/intrinsics/gen/isNormal/c286b7.wgsl.expected.glsl @@ -18,31 +18,18 @@ void isNormal_c286b7() { bvec3 res = tint_isNormal(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { isNormal_c286b7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint3' : undeclared identifier ERROR: 0:5: '' : compilation terminated @@ -64,19 +51,14 @@ void isNormal_c286b7() { bvec3 res = tint_isNormal(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { isNormal_c286b7(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint3' : undeclared identifier ERROR: 0:5: '' : compilation terminated @@ -98,20 +80,15 @@ void isNormal_c286b7() { bvec3 res = tint_isNormal(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { isNormal_c286b7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint3' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/isNormal/c6e880.wgsl.expected.glsl b/test/intrinsics/gen/isNormal/c6e880.wgsl.expected.glsl index 047b0305c0..03618514bb 100644 --- a/test/intrinsics/gen/isNormal/c6e880.wgsl.expected.glsl +++ b/test/intrinsics/gen/isNormal/c6e880.wgsl.expected.glsl @@ -18,31 +18,18 @@ void isNormal_c6e880() { bool res = tint_isNormal(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { isNormal_c6e880(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'asuint' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp uint' @@ -65,19 +52,14 @@ void isNormal_c6e880() { bool res = tint_isNormal(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { isNormal_c6e880(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'asuint' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump uint' @@ -100,20 +82,15 @@ void isNormal_c6e880() { bool res = tint_isNormal(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { isNormal_c6e880(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'asuint' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp uint' diff --git a/test/intrinsics/gen/ldexp/a31cdc.wgsl.expected.glsl b/test/intrinsics/gen/ldexp/a31cdc.wgsl.expected.glsl index 52421d5479..f1a8f19bb2 100644 --- a/test/intrinsics/gen/ldexp/a31cdc.wgsl.expected.glsl +++ b/test/intrinsics/gen/ldexp/a31cdc.wgsl.expected.glsl @@ -5,31 +5,18 @@ void ldexp_a31cdc() { vec3 res = ldexp(vec3(0.0f, 0.0f, 0.0f), ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { ldexp_a31cdc(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void ldexp_a31cdc() { vec3 res = ldexp(vec3(0.0f, 0.0f, 0.0f), ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { ldexp_a31cdc(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void ldexp_a31cdc() { vec3 res = ldexp(vec3(0.0f, 0.0f, 0.0f), ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { ldexp_a31cdc(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/ldexp/abd718.wgsl.expected.glsl b/test/intrinsics/gen/ldexp/abd718.wgsl.expected.glsl index 517e258e46..c72b266212 100644 --- a/test/intrinsics/gen/ldexp/abd718.wgsl.expected.glsl +++ b/test/intrinsics/gen/ldexp/abd718.wgsl.expected.glsl @@ -5,31 +5,18 @@ void ldexp_abd718() { vec2 res = ldexp(vec2(0.0f, 0.0f), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { ldexp_abd718(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void ldexp_abd718() { vec2 res = ldexp(vec2(0.0f, 0.0f), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { ldexp_abd718(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void ldexp_abd718() { vec2 res = ldexp(vec2(0.0f, 0.0f), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { ldexp_abd718(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/ldexp/cc9cde.wgsl.expected.glsl b/test/intrinsics/gen/ldexp/cc9cde.wgsl.expected.glsl index 24485b439f..0b56095457 100644 --- a/test/intrinsics/gen/ldexp/cc9cde.wgsl.expected.glsl +++ b/test/intrinsics/gen/ldexp/cc9cde.wgsl.expected.glsl @@ -5,31 +5,18 @@ void ldexp_cc9cde() { vec4 res = ldexp(vec4(0.0f, 0.0f, 0.0f, 0.0f), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { ldexp_cc9cde(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void ldexp_cc9cde() { vec4 res = ldexp(vec4(0.0f, 0.0f, 0.0f, 0.0f), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { ldexp_cc9cde(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void ldexp_cc9cde() { vec4 res = ldexp(vec4(0.0f, 0.0f, 0.0f, 0.0f), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { ldexp_cc9cde(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/ldexp/db8b49.wgsl.expected.glsl b/test/intrinsics/gen/ldexp/db8b49.wgsl.expected.glsl index 113b4c3b9c..d29b019365 100644 --- a/test/intrinsics/gen/ldexp/db8b49.wgsl.expected.glsl +++ b/test/intrinsics/gen/ldexp/db8b49.wgsl.expected.glsl @@ -5,31 +5,18 @@ void ldexp_db8b49() { float res = ldexp(1.0f, 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { ldexp_db8b49(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void ldexp_db8b49() { float res = ldexp(1.0f, 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { ldexp_db8b49(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void ldexp_db8b49() { float res = ldexp(1.0f, 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { ldexp_db8b49(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/length/056071.wgsl.expected.glsl b/test/intrinsics/gen/length/056071.wgsl.expected.glsl index 3b119de312..259f040ca1 100644 --- a/test/intrinsics/gen/length/056071.wgsl.expected.glsl +++ b/test/intrinsics/gen/length/056071.wgsl.expected.glsl @@ -5,31 +5,18 @@ void length_056071() { float res = length(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { length_056071(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void length_056071() { float res = length(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { length_056071(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void length_056071() { float res = length(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { length_056071(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/length/602a17.wgsl.expected.glsl b/test/intrinsics/gen/length/602a17.wgsl.expected.glsl index ce4b832cad..4a04172579 100644 --- a/test/intrinsics/gen/length/602a17.wgsl.expected.glsl +++ b/test/intrinsics/gen/length/602a17.wgsl.expected.glsl @@ -5,31 +5,18 @@ void length_602a17() { float res = length(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { length_602a17(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void length_602a17() { float res = length(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { length_602a17(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void length_602a17() { float res = length(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { length_602a17(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/length/afde8b.wgsl.expected.glsl b/test/intrinsics/gen/length/afde8b.wgsl.expected.glsl index d86ccd38a9..e58341f209 100644 --- a/test/intrinsics/gen/length/afde8b.wgsl.expected.glsl +++ b/test/intrinsics/gen/length/afde8b.wgsl.expected.glsl @@ -5,31 +5,18 @@ void length_afde8b() { float res = length(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { length_afde8b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void length_afde8b() { float res = length(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { length_afde8b(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void length_afde8b() { float res = length(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { length_afde8b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/length/becebf.wgsl.expected.glsl b/test/intrinsics/gen/length/becebf.wgsl.expected.glsl index 7486516217..3ec5f75d5d 100644 --- a/test/intrinsics/gen/length/becebf.wgsl.expected.glsl +++ b/test/intrinsics/gen/length/becebf.wgsl.expected.glsl @@ -5,31 +5,18 @@ void length_becebf() { float res = length(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { length_becebf(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void length_becebf() { float res = length(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { length_becebf(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void length_becebf() { float res = length(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { length_becebf(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/log/3da25a.wgsl.expected.glsl b/test/intrinsics/gen/log/3da25a.wgsl.expected.glsl index 1bc35fb7a2..1b40c4126c 100644 --- a/test/intrinsics/gen/log/3da25a.wgsl.expected.glsl +++ b/test/intrinsics/gen/log/3da25a.wgsl.expected.glsl @@ -5,31 +5,18 @@ void log_3da25a() { vec4 res = log(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { log_3da25a(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void log_3da25a() { vec4 res = log(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { log_3da25a(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void log_3da25a() { vec4 res = log(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { log_3da25a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/log/7114a6.wgsl.expected.glsl b/test/intrinsics/gen/log/7114a6.wgsl.expected.glsl index 46d72a1904..9b5e63e1a6 100644 --- a/test/intrinsics/gen/log/7114a6.wgsl.expected.glsl +++ b/test/intrinsics/gen/log/7114a6.wgsl.expected.glsl @@ -5,31 +5,18 @@ void log_7114a6() { float res = log(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { log_7114a6(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void log_7114a6() { float res = log(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { log_7114a6(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void log_7114a6() { float res = log(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { log_7114a6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/log/b2ce28.wgsl.expected.glsl b/test/intrinsics/gen/log/b2ce28.wgsl.expected.glsl index aa634070d7..46653ada2b 100644 --- a/test/intrinsics/gen/log/b2ce28.wgsl.expected.glsl +++ b/test/intrinsics/gen/log/b2ce28.wgsl.expected.glsl @@ -5,31 +5,18 @@ void log_b2ce28() { vec2 res = log(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { log_b2ce28(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void log_b2ce28() { vec2 res = log(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { log_b2ce28(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void log_b2ce28() { vec2 res = log(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { log_b2ce28(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/log/f4c570.wgsl.expected.glsl b/test/intrinsics/gen/log/f4c570.wgsl.expected.glsl index 2171e83cc9..4986e79bfa 100644 --- a/test/intrinsics/gen/log/f4c570.wgsl.expected.glsl +++ b/test/intrinsics/gen/log/f4c570.wgsl.expected.glsl @@ -5,31 +5,18 @@ void log_f4c570() { vec3 res = log(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { log_f4c570(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void log_f4c570() { vec3 res = log(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { log_f4c570(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void log_f4c570() { vec3 res = log(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { log_f4c570(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/log2/4036ed.wgsl.expected.glsl b/test/intrinsics/gen/log2/4036ed.wgsl.expected.glsl index a3cbb0d734..ef4bb1904d 100644 --- a/test/intrinsics/gen/log2/4036ed.wgsl.expected.glsl +++ b/test/intrinsics/gen/log2/4036ed.wgsl.expected.glsl @@ -5,31 +5,18 @@ void log2_4036ed() { float res = log2(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { log2_4036ed(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void log2_4036ed() { float res = log2(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { log2_4036ed(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void log2_4036ed() { float res = log2(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { log2_4036ed(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/log2/902988.wgsl.expected.glsl b/test/intrinsics/gen/log2/902988.wgsl.expected.glsl index 23d35bc7b0..a263deab9c 100644 --- a/test/intrinsics/gen/log2/902988.wgsl.expected.glsl +++ b/test/intrinsics/gen/log2/902988.wgsl.expected.glsl @@ -5,31 +5,18 @@ void log2_902988() { vec4 res = log2(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { log2_902988(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void log2_902988() { vec4 res = log2(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { log2_902988(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void log2_902988() { vec4 res = log2(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { log2_902988(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/log2/adb233.wgsl.expected.glsl b/test/intrinsics/gen/log2/adb233.wgsl.expected.glsl index 5cc3c47edf..b79c82b31f 100644 --- a/test/intrinsics/gen/log2/adb233.wgsl.expected.glsl +++ b/test/intrinsics/gen/log2/adb233.wgsl.expected.glsl @@ -5,31 +5,18 @@ void log2_adb233() { vec3 res = log2(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { log2_adb233(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void log2_adb233() { vec3 res = log2(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { log2_adb233(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void log2_adb233() { vec3 res = log2(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { log2_adb233(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/log2/aea659.wgsl.expected.glsl b/test/intrinsics/gen/log2/aea659.wgsl.expected.glsl index ad3b77a6e4..c1161a7e8a 100644 --- a/test/intrinsics/gen/log2/aea659.wgsl.expected.glsl +++ b/test/intrinsics/gen/log2/aea659.wgsl.expected.glsl @@ -5,31 +5,18 @@ void log2_aea659() { vec2 res = log2(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { log2_aea659(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void log2_aea659() { vec2 res = log2(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { log2_aea659(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void log2_aea659() { vec2 res = log2(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { log2_aea659(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/max/0c0aae.wgsl.expected.glsl b/test/intrinsics/gen/max/0c0aae.wgsl.expected.glsl index 63560d09d1..c0f35091cd 100644 --- a/test/intrinsics/gen/max/0c0aae.wgsl.expected.glsl +++ b/test/intrinsics/gen/max/0c0aae.wgsl.expected.glsl @@ -5,31 +5,18 @@ void max_0c0aae() { uint res = max(1u, 1u); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { max_0c0aae(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void max_0c0aae() { uint res = max(1u, 1u); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { max_0c0aae(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void max_0c0aae() { uint res = max(1u, 1u); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { max_0c0aae(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/max/25eafe.wgsl.expected.glsl b/test/intrinsics/gen/max/25eafe.wgsl.expected.glsl index 730e3d371c..03e055f176 100644 --- a/test/intrinsics/gen/max/25eafe.wgsl.expected.glsl +++ b/test/intrinsics/gen/max/25eafe.wgsl.expected.glsl @@ -5,31 +5,18 @@ void max_25eafe() { ivec3 res = max(ivec3(0, 0, 0), ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { max_25eafe(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void max_25eafe() { ivec3 res = max(ivec3(0, 0, 0), ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { max_25eafe(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void max_25eafe() { ivec3 res = max(ivec3(0, 0, 0), ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { max_25eafe(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/max/320815.wgsl.expected.glsl b/test/intrinsics/gen/max/320815.wgsl.expected.glsl index 8e21639ca1..c849500d6b 100644 --- a/test/intrinsics/gen/max/320815.wgsl.expected.glsl +++ b/test/intrinsics/gen/max/320815.wgsl.expected.glsl @@ -5,31 +5,18 @@ void max_320815() { uvec2 res = max(uvec2(0u, 0u), uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { max_320815(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void max_320815() { uvec2 res = max(uvec2(0u, 0u), uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { max_320815(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void max_320815() { uvec2 res = max(uvec2(0u, 0u), uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { max_320815(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/max/44a39d.wgsl.expected.glsl b/test/intrinsics/gen/max/44a39d.wgsl.expected.glsl index 2d87a72fb0..bf3a813273 100644 --- a/test/intrinsics/gen/max/44a39d.wgsl.expected.glsl +++ b/test/intrinsics/gen/max/44a39d.wgsl.expected.glsl @@ -5,31 +5,18 @@ void max_44a39d() { float res = max(1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { max_44a39d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void max_44a39d() { float res = max(1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { max_44a39d(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void max_44a39d() { float res = max(1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { max_44a39d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/max/453e04.wgsl.expected.glsl b/test/intrinsics/gen/max/453e04.wgsl.expected.glsl index f0127c45d9..a23013ab1a 100644 --- a/test/intrinsics/gen/max/453e04.wgsl.expected.glsl +++ b/test/intrinsics/gen/max/453e04.wgsl.expected.glsl @@ -5,31 +5,18 @@ void max_453e04() { uvec4 res = max(uvec4(0u, 0u, 0u, 0u), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { max_453e04(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void max_453e04() { uvec4 res = max(uvec4(0u, 0u, 0u, 0u), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { max_453e04(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void max_453e04() { uvec4 res = max(uvec4(0u, 0u, 0u, 0u), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { max_453e04(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/max/462050.wgsl.expected.glsl b/test/intrinsics/gen/max/462050.wgsl.expected.glsl index db7e09855d..42422075d6 100644 --- a/test/intrinsics/gen/max/462050.wgsl.expected.glsl +++ b/test/intrinsics/gen/max/462050.wgsl.expected.glsl @@ -5,31 +5,18 @@ void max_462050() { vec2 res = max(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { max_462050(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void max_462050() { vec2 res = max(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { max_462050(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void max_462050() { vec2 res = max(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { max_462050(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/max/4883ac.wgsl.expected.glsl b/test/intrinsics/gen/max/4883ac.wgsl.expected.glsl index e418b7904d..f82b20e84d 100644 --- a/test/intrinsics/gen/max/4883ac.wgsl.expected.glsl +++ b/test/intrinsics/gen/max/4883ac.wgsl.expected.glsl @@ -5,31 +5,18 @@ void max_4883ac() { vec3 res = max(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { max_4883ac(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void max_4883ac() { vec3 res = max(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { max_4883ac(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void max_4883ac() { vec3 res = max(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { max_4883ac(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/max/85e6bc.wgsl.expected.glsl b/test/intrinsics/gen/max/85e6bc.wgsl.expected.glsl index 662db4ec2d..cf6e036ba1 100644 --- a/test/intrinsics/gen/max/85e6bc.wgsl.expected.glsl +++ b/test/intrinsics/gen/max/85e6bc.wgsl.expected.glsl @@ -5,31 +5,18 @@ void max_85e6bc() { ivec4 res = max(ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { max_85e6bc(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void max_85e6bc() { ivec4 res = max(ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { max_85e6bc(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void max_85e6bc() { ivec4 res = max(ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { max_85e6bc(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/max/a93419.wgsl.expected.glsl b/test/intrinsics/gen/max/a93419.wgsl.expected.glsl index d39362b591..5daddd73b5 100644 --- a/test/intrinsics/gen/max/a93419.wgsl.expected.glsl +++ b/test/intrinsics/gen/max/a93419.wgsl.expected.glsl @@ -5,31 +5,18 @@ void max_a93419() { vec4 res = max(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { max_a93419(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void max_a93419() { vec4 res = max(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { max_a93419(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void max_a93419() { vec4 res = max(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { max_a93419(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/max/b1b73a.wgsl.expected.glsl b/test/intrinsics/gen/max/b1b73a.wgsl.expected.glsl index bad55c73a4..f53eb96325 100644 --- a/test/intrinsics/gen/max/b1b73a.wgsl.expected.glsl +++ b/test/intrinsics/gen/max/b1b73a.wgsl.expected.glsl @@ -5,31 +5,18 @@ void max_b1b73a() { uvec3 res = max(uvec3(0u, 0u, 0u), uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { max_b1b73a(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void max_b1b73a() { uvec3 res = max(uvec3(0u, 0u, 0u), uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { max_b1b73a(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void max_b1b73a() { uvec3 res = max(uvec3(0u, 0u, 0u), uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { max_b1b73a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/max/ce7c30.wgsl.expected.glsl b/test/intrinsics/gen/max/ce7c30.wgsl.expected.glsl index e9496f360f..470b30c39d 100644 --- a/test/intrinsics/gen/max/ce7c30.wgsl.expected.glsl +++ b/test/intrinsics/gen/max/ce7c30.wgsl.expected.glsl @@ -5,31 +5,18 @@ void max_ce7c30() { int res = max(1, 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { max_ce7c30(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void max_ce7c30() { int res = max(1, 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { max_ce7c30(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void max_ce7c30() { int res = max(1, 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { max_ce7c30(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/max/e8192f.wgsl.expected.glsl b/test/intrinsics/gen/max/e8192f.wgsl.expected.glsl index eead06e87b..bf322b96ce 100644 --- a/test/intrinsics/gen/max/e8192f.wgsl.expected.glsl +++ b/test/intrinsics/gen/max/e8192f.wgsl.expected.glsl @@ -5,31 +5,18 @@ void max_e8192f() { ivec2 res = max(ivec2(0, 0), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { max_e8192f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void max_e8192f() { ivec2 res = max(ivec2(0, 0), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { max_e8192f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void max_e8192f() { ivec2 res = max(ivec2(0, 0), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { max_e8192f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/min/03c7e3.wgsl.expected.glsl b/test/intrinsics/gen/min/03c7e3.wgsl.expected.glsl index 21670e2ffc..e5d154fe41 100644 --- a/test/intrinsics/gen/min/03c7e3.wgsl.expected.glsl +++ b/test/intrinsics/gen/min/03c7e3.wgsl.expected.glsl @@ -5,31 +5,18 @@ void min_03c7e3() { ivec2 res = min(ivec2(0, 0), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { min_03c7e3(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void min_03c7e3() { ivec2 res = min(ivec2(0, 0), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { min_03c7e3(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void min_03c7e3() { ivec2 res = min(ivec2(0, 0), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { min_03c7e3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/min/0dc614.wgsl.expected.glsl b/test/intrinsics/gen/min/0dc614.wgsl.expected.glsl index 23d6a58574..0f8cb328e6 100644 --- a/test/intrinsics/gen/min/0dc614.wgsl.expected.glsl +++ b/test/intrinsics/gen/min/0dc614.wgsl.expected.glsl @@ -5,31 +5,18 @@ void min_0dc614() { uvec4 res = min(uvec4(0u, 0u, 0u, 0u), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { min_0dc614(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void min_0dc614() { uvec4 res = min(uvec4(0u, 0u, 0u, 0u), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { min_0dc614(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void min_0dc614() { uvec4 res = min(uvec4(0u, 0u, 0u, 0u), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { min_0dc614(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/min/3941e1.wgsl.expected.glsl b/test/intrinsics/gen/min/3941e1.wgsl.expected.glsl index 5df9bdcf0f..9ada220c15 100644 --- a/test/intrinsics/gen/min/3941e1.wgsl.expected.glsl +++ b/test/intrinsics/gen/min/3941e1.wgsl.expected.glsl @@ -5,31 +5,18 @@ void min_3941e1() { ivec4 res = min(ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { min_3941e1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void min_3941e1() { ivec4 res = min(ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { min_3941e1(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void min_3941e1() { ivec4 res = min(ivec4(0, 0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { min_3941e1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/min/46c5d3.wgsl.expected.glsl b/test/intrinsics/gen/min/46c5d3.wgsl.expected.glsl index 138a485d19..fc70ab2902 100644 --- a/test/intrinsics/gen/min/46c5d3.wgsl.expected.glsl +++ b/test/intrinsics/gen/min/46c5d3.wgsl.expected.glsl @@ -5,31 +5,18 @@ void min_46c5d3() { uint res = min(1u, 1u); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { min_46c5d3(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void min_46c5d3() { uint res = min(1u, 1u); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { min_46c5d3(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void min_46c5d3() { uint res = min(1u, 1u); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { min_46c5d3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/min/82b28f.wgsl.expected.glsl b/test/intrinsics/gen/min/82b28f.wgsl.expected.glsl index c1d244a18f..79b76c178e 100644 --- a/test/intrinsics/gen/min/82b28f.wgsl.expected.glsl +++ b/test/intrinsics/gen/min/82b28f.wgsl.expected.glsl @@ -5,31 +5,18 @@ void min_82b28f() { uvec2 res = min(uvec2(0u, 0u), uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { min_82b28f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void min_82b28f() { uvec2 res = min(uvec2(0u, 0u), uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { min_82b28f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void min_82b28f() { uvec2 res = min(uvec2(0u, 0u), uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { min_82b28f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/min/93cfc4.wgsl.expected.glsl b/test/intrinsics/gen/min/93cfc4.wgsl.expected.glsl index ea51f496ea..f1b7daa470 100644 --- a/test/intrinsics/gen/min/93cfc4.wgsl.expected.glsl +++ b/test/intrinsics/gen/min/93cfc4.wgsl.expected.glsl @@ -5,31 +5,18 @@ void min_93cfc4() { vec3 res = min(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { min_93cfc4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void min_93cfc4() { vec3 res = min(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { min_93cfc4(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void min_93cfc4() { vec3 res = min(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { min_93cfc4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/min/a45171.wgsl.expected.glsl b/test/intrinsics/gen/min/a45171.wgsl.expected.glsl index 43bee8b18f..ee3ce2061c 100644 --- a/test/intrinsics/gen/min/a45171.wgsl.expected.glsl +++ b/test/intrinsics/gen/min/a45171.wgsl.expected.glsl @@ -5,31 +5,18 @@ void min_a45171() { ivec3 res = min(ivec3(0, 0, 0), ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { min_a45171(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void min_a45171() { ivec3 res = min(ivec3(0, 0, 0), ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { min_a45171(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void min_a45171() { ivec3 res = min(ivec3(0, 0, 0), ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { min_a45171(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/min/aa28ad.wgsl.expected.glsl b/test/intrinsics/gen/min/aa28ad.wgsl.expected.glsl index eb5a4b0003..9833c79cdf 100644 --- a/test/intrinsics/gen/min/aa28ad.wgsl.expected.glsl +++ b/test/intrinsics/gen/min/aa28ad.wgsl.expected.glsl @@ -5,31 +5,18 @@ void min_aa28ad() { vec2 res = min(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { min_aa28ad(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void min_aa28ad() { vec2 res = min(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { min_aa28ad(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void min_aa28ad() { vec2 res = min(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { min_aa28ad(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/min/af326d.wgsl.expected.glsl b/test/intrinsics/gen/min/af326d.wgsl.expected.glsl index 1090dab24c..aa066a9bac 100644 --- a/test/intrinsics/gen/min/af326d.wgsl.expected.glsl +++ b/test/intrinsics/gen/min/af326d.wgsl.expected.glsl @@ -5,31 +5,18 @@ void min_af326d() { float res = min(1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { min_af326d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void min_af326d() { float res = min(1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { min_af326d(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void min_af326d() { float res = min(1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { min_af326d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/min/c70bb7.wgsl.expected.glsl b/test/intrinsics/gen/min/c70bb7.wgsl.expected.glsl index 09ecc63a81..84a8276728 100644 --- a/test/intrinsics/gen/min/c70bb7.wgsl.expected.glsl +++ b/test/intrinsics/gen/min/c70bb7.wgsl.expected.glsl @@ -5,31 +5,18 @@ void min_c70bb7() { uvec3 res = min(uvec3(0u, 0u, 0u), uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { min_c70bb7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void min_c70bb7() { uvec3 res = min(uvec3(0u, 0u, 0u), uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { min_c70bb7(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void min_c70bb7() { uvec3 res = min(uvec3(0u, 0u, 0u), uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { min_c70bb7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/min/c73147.wgsl.expected.glsl b/test/intrinsics/gen/min/c73147.wgsl.expected.glsl index 914a4b36dc..dc5d0a0b8f 100644 --- a/test/intrinsics/gen/min/c73147.wgsl.expected.glsl +++ b/test/intrinsics/gen/min/c73147.wgsl.expected.glsl @@ -5,31 +5,18 @@ void min_c73147() { int res = min(1, 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { min_c73147(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void min_c73147() { int res = min(1, 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { min_c73147(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void min_c73147() { int res = min(1, 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { min_c73147(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/min/c76fa6.wgsl.expected.glsl b/test/intrinsics/gen/min/c76fa6.wgsl.expected.glsl index a6b8d7351b..5ac7d788d0 100644 --- a/test/intrinsics/gen/min/c76fa6.wgsl.expected.glsl +++ b/test/intrinsics/gen/min/c76fa6.wgsl.expected.glsl @@ -5,31 +5,18 @@ void min_c76fa6() { vec4 res = min(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { min_c76fa6(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void min_c76fa6() { vec4 res = min(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { min_c76fa6(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void min_c76fa6() { vec4 res = min(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { min_c76fa6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/mix/0c8c33.wgsl.expected.glsl b/test/intrinsics/gen/mix/0c8c33.wgsl.expected.glsl index 5d2c8c9455..9aa4a99159 100644 --- a/test/intrinsics/gen/mix/0c8c33.wgsl.expected.glsl +++ b/test/intrinsics/gen/mix/0c8c33.wgsl.expected.glsl @@ -5,31 +5,18 @@ void mix_0c8c33() { vec3 res = mix(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { mix_0c8c33(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void mix_0c8c33() { vec3 res = mix(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { mix_0c8c33(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void mix_0c8c33() { vec3 res = mix(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { mix_0c8c33(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/mix/1faeb1.wgsl.expected.glsl b/test/intrinsics/gen/mix/1faeb1.wgsl.expected.glsl index baca38f813..029fe151ae 100644 --- a/test/intrinsics/gen/mix/1faeb1.wgsl.expected.glsl +++ b/test/intrinsics/gen/mix/1faeb1.wgsl.expected.glsl @@ -5,31 +5,18 @@ void mix_1faeb1() { vec4 res = mix(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { mix_1faeb1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void mix_1faeb1() { vec4 res = mix(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { mix_1faeb1(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void mix_1faeb1() { vec4 res = mix(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { mix_1faeb1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/mix/2fadab.wgsl.expected.glsl b/test/intrinsics/gen/mix/2fadab.wgsl.expected.glsl index 926742837c..99c8c80ea4 100644 --- a/test/intrinsics/gen/mix/2fadab.wgsl.expected.glsl +++ b/test/intrinsics/gen/mix/2fadab.wgsl.expected.glsl @@ -5,31 +5,18 @@ void mix_2fadab() { vec2 res = mix(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { mix_2fadab(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void mix_2fadab() { vec2 res = mix(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { mix_2fadab(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void mix_2fadab() { vec2 res = mix(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { mix_2fadab(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/mix/315264.wgsl.expected.glsl b/test/intrinsics/gen/mix/315264.wgsl.expected.glsl index 474594f615..1b17454fe9 100644 --- a/test/intrinsics/gen/mix/315264.wgsl.expected.glsl +++ b/test/intrinsics/gen/mix/315264.wgsl.expected.glsl @@ -5,31 +5,18 @@ void mix_315264() { vec3 res = mix(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { mix_315264(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void mix_315264() { vec3 res = mix(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { mix_315264(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void mix_315264() { vec3 res = mix(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { mix_315264(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/mix/4f0b5e.wgsl.expected.glsl b/test/intrinsics/gen/mix/4f0b5e.wgsl.expected.glsl index df22fe4b68..076f4dc44f 100644 --- a/test/intrinsics/gen/mix/4f0b5e.wgsl.expected.glsl +++ b/test/intrinsics/gen/mix/4f0b5e.wgsl.expected.glsl @@ -5,31 +5,18 @@ void mix_4f0b5e() { float res = mix(1.0f, 1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { mix_4f0b5e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void mix_4f0b5e() { float res = mix(1.0f, 1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { mix_4f0b5e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void mix_4f0b5e() { float res = mix(1.0f, 1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { mix_4f0b5e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/mix/6f8adc.wgsl.expected.glsl b/test/intrinsics/gen/mix/6f8adc.wgsl.expected.glsl index 0d74119feb..b42cd3aba0 100644 --- a/test/intrinsics/gen/mix/6f8adc.wgsl.expected.glsl +++ b/test/intrinsics/gen/mix/6f8adc.wgsl.expected.glsl @@ -5,31 +5,18 @@ void mix_6f8adc() { vec2 res = mix(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { mix_6f8adc(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void mix_6f8adc() { vec2 res = mix(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { mix_6f8adc(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void mix_6f8adc() { vec2 res = mix(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { mix_6f8adc(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/mix/c37ede.wgsl.expected.glsl b/test/intrinsics/gen/mix/c37ede.wgsl.expected.glsl index 69908a31b0..9b42c945ac 100644 --- a/test/intrinsics/gen/mix/c37ede.wgsl.expected.glsl +++ b/test/intrinsics/gen/mix/c37ede.wgsl.expected.glsl @@ -5,31 +5,18 @@ void mix_c37ede() { vec4 res = mix(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { mix_c37ede(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void mix_c37ede() { vec4 res = mix(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { mix_c37ede(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void mix_c37ede() { vec4 res = mix(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { mix_c37ede(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/modf/180fed.wgsl.expected.glsl b/test/intrinsics/gen/modf/180fed.wgsl.expected.glsl index 7ca9bdf6be..aa46a23aaa 100644 --- a/test/intrinsics/gen/modf/180fed.wgsl.expected.glsl +++ b/test/intrinsics/gen/modf/180fed.wgsl.expected.glsl @@ -20,31 +20,18 @@ void modf_180fed() { modf_result res = tint_modf(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { modf_180fed(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:12: '{ } style initializers' : not supported with this profile: es ERROR: 0:12: '' : compilation terminated @@ -72,19 +59,14 @@ void modf_180fed() { modf_result res = tint_modf(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { modf_180fed(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:12: '{ } style initializers' : not supported with this profile: es ERROR: 0:12: '' : compilation terminated @@ -112,20 +94,15 @@ void modf_180fed() { modf_result res = tint_modf(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { modf_180fed(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:12: '{ } style initializers' : not supported with this profile: es ERROR: 0:12: '' : compilation terminated diff --git a/test/intrinsics/gen/modf/9b75f7.wgsl.expected.glsl b/test/intrinsics/gen/modf/9b75f7.wgsl.expected.glsl index 01bd4b3513..236dd37521 100644 --- a/test/intrinsics/gen/modf/9b75f7.wgsl.expected.glsl +++ b/test/intrinsics/gen/modf/9b75f7.wgsl.expected.glsl @@ -20,31 +20,18 @@ void modf_9b75f7() { modf_result_vec3 res = tint_modf(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { modf_9b75f7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:10: 'float3' : undeclared identifier ERROR: 0:10: '' : compilation terminated @@ -72,19 +59,14 @@ void modf_9b75f7() { modf_result_vec3 res = tint_modf(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { modf_9b75f7(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:10: 'float3' : undeclared identifier ERROR: 0:10: '' : compilation terminated @@ -112,20 +94,15 @@ void modf_9b75f7() { modf_result_vec3 res = tint_modf(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { modf_9b75f7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:10: 'float3' : undeclared identifier ERROR: 0:10: '' : compilation terminated diff --git a/test/intrinsics/gen/modf/ec2dbc.wgsl.expected.glsl b/test/intrinsics/gen/modf/ec2dbc.wgsl.expected.glsl index 603abe5107..d4a28d0c2d 100644 --- a/test/intrinsics/gen/modf/ec2dbc.wgsl.expected.glsl +++ b/test/intrinsics/gen/modf/ec2dbc.wgsl.expected.glsl @@ -20,31 +20,18 @@ void modf_ec2dbc() { modf_result_vec4 res = tint_modf(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { modf_ec2dbc(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:10: 'float4' : undeclared identifier ERROR: 0:10: '' : compilation terminated @@ -72,19 +59,14 @@ void modf_ec2dbc() { modf_result_vec4 res = tint_modf(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { modf_ec2dbc(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:10: 'float4' : undeclared identifier ERROR: 0:10: '' : compilation terminated @@ -112,20 +94,15 @@ void modf_ec2dbc() { modf_result_vec4 res = tint_modf(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { modf_ec2dbc(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:10: 'float4' : undeclared identifier ERROR: 0:10: '' : compilation terminated diff --git a/test/intrinsics/gen/modf/f5f20d.wgsl.expected.glsl b/test/intrinsics/gen/modf/f5f20d.wgsl.expected.glsl index c3fde70913..5911f45f0e 100644 --- a/test/intrinsics/gen/modf/f5f20d.wgsl.expected.glsl +++ b/test/intrinsics/gen/modf/f5f20d.wgsl.expected.glsl @@ -20,31 +20,18 @@ void modf_f5f20d() { modf_result_vec2 res = tint_modf(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { modf_f5f20d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:10: 'float2' : undeclared identifier ERROR: 0:10: '' : compilation terminated @@ -72,19 +59,14 @@ void modf_f5f20d() { modf_result_vec2 res = tint_modf(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { modf_f5f20d(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:10: 'float2' : undeclared identifier ERROR: 0:10: '' : compilation terminated @@ -112,20 +94,15 @@ void modf_f5f20d() { modf_result_vec2 res = tint_modf(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { modf_f5f20d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:10: 'float2' : undeclared identifier ERROR: 0:10: '' : compilation terminated diff --git a/test/intrinsics/gen/normalize/64d8c0.wgsl.expected.glsl b/test/intrinsics/gen/normalize/64d8c0.wgsl.expected.glsl index 4558248764..80a6702a8a 100644 --- a/test/intrinsics/gen/normalize/64d8c0.wgsl.expected.glsl +++ b/test/intrinsics/gen/normalize/64d8c0.wgsl.expected.glsl @@ -5,31 +5,18 @@ void normalize_64d8c0() { vec3 res = normalize(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { normalize_64d8c0(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void normalize_64d8c0() { vec3 res = normalize(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { normalize_64d8c0(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void normalize_64d8c0() { vec3 res = normalize(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { normalize_64d8c0(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/normalize/9a0aab.wgsl.expected.glsl b/test/intrinsics/gen/normalize/9a0aab.wgsl.expected.glsl index 959ddaf538..4b415e06ae 100644 --- a/test/intrinsics/gen/normalize/9a0aab.wgsl.expected.glsl +++ b/test/intrinsics/gen/normalize/9a0aab.wgsl.expected.glsl @@ -5,31 +5,18 @@ void normalize_9a0aab() { vec4 res = normalize(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { normalize_9a0aab(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void normalize_9a0aab() { vec4 res = normalize(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { normalize_9a0aab(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void normalize_9a0aab() { vec4 res = normalize(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { normalize_9a0aab(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/normalize/fc2ef1.wgsl.expected.glsl b/test/intrinsics/gen/normalize/fc2ef1.wgsl.expected.glsl index 8c9aaef2d0..572d2b3569 100644 --- a/test/intrinsics/gen/normalize/fc2ef1.wgsl.expected.glsl +++ b/test/intrinsics/gen/normalize/fc2ef1.wgsl.expected.glsl @@ -5,31 +5,18 @@ void normalize_fc2ef1() { vec2 res = normalize(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { normalize_fc2ef1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void normalize_fc2ef1() { vec2 res = normalize(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { normalize_fc2ef1(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void normalize_fc2ef1() { vec2 res = normalize(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { normalize_fc2ef1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/pack2x16float/0e97b3.wgsl.expected.glsl b/test/intrinsics/gen/pack2x16float/0e97b3.wgsl.expected.glsl index efb873d3c4..e4afbe96cb 100644 --- a/test/intrinsics/gen/pack2x16float/0e97b3.wgsl.expected.glsl +++ b/test/intrinsics/gen/pack2x16float/0e97b3.wgsl.expected.glsl @@ -13,31 +13,18 @@ void pack2x16float_0e97b3() { uint res = tint_pack2x16float(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { pack2x16float_0e97b3(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint2' : undeclared identifier ERROR: 0:5: '' : compilation terminated @@ -58,19 +45,14 @@ void pack2x16float_0e97b3() { uint res = tint_pack2x16float(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { pack2x16float_0e97b3(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint2' : undeclared identifier ERROR: 0:5: '' : compilation terminated @@ -91,20 +73,15 @@ void pack2x16float_0e97b3() { uint res = tint_pack2x16float(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { pack2x16float_0e97b3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint2' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/pack2x16snorm/6c169b.wgsl.expected.glsl b/test/intrinsics/gen/pack2x16snorm/6c169b.wgsl.expected.glsl index f3e88a87ec..d96b68511e 100644 --- a/test/intrinsics/gen/pack2x16snorm/6c169b.wgsl.expected.glsl +++ b/test/intrinsics/gen/pack2x16snorm/6c169b.wgsl.expected.glsl @@ -13,31 +13,18 @@ void pack2x16snorm_6c169b() { uint res = tint_pack2x16snorm(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { pack2x16snorm_6c169b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'int2' : undeclared identifier ERROR: 0:5: '' : compilation terminated @@ -58,19 +45,14 @@ void pack2x16snorm_6c169b() { uint res = tint_pack2x16snorm(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { pack2x16snorm_6c169b(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'int2' : undeclared identifier ERROR: 0:5: '' : compilation terminated @@ -91,20 +73,15 @@ void pack2x16snorm_6c169b() { uint res = tint_pack2x16snorm(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { pack2x16snorm_6c169b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'int2' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/pack2x16unorm/0f08e4.wgsl.expected.glsl b/test/intrinsics/gen/pack2x16unorm/0f08e4.wgsl.expected.glsl index 039d0c538a..0d07a9df9d 100644 --- a/test/intrinsics/gen/pack2x16unorm/0f08e4.wgsl.expected.glsl +++ b/test/intrinsics/gen/pack2x16unorm/0f08e4.wgsl.expected.glsl @@ -13,31 +13,18 @@ void pack2x16unorm_0f08e4() { uint res = tint_pack2x16unorm(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { pack2x16unorm_0f08e4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint2' : undeclared identifier ERROR: 0:5: '' : compilation terminated @@ -58,19 +45,14 @@ void pack2x16unorm_0f08e4() { uint res = tint_pack2x16unorm(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { pack2x16unorm_0f08e4(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint2' : undeclared identifier ERROR: 0:5: '' : compilation terminated @@ -91,20 +73,15 @@ void pack2x16unorm_0f08e4() { uint res = tint_pack2x16unorm(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { pack2x16unorm_0f08e4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint2' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/pack4x8snorm/4d22e7.wgsl.expected.glsl b/test/intrinsics/gen/pack4x8snorm/4d22e7.wgsl.expected.glsl index bdb1fa7c58..45a85c93d1 100644 --- a/test/intrinsics/gen/pack4x8snorm/4d22e7.wgsl.expected.glsl +++ b/test/intrinsics/gen/pack4x8snorm/4d22e7.wgsl.expected.glsl @@ -13,31 +13,18 @@ void pack4x8snorm_4d22e7() { uint res = tint_pack4x8snorm(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { pack4x8snorm_4d22e7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'int4' : undeclared identifier ERROR: 0:5: '' : compilation terminated @@ -58,19 +45,14 @@ void pack4x8snorm_4d22e7() { uint res = tint_pack4x8snorm(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { pack4x8snorm_4d22e7(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'int4' : undeclared identifier ERROR: 0:5: '' : compilation terminated @@ -91,20 +73,15 @@ void pack4x8snorm_4d22e7() { uint res = tint_pack4x8snorm(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { pack4x8snorm_4d22e7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'int4' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/pack4x8unorm/95c456.wgsl.expected.glsl b/test/intrinsics/gen/pack4x8unorm/95c456.wgsl.expected.glsl index 354a8bf5d4..f624f5c7ae 100644 --- a/test/intrinsics/gen/pack4x8unorm/95c456.wgsl.expected.glsl +++ b/test/intrinsics/gen/pack4x8unorm/95c456.wgsl.expected.glsl @@ -13,31 +13,18 @@ void pack4x8unorm_95c456() { uint res = tint_pack4x8unorm(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { pack4x8unorm_95c456(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint4' : undeclared identifier ERROR: 0:5: '' : compilation terminated @@ -58,19 +45,14 @@ void pack4x8unorm_95c456() { uint res = tint_pack4x8unorm(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { pack4x8unorm_95c456(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint4' : undeclared identifier ERROR: 0:5: '' : compilation terminated @@ -91,20 +73,15 @@ void pack4x8unorm_95c456() { uint res = tint_pack4x8unorm(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { pack4x8unorm_95c456(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint4' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/pow/04a908.wgsl.expected.glsl b/test/intrinsics/gen/pow/04a908.wgsl.expected.glsl index 82ecafa577..10dfe8542d 100644 --- a/test/intrinsics/gen/pow/04a908.wgsl.expected.glsl +++ b/test/intrinsics/gen/pow/04a908.wgsl.expected.glsl @@ -5,31 +5,18 @@ void pow_04a908() { vec4 res = pow(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { pow_04a908(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void pow_04a908() { vec4 res = pow(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { pow_04a908(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void pow_04a908() { vec4 res = pow(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { pow_04a908(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/pow/46e029.wgsl.expected.glsl b/test/intrinsics/gen/pow/46e029.wgsl.expected.glsl index da1678922f..95975545ec 100644 --- a/test/intrinsics/gen/pow/46e029.wgsl.expected.glsl +++ b/test/intrinsics/gen/pow/46e029.wgsl.expected.glsl @@ -5,31 +5,18 @@ void pow_46e029() { float res = pow(1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { pow_46e029(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void pow_46e029() { float res = pow(1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { pow_46e029(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void pow_46e029() { float res = pow(1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { pow_46e029(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/pow/4a46c9.wgsl.expected.glsl b/test/intrinsics/gen/pow/4a46c9.wgsl.expected.glsl index f1c85fc98b..78d361bf7d 100644 --- a/test/intrinsics/gen/pow/4a46c9.wgsl.expected.glsl +++ b/test/intrinsics/gen/pow/4a46c9.wgsl.expected.glsl @@ -5,31 +5,18 @@ void pow_4a46c9() { vec3 res = pow(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { pow_4a46c9(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void pow_4a46c9() { vec3 res = pow(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { pow_4a46c9(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void pow_4a46c9() { vec3 res = pow(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { pow_4a46c9(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/pow/e60ea5.wgsl.expected.glsl b/test/intrinsics/gen/pow/e60ea5.wgsl.expected.glsl index a52a87ff68..d578be9bb3 100644 --- a/test/intrinsics/gen/pow/e60ea5.wgsl.expected.glsl +++ b/test/intrinsics/gen/pow/e60ea5.wgsl.expected.glsl @@ -5,31 +5,18 @@ void pow_e60ea5() { vec2 res = pow(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { pow_e60ea5(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void pow_e60ea5() { vec2 res = pow(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { pow_e60ea5(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void pow_e60ea5() { vec2 res = pow(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { pow_e60ea5(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/radians/09b7fc.wgsl.expected.glsl b/test/intrinsics/gen/radians/09b7fc.wgsl.expected.glsl index fbfd57bfc5..d2467bf34a 100644 --- a/test/intrinsics/gen/radians/09b7fc.wgsl.expected.glsl +++ b/test/intrinsics/gen/radians/09b7fc.wgsl.expected.glsl @@ -10,31 +10,18 @@ void radians_09b7fc() { vec4 res = tint_radians(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { radians_09b7fc(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -47,19 +34,14 @@ void radians_09b7fc() { vec4 res = tint_radians(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { radians_09b7fc(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -72,17 +54,12 @@ void radians_09b7fc() { vec4 res = tint_radians(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { radians_09b7fc(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/radians/61687a.wgsl.expected.glsl b/test/intrinsics/gen/radians/61687a.wgsl.expected.glsl index 0c61f002f2..0894f0ae96 100644 --- a/test/intrinsics/gen/radians/61687a.wgsl.expected.glsl +++ b/test/intrinsics/gen/radians/61687a.wgsl.expected.glsl @@ -10,31 +10,18 @@ void radians_61687a() { vec2 res = tint_radians(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { radians_61687a(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -47,19 +34,14 @@ void radians_61687a() { vec2 res = tint_radians(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { radians_61687a(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -72,17 +54,12 @@ void radians_61687a() { vec2 res = tint_radians(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { radians_61687a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/radians/6b0ff2.wgsl.expected.glsl b/test/intrinsics/gen/radians/6b0ff2.wgsl.expected.glsl index 48c9109ded..a5b5bb69e7 100644 --- a/test/intrinsics/gen/radians/6b0ff2.wgsl.expected.glsl +++ b/test/intrinsics/gen/radians/6b0ff2.wgsl.expected.glsl @@ -10,31 +10,18 @@ void radians_6b0ff2() { float res = tint_radians(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { radians_6b0ff2(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -47,19 +34,14 @@ void radians_6b0ff2() { float res = tint_radians(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { radians_6b0ff2(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -72,17 +54,12 @@ void radians_6b0ff2() { float res = tint_radians(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { radians_6b0ff2(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/radians/f96258.wgsl.expected.glsl b/test/intrinsics/gen/radians/f96258.wgsl.expected.glsl index e27a435b06..729c8b59b0 100644 --- a/test/intrinsics/gen/radians/f96258.wgsl.expected.glsl +++ b/test/intrinsics/gen/radians/f96258.wgsl.expected.glsl @@ -10,31 +10,18 @@ void radians_f96258() { vec3 res = tint_radians(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { radians_f96258(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -47,19 +34,14 @@ void radians_f96258() { vec3 res = tint_radians(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { radians_f96258(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -72,17 +54,12 @@ void radians_f96258() { vec3 res = tint_radians(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { radians_f96258(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/reflect/05357e.wgsl.expected.glsl b/test/intrinsics/gen/reflect/05357e.wgsl.expected.glsl index 34b7aab785..14f04b1855 100644 --- a/test/intrinsics/gen/reflect/05357e.wgsl.expected.glsl +++ b/test/intrinsics/gen/reflect/05357e.wgsl.expected.glsl @@ -5,31 +5,18 @@ void reflect_05357e() { vec4 res = reflect(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { reflect_05357e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void reflect_05357e() { vec4 res = reflect(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { reflect_05357e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void reflect_05357e() { vec4 res = reflect(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { reflect_05357e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/reflect/b61e10.wgsl.expected.glsl b/test/intrinsics/gen/reflect/b61e10.wgsl.expected.glsl index 423ee1e25a..8aa0402ae5 100644 --- a/test/intrinsics/gen/reflect/b61e10.wgsl.expected.glsl +++ b/test/intrinsics/gen/reflect/b61e10.wgsl.expected.glsl @@ -5,31 +5,18 @@ void reflect_b61e10() { vec2 res = reflect(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { reflect_b61e10(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void reflect_b61e10() { vec2 res = reflect(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { reflect_b61e10(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void reflect_b61e10() { vec2 res = reflect(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { reflect_b61e10(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/reflect/f47fdb.wgsl.expected.glsl b/test/intrinsics/gen/reflect/f47fdb.wgsl.expected.glsl index 32b62a0671..71cc9ec847 100644 --- a/test/intrinsics/gen/reflect/f47fdb.wgsl.expected.glsl +++ b/test/intrinsics/gen/reflect/f47fdb.wgsl.expected.glsl @@ -5,31 +5,18 @@ void reflect_f47fdb() { vec3 res = reflect(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { reflect_f47fdb(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void reflect_f47fdb() { vec3 res = reflect(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { reflect_f47fdb(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void reflect_f47fdb() { vec3 res = reflect(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { reflect_f47fdb(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/refract/7e02e6.wgsl.expected.glsl b/test/intrinsics/gen/refract/7e02e6.wgsl.expected.glsl index c46e333c8a..8e4be77dcd 100644 --- a/test/intrinsics/gen/refract/7e02e6.wgsl.expected.glsl +++ b/test/intrinsics/gen/refract/7e02e6.wgsl.expected.glsl @@ -5,31 +5,18 @@ void refract_7e02e6() { vec4 res = refract(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { refract_7e02e6(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void refract_7e02e6() { vec4 res = refract(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { refract_7e02e6(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void refract_7e02e6() { vec4 res = refract(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { refract_7e02e6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/refract/cbc1d2.wgsl.expected.glsl b/test/intrinsics/gen/refract/cbc1d2.wgsl.expected.glsl index f7e95c408e..37a29b53d9 100644 --- a/test/intrinsics/gen/refract/cbc1d2.wgsl.expected.glsl +++ b/test/intrinsics/gen/refract/cbc1d2.wgsl.expected.glsl @@ -5,31 +5,18 @@ void refract_cbc1d2() { vec3 res = refract(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { refract_cbc1d2(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void refract_cbc1d2() { vec3 res = refract(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { refract_cbc1d2(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void refract_cbc1d2() { vec3 res = refract(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { refract_cbc1d2(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/refract/cd905f.wgsl.expected.glsl b/test/intrinsics/gen/refract/cd905f.wgsl.expected.glsl index 0f1a3dea19..57420845ce 100644 --- a/test/intrinsics/gen/refract/cd905f.wgsl.expected.glsl +++ b/test/intrinsics/gen/refract/cd905f.wgsl.expected.glsl @@ -5,31 +5,18 @@ void refract_cd905f() { vec2 res = refract(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { refract_cd905f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void refract_cd905f() { vec2 res = refract(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { refract_cd905f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void refract_cd905f() { vec2 res = refract(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { refract_cd905f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/reverseBits/222177.wgsl.expected.glsl b/test/intrinsics/gen/reverseBits/222177.wgsl.expected.glsl index bad1323ca9..997a045f6e 100644 --- a/test/intrinsics/gen/reverseBits/222177.wgsl.expected.glsl +++ b/test/intrinsics/gen/reverseBits/222177.wgsl.expected.glsl @@ -7,31 +7,18 @@ void reverseBits_222177() { ivec2 res = reversebits(ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { reverseBits_222177(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 2-component vector of int' @@ -47,19 +34,14 @@ void reverseBits_222177() { ivec2 res = reversebits(ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { reverseBits_222177(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of int' @@ -75,20 +57,15 @@ void reverseBits_222177() { ivec2 res = reversebits(ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { reverseBits_222177(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 2-component vector of int' diff --git a/test/intrinsics/gen/reverseBits/35fea9.wgsl.expected.glsl b/test/intrinsics/gen/reverseBits/35fea9.wgsl.expected.glsl index 13f72b8383..1a6b1aab7a 100644 --- a/test/intrinsics/gen/reverseBits/35fea9.wgsl.expected.glsl +++ b/test/intrinsics/gen/reverseBits/35fea9.wgsl.expected.glsl @@ -7,31 +7,18 @@ void reverseBits_35fea9() { uvec4 res = reversebits(uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { reverseBits_35fea9(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 4-component vector of uint' @@ -47,19 +34,14 @@ void reverseBits_35fea9() { uvec4 res = reversebits(uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { reverseBits_35fea9(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of uint' @@ -75,20 +57,15 @@ void reverseBits_35fea9() { uvec4 res = reversebits(uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { reverseBits_35fea9(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 4-component vector of uint' diff --git a/test/intrinsics/gen/reverseBits/4dbd6f.wgsl.expected.glsl b/test/intrinsics/gen/reverseBits/4dbd6f.wgsl.expected.glsl index b512ef14d2..1bb351a2f6 100644 --- a/test/intrinsics/gen/reverseBits/4dbd6f.wgsl.expected.glsl +++ b/test/intrinsics/gen/reverseBits/4dbd6f.wgsl.expected.glsl @@ -7,31 +7,18 @@ void reverseBits_4dbd6f() { ivec4 res = reversebits(ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { reverseBits_4dbd6f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 4-component vector of int' @@ -47,19 +34,14 @@ void reverseBits_4dbd6f() { ivec4 res = reversebits(ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { reverseBits_4dbd6f(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of int' @@ -75,20 +57,15 @@ void reverseBits_4dbd6f() { ivec4 res = reversebits(ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { reverseBits_4dbd6f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 4-component vector of int' diff --git a/test/intrinsics/gen/reverseBits/7c4269.wgsl.expected.glsl b/test/intrinsics/gen/reverseBits/7c4269.wgsl.expected.glsl index b655cf255f..dc5622405f 100644 --- a/test/intrinsics/gen/reverseBits/7c4269.wgsl.expected.glsl +++ b/test/intrinsics/gen/reverseBits/7c4269.wgsl.expected.glsl @@ -7,31 +7,18 @@ void reverseBits_7c4269() { int res = reversebits(1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { reverseBits_7c4269(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp int' @@ -47,19 +34,14 @@ void reverseBits_7c4269() { int res = reversebits(1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { reverseBits_7c4269(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -75,20 +57,15 @@ void reverseBits_7c4269() { int res = reversebits(1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { reverseBits_7c4269(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/reverseBits/a6ccd4.wgsl.expected.glsl b/test/intrinsics/gen/reverseBits/a6ccd4.wgsl.expected.glsl index 5956ce2bac..355b5fa6cf 100644 --- a/test/intrinsics/gen/reverseBits/a6ccd4.wgsl.expected.glsl +++ b/test/intrinsics/gen/reverseBits/a6ccd4.wgsl.expected.glsl @@ -7,31 +7,18 @@ void reverseBits_a6ccd4() { uvec3 res = reversebits(uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { reverseBits_a6ccd4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 3-component vector of uint' @@ -47,19 +34,14 @@ void reverseBits_a6ccd4() { uvec3 res = reversebits(uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { reverseBits_a6ccd4(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of uint' @@ -75,20 +57,15 @@ void reverseBits_a6ccd4() { uvec3 res = reversebits(uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { reverseBits_a6ccd4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 3-component vector of uint' diff --git a/test/intrinsics/gen/reverseBits/c21bc1.wgsl.expected.glsl b/test/intrinsics/gen/reverseBits/c21bc1.wgsl.expected.glsl index d79516d7b0..2132f70b38 100644 --- a/test/intrinsics/gen/reverseBits/c21bc1.wgsl.expected.glsl +++ b/test/intrinsics/gen/reverseBits/c21bc1.wgsl.expected.glsl @@ -7,31 +7,18 @@ void reverseBits_c21bc1() { ivec3 res = reversebits(ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { reverseBits_c21bc1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 3-component vector of int' @@ -47,19 +34,14 @@ void reverseBits_c21bc1() { ivec3 res = reversebits(ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { reverseBits_c21bc1(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of int' @@ -75,20 +57,15 @@ void reverseBits_c21bc1() { ivec3 res = reversebits(ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { reverseBits_c21bc1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 3-component vector of int' diff --git a/test/intrinsics/gen/reverseBits/e1f4c1.wgsl.expected.glsl b/test/intrinsics/gen/reverseBits/e1f4c1.wgsl.expected.glsl index 4d22669f0b..77c6c6aa32 100644 --- a/test/intrinsics/gen/reverseBits/e1f4c1.wgsl.expected.glsl +++ b/test/intrinsics/gen/reverseBits/e1f4c1.wgsl.expected.glsl @@ -7,31 +7,18 @@ void reverseBits_e1f4c1() { uvec2 res = reversebits(uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { reverseBits_e1f4c1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 2-component vector of uint' @@ -47,19 +34,14 @@ void reverseBits_e1f4c1() { uvec2 res = reversebits(uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { reverseBits_e1f4c1(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of uint' @@ -75,20 +57,15 @@ void reverseBits_e1f4c1() { uvec2 res = reversebits(uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { reverseBits_e1f4c1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp 2-component vector of uint' diff --git a/test/intrinsics/gen/reverseBits/e31adf.wgsl.expected.glsl b/test/intrinsics/gen/reverseBits/e31adf.wgsl.expected.glsl index de7818786e..a30d33dd47 100644 --- a/test/intrinsics/gen/reverseBits/e31adf.wgsl.expected.glsl +++ b/test/intrinsics/gen/reverseBits/e31adf.wgsl.expected.glsl @@ -7,31 +7,18 @@ void reverseBits_e31adf() { uint res = reversebits(1u); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { reverseBits_e31adf(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp uint' @@ -47,19 +34,14 @@ void reverseBits_e31adf() { uint res = reversebits(1u); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { reverseBits_e31adf(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp mediump uint' @@ -75,20 +57,15 @@ void reverseBits_e31adf() { uint res = reversebits(1u); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { reverseBits_e31adf(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'reversebits' : no matching overloaded function found ERROR: 0:5: '=' : cannot convert from ' const float' to ' temp highp uint' diff --git a/test/intrinsics/gen/round/106c0b.wgsl.expected.glsl b/test/intrinsics/gen/round/106c0b.wgsl.expected.glsl index 543cdfafe9..e970e888cf 100644 --- a/test/intrinsics/gen/round/106c0b.wgsl.expected.glsl +++ b/test/intrinsics/gen/round/106c0b.wgsl.expected.glsl @@ -5,31 +5,18 @@ void round_106c0b() { vec4 res = round(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { round_106c0b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void round_106c0b() { vec4 res = round(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { round_106c0b(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void round_106c0b() { vec4 res = round(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { round_106c0b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/round/1c7897.wgsl.expected.glsl b/test/intrinsics/gen/round/1c7897.wgsl.expected.glsl index 938fc0a742..c506bacf70 100644 --- a/test/intrinsics/gen/round/1c7897.wgsl.expected.glsl +++ b/test/intrinsics/gen/round/1c7897.wgsl.expected.glsl @@ -5,31 +5,18 @@ void round_1c7897() { vec3 res = round(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { round_1c7897(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void round_1c7897() { vec3 res = round(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { round_1c7897(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void round_1c7897() { vec3 res = round(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { round_1c7897(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/round/52c84d.wgsl.expected.glsl b/test/intrinsics/gen/round/52c84d.wgsl.expected.glsl index 1747df8204..94b648b131 100644 --- a/test/intrinsics/gen/round/52c84d.wgsl.expected.glsl +++ b/test/intrinsics/gen/round/52c84d.wgsl.expected.glsl @@ -5,31 +5,18 @@ void round_52c84d() { vec2 res = round(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { round_52c84d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void round_52c84d() { vec2 res = round(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { round_52c84d(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void round_52c84d() { vec2 res = round(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { round_52c84d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/round/9edc38.wgsl.expected.glsl b/test/intrinsics/gen/round/9edc38.wgsl.expected.glsl index faa0f32ffc..e76ae7797c 100644 --- a/test/intrinsics/gen/round/9edc38.wgsl.expected.glsl +++ b/test/intrinsics/gen/round/9edc38.wgsl.expected.glsl @@ -5,31 +5,18 @@ void round_9edc38() { float res = round(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { round_9edc38(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void round_9edc38() { float res = round(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { round_9edc38(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void round_9edc38() { float res = round(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { round_9edc38(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/select/00b848.wgsl.expected.glsl b/test/intrinsics/gen/select/00b848.wgsl.expected.glsl index a6559e0398..7b6954a1d7 100644 --- a/test/intrinsics/gen/select/00b848.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/00b848.wgsl.expected.glsl @@ -7,31 +7,18 @@ void select_00b848() { ivec2 res = (bvec2(false, false) ? ivec2(0, 0) : ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_00b848(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -46,19 +33,14 @@ void select_00b848() { ivec2 res = (bvec2(false, false) ? ivec2(0, 0) : ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_00b848(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -73,20 +55,15 @@ void select_00b848() { ivec2 res = (bvec2(false, false) ? ivec2(0, 0) : ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_00b848(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/select/01e2cd.wgsl.expected.glsl b/test/intrinsics/gen/select/01e2cd.wgsl.expected.glsl index c414d875dc..477c92529c 100644 --- a/test/intrinsics/gen/select/01e2cd.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/01e2cd.wgsl.expected.glsl @@ -7,31 +7,18 @@ void select_01e2cd() { ivec3 res = (bvec3(false, false, false) ? ivec3(0, 0, 0) : ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_01e2cd(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -46,19 +33,14 @@ void select_01e2cd() { ivec3 res = (bvec3(false, false, false) ? ivec3(0, 0, 0) : ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_01e2cd(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -73,20 +55,15 @@ void select_01e2cd() { ivec3 res = (bvec3(false, false, false) ? ivec3(0, 0, 0) : ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_01e2cd(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/select/087ea4.wgsl.expected.glsl b/test/intrinsics/gen/select/087ea4.wgsl.expected.glsl index 4aac9211a2..037a6a4eaa 100644 --- a/test/intrinsics/gen/select/087ea4.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/087ea4.wgsl.expected.glsl @@ -5,31 +5,18 @@ void select_087ea4() { uvec4 res = (false ? uvec4(0u, 0u, 0u, 0u) : uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_087ea4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void select_087ea4() { uvec4 res = (false ? uvec4(0u, 0u, 0u, 0u) : uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_087ea4(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void select_087ea4() { uvec4 res = (false ? uvec4(0u, 0u, 0u, 0u) : uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_087ea4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/select/1e960b.wgsl.expected.glsl b/test/intrinsics/gen/select/1e960b.wgsl.expected.glsl index 1c22a52dd5..0a06c7e054 100644 --- a/test/intrinsics/gen/select/1e960b.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/1e960b.wgsl.expected.glsl @@ -7,31 +7,18 @@ void select_1e960b() { uvec2 res = (bvec2(false, false) ? uvec2(0u, 0u) : uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_1e960b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -46,19 +33,14 @@ void select_1e960b() { uvec2 res = (bvec2(false, false) ? uvec2(0u, 0u) : uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_1e960b(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -73,20 +55,15 @@ void select_1e960b() { uvec2 res = (bvec2(false, false) ? uvec2(0u, 0u) : uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_1e960b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/select/266aff.wgsl.expected.glsl b/test/intrinsics/gen/select/266aff.wgsl.expected.glsl index 239efd1d2c..06c7dea43e 100644 --- a/test/intrinsics/gen/select/266aff.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/266aff.wgsl.expected.glsl @@ -7,31 +7,18 @@ void select_266aff() { vec2 res = (bvec2(false, false) ? vec2(0.0f, 0.0f) : vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_266aff(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -46,19 +33,14 @@ void select_266aff() { vec2 res = (bvec2(false, false) ? vec2(0.0f, 0.0f) : vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_266aff(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -73,20 +55,15 @@ void select_266aff() { vec2 res = (bvec2(false, false) ? vec2(0.0f, 0.0f) : vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_266aff(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/select/28a27e.wgsl.expected.glsl b/test/intrinsics/gen/select/28a27e.wgsl.expected.glsl index 303c8eeef7..6ce85102a2 100644 --- a/test/intrinsics/gen/select/28a27e.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/28a27e.wgsl.expected.glsl @@ -7,31 +7,18 @@ void select_28a27e() { uvec3 res = (bvec3(false, false, false) ? uvec3(0u, 0u, 0u) : uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_28a27e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -46,19 +33,14 @@ void select_28a27e() { uvec3 res = (bvec3(false, false, false) ? uvec3(0u, 0u, 0u) : uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_28a27e(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -73,20 +55,15 @@ void select_28a27e() { uvec3 res = (bvec3(false, false, false) ? uvec3(0u, 0u, 0u) : uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_28a27e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/select/3c25ce.wgsl.expected.glsl b/test/intrinsics/gen/select/3c25ce.wgsl.expected.glsl index b89b64971b..baca720a5e 100644 --- a/test/intrinsics/gen/select/3c25ce.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/3c25ce.wgsl.expected.glsl @@ -5,31 +5,18 @@ void select_3c25ce() { bvec3 res = (false ? bvec3(false, false, false) : bvec3(false, false, false)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_3c25ce(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void select_3c25ce() { bvec3 res = (false ? bvec3(false, false, false) : bvec3(false, false, false)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_3c25ce(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void select_3c25ce() { bvec3 res = (false ? bvec3(false, false, false) : bvec3(false, false, false)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_3c25ce(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/select/416e14.wgsl.expected.glsl b/test/intrinsics/gen/select/416e14.wgsl.expected.glsl index df0fd7e319..303e09a3ba 100644 --- a/test/intrinsics/gen/select/416e14.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/416e14.wgsl.expected.glsl @@ -5,31 +5,18 @@ void select_416e14() { float res = (false ? 1.0f : 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_416e14(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void select_416e14() { float res = (false ? 1.0f : 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_416e14(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void select_416e14() { float res = (false ? 1.0f : 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_416e14(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/select/51b047.wgsl.expected.glsl b/test/intrinsics/gen/select/51b047.wgsl.expected.glsl index e8c162b507..1f2f26eeea 100644 --- a/test/intrinsics/gen/select/51b047.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/51b047.wgsl.expected.glsl @@ -5,31 +5,18 @@ void select_51b047() { uvec2 res = (false ? uvec2(0u, 0u) : uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_51b047(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void select_51b047() { uvec2 res = (false ? uvec2(0u, 0u) : uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_51b047(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void select_51b047() { uvec2 res = (false ? uvec2(0u, 0u) : uvec2(0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_51b047(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/select/713567.wgsl.expected.glsl b/test/intrinsics/gen/select/713567.wgsl.expected.glsl index 6c78e34033..fd2bfecce0 100644 --- a/test/intrinsics/gen/select/713567.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/713567.wgsl.expected.glsl @@ -5,31 +5,18 @@ void select_713567() { vec4 res = (false ? vec4(0.0f, 0.0f, 0.0f, 0.0f) : vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_713567(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void select_713567() { vec4 res = (false ? vec4(0.0f, 0.0f, 0.0f, 0.0f) : vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_713567(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void select_713567() { vec4 res = (false ? vec4(0.0f, 0.0f, 0.0f, 0.0f) : vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_713567(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/select/78be5f.wgsl.expected.glsl b/test/intrinsics/gen/select/78be5f.wgsl.expected.glsl index 285c1399b4..ff2b925991 100644 --- a/test/intrinsics/gen/select/78be5f.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/78be5f.wgsl.expected.glsl @@ -5,31 +5,18 @@ void select_78be5f() { vec3 res = (false ? vec3(0.0f, 0.0f, 0.0f) : vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_78be5f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void select_78be5f() { vec3 res = (false ? vec3(0.0f, 0.0f, 0.0f) : vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_78be5f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void select_78be5f() { vec3 res = (false ? vec3(0.0f, 0.0f, 0.0f) : vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_78be5f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/select/80a9a9.wgsl.expected.glsl b/test/intrinsics/gen/select/80a9a9.wgsl.expected.glsl index 49e4ec5924..2d439497b6 100644 --- a/test/intrinsics/gen/select/80a9a9.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/80a9a9.wgsl.expected.glsl @@ -7,31 +7,18 @@ void select_80a9a9() { bvec3 res = (bvec3(false, false, false) ? bvec3(false, false, false) : bvec3(false, false, false)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_80a9a9(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -46,19 +33,14 @@ void select_80a9a9() { bvec3 res = (bvec3(false, false, false) ? bvec3(false, false, false) : bvec3(false, false, false)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_80a9a9(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -73,20 +55,15 @@ void select_80a9a9() { bvec3 res = (bvec3(false, false, false) ? bvec3(false, false, false) : bvec3(false, false, false)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_80a9a9(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/select/8fa62c.wgsl.expected.glsl b/test/intrinsics/gen/select/8fa62c.wgsl.expected.glsl index fb5d604efc..5914cdd780 100644 --- a/test/intrinsics/gen/select/8fa62c.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/8fa62c.wgsl.expected.glsl @@ -5,31 +5,18 @@ void select_8fa62c() { ivec3 res = (false ? ivec3(0, 0, 0) : ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_8fa62c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void select_8fa62c() { ivec3 res = (false ? ivec3(0, 0, 0) : ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_8fa62c(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void select_8fa62c() { ivec3 res = (false ? ivec3(0, 0, 0) : ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_8fa62c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/select/99f883.wgsl.expected.glsl b/test/intrinsics/gen/select/99f883.wgsl.expected.glsl index c4a5fdbb6d..724581991a 100644 --- a/test/intrinsics/gen/select/99f883.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/99f883.wgsl.expected.glsl @@ -5,31 +5,18 @@ void select_99f883() { uint res = (false ? 1u : 1u); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_99f883(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void select_99f883() { uint res = (false ? 1u : 1u); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_99f883(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void select_99f883() { uint res = (false ? 1u : 1u); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_99f883(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/select/a2860e.wgsl.expected.glsl b/test/intrinsics/gen/select/a2860e.wgsl.expected.glsl index 823a57d066..3ca06e29eb 100644 --- a/test/intrinsics/gen/select/a2860e.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/a2860e.wgsl.expected.glsl @@ -7,31 +7,18 @@ void select_a2860e() { ivec4 res = (bvec4(false, false, false, false) ? ivec4(0, 0, 0, 0) : ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_a2860e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -46,19 +33,14 @@ void select_a2860e() { ivec4 res = (bvec4(false, false, false, false) ? ivec4(0, 0, 0, 0) : ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_a2860e(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -73,20 +55,15 @@ void select_a2860e() { ivec4 res = (bvec4(false, false, false, false) ? ivec4(0, 0, 0, 0) : ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_a2860e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/select/ab069f.wgsl.expected.glsl b/test/intrinsics/gen/select/ab069f.wgsl.expected.glsl index 61f2ca1ca6..9127716b13 100644 --- a/test/intrinsics/gen/select/ab069f.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/ab069f.wgsl.expected.glsl @@ -5,31 +5,18 @@ void select_ab069f() { ivec4 res = (false ? ivec4(0, 0, 0, 0) : ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_ab069f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void select_ab069f() { ivec4 res = (false ? ivec4(0, 0, 0, 0) : ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_ab069f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void select_ab069f() { ivec4 res = (false ? ivec4(0, 0, 0, 0) : ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_ab069f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/select/b04721.wgsl.expected.glsl b/test/intrinsics/gen/select/b04721.wgsl.expected.glsl index 816bbbfbfb..a9e543ecaa 100644 --- a/test/intrinsics/gen/select/b04721.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/b04721.wgsl.expected.glsl @@ -5,31 +5,18 @@ void select_b04721() { uvec3 res = (false ? uvec3(0u, 0u, 0u) : uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_b04721(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void select_b04721() { uvec3 res = (false ? uvec3(0u, 0u, 0u) : uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_b04721(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void select_b04721() { uvec3 res = (false ? uvec3(0u, 0u, 0u) : uvec3(0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_b04721(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/select/bb447f.wgsl.expected.glsl b/test/intrinsics/gen/select/bb447f.wgsl.expected.glsl index 554f56ecbb..0ba7a30c6c 100644 --- a/test/intrinsics/gen/select/bb447f.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/bb447f.wgsl.expected.glsl @@ -5,31 +5,18 @@ void select_bb447f() { ivec2 res = (false ? ivec2(0, 0) : ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_bb447f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void select_bb447f() { ivec2 res = (false ? ivec2(0, 0) : ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_bb447f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void select_bb447f() { ivec2 res = (false ? ivec2(0, 0) : ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_bb447f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/select/bb8aae.wgsl.expected.glsl b/test/intrinsics/gen/select/bb8aae.wgsl.expected.glsl index d2b160767e..0e1a50ed9f 100644 --- a/test/intrinsics/gen/select/bb8aae.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/bb8aae.wgsl.expected.glsl @@ -7,31 +7,18 @@ void select_bb8aae() { vec4 res = (bvec4(false, false, false, false) ? vec4(0.0f, 0.0f, 0.0f, 0.0f) : vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_bb8aae(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -46,19 +33,14 @@ void select_bb8aae() { vec4 res = (bvec4(false, false, false, false) ? vec4(0.0f, 0.0f, 0.0f, 0.0f) : vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_bb8aae(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -73,20 +55,15 @@ void select_bb8aae() { vec4 res = (bvec4(false, false, false, false) ? vec4(0.0f, 0.0f, 0.0f, 0.0f) : vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_bb8aae(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/select/bf3d29.wgsl.expected.glsl b/test/intrinsics/gen/select/bf3d29.wgsl.expected.glsl index 8cf102e3a6..697a02c564 100644 --- a/test/intrinsics/gen/select/bf3d29.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/bf3d29.wgsl.expected.glsl @@ -5,31 +5,18 @@ void select_bf3d29() { vec2 res = (false ? vec2(0.0f, 0.0f) : vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_bf3d29(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void select_bf3d29() { vec2 res = (false ? vec2(0.0f, 0.0f) : vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_bf3d29(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void select_bf3d29() { vec2 res = (false ? vec2(0.0f, 0.0f) : vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_bf3d29(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/select/c31f9e.wgsl.expected.glsl b/test/intrinsics/gen/select/c31f9e.wgsl.expected.glsl index 6cc94bcf9a..20c38f78f8 100644 --- a/test/intrinsics/gen/select/c31f9e.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/c31f9e.wgsl.expected.glsl @@ -5,31 +5,18 @@ void select_c31f9e() { bool res = (false ? false : false); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_c31f9e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void select_c31f9e() { bool res = (false ? false : false); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_c31f9e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void select_c31f9e() { bool res = (false ? false : false); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_c31f9e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/select/c41bd1.wgsl.expected.glsl b/test/intrinsics/gen/select/c41bd1.wgsl.expected.glsl index ca938a826f..926bbaf434 100644 --- a/test/intrinsics/gen/select/c41bd1.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/c41bd1.wgsl.expected.glsl @@ -5,31 +5,18 @@ void select_c41bd1() { bvec4 res = (false ? bvec4(false, false, false, false) : bvec4(false, false, false, false)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_c41bd1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void select_c41bd1() { bvec4 res = (false ? bvec4(false, false, false, false) : bvec4(false, false, false, false)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_c41bd1(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void select_c41bd1() { bvec4 res = (false ? bvec4(false, false, false, false) : bvec4(false, false, false, false)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_c41bd1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/select/c4a4ef.wgsl.expected.glsl b/test/intrinsics/gen/select/c4a4ef.wgsl.expected.glsl index ab85b6e45b..4ee2ee9ae4 100644 --- a/test/intrinsics/gen/select/c4a4ef.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/c4a4ef.wgsl.expected.glsl @@ -7,31 +7,18 @@ void select_c4a4ef() { uvec4 res = (bvec4(false, false, false, false) ? uvec4(0u, 0u, 0u, 0u) : uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_c4a4ef(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -46,19 +33,14 @@ void select_c4a4ef() { uvec4 res = (bvec4(false, false, false, false) ? uvec4(0u, 0u, 0u, 0u) : uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_c4a4ef(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -73,20 +55,15 @@ void select_c4a4ef() { uvec4 res = (bvec4(false, false, false, false) ? uvec4(0u, 0u, 0u, 0u) : uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_c4a4ef(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/select/cb9301.wgsl.expected.glsl b/test/intrinsics/gen/select/cb9301.wgsl.expected.glsl index 89cfd90b7f..87502ee75d 100644 --- a/test/intrinsics/gen/select/cb9301.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/cb9301.wgsl.expected.glsl @@ -7,31 +7,18 @@ void select_cb9301() { bvec2 res = (bvec2(false, false) ? bvec2(false, false) : bvec2(false, false)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_cb9301(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -46,19 +33,14 @@ void select_cb9301() { bvec2 res = (bvec2(false, false) ? bvec2(false, false) : bvec2(false, false)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_cb9301(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -73,20 +55,15 @@ void select_cb9301() { bvec2 res = (bvec2(false, false) ? bvec2(false, false) : bvec2(false, false)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_cb9301(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/select/e3e028.wgsl.expected.glsl b/test/intrinsics/gen/select/e3e028.wgsl.expected.glsl index 88d5c1abfe..b8d0f12de3 100644 --- a/test/intrinsics/gen/select/e3e028.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/e3e028.wgsl.expected.glsl @@ -7,31 +7,18 @@ void select_e3e028() { bvec4 res = (bvec4(false, false, false, false) ? bvec4(false, false, false, false) : bvec4(false, false, false, false)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_e3e028(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -46,19 +33,14 @@ void select_e3e028() { bvec4 res = (bvec4(false, false, false, false) ? bvec4(false, false, false, false) : bvec4(false, false, false, false)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_e3e028(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -73,20 +55,15 @@ void select_e3e028() { bvec4 res = (bvec4(false, false, false, false) ? bvec4(false, false, false, false) : bvec4(false, false, false, false)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_e3e028(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/select/ebfea2.wgsl.expected.glsl b/test/intrinsics/gen/select/ebfea2.wgsl.expected.glsl index 7158954042..4f56425e9a 100644 --- a/test/intrinsics/gen/select/ebfea2.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/ebfea2.wgsl.expected.glsl @@ -7,31 +7,18 @@ void select_ebfea2() { vec3 res = (bvec3(false, false, false) ? vec3(0.0f, 0.0f, 0.0f) : vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_ebfea2(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -46,19 +33,14 @@ void select_ebfea2() { vec3 res = (bvec3(false, false, false) ? vec3(0.0f, 0.0f, 0.0f) : vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_ebfea2(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated @@ -73,20 +55,15 @@ void select_ebfea2() { vec3 res = (bvec3(false, false, false) ? vec3(0.0f, 0.0f, 0.0f) : vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_ebfea2(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/gen/select/ed8a15.wgsl.expected.glsl b/test/intrinsics/gen/select/ed8a15.wgsl.expected.glsl index 4e8bed7819..c974822f48 100644 --- a/test/intrinsics/gen/select/ed8a15.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/ed8a15.wgsl.expected.glsl @@ -5,31 +5,18 @@ void select_ed8a15() { int res = (false ? 1 : 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_ed8a15(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void select_ed8a15() { int res = (false ? 1 : 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_ed8a15(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void select_ed8a15() { int res = (false ? 1 : 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_ed8a15(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/select/fb7e53.wgsl.expected.glsl b/test/intrinsics/gen/select/fb7e53.wgsl.expected.glsl index b928a2d557..d3d31f85c8 100644 --- a/test/intrinsics/gen/select/fb7e53.wgsl.expected.glsl +++ b/test/intrinsics/gen/select/fb7e53.wgsl.expected.glsl @@ -5,31 +5,18 @@ void select_fb7e53() { bvec2 res = (false ? bvec2(false, false) : bvec2(false, false)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { select_fb7e53(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void select_fb7e53() { bvec2 res = (false ? bvec2(false, false) : bvec2(false, false)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { select_fb7e53(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void select_fb7e53() { bvec2 res = (false ? bvec2(false, false) : bvec2(false, false)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { select_fb7e53(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/sign/159665.wgsl.expected.glsl b/test/intrinsics/gen/sign/159665.wgsl.expected.glsl index 37c77968f8..942f155db9 100644 --- a/test/intrinsics/gen/sign/159665.wgsl.expected.glsl +++ b/test/intrinsics/gen/sign/159665.wgsl.expected.glsl @@ -5,31 +5,18 @@ void sign_159665() { vec3 res = sign(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { sign_159665(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void sign_159665() { vec3 res = sign(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { sign_159665(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void sign_159665() { vec3 res = sign(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { sign_159665(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/sign/b8f634.wgsl.expected.glsl b/test/intrinsics/gen/sign/b8f634.wgsl.expected.glsl index cd159a8279..05137b155c 100644 --- a/test/intrinsics/gen/sign/b8f634.wgsl.expected.glsl +++ b/test/intrinsics/gen/sign/b8f634.wgsl.expected.glsl @@ -5,31 +5,18 @@ void sign_b8f634() { vec4 res = sign(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { sign_b8f634(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void sign_b8f634() { vec4 res = sign(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { sign_b8f634(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void sign_b8f634() { vec4 res = sign(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { sign_b8f634(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/sign/d065d8.wgsl.expected.glsl b/test/intrinsics/gen/sign/d065d8.wgsl.expected.glsl index f19d9dad92..8b415cb037 100644 --- a/test/intrinsics/gen/sign/d065d8.wgsl.expected.glsl +++ b/test/intrinsics/gen/sign/d065d8.wgsl.expected.glsl @@ -5,31 +5,18 @@ void sign_d065d8() { vec2 res = sign(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { sign_d065d8(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void sign_d065d8() { vec2 res = sign(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { sign_d065d8(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void sign_d065d8() { vec2 res = sign(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { sign_d065d8(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/sign/dd790e.wgsl.expected.glsl b/test/intrinsics/gen/sign/dd790e.wgsl.expected.glsl index 4a4a7d1ac4..b8801544bd 100644 --- a/test/intrinsics/gen/sign/dd790e.wgsl.expected.glsl +++ b/test/intrinsics/gen/sign/dd790e.wgsl.expected.glsl @@ -5,31 +5,18 @@ void sign_dd790e() { float res = sign(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { sign_dd790e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void sign_dd790e() { float res = sign(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { sign_dd790e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void sign_dd790e() { float res = sign(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { sign_dd790e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/sin/01f241.wgsl.expected.glsl b/test/intrinsics/gen/sin/01f241.wgsl.expected.glsl index 0dcac18668..9c7240d8a9 100644 --- a/test/intrinsics/gen/sin/01f241.wgsl.expected.glsl +++ b/test/intrinsics/gen/sin/01f241.wgsl.expected.glsl @@ -5,31 +5,18 @@ void sin_01f241() { vec3 res = sin(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { sin_01f241(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void sin_01f241() { vec3 res = sin(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { sin_01f241(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void sin_01f241() { vec3 res = sin(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { sin_01f241(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/sin/4e3979.wgsl.expected.glsl b/test/intrinsics/gen/sin/4e3979.wgsl.expected.glsl index 56583fd386..1e5d135e18 100644 --- a/test/intrinsics/gen/sin/4e3979.wgsl.expected.glsl +++ b/test/intrinsics/gen/sin/4e3979.wgsl.expected.glsl @@ -5,31 +5,18 @@ void sin_4e3979() { vec4 res = sin(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { sin_4e3979(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void sin_4e3979() { vec4 res = sin(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { sin_4e3979(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void sin_4e3979() { vec4 res = sin(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { sin_4e3979(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/sin/b78c91.wgsl.expected.glsl b/test/intrinsics/gen/sin/b78c91.wgsl.expected.glsl index e4382faced..de61dcf439 100644 --- a/test/intrinsics/gen/sin/b78c91.wgsl.expected.glsl +++ b/test/intrinsics/gen/sin/b78c91.wgsl.expected.glsl @@ -5,31 +5,18 @@ void sin_b78c91() { float res = sin(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { sin_b78c91(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void sin_b78c91() { float res = sin(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { sin_b78c91(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void sin_b78c91() { float res = sin(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { sin_b78c91(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/sin/fc8bc4.wgsl.expected.glsl b/test/intrinsics/gen/sin/fc8bc4.wgsl.expected.glsl index 6a5df55573..d475617096 100644 --- a/test/intrinsics/gen/sin/fc8bc4.wgsl.expected.glsl +++ b/test/intrinsics/gen/sin/fc8bc4.wgsl.expected.glsl @@ -5,31 +5,18 @@ void sin_fc8bc4() { vec2 res = sin(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { sin_fc8bc4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void sin_fc8bc4() { vec2 res = sin(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { sin_fc8bc4(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void sin_fc8bc4() { vec2 res = sin(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { sin_fc8bc4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/sinh/445e33.wgsl.expected.glsl b/test/intrinsics/gen/sinh/445e33.wgsl.expected.glsl index 81eb153818..c60e3acb13 100644 --- a/test/intrinsics/gen/sinh/445e33.wgsl.expected.glsl +++ b/test/intrinsics/gen/sinh/445e33.wgsl.expected.glsl @@ -5,31 +5,18 @@ void sinh_445e33() { vec4 res = sinh(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { sinh_445e33(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void sinh_445e33() { vec4 res = sinh(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { sinh_445e33(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void sinh_445e33() { vec4 res = sinh(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { sinh_445e33(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/sinh/7bb598.wgsl.expected.glsl b/test/intrinsics/gen/sinh/7bb598.wgsl.expected.glsl index 37ed11914b..5f7835a791 100644 --- a/test/intrinsics/gen/sinh/7bb598.wgsl.expected.glsl +++ b/test/intrinsics/gen/sinh/7bb598.wgsl.expected.glsl @@ -5,31 +5,18 @@ void sinh_7bb598() { float res = sinh(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { sinh_7bb598(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void sinh_7bb598() { float res = sinh(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { sinh_7bb598(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void sinh_7bb598() { float res = sinh(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { sinh_7bb598(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/sinh/b9860e.wgsl.expected.glsl b/test/intrinsics/gen/sinh/b9860e.wgsl.expected.glsl index 43896ef6e5..1000a48866 100644 --- a/test/intrinsics/gen/sinh/b9860e.wgsl.expected.glsl +++ b/test/intrinsics/gen/sinh/b9860e.wgsl.expected.glsl @@ -5,31 +5,18 @@ void sinh_b9860e() { vec2 res = sinh(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { sinh_b9860e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void sinh_b9860e() { vec2 res = sinh(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { sinh_b9860e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void sinh_b9860e() { vec2 res = sinh(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { sinh_b9860e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/sinh/c9a5eb.wgsl.expected.glsl b/test/intrinsics/gen/sinh/c9a5eb.wgsl.expected.glsl index aa91888e46..bec04b200c 100644 --- a/test/intrinsics/gen/sinh/c9a5eb.wgsl.expected.glsl +++ b/test/intrinsics/gen/sinh/c9a5eb.wgsl.expected.glsl @@ -5,31 +5,18 @@ void sinh_c9a5eb() { vec3 res = sinh(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { sinh_c9a5eb(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void sinh_c9a5eb() { vec3 res = sinh(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { sinh_c9a5eb(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void sinh_c9a5eb() { vec3 res = sinh(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { sinh_c9a5eb(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/smoothStep/5f615b.wgsl.expected.glsl b/test/intrinsics/gen/smoothStep/5f615b.wgsl.expected.glsl index 85550783b3..0c40f90fef 100644 --- a/test/intrinsics/gen/smoothStep/5f615b.wgsl.expected.glsl +++ b/test/intrinsics/gen/smoothStep/5f615b.wgsl.expected.glsl @@ -5,31 +5,18 @@ void smoothStep_5f615b() { vec4 res = smoothstep(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { smoothStep_5f615b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void smoothStep_5f615b() { vec4 res = smoothstep(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { smoothStep_5f615b(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void smoothStep_5f615b() { vec4 res = smoothstep(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { smoothStep_5f615b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/smoothStep/658be3.wgsl.expected.glsl b/test/intrinsics/gen/smoothStep/658be3.wgsl.expected.glsl index 3c64b14c16..e4f9bc9fb7 100644 --- a/test/intrinsics/gen/smoothStep/658be3.wgsl.expected.glsl +++ b/test/intrinsics/gen/smoothStep/658be3.wgsl.expected.glsl @@ -5,31 +5,18 @@ void smoothStep_658be3() { vec3 res = smoothstep(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { smoothStep_658be3(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void smoothStep_658be3() { vec3 res = smoothstep(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { smoothStep_658be3(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void smoothStep_658be3() { vec3 res = smoothstep(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { smoothStep_658be3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/smoothStep/c11eef.wgsl.expected.glsl b/test/intrinsics/gen/smoothStep/c11eef.wgsl.expected.glsl index 0d3cc99d41..f90da5a24c 100644 --- a/test/intrinsics/gen/smoothStep/c11eef.wgsl.expected.glsl +++ b/test/intrinsics/gen/smoothStep/c11eef.wgsl.expected.glsl @@ -5,31 +5,18 @@ void smoothStep_c11eef() { vec2 res = smoothstep(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { smoothStep_c11eef(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void smoothStep_c11eef() { vec2 res = smoothstep(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { smoothStep_c11eef(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void smoothStep_c11eef() { vec2 res = smoothstep(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { smoothStep_c11eef(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/smoothStep/cb0bfb.wgsl.expected.glsl b/test/intrinsics/gen/smoothStep/cb0bfb.wgsl.expected.glsl index d18d1ff6c5..999364b48a 100644 --- a/test/intrinsics/gen/smoothStep/cb0bfb.wgsl.expected.glsl +++ b/test/intrinsics/gen/smoothStep/cb0bfb.wgsl.expected.glsl @@ -5,31 +5,18 @@ void smoothStep_cb0bfb() { float res = smoothstep(1.0f, 1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { smoothStep_cb0bfb(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void smoothStep_cb0bfb() { float res = smoothstep(1.0f, 1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { smoothStep_cb0bfb(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void smoothStep_cb0bfb() { float res = smoothstep(1.0f, 1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { smoothStep_cb0bfb(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/sqrt/20c74e.wgsl.expected.glsl b/test/intrinsics/gen/sqrt/20c74e.wgsl.expected.glsl index 87e1877fa0..f61935096c 100644 --- a/test/intrinsics/gen/sqrt/20c74e.wgsl.expected.glsl +++ b/test/intrinsics/gen/sqrt/20c74e.wgsl.expected.glsl @@ -5,31 +5,18 @@ void sqrt_20c74e() { float res = sqrt(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { sqrt_20c74e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void sqrt_20c74e() { float res = sqrt(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { sqrt_20c74e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void sqrt_20c74e() { float res = sqrt(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { sqrt_20c74e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/sqrt/8c7024.wgsl.expected.glsl b/test/intrinsics/gen/sqrt/8c7024.wgsl.expected.glsl index 9f52b9f403..2f4abe4683 100644 --- a/test/intrinsics/gen/sqrt/8c7024.wgsl.expected.glsl +++ b/test/intrinsics/gen/sqrt/8c7024.wgsl.expected.glsl @@ -5,31 +5,18 @@ void sqrt_8c7024() { vec2 res = sqrt(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { sqrt_8c7024(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void sqrt_8c7024() { vec2 res = sqrt(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { sqrt_8c7024(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void sqrt_8c7024() { vec2 res = sqrt(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { sqrt_8c7024(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/sqrt/aa0d7a.wgsl.expected.glsl b/test/intrinsics/gen/sqrt/aa0d7a.wgsl.expected.glsl index 32e6ead2a5..754492c038 100644 --- a/test/intrinsics/gen/sqrt/aa0d7a.wgsl.expected.glsl +++ b/test/intrinsics/gen/sqrt/aa0d7a.wgsl.expected.glsl @@ -5,31 +5,18 @@ void sqrt_aa0d7a() { vec4 res = sqrt(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { sqrt_aa0d7a(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void sqrt_aa0d7a() { vec4 res = sqrt(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { sqrt_aa0d7a(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void sqrt_aa0d7a() { vec4 res = sqrt(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { sqrt_aa0d7a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/sqrt/f8c59a.wgsl.expected.glsl b/test/intrinsics/gen/sqrt/f8c59a.wgsl.expected.glsl index d2209a9c3c..efbb532887 100644 --- a/test/intrinsics/gen/sqrt/f8c59a.wgsl.expected.glsl +++ b/test/intrinsics/gen/sqrt/f8c59a.wgsl.expected.glsl @@ -5,31 +5,18 @@ void sqrt_f8c59a() { vec3 res = sqrt(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { sqrt_f8c59a(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void sqrt_f8c59a() { vec3 res = sqrt(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { sqrt_f8c59a(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void sqrt_f8c59a() { vec3 res = sqrt(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { sqrt_f8c59a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/step/0b073b.wgsl.expected.glsl b/test/intrinsics/gen/step/0b073b.wgsl.expected.glsl index 0f72929373..563e5007c6 100644 --- a/test/intrinsics/gen/step/0b073b.wgsl.expected.glsl +++ b/test/intrinsics/gen/step/0b073b.wgsl.expected.glsl @@ -5,31 +5,18 @@ void step_0b073b() { float res = step(1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { step_0b073b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void step_0b073b() { float res = step(1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { step_0b073b(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void step_0b073b() { float res = step(1.0f, 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { step_0b073b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/step/19accd.wgsl.expected.glsl b/test/intrinsics/gen/step/19accd.wgsl.expected.glsl index 7d2918fce7..d339cac84b 100644 --- a/test/intrinsics/gen/step/19accd.wgsl.expected.glsl +++ b/test/intrinsics/gen/step/19accd.wgsl.expected.glsl @@ -5,31 +5,18 @@ void step_19accd() { vec2 res = step(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { step_19accd(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void step_19accd() { vec2 res = step(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { step_19accd(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void step_19accd() { vec2 res = step(vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { step_19accd(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/step/334303.wgsl.expected.glsl b/test/intrinsics/gen/step/334303.wgsl.expected.glsl index f3223695ae..786bc77477 100644 --- a/test/intrinsics/gen/step/334303.wgsl.expected.glsl +++ b/test/intrinsics/gen/step/334303.wgsl.expected.glsl @@ -5,31 +5,18 @@ void step_334303() { vec3 res = step(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { step_334303(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void step_334303() { vec3 res = step(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { step_334303(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void step_334303() { vec3 res = step(vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { step_334303(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/step/e2b337.wgsl.expected.glsl b/test/intrinsics/gen/step/e2b337.wgsl.expected.glsl index d79c9a903f..157208e23d 100644 --- a/test/intrinsics/gen/step/e2b337.wgsl.expected.glsl +++ b/test/intrinsics/gen/step/e2b337.wgsl.expected.glsl @@ -5,31 +5,18 @@ void step_e2b337() { vec4 res = step(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { step_e2b337(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void step_e2b337() { vec4 res = step(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { step_e2b337(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void step_e2b337() { vec4 res = step(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { step_e2b337(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/storageBarrier/d87211.wgsl.expected.glsl b/test/intrinsics/gen/storageBarrier/d87211.wgsl.expected.glsl index 52d644611b..31a51a73d8 100644 --- a/test/intrinsics/gen/storageBarrier/d87211.wgsl.expected.glsl +++ b/test/intrinsics/gen/storageBarrier/d87211.wgsl.expected.glsl @@ -5,13 +5,12 @@ void storageBarrier_d87211() { memoryBarrierBuffer(); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { storageBarrier_d87211(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/tan/244e2a.wgsl.expected.glsl b/test/intrinsics/gen/tan/244e2a.wgsl.expected.glsl index d4c23fb4b8..0884a5563c 100644 --- a/test/intrinsics/gen/tan/244e2a.wgsl.expected.glsl +++ b/test/intrinsics/gen/tan/244e2a.wgsl.expected.glsl @@ -5,31 +5,18 @@ void tan_244e2a() { vec4 res = tan(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { tan_244e2a(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void tan_244e2a() { vec4 res = tan(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { tan_244e2a(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void tan_244e2a() { vec4 res = tan(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { tan_244e2a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/tan/2f030e.wgsl.expected.glsl b/test/intrinsics/gen/tan/2f030e.wgsl.expected.glsl index 65b6d14fea..46246dc46f 100644 --- a/test/intrinsics/gen/tan/2f030e.wgsl.expected.glsl +++ b/test/intrinsics/gen/tan/2f030e.wgsl.expected.glsl @@ -5,31 +5,18 @@ void tan_2f030e() { float res = tan(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { tan_2f030e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void tan_2f030e() { float res = tan(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { tan_2f030e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void tan_2f030e() { float res = tan(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { tan_2f030e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/tan/7ea104.wgsl.expected.glsl b/test/intrinsics/gen/tan/7ea104.wgsl.expected.glsl index 3725d7b99a..4180b59478 100644 --- a/test/intrinsics/gen/tan/7ea104.wgsl.expected.glsl +++ b/test/intrinsics/gen/tan/7ea104.wgsl.expected.glsl @@ -5,31 +5,18 @@ void tan_7ea104() { vec3 res = tan(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { tan_7ea104(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void tan_7ea104() { vec3 res = tan(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { tan_7ea104(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void tan_7ea104() { vec3 res = tan(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { tan_7ea104(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/tan/8ce3e9.wgsl.expected.glsl b/test/intrinsics/gen/tan/8ce3e9.wgsl.expected.glsl index 4e2ce26709..c5fda5d31f 100644 --- a/test/intrinsics/gen/tan/8ce3e9.wgsl.expected.glsl +++ b/test/intrinsics/gen/tan/8ce3e9.wgsl.expected.glsl @@ -5,31 +5,18 @@ void tan_8ce3e9() { vec2 res = tan(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { tan_8ce3e9(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void tan_8ce3e9() { vec2 res = tan(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { tan_8ce3e9(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void tan_8ce3e9() { vec2 res = tan(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { tan_8ce3e9(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/tanh/5663c5.wgsl.expected.glsl b/test/intrinsics/gen/tanh/5663c5.wgsl.expected.glsl index 75d7d83ab0..827d00c875 100644 --- a/test/intrinsics/gen/tanh/5663c5.wgsl.expected.glsl +++ b/test/intrinsics/gen/tanh/5663c5.wgsl.expected.glsl @@ -5,31 +5,18 @@ void tanh_5663c5() { vec4 res = tanh(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { tanh_5663c5(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void tanh_5663c5() { vec4 res = tanh(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { tanh_5663c5(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void tanh_5663c5() { vec4 res = tanh(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { tanh_5663c5(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/tanh/5724b3.wgsl.expected.glsl b/test/intrinsics/gen/tanh/5724b3.wgsl.expected.glsl index cfccd02950..81165d19fd 100644 --- a/test/intrinsics/gen/tanh/5724b3.wgsl.expected.glsl +++ b/test/intrinsics/gen/tanh/5724b3.wgsl.expected.glsl @@ -5,31 +5,18 @@ void tanh_5724b3() { vec2 res = tanh(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { tanh_5724b3(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void tanh_5724b3() { vec2 res = tanh(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { tanh_5724b3(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void tanh_5724b3() { vec2 res = tanh(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { tanh_5724b3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/tanh/9f9fb9.wgsl.expected.glsl b/test/intrinsics/gen/tanh/9f9fb9.wgsl.expected.glsl index 0f13e27544..81e516acc5 100644 --- a/test/intrinsics/gen/tanh/9f9fb9.wgsl.expected.glsl +++ b/test/intrinsics/gen/tanh/9f9fb9.wgsl.expected.glsl @@ -5,31 +5,18 @@ void tanh_9f9fb9() { vec3 res = tanh(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { tanh_9f9fb9(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void tanh_9f9fb9() { vec3 res = tanh(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { tanh_9f9fb9(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void tanh_9f9fb9() { vec3 res = tanh(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { tanh_9f9fb9(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/tanh/c15fdb.wgsl.expected.glsl b/test/intrinsics/gen/tanh/c15fdb.wgsl.expected.glsl index d750eed346..bbc7766dc6 100644 --- a/test/intrinsics/gen/tanh/c15fdb.wgsl.expected.glsl +++ b/test/intrinsics/gen/tanh/c15fdb.wgsl.expected.glsl @@ -5,31 +5,18 @@ void tanh_c15fdb() { float res = tanh(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { tanh_c15fdb(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void tanh_c15fdb() { float res = tanh(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { tanh_c15fdb(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void tanh_c15fdb() { float res = tanh(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { tanh_c15fdb(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/002b2a.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/002b2a.wgsl.expected.glsl index 14f92e4fc7..4918d10f38 100644 --- a/test/intrinsics/gen/textureDimensions/002b2a.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/002b2a.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_002b2a() { int res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_002b2a(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_002b2a() { int res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_002b2a(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_002b2a() { int res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_002b2a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/012b82.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/012b82.wgsl.expected.glsl index 2c55d0691a..3080952c83 100644 --- a/test/intrinsics/gen/textureDimensions/012b82.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/012b82.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_012b82() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_012b82(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_012b82() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_012b82(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_012b82() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_012b82(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/08753d.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/08753d.wgsl.expected.glsl index 48a35aab4f..488f0622bc 100644 --- a/test/intrinsics/gen/textureDimensions/08753d.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/08753d.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_08753d() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_08753d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureDimensions_08753d() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_08753d(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureDimensions_08753d() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_08753d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureDimensions/0c4772.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/0c4772.wgsl.expected.glsl index 7a591c01d8..e75f30fffd 100644 --- a/test/intrinsics/gen/textureDimensions/0c4772.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/0c4772.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_0c4772() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_0c4772(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_0c4772() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_0c4772(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_0c4772() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_0c4772(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/0cce40.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/0cce40.wgsl.expected.glsl index c22bc6f388..1a439b8243 100644 --- a/test/intrinsics/gen/textureDimensions/0cce40.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/0cce40.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_0cce40() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_0cce40(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureDimensions_0cce40() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_0cce40(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureDimensions_0cce40() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_0cce40(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureDimensions/0cf2ff.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/0cf2ff.wgsl.expected.glsl index b469d25bb4..dcc64f6994 100644 --- a/test/intrinsics/gen/textureDimensions/0cf2ff.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/0cf2ff.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_0cf2ff() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_0cf2ff(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_0cf2ff() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_0cf2ff(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_0cf2ff() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_0cf2ff(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/0d8b7e.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/0d8b7e.wgsl.expected.glsl index c9e5480f5e..72fc99040d 100644 --- a/test/intrinsics/gen/textureDimensions/0d8b7e.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/0d8b7e.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_0d8b7e() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_0d8b7e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_0d8b7e() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_0d8b7e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_0d8b7e() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_0d8b7e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/0e32ee.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/0e32ee.wgsl.expected.glsl index aa2ecfa2c4..13793968db 100644 --- a/test/intrinsics/gen/textureDimensions/0e32ee.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/0e32ee.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_0e32ee() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_0e32ee(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_0e32ee() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_0e32ee(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_0e32ee() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_0e32ee(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/0f3c50.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/0f3c50.wgsl.expected.glsl index 5c0b2c3570..c1f2ad3e2d 100644 --- a/test/intrinsics/gen/textureDimensions/0f3c50.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/0f3c50.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_0f3c50() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_0f3c50(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_0f3c50() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_0f3c50(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_0f3c50() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_0f3c50(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/1191a5.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/1191a5.wgsl.expected.glsl index 4967d803a2..8c8905e4b7 100644 --- a/test/intrinsics/gen/textureDimensions/1191a5.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/1191a5.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_1191a5() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_1191a5(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_1191a5() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_1191a5(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_1191a5() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_1191a5(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/12c9bb.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/12c9bb.wgsl.expected.glsl index d650570488..d6210f5a26 100644 --- a/test/intrinsics/gen/textureDimensions/12c9bb.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/12c9bb.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_12c9bb() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_12c9bb(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_12c9bb() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_12c9bb(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_12c9bb() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_12c9bb(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/147998.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/147998.wgsl.expected.glsl index 4f4b2295ae..0941bf104d 100644 --- a/test/intrinsics/gen/textureDimensions/147998.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/147998.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_147998() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_147998(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_147998() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_147998(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_147998() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_147998(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/16036c.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/16036c.wgsl.expected.glsl index 36e6ad42e4..be1d72bd8a 100644 --- a/test/intrinsics/gen/textureDimensions/16036c.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/16036c.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_16036c() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_16036c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_16036c() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_16036c(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_16036c() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_16036c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/1b71f0.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/1b71f0.wgsl.expected.glsl index 2fd6faa938..0f5191c79d 100644 --- a/test/intrinsics/gen/textureDimensions/1b71f0.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/1b71f0.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_1b71f0() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_1b71f0(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_1b71f0() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_1b71f0(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_1b71f0() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_1b71f0(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/1d6c26.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/1d6c26.wgsl.expected.glsl index 0da782cb13..f8c0a84ac7 100644 --- a/test/intrinsics/gen/textureDimensions/1d6c26.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/1d6c26.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_1d6c26() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_1d6c26(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_1d6c26() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_1d6c26(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_1d6c26() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_1d6c26(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/1e9e39.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/1e9e39.wgsl.expected.glsl index 23f9499947..5a31fac073 100644 --- a/test/intrinsics/gen/textureDimensions/1e9e39.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/1e9e39.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_1e9e39() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_1e9e39(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureDimensions_1e9e39() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_1e9e39(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureDimensions_1e9e39() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_1e9e39(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureDimensions/1f20c5.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/1f20c5.wgsl.expected.glsl index 5017607b0f..eeb52a6252 100644 --- a/test/intrinsics/gen/textureDimensions/1f20c5.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/1f20c5.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_1f20c5() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_1f20c5(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_1f20c5() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_1f20c5(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_1f20c5() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_1f20c5(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/214dd4.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/214dd4.wgsl.expected.glsl index 8f243b6273..811a9b61dd 100644 --- a/test/intrinsics/gen/textureDimensions/214dd4.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/214dd4.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_214dd4() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_214dd4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_214dd4() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_214dd4(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_214dd4() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_214dd4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/221f22.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/221f22.wgsl.expected.glsl index 1042e3cd88..a162070fee 100644 --- a/test/intrinsics/gen/textureDimensions/221f22.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/221f22.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_221f22() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_221f22(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_221f22() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_221f22(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_221f22() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_221f22(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/267788.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/267788.wgsl.expected.glsl index c5073661f6..e9b6be0c0a 100644 --- a/test/intrinsics/gen/textureDimensions/267788.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/267788.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_267788() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_267788(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_267788() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_267788(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_267788() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_267788(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/26bdfa.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/26bdfa.wgsl.expected.glsl index 41a9191925..7eeda4fe76 100644 --- a/test/intrinsics/gen/textureDimensions/26bdfa.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/26bdfa.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_26bdfa() { ivec3 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_26bdfa(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_26bdfa() { ivec3 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_26bdfa(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_26bdfa() { ivec3 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_26bdfa(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/26ef6c.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/26ef6c.wgsl.expected.glsl index 2af5f6154b..9203abd200 100644 --- a/test/intrinsics/gen/textureDimensions/26ef6c.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/26ef6c.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_26ef6c() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_26ef6c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_26ef6c() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_26ef6c(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_26ef6c() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_26ef6c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/2ad087.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/2ad087.wgsl.expected.glsl index 3022183c0d..1d53576aeb 100644 --- a/test/intrinsics/gen/textureDimensions/2ad087.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/2ad087.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_2ad087() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_2ad087(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_2ad087() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_2ad087(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_2ad087() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_2ad087(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/2efa05.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/2efa05.wgsl.expected.glsl index d479f5d24b..304e2ba2bc 100644 --- a/test/intrinsics/gen/textureDimensions/2efa05.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/2efa05.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_2efa05() { ivec3 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_2efa05(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_2efa05() { ivec3 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_2efa05(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_2efa05() { ivec3 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_2efa05(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/2f289f.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/2f289f.wgsl.expected.glsl index 0e911ecae2..908e7360c5 100644 --- a/test/intrinsics/gen/textureDimensions/2f289f.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/2f289f.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_2f289f() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_2f289f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_2f289f() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_2f289f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_2f289f() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_2f289f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/2fe1cc.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/2fe1cc.wgsl.expected.glsl index f5a17e6e1e..370e7c7122 100644 --- a/test/intrinsics/gen/textureDimensions/2fe1cc.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/2fe1cc.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_2fe1cc() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_2fe1cc(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_2fe1cc() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_2fe1cc(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_2fe1cc() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_2fe1cc(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/318ecc.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/318ecc.wgsl.expected.glsl index 3398fc91af..9a2ce52f82 100644 --- a/test/intrinsics/gen/textureDimensions/318ecc.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/318ecc.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_318ecc() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_318ecc(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureDimensions_318ecc() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_318ecc(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureDimensions_318ecc() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_318ecc(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureDimensions/340d06.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/340d06.wgsl.expected.glsl index fcc17642be..660137e83d 100644 --- a/test/intrinsics/gen/textureDimensions/340d06.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/340d06.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_340d06() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_340d06(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_340d06() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_340d06(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_340d06() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_340d06(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/398e30.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/398e30.wgsl.expected.glsl index 4a6a6ad478..65443cf87d 100644 --- a/test/intrinsics/gen/textureDimensions/398e30.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/398e30.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_398e30() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_398e30(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_398e30() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_398e30(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_398e30() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_398e30(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/3a94ea.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/3a94ea.wgsl.expected.glsl index 883af99a0a..45d0c2a7bf 100644 --- a/test/intrinsics/gen/textureDimensions/3a94ea.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/3a94ea.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_3a94ea() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_3a94ea(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_3a94ea() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_3a94ea(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_3a94ea() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_3a94ea(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/3aca08.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/3aca08.wgsl.expected.glsl index 7af209ee84..2fab51de74 100644 --- a/test/intrinsics/gen/textureDimensions/3aca08.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/3aca08.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_3aca08() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_3aca08(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureDimensions_3aca08() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_3aca08(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureDimensions_3aca08() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_3aca08(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureDimensions/3c5ad8.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/3c5ad8.wgsl.expected.glsl index e930f20568..b8c86eed26 100644 --- a/test/intrinsics/gen/textureDimensions/3c5ad8.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/3c5ad8.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_3c5ad8() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_3c5ad8(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_3c5ad8() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_3c5ad8(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_3c5ad8() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_3c5ad8(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/4152a6.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/4152a6.wgsl.expected.glsl index 7eb9fe19b1..3ac20e9f7c 100644 --- a/test/intrinsics/gen/textureDimensions/4152a6.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/4152a6.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_4152a6() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_4152a6(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_4152a6() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_4152a6(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_4152a6() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_4152a6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/423f99.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/423f99.wgsl.expected.glsl index c0c95d2adb..488c42480a 100644 --- a/test/intrinsics/gen/textureDimensions/423f99.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/423f99.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_423f99() { int res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_423f99(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_423f99() { int res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_423f99(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_423f99() { int res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_423f99(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/4267ee.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/4267ee.wgsl.expected.glsl index 7b34430714..7fcb8e4af5 100644 --- a/test/intrinsics/gen/textureDimensions/4267ee.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/4267ee.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_4267ee() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_4267ee(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_4267ee() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_4267ee(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_4267ee() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_4267ee(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/42d4e6.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/42d4e6.wgsl.expected.glsl index ff1dc833e0..57f7a5419a 100644 --- a/test/intrinsics/gen/textureDimensions/42d4e6.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/42d4e6.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_42d4e6() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_42d4e6(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureDimensions_42d4e6() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_42d4e6(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureDimensions_42d4e6() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_42d4e6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureDimensions/48cb89.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/48cb89.wgsl.expected.glsl index dedc3e52fc..0c46823b29 100644 --- a/test/intrinsics/gen/textureDimensions/48cb89.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/48cb89.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_48cb89() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_48cb89(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_48cb89() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_48cb89(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_48cb89() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_48cb89(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/49d274.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/49d274.wgsl.expected.glsl index b86ec80662..2cd86dd6c1 100644 --- a/test/intrinsics/gen/textureDimensions/49d274.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/49d274.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_49d274() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_49d274(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_49d274() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_49d274(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_49d274() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_49d274(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/4df9a8.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/4df9a8.wgsl.expected.glsl index 1b3d08f47d..62bbc5af53 100644 --- a/test/intrinsics/gen/textureDimensions/4df9a8.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/4df9a8.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_4df9a8() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_4df9a8(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_4df9a8() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_4df9a8(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_4df9a8() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_4df9a8(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/50a9ee.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/50a9ee.wgsl.expected.glsl index 2dc6825fd0..851d16c319 100644 --- a/test/intrinsics/gen/textureDimensions/50a9ee.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/50a9ee.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_50a9ee() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_50a9ee(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_50a9ee() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_50a9ee(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_50a9ee() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_50a9ee(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/52045c.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/52045c.wgsl.expected.glsl index 2322ae57cf..eab122403b 100644 --- a/test/intrinsics/gen/textureDimensions/52045c.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/52045c.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_52045c() { int res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_52045c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_52045c() { int res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_52045c(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_52045c() { int res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_52045c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/55b23e.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/55b23e.wgsl.expected.glsl index 6edb6470fe..658ce33985 100644 --- a/test/intrinsics/gen/textureDimensions/55b23e.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/55b23e.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_55b23e() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_55b23e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_55b23e() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_55b23e(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_55b23e() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_55b23e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/579629.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/579629.wgsl.expected.glsl index bb33254a1b..e36787dad4 100644 --- a/test/intrinsics/gen/textureDimensions/579629.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/579629.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_579629() { ivec2 res = textureSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_579629(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_579629() { ivec2 res = textureSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_579629(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_579629() { ivec2 res = textureSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_579629(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/57da0b.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/57da0b.wgsl.expected.glsl index a2a5088e4b..29208afaa7 100644 --- a/test/intrinsics/gen/textureDimensions/57da0b.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/57da0b.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_57da0b() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_57da0b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureDimensions_57da0b() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_57da0b(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureDimensions_57da0b() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_57da0b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureDimensions/57e28f.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/57e28f.wgsl.expected.glsl index 5703d387fa..14c08b895b 100644 --- a/test/intrinsics/gen/textureDimensions/57e28f.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/57e28f.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_57e28f() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_57e28f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_57e28f() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_57e28f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_57e28f() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_57e28f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/58a515.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/58a515.wgsl.expected.glsl index 4705fe6243..493897378d 100644 --- a/test/intrinsics/gen/textureDimensions/58a515.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/58a515.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_58a515() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_58a515(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_58a515() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_58a515(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_58a515() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_58a515(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/5985f3.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/5985f3.wgsl.expected.glsl index 0867e7024d..998221a902 100644 --- a/test/intrinsics/gen/textureDimensions/5985f3.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/5985f3.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_5985f3() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_5985f3(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_5985f3() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_5985f3(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_5985f3() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_5985f3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/5caa5e.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/5caa5e.wgsl.expected.glsl index aa60bfd1ec..4c3260a584 100644 --- a/test/intrinsics/gen/textureDimensions/5caa5e.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/5caa5e.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_5caa5e() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_5caa5e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureDimensions_5caa5e() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_5caa5e(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureDimensions_5caa5e() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_5caa5e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureDimensions/5e295d.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/5e295d.wgsl.expected.glsl index c83720621d..f68edd4fc7 100644 --- a/test/intrinsics/gen/textureDimensions/5e295d.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/5e295d.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_5e295d() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_5e295d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_5e295d() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_5e295d(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_5e295d() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_5e295d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/60bf54.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/60bf54.wgsl.expected.glsl index 3487223b28..ced7196069 100644 --- a/test/intrinsics/gen/textureDimensions/60bf54.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/60bf54.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_60bf54() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_60bf54(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_60bf54() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_60bf54(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_60bf54() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_60bf54(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/63f3cf.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/63f3cf.wgsl.expected.glsl index d9953ab4a6..8db8a7b990 100644 --- a/test/intrinsics/gen/textureDimensions/63f3cf.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/63f3cf.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_63f3cf() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_63f3cf(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_63f3cf() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_63f3cf(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_63f3cf() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_63f3cf(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/68105c.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/68105c.wgsl.expected.glsl index 83013ddfe1..e2756f450c 100644 --- a/test/intrinsics/gen/textureDimensions/68105c.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/68105c.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_68105c() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_68105c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_68105c() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_68105c(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_68105c() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_68105c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/686ef2.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/686ef2.wgsl.expected.glsl index 5fdb83d51c..37a1df0bda 100644 --- a/test/intrinsics/gen/textureDimensions/686ef2.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/686ef2.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_686ef2() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_686ef2(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_686ef2() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_686ef2(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_686ef2() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_686ef2(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/6adac6.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/6adac6.wgsl.expected.glsl index a837f74af0..3251ad97b5 100644 --- a/test/intrinsics/gen/textureDimensions/6adac6.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/6adac6.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_6adac6() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_6adac6(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureDimensions_6adac6() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_6adac6(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureDimensions_6adac6() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_6adac6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureDimensions/6ec1b4.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/6ec1b4.wgsl.expected.glsl index d53f89ccab..59ad4a50cd 100644 --- a/test/intrinsics/gen/textureDimensions/6ec1b4.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/6ec1b4.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_6ec1b4() { ivec3 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_6ec1b4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_6ec1b4() { ivec3 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_6ec1b4(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_6ec1b4() { ivec3 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_6ec1b4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/6f0d79.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/6f0d79.wgsl.expected.glsl index 9f84fac9c5..56e978cdf9 100644 --- a/test/intrinsics/gen/textureDimensions/6f0d79.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/6f0d79.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_6f0d79() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_6f0d79(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_6f0d79() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_6f0d79(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_6f0d79() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_6f0d79(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/702c53.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/702c53.wgsl.expected.glsl index dc198d9d2d..50d9fab792 100644 --- a/test/intrinsics/gen/textureDimensions/702c53.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/702c53.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_702c53() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_702c53(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_702c53() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_702c53(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_702c53() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_702c53(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/72e5d6.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/72e5d6.wgsl.expected.glsl index b9d84113df..8831c41758 100644 --- a/test/intrinsics/gen/textureDimensions/72e5d6.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/72e5d6.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_72e5d6() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_72e5d6(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_72e5d6() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_72e5d6(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_72e5d6() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_72e5d6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/79df87.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/79df87.wgsl.expected.glsl index f149da1aee..b14a095fdd 100644 --- a/test/intrinsics/gen/textureDimensions/79df87.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/79df87.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_79df87() { int res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_79df87(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_79df87() { int res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_79df87(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_79df87() { int res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_79df87(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/7bf826.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/7bf826.wgsl.expected.glsl index a66e815b5a..7e1e045996 100644 --- a/test/intrinsics/gen/textureDimensions/7bf826.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/7bf826.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_7bf826() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_7bf826(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_7bf826() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_7bf826(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_7bf826() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_7bf826(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/7f5c2e.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/7f5c2e.wgsl.expected.glsl index 253b2b4bf5..e74df61bac 100644 --- a/test/intrinsics/gen/textureDimensions/7f5c2e.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/7f5c2e.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_7f5c2e() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_7f5c2e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_7f5c2e() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_7f5c2e(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_7f5c2e() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_7f5c2e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/8028f3.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/8028f3.wgsl.expected.glsl index f9c21cea1f..53570019cc 100644 --- a/test/intrinsics/gen/textureDimensions/8028f3.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/8028f3.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_8028f3() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_8028f3(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_8028f3() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_8028f3(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_8028f3() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_8028f3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/811679.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/811679.wgsl.expected.glsl index 6a6bbb39f4..66721ab16c 100644 --- a/test/intrinsics/gen/textureDimensions/811679.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/811679.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_811679() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_811679(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_811679() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_811679(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_811679() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_811679(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/820596.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/820596.wgsl.expected.glsl index 3b765b8541..a675697582 100644 --- a/test/intrinsics/gen/textureDimensions/820596.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/820596.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_820596() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_820596(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_820596() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_820596(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_820596() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_820596(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/83ee5a.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/83ee5a.wgsl.expected.glsl index 24adf9727d..630004e6a0 100644 --- a/test/intrinsics/gen/textureDimensions/83ee5a.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/83ee5a.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_83ee5a() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_83ee5a(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_83ee5a() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_83ee5a(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_83ee5a() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_83ee5a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/85d556.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/85d556.wgsl.expected.glsl index 38697f6230..608225215c 100644 --- a/test/intrinsics/gen/textureDimensions/85d556.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/85d556.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_85d556() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_85d556(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_85d556() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_85d556(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_85d556() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_85d556(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/88ad17.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/88ad17.wgsl.expected.glsl index ddf17b073d..69ed057630 100644 --- a/test/intrinsics/gen/textureDimensions/88ad17.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/88ad17.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_88ad17() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_88ad17(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_88ad17() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_88ad17(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_88ad17() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_88ad17(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/8aa4c4.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/8aa4c4.wgsl.expected.glsl index 4094696140..537ae826fc 100644 --- a/test/intrinsics/gen/textureDimensions/8aa4c4.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/8aa4c4.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_8aa4c4() { ivec3 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_8aa4c4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_8aa4c4() { ivec3 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_8aa4c4(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_8aa4c4() { ivec3 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_8aa4c4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/8deb5e.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/8deb5e.wgsl.expected.glsl index 61106bcfb7..c0c0a0d913 100644 --- a/test/intrinsics/gen/textureDimensions/8deb5e.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/8deb5e.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_8deb5e() { ivec3 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_8deb5e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_8deb5e() { ivec3 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_8deb5e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_8deb5e() { ivec3 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_8deb5e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/8f20bf.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/8f20bf.wgsl.expected.glsl index 80db1d7d1a..4de19af65b 100644 --- a/test/intrinsics/gen/textureDimensions/8f20bf.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/8f20bf.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_8f20bf() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_8f20bf(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_8f20bf() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_8f20bf(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_8f20bf() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_8f20bf(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/8fca0f.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/8fca0f.wgsl.expected.glsl index 8b89fb84e1..a6c88d7ecd 100644 --- a/test/intrinsics/gen/textureDimensions/8fca0f.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/8fca0f.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_8fca0f() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_8fca0f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_8fca0f() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_8fca0f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_8fca0f() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_8fca0f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/90340b.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/90340b.wgsl.expected.glsl index 304f830e32..808572398e 100644 --- a/test/intrinsics/gen/textureDimensions/90340b.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/90340b.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_90340b() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_90340b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_90340b() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_90340b(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_90340b() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_90340b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/9042ab.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/9042ab.wgsl.expected.glsl index d51bdd08f0..e081a36a9f 100644 --- a/test/intrinsics/gen/textureDimensions/9042ab.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/9042ab.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_9042ab() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_9042ab(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_9042ab() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_9042ab(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_9042ab() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_9042ab(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/9393b0.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/9393b0.wgsl.expected.glsl index 2641780999..e1b42dfa8f 100644 --- a/test/intrinsics/gen/textureDimensions/9393b0.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/9393b0.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_9393b0() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_9393b0(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_9393b0() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_9393b0(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_9393b0() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_9393b0(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/939fdb.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/939fdb.wgsl.expected.glsl index 249f885a88..b8fd95b0d4 100644 --- a/test/intrinsics/gen/textureDimensions/939fdb.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/939fdb.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_939fdb() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_939fdb(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_939fdb() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_939fdb(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_939fdb() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_939fdb(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/962dcd.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/962dcd.wgsl.expected.glsl index 0df22f8509..c741061e8c 100644 --- a/test/intrinsics/gen/textureDimensions/962dcd.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/962dcd.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_962dcd() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_962dcd(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_962dcd() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_962dcd(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_962dcd() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_962dcd(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/9abfe5.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/9abfe5.wgsl.expected.glsl index 4466a1d9f1..ec95d846e6 100644 --- a/test/intrinsics/gen/textureDimensions/9abfe5.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/9abfe5.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_9abfe5() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_9abfe5(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_9abfe5() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_9abfe5(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_9abfe5() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_9abfe5(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/9c9c57.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/9c9c57.wgsl.expected.glsl index 90cfd47b6d..c7ae9b9208 100644 --- a/test/intrinsics/gen/textureDimensions/9c9c57.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/9c9c57.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_9c9c57() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_9c9c57(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_9c9c57() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_9c9c57(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_9c9c57() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_9c9c57(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/9da9e2.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/9da9e2.wgsl.expected.glsl index 3282b4c825..003370a6a6 100644 --- a/test/intrinsics/gen/textureDimensions/9da9e2.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/9da9e2.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_9da9e2() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_9da9e2(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureDimensions_9da9e2() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_9da9e2(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureDimensions_9da9e2() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_9da9e2(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureDimensions/9eb8d8.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/9eb8d8.wgsl.expected.glsl index 06452a687e..8e51dd9a6b 100644 --- a/test/intrinsics/gen/textureDimensions/9eb8d8.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/9eb8d8.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_9eb8d8() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_9eb8d8(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_9eb8d8() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_9eb8d8(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_9eb8d8() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_9eb8d8(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/9f8e46.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/9f8e46.wgsl.expected.glsl index 6af3f445bf..d319fe9c08 100644 --- a/test/intrinsics/gen/textureDimensions/9f8e46.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/9f8e46.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_9f8e46() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_9f8e46(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_9f8e46() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_9f8e46(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_9f8e46() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_9f8e46(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/a01845.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/a01845.wgsl.expected.glsl index 87c69a8ea5..2cedd1ee45 100644 --- a/test/intrinsics/gen/textureDimensions/a01845.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/a01845.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_a01845() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_a01845(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_a01845() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_a01845(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_a01845() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_a01845(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/a7d565.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/a7d565.wgsl.expected.glsl index 664e20429e..77348b5d4e 100644 --- a/test/intrinsics/gen/textureDimensions/a7d565.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/a7d565.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_a7d565() { int res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_a7d565(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_a7d565() { int res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_a7d565(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_a7d565() { int res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_a7d565(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/a863f2.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/a863f2.wgsl.expected.glsl index ff71748270..1138a782f6 100644 --- a/test/intrinsics/gen/textureDimensions/a863f2.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/a863f2.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_a863f2() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_a863f2(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureDimensions_a863f2() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_a863f2(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureDimensions_a863f2() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_a863f2(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureDimensions/a9c9c1.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/a9c9c1.wgsl.expected.glsl index 30537426c9..21da942093 100644 --- a/test/intrinsics/gen/textureDimensions/a9c9c1.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/a9c9c1.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_a9c9c1() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_a9c9c1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_a9c9c1() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_a9c9c1(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_a9c9c1() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_a9c9c1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/b0e16d.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/b0e16d.wgsl.expected.glsl index ddf7bffefe..1344198a42 100644 --- a/test/intrinsics/gen/textureDimensions/b0e16d.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/b0e16d.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_b0e16d() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_b0e16d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_b0e16d() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_b0e16d(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_b0e16d() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_b0e16d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/b3c954.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/b3c954.wgsl.expected.glsl index 27edddaf88..1de7ad218e 100644 --- a/test/intrinsics/gen/textureDimensions/b3c954.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/b3c954.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_b3c954() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_b3c954(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_b3c954() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_b3c954(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_b3c954() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_b3c954(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/b3e407.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/b3e407.wgsl.expected.glsl index ee7fbb6bee..a42f12ce84 100644 --- a/test/intrinsics/gen/textureDimensions/b3e407.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/b3e407.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_b3e407() { int res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_b3e407(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_b3e407() { int res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_b3e407(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_b3e407() { int res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_b3e407(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/b91240.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/b91240.wgsl.expected.glsl index 942e900ade..69de1f7abb 100644 --- a/test/intrinsics/gen/textureDimensions/b91240.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/b91240.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_b91240() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_b91240(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_b91240() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_b91240(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_b91240() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_b91240(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/ba1481.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/ba1481.wgsl.expected.glsl index b1a73dba12..0dc8786f48 100644 --- a/test/intrinsics/gen/textureDimensions/ba1481.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/ba1481.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_ba1481() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_ba1481(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_ba1481() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_ba1481(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_ba1481() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_ba1481(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/bb3dde.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/bb3dde.wgsl.expected.glsl index d53a4f06a9..fc54c29c63 100644 --- a/test/intrinsics/gen/textureDimensions/bb3dde.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/bb3dde.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_bb3dde() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_bb3dde(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_bb3dde() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_bb3dde(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_bb3dde() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_bb3dde(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/c30e75.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/c30e75.wgsl.expected.glsl index 43dbd13bae..06b7e56d45 100644 --- a/test/intrinsics/gen/textureDimensions/c30e75.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/c30e75.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_c30e75() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_c30e75(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_c30e75() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_c30e75(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_c30e75() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_c30e75(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/c7943d.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/c7943d.wgsl.expected.glsl index a05daa284a..1efc49e475 100644 --- a/test/intrinsics/gen/textureDimensions/c7943d.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/c7943d.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_c7943d() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_c7943d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_c7943d() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_c7943d(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_c7943d() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_c7943d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/cc968c.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/cc968c.wgsl.expected.glsl index 66c6718342..ec3883d5b4 100644 --- a/test/intrinsics/gen/textureDimensions/cc968c.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/cc968c.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_cc968c() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_cc968c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_cc968c() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_cc968c(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_cc968c() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_cc968c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/cccc8f.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/cccc8f.wgsl.expected.glsl index 10234236ea..34a1f00385 100644 --- a/test/intrinsics/gen/textureDimensions/cccc8f.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/cccc8f.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_cccc8f() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_cccc8f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureDimensions_cccc8f() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_cccc8f(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureDimensions_cccc8f() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_cccc8f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureDimensions/cd76a7.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/cd76a7.wgsl.expected.glsl index 9946cc25c6..a0fc36661f 100644 --- a/test/intrinsics/gen/textureDimensions/cd76a7.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/cd76a7.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_cd76a7() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_cd76a7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_cd76a7() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_cd76a7(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_cd76a7() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_cd76a7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/cdf473.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/cdf473.wgsl.expected.glsl index ad020972cd..553c607c3b 100644 --- a/test/intrinsics/gen/textureDimensions/cdf473.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/cdf473.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_cdf473() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_cdf473(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_cdf473() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_cdf473(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_cdf473() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_cdf473(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/cec841.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/cec841.wgsl.expected.glsl index b14fbe8970..9887c81a44 100644 --- a/test/intrinsics/gen/textureDimensions/cec841.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/cec841.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_cec841() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_cec841(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_cec841() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_cec841(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_cec841() { ivec2 res = textureSize(arg_0_1, 0).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_cec841(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/cf7e43.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/cf7e43.wgsl.expected.glsl index a41c319751..1a2dd2788e 100644 --- a/test/intrinsics/gen/textureDimensions/cf7e43.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/cf7e43.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_cf7e43() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_cf7e43(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_cf7e43() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_cf7e43(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_cf7e43() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_cf7e43(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/d125bc.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/d125bc.wgsl.expected.glsl index 9dbf7f40d6..a7a7c00d99 100644 --- a/test/intrinsics/gen/textureDimensions/d125bc.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/d125bc.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_d125bc() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_d125bc(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_d125bc() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_d125bc(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_d125bc() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_d125bc(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/d83c45.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/d83c45.wgsl.expected.glsl index d434b3e733..8b5f0704f4 100644 --- a/test/intrinsics/gen/textureDimensions/d83c45.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/d83c45.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_d83c45() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_d83c45(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_d83c45() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_d83c45(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_d83c45() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_d83c45(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/daf7c0.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/daf7c0.wgsl.expected.glsl index 73f127b729..ac91dcf2ce 100644 --- a/test/intrinsics/gen/textureDimensions/daf7c0.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/daf7c0.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_daf7c0() { ivec2 res = textureSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_daf7c0(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_daf7c0() { ivec2 res = textureSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_daf7c0(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_daf7c0() { ivec2 res = textureSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_daf7c0(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/dc2dd0.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/dc2dd0.wgsl.expected.glsl index b1f94d93f2..303891fb50 100644 --- a/test/intrinsics/gen/textureDimensions/dc2dd0.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/dc2dd0.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_dc2dd0() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_dc2dd0(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureDimensions_dc2dd0() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_dc2dd0(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureDimensions_dc2dd0() { int res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_dc2dd0(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureDimensions/e927be.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/e927be.wgsl.expected.glsl index 74761e16ff..6a36ed2295 100644 --- a/test/intrinsics/gen/textureDimensions/e927be.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/e927be.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_e927be() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_e927be(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_e927be() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_e927be(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_e927be() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_e927be(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/e9e96c.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/e9e96c.wgsl.expected.glsl index cc5eb73991..ff80da8d9c 100644 --- a/test/intrinsics/gen/textureDimensions/e9e96c.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/e9e96c.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_e9e96c() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_e9e96c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_e9e96c() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_e9e96c(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_e9e96c() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_e9e96c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/ef5b89.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/ef5b89.wgsl.expected.glsl index e9158de3df..6081669d8b 100644 --- a/test/intrinsics/gen/textureDimensions/ef5b89.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/ef5b89.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_ef5b89() { ivec2 res = textureSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_ef5b89(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_ef5b89() { ivec2 res = textureSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_ef5b89(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_ef5b89() { ivec2 res = textureSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_ef5b89(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/efc8a4.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/efc8a4.wgsl.expected.glsl index 89b3428688..263b1b4bb7 100644 --- a/test/intrinsics/gen/textureDimensions/efc8a4.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/efc8a4.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_efc8a4() { ivec3 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_efc8a4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_efc8a4() { ivec3 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_efc8a4(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_efc8a4() { ivec3 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_efc8a4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/f60bdb.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/f60bdb.wgsl.expected.glsl index 85626e25b5..5b44875e93 100644 --- a/test/intrinsics/gen/textureDimensions/f60bdb.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/f60bdb.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_f60bdb() { ivec2 res = textureSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_f60bdb(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_f60bdb() { ivec2 res = textureSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_f60bdb(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_f60bdb() { ivec2 res = textureSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_f60bdb(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/f7145b.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/f7145b.wgsl.expected.glsl index f855aeefe8..e64653c531 100644 --- a/test/intrinsics/gen/textureDimensions/f7145b.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/f7145b.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_f7145b() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_f7145b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_f7145b() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_f7145b(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_f7145b() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_f7145b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/f931c7.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/f931c7.wgsl.expected.glsl index 25889f57ef..a6c0397cb5 100644 --- a/test/intrinsics/gen/textureDimensions/f931c7.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/f931c7.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_f931c7() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_f931c7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_f931c7() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_f931c7(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_f931c7() { ivec2 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_f931c7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/fa9859.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/fa9859.wgsl.expected.glsl index 853f710896..8d8a510b73 100644 --- a/test/intrinsics/gen/textureDimensions/fa9859.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/fa9859.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_fa9859() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_fa9859(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_fa9859() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_fa9859(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_fa9859() { ivec2 res = textureSize(arg_0_1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_fa9859(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureDimensions/fb5670.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/fb5670.wgsl.expected.glsl index a8498fee2d..9c6a56b172 100644 --- a/test/intrinsics/gen/textureDimensions/fb5670.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/fb5670.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureDimensions_fb5670() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_fb5670(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureDimensions_fb5670() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_fb5670(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureDimensions_fb5670() { ivec2 res = imageSize(arg_0_1).xy; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_fb5670(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureDimensions/fcac78.wgsl.expected.glsl b/test/intrinsics/gen/textureDimensions/fcac78.wgsl.expected.glsl index 56f7a39794..69c5a4d209 100644 --- a/test/intrinsics/gen/textureDimensions/fcac78.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureDimensions/fcac78.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureDimensions_fcac78() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureDimensions_fcac78(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureDimensions_fcac78() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureDimensions_fcac78(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureDimensions_fcac78() { ivec3 res = imageSize(arg_0_1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureDimensions_fcac78(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/01305f.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/01305f.wgsl.expected.glsl index 9c485b238f..5389a4ce36 100644 --- a/test/intrinsics/gen/textureGather/01305f.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/01305f.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_01305f() { uvec4 res = textureGather(arg_1_arg_2, vec3(0.0f, 0.0f, float(1)), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_01305f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_01305f() { uvec4 res = textureGather(arg_1_arg_2, vec3(0.0f, 0.0f, float(1)), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_01305f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_01305f() { uvec4 res = textureGather(arg_1_arg_2, vec3(0.0f, 0.0f, float(1)), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_01305f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/06030a.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/06030a.wgsl.expected.glsl index 6c84a46772..21b131efa7 100644 --- a/test/intrinsics/gen/textureGather/06030a.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/06030a.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_06030a() { vec4 res = textureGatherOffset(arg_1_arg_2, vec3(0.0f, 0.0f, float(1)), ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_06030a(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_06030a() { vec4 res = textureGatherOffset(arg_1_arg_2, vec3(0.0f, 0.0f, float(1)), ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_06030a(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_06030a() { vec4 res = textureGatherOffset(arg_1_arg_2, vec3(0.0f, 0.0f, float(1)), ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_06030a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/10c554.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/10c554.wgsl.expected.glsl index 073e19ee29..a52c1d49c6 100644 --- a/test/intrinsics/gen/textureGather/10c554.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/10c554.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_10c554() { vec4 res = textureGather(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_10c554(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_10c554() { vec4 res = textureGather(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_10c554(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_10c554() { vec4 res = textureGather(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_10c554(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/15d79c.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/15d79c.wgsl.expected.glsl index dea7b6980e..69544545fd 100644 --- a/test/intrinsics/gen/textureGather/15d79c.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/15d79c.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_15d79c() { vec4 res = textureGatherOffset(arg_1_arg_2, vec2(0.0f, 0.0f), ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_15d79c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_15d79c() { vec4 res = textureGatherOffset(arg_1_arg_2, vec2(0.0f, 0.0f), ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_15d79c(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_15d79c() { vec4 res = textureGatherOffset(arg_1_arg_2, vec2(0.0f, 0.0f), ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_15d79c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/2e0ed5.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/2e0ed5.wgsl.expected.glsl index ed998ff9e1..004593d8b4 100644 --- a/test/intrinsics/gen/textureGather/2e0ed5.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/2e0ed5.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_2e0ed5() { vec4 res = textureGather(arg_0_arg_1, vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_2e0ed5(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_2e0ed5() { vec4 res = textureGather(arg_0_arg_1, vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_2e0ed5(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_2e0ed5() { vec4 res = textureGather(arg_0_arg_1, vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_2e0ed5(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/3112e8.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/3112e8.wgsl.expected.glsl index ffbb04b854..b9f564e09a 100644 --- a/test/intrinsics/gen/textureGather/3112e8.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/3112e8.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureGather_3112e8() { vec4 res = textureGather(arg_1_arg_2, vec4(0.0f, 0.0f, 0.0f, float(1)), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_3112e8(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -50,19 +37,14 @@ void textureGather_3112e8() { vec4 res = textureGather(arg_1_arg_2, vec4(0.0f, 0.0f, 0.0f, float(1)), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_3112e8(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -79,20 +61,15 @@ void textureGather_3112e8() { vec4 res = textureGather(arg_1_arg_2, vec4(0.0f, 0.0f, 0.0f, float(1)), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_3112e8(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureGather/3c527e.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/3c527e.wgsl.expected.glsl index ea10f93cd1..c909e1c8f5 100644 --- a/test/intrinsics/gen/textureGather/3c527e.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/3c527e.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureGather_3c527e() { uvec4 res = textureGather(arg_1_arg_2, vec4(0.0f, 0.0f, 0.0f, float(1)), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_3c527e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -50,19 +37,14 @@ void textureGather_3c527e() { uvec4 res = textureGather(arg_1_arg_2, vec4(0.0f, 0.0f, 0.0f, float(1)), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_3c527e(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -79,20 +61,15 @@ void textureGather_3c527e() { uvec4 res = textureGather(arg_1_arg_2, vec4(0.0f, 0.0f, 0.0f, float(1)), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_3c527e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureGather/43025d.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/43025d.wgsl.expected.glsl index c770aa50ea..c29566bf6c 100644 --- a/test/intrinsics/gen/textureGather/43025d.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/43025d.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureGather_43025d() { vec4 res = textureGather(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1))); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_43025d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -50,19 +37,14 @@ void textureGather_43025d() { vec4 res = textureGather(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1))); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_43025d(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -79,20 +61,15 @@ void textureGather_43025d() { vec4 res = textureGather(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1))); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_43025d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureGather/4f2350.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/4f2350.wgsl.expected.glsl index c5f4ab33d8..ac23239eb5 100644 --- a/test/intrinsics/gen/textureGather/4f2350.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/4f2350.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_4f2350() { ivec4 res = textureGatherOffset(arg_1_arg_2, vec3(0.0f, 0.0f, float(1)), ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_4f2350(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_4f2350() { ivec4 res = textureGatherOffset(arg_1_arg_2, vec3(0.0f, 0.0f, float(1)), ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_4f2350(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_4f2350() { ivec4 res = textureGatherOffset(arg_1_arg_2, vec3(0.0f, 0.0f, float(1)), ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_4f2350(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/51cf0b.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/51cf0b.wgsl.expected.glsl index b5cd131994..1ff67427e0 100644 --- a/test/intrinsics/gen/textureGather/51cf0b.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/51cf0b.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_51cf0b() { ivec4 res = textureGather(arg_1_arg_2, vec3(0.0f, 0.0f, float(1)), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_51cf0b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_51cf0b() { ivec4 res = textureGather(arg_1_arg_2, vec3(0.0f, 0.0f, float(1)), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_51cf0b(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_51cf0b() { ivec4 res = textureGather(arg_1_arg_2, vec3(0.0f, 0.0f, float(1)), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_51cf0b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/53ece6.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/53ece6.wgsl.expected.glsl index 2d6eb3acb3..cfc3c9eee8 100644 --- a/test/intrinsics/gen/textureGather/53ece6.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/53ece6.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_53ece6() { vec4 res = textureGatherOffset(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_53ece6(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_53ece6() { vec4 res = textureGatherOffset(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_53ece6(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_53ece6() { vec4 res = textureGatherOffset(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_53ece6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/57bfc6.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/57bfc6.wgsl.expected.glsl index 0b79d6418c..8eb89836b4 100644 --- a/test/intrinsics/gen/textureGather/57bfc6.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/57bfc6.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_57bfc6() { vec4 res = textureGather(arg_1_arg_2, vec3(0.0f, 0.0f, 0.0f), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_57bfc6(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_57bfc6() { vec4 res = textureGather(arg_1_arg_2, vec3(0.0f, 0.0f, 0.0f), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_57bfc6(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_57bfc6() { vec4 res = textureGather(arg_1_arg_2, vec3(0.0f, 0.0f, 0.0f), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_57bfc6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/587ba3.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/587ba3.wgsl.expected.glsl index 369cafb5a6..ecb1131902 100644 --- a/test/intrinsics/gen/textureGather/587ba3.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/587ba3.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_587ba3() { ivec4 res = textureGather(arg_1_arg_2, vec2(0.0f, 0.0f), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_587ba3(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_587ba3() { ivec4 res = textureGather(arg_1_arg_2, vec2(0.0f, 0.0f), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_587ba3(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_587ba3() { ivec4 res = textureGather(arg_1_arg_2, vec2(0.0f, 0.0f), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_587ba3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/69e0fb.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/69e0fb.wgsl.expected.glsl index e862fd5bb5..060919e577 100644 --- a/test/intrinsics/gen/textureGather/69e0fb.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/69e0fb.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_69e0fb() { ivec4 res = textureGatherOffset(arg_1_arg_2, vec2(0.0f, 0.0f), ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_69e0fb(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_69e0fb() { ivec4 res = textureGatherOffset(arg_1_arg_2, vec2(0.0f, 0.0f), ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_69e0fb(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_69e0fb() { ivec4 res = textureGatherOffset(arg_1_arg_2, vec2(0.0f, 0.0f), ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_69e0fb(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/93003d.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/93003d.wgsl.expected.glsl index 57c6303f5f..bd5c8b6b78 100644 --- a/test/intrinsics/gen/textureGather/93003d.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/93003d.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_93003d() { uvec4 res = textureGatherOffset(arg_1_arg_2, vec2(0.0f, 0.0f), ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_93003d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_93003d() { uvec4 res = textureGatherOffset(arg_1_arg_2, vec2(0.0f, 0.0f), ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_93003d(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_93003d() { uvec4 res = textureGatherOffset(arg_1_arg_2, vec2(0.0f, 0.0f), ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_93003d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/9a6358.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/9a6358.wgsl.expected.glsl index e872aa3068..c79ce78e86 100644 --- a/test/intrinsics/gen/textureGather/9a6358.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/9a6358.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_9a6358() { vec4 res = textureGather(arg_0_arg_1, vec3(0.0f, 0.0f, float(1))); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_9a6358(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_9a6358() { vec4 res = textureGather(arg_0_arg_1, vec3(0.0f, 0.0f, float(1))); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_9a6358(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_9a6358() { vec4 res = textureGather(arg_0_arg_1, vec3(0.0f, 0.0f, float(1))); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_9a6358(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/9efca2.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/9efca2.wgsl.expected.glsl index 614bd6766b..49c5e4f6a7 100644 --- a/test/intrinsics/gen/textureGather/9efca2.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/9efca2.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_9efca2() { vec4 res = textureGather(arg_1_arg_2, vec3(0.0f, 0.0f, float(1)), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_9efca2(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_9efca2() { vec4 res = textureGather(arg_1_arg_2, vec3(0.0f, 0.0f, float(1)), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_9efca2(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_9efca2() { vec4 res = textureGather(arg_1_arg_2, vec3(0.0f, 0.0f, float(1)), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_9efca2(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/bd0b1e.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/bd0b1e.wgsl.expected.glsl index 97371b6104..ecfe8634a5 100644 --- a/test/intrinsics/gen/textureGather/bd0b1e.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/bd0b1e.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_bd0b1e() { vec4 res = textureGather(arg_1_arg_2, vec2(0.0f, 0.0f), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_bd0b1e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_bd0b1e() { vec4 res = textureGather(arg_1_arg_2, vec2(0.0f, 0.0f), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_bd0b1e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_bd0b1e() { vec4 res = textureGather(arg_1_arg_2, vec2(0.0f, 0.0f), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_bd0b1e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/c409ae.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/c409ae.wgsl.expected.glsl index 1f317e7fca..4211e7bbd5 100644 --- a/test/intrinsics/gen/textureGather/c409ae.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/c409ae.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_c409ae() { vec4 res = textureGatherOffset(arg_0_arg_1, vec2(0.0f, 0.0f), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_c409ae(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_c409ae() { vec4 res = textureGatherOffset(arg_0_arg_1, vec2(0.0f, 0.0f), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_c409ae(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_c409ae() { vec4 res = textureGatherOffset(arg_0_arg_1, vec2(0.0f, 0.0f), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_c409ae(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/c55822.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/c55822.wgsl.expected.glsl index 8ab7901fb9..c376ef6c26 100644 --- a/test/intrinsics/gen/textureGather/c55822.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/c55822.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureGather_c55822() { ivec4 res = textureGather(arg_1_arg_2, vec4(0.0f, 0.0f, 0.0f, float(1)), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_c55822(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -50,19 +37,14 @@ void textureGather_c55822() { ivec4 res = textureGather(arg_1_arg_2, vec4(0.0f, 0.0f, 0.0f, float(1)), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_c55822(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -79,20 +61,15 @@ void textureGather_c55822() { ivec4 res = textureGather(arg_1_arg_2, vec4(0.0f, 0.0f, 0.0f, float(1)), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_c55822(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureGather/e1b67d.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/e1b67d.wgsl.expected.glsl index 0f00339410..63bf56cdc2 100644 --- a/test/intrinsics/gen/textureGather/e1b67d.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/e1b67d.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_e1b67d() { uvec4 res = textureGather(arg_1_arg_2, vec3(0.0f, 0.0f, 0.0f), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_e1b67d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_e1b67d() { uvec4 res = textureGather(arg_1_arg_2, vec3(0.0f, 0.0f, 0.0f), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_e1b67d(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_e1b67d() { uvec4 res = textureGather(arg_1_arg_2, vec3(0.0f, 0.0f, 0.0f), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_e1b67d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/e9eff6.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/e9eff6.wgsl.expected.glsl index 015e775447..543a238999 100644 --- a/test/intrinsics/gen/textureGather/e9eff6.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/e9eff6.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_e9eff6() { uvec4 res = textureGather(arg_1_arg_2, vec2(0.0f, 0.0f), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_e9eff6(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_e9eff6() { uvec4 res = textureGather(arg_1_arg_2, vec2(0.0f, 0.0f), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_e9eff6(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_e9eff6() { uvec4 res = textureGather(arg_1_arg_2, vec2(0.0f, 0.0f), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_e9eff6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/f5f3ba.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/f5f3ba.wgsl.expected.glsl index e0ab81c155..70393981a4 100644 --- a/test/intrinsics/gen/textureGather/f5f3ba.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/f5f3ba.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_f5f3ba() { uvec4 res = textureGatherOffset(arg_1_arg_2, vec3(0.0f, 0.0f, float(1)), ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_f5f3ba(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_f5f3ba() { uvec4 res = textureGatherOffset(arg_1_arg_2, vec3(0.0f, 0.0f, float(1)), ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_f5f3ba(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_f5f3ba() { uvec4 res = textureGatherOffset(arg_1_arg_2, vec3(0.0f, 0.0f, float(1)), ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_f5f3ba(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGather/f7995a.wgsl.expected.glsl b/test/intrinsics/gen/textureGather/f7995a.wgsl.expected.glsl index 9d745f20df..6d73a7206f 100644 --- a/test/intrinsics/gen/textureGather/f7995a.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGather/f7995a.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureGather_f7995a() { ivec4 res = textureGather(arg_1_arg_2, vec3(0.0f, 0.0f, 0.0f), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGather_f7995a(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureGather_f7995a() { ivec4 res = textureGather(arg_1_arg_2, vec3(0.0f, 0.0f, 0.0f), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGather_f7995a(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureGather_f7995a() { ivec4 res = textureGather(arg_1_arg_2, vec3(0.0f, 0.0f, 0.0f), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGather_f7995a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureGatherCompare/182fd4.wgsl.expected.glsl b/test/intrinsics/gen/textureGatherCompare/182fd4.wgsl.expected.glsl index c76101ce7c..74cb0124ca 100644 --- a/test/intrinsics/gen/textureGatherCompare/182fd4.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGatherCompare/182fd4.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureGatherCompare_182fd4() { vec4 res = textureGather(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGatherCompare_182fd4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureGather' : no matching overloaded function found ERROR: 0:7: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' @@ -51,19 +38,14 @@ void textureGatherCompare_182fd4() { vec4 res = textureGather(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGatherCompare_182fd4(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureGather' : no matching overloaded function found ERROR: 0:7: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' @@ -81,20 +63,15 @@ void textureGatherCompare_182fd4() { vec4 res = textureGather(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGatherCompare_182fd4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureGather' : no matching overloaded function found ERROR: 0:7: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' diff --git a/test/intrinsics/gen/textureGatherCompare/60d2d1.wgsl.expected.glsl b/test/intrinsics/gen/textureGatherCompare/60d2d1.wgsl.expected.glsl index 94a4141c10..55be13608a 100644 --- a/test/intrinsics/gen/textureGatherCompare/60d2d1.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGatherCompare/60d2d1.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureGatherCompare_60d2d1() { vec4 res = textureGather(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGatherCompare_60d2d1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -50,19 +37,14 @@ void textureGatherCompare_60d2d1() { vec4 res = textureGather(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGatherCompare_60d2d1(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -79,20 +61,15 @@ void textureGatherCompare_60d2d1() { vec4 res = textureGather(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGatherCompare_60d2d1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureGatherCompare/6d9352.wgsl.expected.glsl b/test/intrinsics/gen/textureGatherCompare/6d9352.wgsl.expected.glsl index 269455469a..8ada980534 100644 --- a/test/intrinsics/gen/textureGatherCompare/6d9352.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGatherCompare/6d9352.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureGatherCompare_6d9352() { vec4 res = textureGather(arg_0_arg_1, vec2(0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGatherCompare_6d9352(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureGather' : no matching overloaded function found ERROR: 0:7: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' @@ -51,19 +38,14 @@ void textureGatherCompare_6d9352() { vec4 res = textureGather(arg_0_arg_1, vec2(0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGatherCompare_6d9352(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureGather' : no matching overloaded function found ERROR: 0:7: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' @@ -81,20 +63,15 @@ void textureGatherCompare_6d9352() { vec4 res = textureGather(arg_0_arg_1, vec2(0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGatherCompare_6d9352(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureGather' : no matching overloaded function found ERROR: 0:7: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' diff --git a/test/intrinsics/gen/textureGatherCompare/6f1267.wgsl.expected.glsl b/test/intrinsics/gen/textureGatherCompare/6f1267.wgsl.expected.glsl index df3b334e1f..cfe99da8d5 100644 --- a/test/intrinsics/gen/textureGatherCompare/6f1267.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGatherCompare/6f1267.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureGatherCompare_6f1267() { vec4 res = textureGatherOffset(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 1.0f, ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGatherCompare_6f1267(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureGatherOffset' : no matching overloaded function found ERROR: 0:7: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' @@ -51,19 +38,14 @@ void textureGatherCompare_6f1267() { vec4 res = textureGatherOffset(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 1.0f, ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGatherCompare_6f1267(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureGatherOffset' : no matching overloaded function found ERROR: 0:7: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' @@ -81,20 +63,15 @@ void textureGatherCompare_6f1267() { vec4 res = textureGatherOffset(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 1.0f, ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGatherCompare_6f1267(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureGatherOffset' : no matching overloaded function found ERROR: 0:7: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' diff --git a/test/intrinsics/gen/textureGatherCompare/783e65.wgsl.expected.glsl b/test/intrinsics/gen/textureGatherCompare/783e65.wgsl.expected.glsl index 904a0a5a5f..02015bd61e 100644 --- a/test/intrinsics/gen/textureGatherCompare/783e65.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGatherCompare/783e65.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureGatherCompare_783e65() { vec4 res = textureGather(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGatherCompare_783e65(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureGather' : no matching overloaded function found ERROR: 0:7: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' @@ -51,19 +38,14 @@ void textureGatherCompare_783e65() { vec4 res = textureGather(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGatherCompare_783e65(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureGather' : no matching overloaded function found ERROR: 0:7: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' @@ -81,20 +63,15 @@ void textureGatherCompare_783e65() { vec4 res = textureGather(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGatherCompare_783e65(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureGather' : no matching overloaded function found ERROR: 0:7: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' diff --git a/test/intrinsics/gen/textureGatherCompare/a5f587.wgsl.expected.glsl b/test/intrinsics/gen/textureGatherCompare/a5f587.wgsl.expected.glsl index 0c1fcc2ec9..bec1404c26 100644 --- a/test/intrinsics/gen/textureGatherCompare/a5f587.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureGatherCompare/a5f587.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureGatherCompare_a5f587() { vec4 res = textureGatherOffset(arg_0_arg_1, vec2(0.0f, 0.0f), 1.0f, ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureGatherCompare_a5f587(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureGatherOffset' : no matching overloaded function found ERROR: 0:7: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' @@ -51,19 +38,14 @@ void textureGatherCompare_a5f587() { vec4 res = textureGatherOffset(arg_0_arg_1, vec2(0.0f, 0.0f), 1.0f, ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureGatherCompare_a5f587(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureGatherOffset' : no matching overloaded function found ERROR: 0:7: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' @@ -81,20 +63,15 @@ void textureGatherCompare_a5f587() { vec4 res = textureGatherOffset(arg_0_arg_1, vec2(0.0f, 0.0f), 1.0f, ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureGatherCompare_a5f587(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureGatherOffset' : no matching overloaded function found ERROR: 0:7: '=' : cannot convert from ' const float' to ' temp mediump 4-component vector of float' diff --git a/test/intrinsics/gen/textureLoad/19cf87.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/19cf87.wgsl.expected.glsl index 5412f67a3b..8e1ff9d6f9 100644 --- a/test/intrinsics/gen/textureLoad/19cf87.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/19cf87.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureLoad_19cf87() { float res = texelFetch(arg_0_1, ivec2(0, 0), 0).x; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_19cf87(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureLoad_19cf87() { float res = texelFetch(arg_0_1, ivec2(0, 0), 0).x; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_19cf87(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureLoad_19cf87() { float res = texelFetch(arg_0_1, ivec2(0, 0), 0).x; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_19cf87(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureLoad/1b8588.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/1b8588.wgsl.expected.glsl index fb511ee92a..d4c7cc9060 100644 --- a/test/intrinsics/gen/textureLoad/1b8588.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/1b8588.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureLoad_1b8588() { uvec4 res = texelFetch(arg_0_1, 1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_1b8588(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureLoad_1b8588() { uvec4 res = texelFetch(arg_0_1, 1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_1b8588(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureLoad_1b8588() { uvec4 res = texelFetch(arg_0_1, 1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_1b8588(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureLoad/1f2016.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/1f2016.wgsl.expected.glsl index 73e9fa2af2..6defceb367 100644 --- a/test/intrinsics/gen/textureLoad/1f2016.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/1f2016.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureLoad_1f2016() { vec4 res = texelFetch(arg_0_1, ivec3(0, 0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_1f2016(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureLoad_1f2016() { vec4 res = texelFetch(arg_0_1, ivec3(0, 0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_1f2016(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureLoad_1f2016() { vec4 res = texelFetch(arg_0_1, ivec3(0, 0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_1f2016(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureLoad/484344.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/484344.wgsl.expected.glsl index 9682ec0466..f0ecc81ffa 100644 --- a/test/intrinsics/gen/textureLoad/484344.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/484344.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureLoad_484344() { vec4 res = texelFetch(arg_0_1, ivec2(0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_484344(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureLoad_484344() { vec4 res = texelFetch(arg_0_1, ivec2(0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_484344(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureLoad_484344() { vec4 res = texelFetch(arg_0_1, ivec2(0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_484344(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureLoad/4fd803.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/4fd803.wgsl.expected.glsl index 5dd74b92af..dac790245a 100644 --- a/test/intrinsics/gen/textureLoad/4fd803.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/4fd803.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureLoad_4fd803() { ivec4 res = texelFetch(arg_0_1, ivec3(0, 0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_4fd803(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureLoad_4fd803() { ivec4 res = texelFetch(arg_0_1, ivec3(0, 0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_4fd803(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureLoad_4fd803() { ivec4 res = texelFetch(arg_0_1, ivec3(0, 0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_4fd803(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureLoad/5a2f9d.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/5a2f9d.wgsl.expected.glsl index e3c138f5d4..753b79bcf0 100644 --- a/test/intrinsics/gen/textureLoad/5a2f9d.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/5a2f9d.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureLoad_5a2f9d() { ivec4 res = texelFetch(arg_0_1, 1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_5a2f9d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureLoad_5a2f9d() { ivec4 res = texelFetch(arg_0_1, 1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_5a2f9d(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureLoad_5a2f9d() { ivec4 res = texelFetch(arg_0_1, 1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_5a2f9d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureLoad/6154d4.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/6154d4.wgsl.expected.glsl index 3470f2720c..8e43537e64 100644 --- a/test/intrinsics/gen/textureLoad/6154d4.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/6154d4.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureLoad_6154d4() { uvec4 res = texelFetch(arg_0_1, ivec2(0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_6154d4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureLoad_6154d4() { uvec4 res = texelFetch(arg_0_1, ivec2(0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_6154d4(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureLoad_6154d4() { uvec4 res = texelFetch(arg_0_1, ivec2(0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_6154d4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureLoad/6273b1.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/6273b1.wgsl.expected.glsl index 527ff52482..7416ba277c 100644 --- a/test/intrinsics/gen/textureLoad/6273b1.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/6273b1.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureLoad_6273b1() { float res = texelFetch(arg_0_1, ivec2(0, 0), 1).x; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_6273b1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureLoad_6273b1() { float res = texelFetch(arg_0_1, ivec2(0, 0), 1).x; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_6273b1(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureLoad_6273b1() { float res = texelFetch(arg_0_1, ivec2(0, 0), 1).x; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_6273b1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureLoad/79e697.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/79e697.wgsl.expected.glsl index 35d4409ebd..9c762cc94e 100644 --- a/test/intrinsics/gen/textureLoad/79e697.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/79e697.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureLoad_79e697() { ivec4 res = texelFetch(arg_0_1, ivec3(0, 0, 1), 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_79e697(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureLoad_79e697() { ivec4 res = texelFetch(arg_0_1, ivec3(0, 0, 1), 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_79e697(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureLoad_79e697() { ivec4 res = texelFetch(arg_0_1, ivec3(0, 0, 1), 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_79e697(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureLoad/7c90e5.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/7c90e5.wgsl.expected.glsl index 87cab79869..968904253b 100644 --- a/test/intrinsics/gen/textureLoad/7c90e5.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/7c90e5.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureLoad_7c90e5() { uvec4 res = texelFetch(arg_0_1, ivec3(0, 0, 1), 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_7c90e5(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureLoad_7c90e5() { uvec4 res = texelFetch(arg_0_1, ivec3(0, 0, 1), 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_7c90e5(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureLoad_7c90e5() { uvec4 res = texelFetch(arg_0_1, ivec3(0, 0, 1), 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_7c90e5(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureLoad/81c381.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/81c381.wgsl.expected.glsl index 0ae7c9106c..fc474bdd35 100644 --- a/test/intrinsics/gen/textureLoad/81c381.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/81c381.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureLoad_81c381() { vec4 res = texelFetch(arg_0_1, 1, 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_81c381(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureLoad_81c381() { vec4 res = texelFetch(arg_0_1, 1, 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_81c381(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureLoad_81c381() { vec4 res = texelFetch(arg_0_1, 1, 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_81c381(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureLoad/87be85.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/87be85.wgsl.expected.glsl index 6240bc693d..16aca94260 100644 --- a/test/intrinsics/gen/textureLoad/87be85.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/87be85.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureLoad_87be85() { vec4 res = texelFetch(arg_0_1, ivec3(0, 0, 1), 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_87be85(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureLoad_87be85() { vec4 res = texelFetch(arg_0_1, ivec3(0, 0, 1), 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_87be85(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureLoad_87be85() { vec4 res = texelFetch(arg_0_1, ivec3(0, 0, 1), 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_87be85(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureLoad/8acf41.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/8acf41.wgsl.expected.glsl index fc14c7a980..98bc6a34a9 100644 --- a/test/intrinsics/gen/textureLoad/8acf41.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/8acf41.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureLoad_8acf41() { vec4 res = texelFetch(arg_0_1, ivec2(0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_8acf41(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureLoad_8acf41() { vec4 res = texelFetch(arg_0_1, ivec2(0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_8acf41(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureLoad_8acf41() { vec4 res = texelFetch(arg_0_1, ivec2(0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_8acf41(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureLoad/9b2667.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/9b2667.wgsl.expected.glsl index 78ec7ba62f..74b106db6e 100644 --- a/test/intrinsics/gen/textureLoad/9b2667.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/9b2667.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureLoad_9b2667() { float res = texelFetch(arg_0_1, ivec3(0, 0, 1), 0).x; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_9b2667(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureLoad_9b2667() { float res = texelFetch(arg_0_1, ivec3(0, 0, 1), 0).x; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_9b2667(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureLoad_9b2667() { float res = texelFetch(arg_0_1, ivec3(0, 0, 1), 0).x; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_9b2667(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureLoad/a583c9.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/a583c9.wgsl.expected.glsl index bc1f029fc4..d328ec0a17 100644 --- a/test/intrinsics/gen/textureLoad/a583c9.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/a583c9.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureLoad_a583c9() { vec4 res = texelFetch(arg_0_1, ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_a583c9(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureLoad_a583c9() { vec4 res = texelFetch(arg_0_1, ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_a583c9(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureLoad_a583c9() { vec4 res = texelFetch(arg_0_1, ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_a583c9(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureLoad/a9a9f5.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/a9a9f5.wgsl.expected.glsl index 40ac76841d..37197ae372 100644 --- a/test/intrinsics/gen/textureLoad/a9a9f5.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/a9a9f5.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureLoad_a9a9f5() { uvec4 res = texelFetch(arg_0_1, ivec3(0, 0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_a9a9f5(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureLoad_a9a9f5() { uvec4 res = texelFetch(arg_0_1, ivec3(0, 0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_a9a9f5(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureLoad_a9a9f5() { uvec4 res = texelFetch(arg_0_1, ivec3(0, 0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_a9a9f5(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureLoad/c2a480.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/c2a480.wgsl.expected.glsl index 24250999bb..a60ce4965d 100644 --- a/test/intrinsics/gen/textureLoad/c2a480.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/c2a480.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureLoad_c2a480() { ivec4 res = texelFetch(arg_0_1, ivec2(0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_c2a480(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureLoad_c2a480() { ivec4 res = texelFetch(arg_0_1, ivec2(0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_c2a480(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureLoad_c2a480() { ivec4 res = texelFetch(arg_0_1, ivec2(0, 0), 0); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_c2a480(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureLoad/c378ee.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/c378ee.wgsl.expected.glsl index a5fbbe27d9..384dc44bed 100644 --- a/test/intrinsics/gen/textureLoad/c378ee.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/c378ee.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureLoad_c378ee() { uvec4 res = texelFetch(arg_0_1, ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_c378ee(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureLoad_c378ee() { uvec4 res = texelFetch(arg_0_1, ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_c378ee(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureLoad_c378ee() { uvec4 res = texelFetch(arg_0_1, ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_c378ee(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureLoad/e3d2cc.wgsl.expected.glsl b/test/intrinsics/gen/textureLoad/e3d2cc.wgsl.expected.glsl index 9aafc2490a..898cd99a45 100644 --- a/test/intrinsics/gen/textureLoad/e3d2cc.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureLoad/e3d2cc.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureLoad_e3d2cc() { ivec4 res = texelFetch(arg_0_1, ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureLoad_e3d2cc(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureLoad_e3d2cc() { ivec4 res = texelFetch(arg_0_1, ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureLoad_e3d2cc(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureLoad_e3d2cc() { ivec4 res = texelFetch(arg_0_1, ivec2(0, 0), 1); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureLoad_e3d2cc(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureNumLayers/024820.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/024820.wgsl.expected.glsl index f67b0d807a..f8331b3a5e 100644 --- a/test/intrinsics/gen/textureNumLayers/024820.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/024820.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_024820() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_024820(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLayers_024820() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_024820(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLayers_024820() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_024820(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLayers/053df7.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/053df7.wgsl.expected.glsl index 1433d32fc7..f3f2b3831b 100644 --- a/test/intrinsics/gen/textureNumLayers/053df7.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/053df7.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_053df7() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_053df7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureNumLayers_053df7() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_053df7(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureNumLayers_053df7() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_053df7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureNumLayers/058cc3.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/058cc3.wgsl.expected.glsl index 8120d25494..44e5060f8b 100644 --- a/test/intrinsics/gen/textureNumLayers/058cc3.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/058cc3.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_058cc3() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_058cc3(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureNumLayers_058cc3() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_058cc3(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureNumLayers_058cc3() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_058cc3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureNumLayers/09d05d.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/09d05d.wgsl.expected.glsl index 85d6768eed..c82eb8ec51 100644 --- a/test/intrinsics/gen/textureNumLayers/09d05d.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/09d05d.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_09d05d() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_09d05d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLayers_09d05d() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_09d05d(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLayers_09d05d() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_09d05d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLayers/13b4ce.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/13b4ce.wgsl.expected.glsl index 0c9751afb5..21522e6a6b 100644 --- a/test/intrinsics/gen/textureNumLayers/13b4ce.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/13b4ce.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_13b4ce() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_13b4ce(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLayers_13b4ce() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_13b4ce(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLayers_13b4ce() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_13b4ce(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLayers/22e53b.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/22e53b.wgsl.expected.glsl index 71288c5bb0..fb99cff77c 100644 --- a/test/intrinsics/gen/textureNumLayers/22e53b.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/22e53b.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_22e53b() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_22e53b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLayers_22e53b() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_22e53b(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLayers_22e53b() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_22e53b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLayers/562013.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/562013.wgsl.expected.glsl index edd36532b6..22c897b8c6 100644 --- a/test/intrinsics/gen/textureNumLayers/562013.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/562013.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_562013() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_562013(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLayers_562013() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_562013(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLayers_562013() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_562013(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLayers/5d59cd.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/5d59cd.wgsl.expected.glsl index 6cb0d2d524..ff2a74ef00 100644 --- a/test/intrinsics/gen/textureNumLayers/5d59cd.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/5d59cd.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_5d59cd() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_5d59cd(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureNumLayers_5d59cd() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_5d59cd(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureNumLayers_5d59cd() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_5d59cd(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureNumLayers/68a65b.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/68a65b.wgsl.expected.glsl index 2c22d99837..b069934b93 100644 --- a/test/intrinsics/gen/textureNumLayers/68a65b.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/68a65b.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_68a65b() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_68a65b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLayers_68a65b() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_68a65b(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLayers_68a65b() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_68a65b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLayers/778bd1.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/778bd1.wgsl.expected.glsl index 2dc89f1e9f..87da8dc4c0 100644 --- a/test/intrinsics/gen/textureNumLayers/778bd1.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/778bd1.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_778bd1() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_778bd1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureNumLayers_778bd1() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_778bd1(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureNumLayers_778bd1() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_778bd1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureNumLayers/7f1937.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/7f1937.wgsl.expected.glsl index 7951783345..cf2a7573c6 100644 --- a/test/intrinsics/gen/textureNumLayers/7f1937.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/7f1937.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_7f1937() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_7f1937(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureNumLayers_7f1937() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_7f1937(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureNumLayers_7f1937() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_7f1937(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureNumLayers/85f980.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/85f980.wgsl.expected.glsl index 00b6c8d932..a96bc517cf 100644 --- a/test/intrinsics/gen/textureNumLayers/85f980.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/85f980.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_85f980() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_85f980(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureNumLayers_85f980() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_85f980(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureNumLayers_85f980() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_85f980(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureNumLayers/87953e.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/87953e.wgsl.expected.glsl index 835800ad7e..1575baae57 100644 --- a/test/intrinsics/gen/textureNumLayers/87953e.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/87953e.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_87953e() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_87953e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLayers_87953e() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_87953e(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLayers_87953e() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_87953e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLayers/893e7c.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/893e7c.wgsl.expected.glsl index 9fa11ee033..b9f782c709 100644 --- a/test/intrinsics/gen/textureNumLayers/893e7c.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/893e7c.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_893e7c() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_893e7c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLayers_893e7c() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_893e7c(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLayers_893e7c() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_893e7c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLayers/9700fb.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/9700fb.wgsl.expected.glsl index ae57eb4441..9999bb414a 100644 --- a/test/intrinsics/gen/textureNumLayers/9700fb.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/9700fb.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_9700fb() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_9700fb(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLayers_9700fb() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_9700fb(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLayers_9700fb() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_9700fb(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLayers/a216d2.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/a216d2.wgsl.expected.glsl index 875fca051f..ed0195dabc 100644 --- a/test/intrinsics/gen/textureNumLayers/a216d2.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/a216d2.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_a216d2() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_a216d2(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLayers_a216d2() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_a216d2(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLayers_a216d2() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_a216d2(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLayers/cd5dc8.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/cd5dc8.wgsl.expected.glsl index 451e755ad6..d936e9669f 100644 --- a/test/intrinsics/gen/textureNumLayers/cd5dc8.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/cd5dc8.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_cd5dc8() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_cd5dc8(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLayers_cd5dc8() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_cd5dc8(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLayers_cd5dc8() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_cd5dc8(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLayers/d5b228.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/d5b228.wgsl.expected.glsl index ab739fc567..2e32417d8f 100644 --- a/test/intrinsics/gen/textureNumLayers/d5b228.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/d5b228.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_d5b228() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_d5b228(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLayers_d5b228() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_d5b228(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLayers_d5b228() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_d5b228(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLayers/e31be1.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/e31be1.wgsl.expected.glsl index 2b8859db81..6b42f0eaad 100644 --- a/test/intrinsics/gen/textureNumLayers/e31be1.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/e31be1.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_e31be1() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_e31be1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLayers_e31be1() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_e31be1(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLayers_e31be1() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_e31be1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLayers/e653c0.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/e653c0.wgsl.expected.glsl index 007b6ace7b..a50d766a70 100644 --- a/test/intrinsics/gen/textureNumLayers/e653c0.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/e653c0.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_e653c0() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_e653c0(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLayers_e653c0() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_e653c0(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLayers_e653c0() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_e653c0(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLayers/ee942f.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/ee942f.wgsl.expected.glsl index ab9eb508f3..bdf37c8475 100644 --- a/test/intrinsics/gen/textureNumLayers/ee942f.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/ee942f.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_ee942f() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_ee942f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLayers_ee942f() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_ee942f(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLayers_ee942f() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_ee942f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLayers/f33005.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/f33005.wgsl.expected.glsl index 3a29646c9a..556b4eda08 100644 --- a/test/intrinsics/gen/textureNumLayers/f33005.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/f33005.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_f33005() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_f33005(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLayers_f33005() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_f33005(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLayers_f33005() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_f33005(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLayers/fcec98.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/fcec98.wgsl.expected.glsl index 60679ad1a5..6eae1477c2 100644 --- a/test/intrinsics/gen/textureNumLayers/fcec98.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/fcec98.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_fcec98() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_fcec98(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureNumLayers_fcec98() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_fcec98(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureNumLayers_fcec98() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_fcec98(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureNumLayers/ff5e89.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLayers/ff5e89.wgsl.expected.glsl index f662bf51fa..46a346c4b3 100644 --- a/test/intrinsics/gen/textureNumLayers/ff5e89.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLayers/ff5e89.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLayers_ff5e89() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLayers_ff5e89(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLayers_ff5e89() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLayers_ff5e89(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLayers_ff5e89() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLayers_ff5e89(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLevels/076cb5.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/076cb5.wgsl.expected.glsl index 8af1de3453..8277c6d39e 100644 --- a/test/intrinsics/gen/textureNumLevels/076cb5.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/076cb5.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_076cb5() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_076cb5(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLevels_076cb5() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_076cb5(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLevels_076cb5() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_076cb5(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLevels/080d95.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/080d95.wgsl.expected.glsl index f5ea75b264..96eaa132c7 100644 --- a/test/intrinsics/gen/textureNumLevels/080d95.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/080d95.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_080d95() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_080d95(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLevels_080d95() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_080d95(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLevels_080d95() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_080d95(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLevels/09ddd0.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/09ddd0.wgsl.expected.glsl index f014bea1bf..17125a0fe3 100644 --- a/test/intrinsics/gen/textureNumLevels/09ddd0.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/09ddd0.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_09ddd0() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_09ddd0(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLevels_09ddd0() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_09ddd0(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLevels_09ddd0() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_09ddd0(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLevels/105988.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/105988.wgsl.expected.glsl index b88b1bed64..42ddf8c5c8 100644 --- a/test/intrinsics/gen/textureNumLevels/105988.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/105988.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_105988() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_105988(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLevels_105988() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_105988(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLevels_105988() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_105988(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLevels/1e6f3b.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/1e6f3b.wgsl.expected.glsl index 7c231ca9d0..91180d5e2d 100644 --- a/test/intrinsics/gen/textureNumLevels/1e6f3b.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/1e6f3b.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_1e6f3b() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_1e6f3b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureNumLevels_1e6f3b() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_1e6f3b(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureNumLevels_1e6f3b() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_1e6f3b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureNumLevels/23f750.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/23f750.wgsl.expected.glsl index 8c20d6e45c..f3c86f5051 100644 --- a/test/intrinsics/gen/textureNumLevels/23f750.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/23f750.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_23f750() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_23f750(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLevels_23f750() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_23f750(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLevels_23f750() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_23f750(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLevels/2c3575.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/2c3575.wgsl.expected.glsl index b1131a02c9..6194cd15dc 100644 --- a/test/intrinsics/gen/textureNumLevels/2c3575.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/2c3575.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_2c3575() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_2c3575(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureNumLevels_2c3575() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_2c3575(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureNumLevels_2c3575() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_2c3575(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureNumLevels/32a0ae.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/32a0ae.wgsl.expected.glsl index ddc40637ac..b09220a5d6 100644 --- a/test/intrinsics/gen/textureNumLevels/32a0ae.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/32a0ae.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_32a0ae() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_32a0ae(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureNumLevels_32a0ae() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_32a0ae(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureNumLevels_32a0ae() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_32a0ae(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureNumLevels/5101cf.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/5101cf.wgsl.expected.glsl index fcc74f7f2f..238271ddb8 100644 --- a/test/intrinsics/gen/textureNumLevels/5101cf.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/5101cf.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_5101cf() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_5101cf(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLevels_5101cf() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_5101cf(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLevels_5101cf() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_5101cf(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLevels/51b5bb.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/51b5bb.wgsl.expected.glsl index 11b5d551b3..77fc6a530e 100644 --- a/test/intrinsics/gen/textureNumLevels/51b5bb.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/51b5bb.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_51b5bb() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_51b5bb(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureNumLevels_51b5bb() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_51b5bb(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureNumLevels_51b5bb() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_51b5bb(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureNumLevels/897aaf.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/897aaf.wgsl.expected.glsl index ace3b6d453..f7d9e09ba1 100644 --- a/test/intrinsics/gen/textureNumLevels/897aaf.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/897aaf.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_897aaf() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_897aaf(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLevels_897aaf() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_897aaf(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLevels_897aaf() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_897aaf(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLevels/9da7a5.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/9da7a5.wgsl.expected.glsl index 8fcea69762..9489c3191e 100644 --- a/test/intrinsics/gen/textureNumLevels/9da7a5.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/9da7a5.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_9da7a5() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_9da7a5(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLevels_9da7a5() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_9da7a5(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLevels_9da7a5() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_9da7a5(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLevels/a91c03.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/a91c03.wgsl.expected.glsl index 8c92d9a1a5..90a70811c6 100644 --- a/test/intrinsics/gen/textureNumLevels/a91c03.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/a91c03.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_a91c03() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_a91c03(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureNumLevels_a91c03() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_a91c03(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureNumLevels_a91c03() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_a91c03(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'isamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureNumLevels/aee7c8.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/aee7c8.wgsl.expected.glsl index 00c68654a5..a366ac0a57 100644 --- a/test/intrinsics/gen/textureNumLevels/aee7c8.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/aee7c8.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_aee7c8() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_aee7c8(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureNumLevels_aee7c8() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_aee7c8(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureNumLevels_aee7c8() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_aee7c8(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureNumLevels/b1b12b.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/b1b12b.wgsl.expected.glsl index 95168787b6..cc6f34592d 100644 --- a/test/intrinsics/gen/textureNumLevels/b1b12b.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/b1b12b.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_b1b12b() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_b1b12b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLevels_b1b12b() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_b1b12b(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLevels_b1b12b() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_b1b12b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLevels/b4f5ea.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/b4f5ea.wgsl.expected.glsl index d103725012..78da5ea1a2 100644 --- a/test/intrinsics/gen/textureNumLevels/b4f5ea.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/b4f5ea.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_b4f5ea() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_b4f5ea(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLevels_b4f5ea() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_b4f5ea(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLevels_b4f5ea() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_b4f5ea(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLevels/d004a9.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/d004a9.wgsl.expected.glsl index aa22cc75ff..929a3df090 100644 --- a/test/intrinsics/gen/textureNumLevels/d004a9.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/d004a9.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_d004a9() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_d004a9(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLevels_d004a9() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_d004a9(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLevels_d004a9() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_d004a9(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLevels/dca09e.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/dca09e.wgsl.expected.glsl index 565b95ff2b..cb28270166 100644 --- a/test/intrinsics/gen/textureNumLevels/dca09e.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/dca09e.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_dca09e() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_dca09e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLevels_dca09e() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_dca09e(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLevels_dca09e() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_dca09e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLevels/e67231.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/e67231.wgsl.expected.glsl index c955cb20c2..b2827d23e5 100644 --- a/test/intrinsics/gen/textureNumLevels/e67231.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/e67231.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_e67231() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_e67231(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLevels_e67231() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_e67231(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLevels_e67231() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_e67231(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLevels/ed078b.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/ed078b.wgsl.expected.glsl index 77747c5020..2ff2192324 100644 --- a/test/intrinsics/gen/textureNumLevels/ed078b.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/ed078b.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_ed078b() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_ed078b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLevels_ed078b() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_ed078b(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLevels_ed078b() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_ed078b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumLevels/f46ec6.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/f46ec6.wgsl.expected.glsl index 9d7d15011e..a1af03ca50 100644 --- a/test/intrinsics/gen/textureNumLevels/f46ec6.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/f46ec6.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_f46ec6() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_f46ec6(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureNumLevels_f46ec6() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_f46ec6(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureNumLevels_f46ec6() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_f46ec6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'usamplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureNumLevels/f5828d.wgsl.expected.glsl b/test/intrinsics/gen/textureNumLevels/f5828d.wgsl.expected.glsl index 3924bda17e..17944a8589 100644 --- a/test/intrinsics/gen/textureNumLevels/f5828d.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumLevels/f5828d.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumLevels_f5828d() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumLevels_f5828d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumLevels_f5828d() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumLevels_f5828d(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumLevels_f5828d() { int res = textureQueryLevels(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumLevels_f5828d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumSamples/2c6f14.wgsl.expected.glsl b/test/intrinsics/gen/textureNumSamples/2c6f14.wgsl.expected.glsl index 81de2d0c7a..fe9aef909b 100644 --- a/test/intrinsics/gen/textureNumSamples/2c6f14.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumSamples/2c6f14.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumSamples_2c6f14() { int res = textureSamples(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumSamples_2c6f14(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureSamples' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumSamples_2c6f14() { int res = textureSamples(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumSamples_2c6f14(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureSamples' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumSamples_2c6f14() { int res = textureSamples(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumSamples_2c6f14(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureSamples' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumSamples/42f8bb.wgsl.expected.glsl b/test/intrinsics/gen/textureNumSamples/42f8bb.wgsl.expected.glsl index bb0a17ad2d..47d488a487 100644 --- a/test/intrinsics/gen/textureNumSamples/42f8bb.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumSamples/42f8bb.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumSamples_42f8bb() { int res = textureSamples(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumSamples_42f8bb(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureSamples' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumSamples_42f8bb() { int res = textureSamples(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumSamples_42f8bb(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureSamples' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumSamples_42f8bb() { int res = textureSamples(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumSamples_42f8bb(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureSamples' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumSamples/449d23.wgsl.expected.glsl b/test/intrinsics/gen/textureNumSamples/449d23.wgsl.expected.glsl index 98c556ab11..709034eb38 100644 --- a/test/intrinsics/gen/textureNumSamples/449d23.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumSamples/449d23.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumSamples_449d23() { int res = textureSamples(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumSamples_449d23(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureSamples' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumSamples_449d23() { int res = textureSamples(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumSamples_449d23(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureSamples' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumSamples_449d23() { int res = textureSamples(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumSamples_449d23(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureSamples' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureNumSamples/a3c8a0.wgsl.expected.glsl b/test/intrinsics/gen/textureNumSamples/a3c8a0.wgsl.expected.glsl index 1e01150e9f..516bc30ed3 100644 --- a/test/intrinsics/gen/textureNumSamples/a3c8a0.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureNumSamples/a3c8a0.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureNumSamples_a3c8a0() { int res = textureSamples(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureNumSamples_a3c8a0(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureSamples' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' @@ -49,19 +36,14 @@ void textureNumSamples_a3c8a0() { int res = textureSamples(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureNumSamples_a3c8a0(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureSamples' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -78,20 +60,15 @@ void textureNumSamples_a3c8a0() { int res = textureSamples(arg_0_1);; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureNumSamples_a3c8a0(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureSamples' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/intrinsics/gen/textureSample/02aa9b.wgsl.expected.glsl b/test/intrinsics/gen/textureSample/02aa9b.wgsl.expected.glsl index 77a763ed2c..00c91e0177 100644 --- a/test/intrinsics/gen/textureSample/02aa9b.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSample/02aa9b.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSample_02aa9b() { void fragment_main() { textureSample_02aa9b(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSample/100dc0.wgsl.expected.glsl b/test/intrinsics/gen/textureSample/100dc0.wgsl.expected.glsl index cf23155043..97c7b80ceb 100644 --- a/test/intrinsics/gen/textureSample/100dc0.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSample/100dc0.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSample_100dc0() { void fragment_main() { textureSample_100dc0(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSample/38bbb9.wgsl.expected.glsl b/test/intrinsics/gen/textureSample/38bbb9.wgsl.expected.glsl index 4541476dba..a9d17e764e 100644 --- a/test/intrinsics/gen/textureSample/38bbb9.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSample/38bbb9.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSample_38bbb9() { void fragment_main() { textureSample_38bbb9(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSample/3b50bd.wgsl.expected.glsl b/test/intrinsics/gen/textureSample/3b50bd.wgsl.expected.glsl index 04c2dab834..10aa7b4398 100644 --- a/test/intrinsics/gen/textureSample/3b50bd.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSample/3b50bd.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSample_3b50bd() { void fragment_main() { textureSample_3b50bd(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSample/4dd1bf.wgsl.expected.glsl b/test/intrinsics/gen/textureSample/4dd1bf.wgsl.expected.glsl index 0c0a8bb43f..a7f643c445 100644 --- a/test/intrinsics/gen/textureSample/4dd1bf.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSample/4dd1bf.wgsl.expected.glsl @@ -11,13 +11,12 @@ void textureSample_4dd1bf() { void fragment_main() { textureSample_4dd1bf(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSample/51b514.wgsl.expected.glsl b/test/intrinsics/gen/textureSample/51b514.wgsl.expected.glsl index fa29227884..ead0363d98 100644 --- a/test/intrinsics/gen/textureSample/51b514.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSample/51b514.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSample_51b514() { void fragment_main() { textureSample_51b514(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSample/667d76.wgsl.expected.glsl b/test/intrinsics/gen/textureSample/667d76.wgsl.expected.glsl index def5be6ac3..8302945b37 100644 --- a/test/intrinsics/gen/textureSample/667d76.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSample/667d76.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSample_667d76() { void fragment_main() { textureSample_667d76(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSample/6717ca.wgsl.expected.glsl b/test/intrinsics/gen/textureSample/6717ca.wgsl.expected.glsl index 6189a03944..2698d8dc64 100644 --- a/test/intrinsics/gen/textureSample/6717ca.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSample/6717ca.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSample_6717ca() { void fragment_main() { textureSample_6717ca(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSample/6e64fb.wgsl.expected.glsl b/test/intrinsics/gen/textureSample/6e64fb.wgsl.expected.glsl index 1bf28939a1..319afe29de 100644 --- a/test/intrinsics/gen/textureSample/6e64fb.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSample/6e64fb.wgsl.expected.glsl @@ -11,13 +11,12 @@ void textureSample_6e64fb() { void fragment_main() { textureSample_6e64fb(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSample/7c3baa.wgsl.expected.glsl b/test/intrinsics/gen/textureSample/7c3baa.wgsl.expected.glsl index 4058d9badc..9d7c7492b2 100644 --- a/test/intrinsics/gen/textureSample/7c3baa.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSample/7c3baa.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSample_7c3baa() { void fragment_main() { textureSample_7c3baa(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSample/7e9ffd.wgsl.expected.glsl b/test/intrinsics/gen/textureSample/7e9ffd.wgsl.expected.glsl index ebd77203c5..86c21556c3 100644 --- a/test/intrinsics/gen/textureSample/7e9ffd.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSample/7e9ffd.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSample_7e9ffd() { void fragment_main() { textureSample_7e9ffd(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSample/8522e7.wgsl.expected.glsl b/test/intrinsics/gen/textureSample/8522e7.wgsl.expected.glsl index 68f3566894..87741c0510 100644 --- a/test/intrinsics/gen/textureSample/8522e7.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSample/8522e7.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSample_8522e7() { void fragment_main() { textureSample_8522e7(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSample/c2f4e8.wgsl.expected.glsl b/test/intrinsics/gen/textureSample/c2f4e8.wgsl.expected.glsl index 54e6cbdde5..7153e8cd69 100644 --- a/test/intrinsics/gen/textureSample/c2f4e8.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSample/c2f4e8.wgsl.expected.glsl @@ -11,13 +11,12 @@ void textureSample_c2f4e8() { void fragment_main() { textureSample_c2f4e8(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSample/e53267.wgsl.expected.glsl b/test/intrinsics/gen/textureSample/e53267.wgsl.expected.glsl index c014268aa3..43ac089e0e 100644 --- a/test/intrinsics/gen/textureSample/e53267.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSample/e53267.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSample_e53267() { void fragment_main() { textureSample_e53267(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSample/ea7030.wgsl.expected.glsl b/test/intrinsics/gen/textureSample/ea7030.wgsl.expected.glsl index 80069552d2..f1d193e091 100644 --- a/test/intrinsics/gen/textureSample/ea7030.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSample/ea7030.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSample_ea7030() { void fragment_main() { textureSample_ea7030(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleBias/53b9f7.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleBias/53b9f7.wgsl.expected.glsl index fb0329d908..b85dbcd418 100644 --- a/test/intrinsics/gen/textureSampleBias/53b9f7.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleBias/53b9f7.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSampleBias_53b9f7() { void fragment_main() { textureSampleBias_53b9f7(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleBias/65ac50.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleBias/65ac50.wgsl.expected.glsl index 10913953bd..9a0a158ca1 100644 --- a/test/intrinsics/gen/textureSampleBias/65ac50.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleBias/65ac50.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSampleBias_65ac50() { void fragment_main() { textureSampleBias_65ac50(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleBias/6a9113.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleBias/6a9113.wgsl.expected.glsl index d9202052ab..2420cc9341 100644 --- a/test/intrinsics/gen/textureSampleBias/6a9113.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleBias/6a9113.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSampleBias_6a9113() { void fragment_main() { textureSampleBias_6a9113(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleBias/80e579.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleBias/80e579.wgsl.expected.glsl index 1d24e97338..0b9130c29c 100644 --- a/test/intrinsics/gen/textureSampleBias/80e579.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleBias/80e579.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSampleBias_80e579() { void fragment_main() { textureSampleBias_80e579(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleBias/81c19a.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleBias/81c19a.wgsl.expected.glsl index eceb36672e..6672660fa6 100644 --- a/test/intrinsics/gen/textureSampleBias/81c19a.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleBias/81c19a.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSampleBias_81c19a() { void fragment_main() { textureSampleBias_81c19a(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleBias/d3fa1b.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleBias/d3fa1b.wgsl.expected.glsl index 84c7017e88..0530165953 100644 --- a/test/intrinsics/gen/textureSampleBias/d3fa1b.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleBias/d3fa1b.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSampleBias_d3fa1b() { void fragment_main() { textureSampleBias_d3fa1b(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleBias/df91bb.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleBias/df91bb.wgsl.expected.glsl index 478b3204f4..e68a55142f 100644 --- a/test/intrinsics/gen/textureSampleBias/df91bb.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleBias/df91bb.wgsl.expected.glsl @@ -9,10 +9,9 @@ void textureSampleBias_df91bb() { void fragment_main() { textureSampleBias_df91bb(); - return; } void main() { fragment_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleBias/eed7c4.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleBias/eed7c4.wgsl.expected.glsl index 086831e820..ae018215aa 100644 --- a/test/intrinsics/gen/textureSampleBias/eed7c4.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleBias/eed7c4.wgsl.expected.glsl @@ -11,13 +11,12 @@ void textureSampleBias_eed7c4() { void fragment_main() { textureSampleBias_eed7c4(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleCompare/25fcd1.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleCompare/25fcd1.wgsl.expected.glsl index 1231a761a8..ff08b55772 100644 --- a/test/intrinsics/gen/textureSampleCompare/25fcd1.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleCompare/25fcd1.wgsl.expected.glsl @@ -11,13 +11,12 @@ void textureSampleCompare_25fcd1() { void fragment_main() { textureSampleCompare_25fcd1(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureOffset' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleCompare/3a5923.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleCompare/3a5923.wgsl.expected.glsl index 7c2b7a6054..60f4e27b32 100644 --- a/test/intrinsics/gen/textureSampleCompare/3a5923.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleCompare/3a5923.wgsl.expected.glsl @@ -11,13 +11,12 @@ void textureSampleCompare_3a5923() { void fragment_main() { textureSampleCompare_3a5923(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:7: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleCompare/63fb83.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleCompare/63fb83.wgsl.expected.glsl index 66c6f937da..c0fcda19fc 100644 --- a/test/intrinsics/gen/textureSampleCompare/63fb83.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleCompare/63fb83.wgsl.expected.glsl @@ -11,13 +11,12 @@ void textureSampleCompare_63fb83() { void fragment_main() { textureSampleCompare_63fb83(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:7: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleCompare/98b85c.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleCompare/98b85c.wgsl.expected.glsl index c0ae874002..e8c1d5c53b 100644 --- a/test/intrinsics/gen/textureSampleCompare/98b85c.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleCompare/98b85c.wgsl.expected.glsl @@ -11,13 +11,12 @@ void textureSampleCompare_98b85c() { void fragment_main() { textureSampleCompare_98b85c(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureOffset' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleCompare/a3ca7e.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleCompare/a3ca7e.wgsl.expected.glsl index c7d428c8be..34b1feacde 100644 --- a/test/intrinsics/gen/textureSampleCompare/a3ca7e.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleCompare/a3ca7e.wgsl.expected.glsl @@ -11,13 +11,12 @@ void textureSampleCompare_a3ca7e() { void fragment_main() { textureSampleCompare_a3ca7e(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleCompare/dd431d.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleCompare/dd431d.wgsl.expected.glsl index 8c04e11feb..79482dca4f 100644 --- a/test/intrinsics/gen/textureSampleCompare/dd431d.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleCompare/dd431d.wgsl.expected.glsl @@ -11,13 +11,12 @@ void textureSampleCompare_dd431d() { void fragment_main() { textureSampleCompare_dd431d(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:7: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleCompareLevel/011a8f.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleCompareLevel/011a8f.wgsl.expected.glsl index 7f8280ef21..40fe943a82 100644 --- a/test/intrinsics/gen/textureSampleCompareLevel/011a8f.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleCompareLevel/011a8f.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureSampleCompareLevel_011a8f() { float res = textureOffset(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 1.0f, ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleCompareLevel_011a8f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureOffset' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated @@ -50,19 +37,14 @@ void textureSampleCompareLevel_011a8f() { float res = textureOffset(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 1.0f, ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleCompareLevel_011a8f(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureOffset' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated @@ -79,20 +61,15 @@ void textureSampleCompareLevel_011a8f() { float res = textureOffset(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 1.0f, ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleCompareLevel_011a8f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureOffset' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleCompareLevel/1116ed.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleCompareLevel/1116ed.wgsl.expected.glsl index a99409794e..5b38908164 100644 --- a/test/intrinsics/gen/textureSampleCompareLevel/1116ed.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleCompareLevel/1116ed.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureSampleCompareLevel_1116ed() { float res = texture(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleCompareLevel_1116ed(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'texture' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated @@ -50,19 +37,14 @@ void textureSampleCompareLevel_1116ed() { float res = texture(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleCompareLevel_1116ed(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:7: '' : compilation terminated @@ -79,20 +61,15 @@ void textureSampleCompareLevel_1116ed() { float res = texture(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleCompareLevel_1116ed(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:7: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleCompareLevel/1568e3.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleCompareLevel/1568e3.wgsl.expected.glsl index 5ec997dffd..b2824eff71 100644 --- a/test/intrinsics/gen/textureSampleCompareLevel/1568e3.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleCompareLevel/1568e3.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureSampleCompareLevel_1568e3() { float res = texture(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleCompareLevel_1568e3(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'texture' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated @@ -50,19 +37,14 @@ void textureSampleCompareLevel_1568e3() { float res = texture(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleCompareLevel_1568e3(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:7: '' : compilation terminated @@ -79,20 +61,15 @@ void textureSampleCompareLevel_1568e3() { float res = texture(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleCompareLevel_1568e3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:7: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleCompareLevel/2ad2b1.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleCompareLevel/2ad2b1.wgsl.expected.glsl index b3a2099f1d..0091bc042d 100644 --- a/test/intrinsics/gen/textureSampleCompareLevel/2ad2b1.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleCompareLevel/2ad2b1.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureSampleCompareLevel_2ad2b1() { float res = texture(arg_0_arg_1, vec2(0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleCompareLevel_2ad2b1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'texture' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated @@ -50,19 +37,14 @@ void textureSampleCompareLevel_2ad2b1() { float res = texture(arg_0_arg_1, vec2(0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleCompareLevel_2ad2b1(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:7: '' : compilation terminated @@ -79,20 +61,15 @@ void textureSampleCompareLevel_2ad2b1() { float res = texture(arg_0_arg_1, vec2(0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleCompareLevel_2ad2b1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:7: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.glsl index bdbfe50c71..d52c23e41f 100644 --- a/test/intrinsics/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleCompareLevel/4cf3a2.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureSampleCompareLevel_4cf3a2() { float res = texture(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleCompareLevel_4cf3a2(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -50,19 +37,14 @@ void textureSampleCompareLevel_4cf3a2() { float res = texture(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleCompareLevel_4cf3a2(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -79,20 +61,15 @@ void textureSampleCompareLevel_4cf3a2() { float res = texture(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleCompareLevel_4cf3a2(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleCompareLevel/f8121c.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleCompareLevel/f8121c.wgsl.expected.glsl index da1ac6c7a9..2d0da979cd 100644 --- a/test/intrinsics/gen/textureSampleCompareLevel/f8121c.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleCompareLevel/f8121c.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureSampleCompareLevel_f8121c() { float res = textureOffset(arg_0_arg_1, vec2(0.0f, 0.0f), 1.0f, ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleCompareLevel_f8121c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureOffset' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated @@ -50,19 +37,14 @@ void textureSampleCompareLevel_f8121c() { float res = textureOffset(arg_0_arg_1, vec2(0.0f, 0.0f), 1.0f, ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleCompareLevel_f8121c(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureOffset' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated @@ -79,20 +61,15 @@ void textureSampleCompareLevel_f8121c() { float res = textureOffset(arg_0_arg_1, vec2(0.0f, 0.0f), 1.0f, ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleCompareLevel_f8121c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureOffset' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleGrad/21402b.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleGrad/21402b.wgsl.expected.glsl index 7b9b193a9b..d998ea6eaa 100644 --- a/test/intrinsics/gen/textureSampleGrad/21402b.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleGrad/21402b.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureSampleGrad_21402b() { vec4 res = textureGrad(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleGrad_21402b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureSampleGrad_21402b() { vec4 res = textureGrad(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleGrad_21402b(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureSampleGrad_21402b() { vec4 res = textureGrad(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleGrad_21402b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleGrad/2ecd8f.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleGrad/2ecd8f.wgsl.expected.glsl index 3a47f0d9f4..dca9e6a558 100644 --- a/test/intrinsics/gen/textureSampleGrad/2ecd8f.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleGrad/2ecd8f.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureSampleGrad_2ecd8f() { vec4 res = textureGrad(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleGrad_2ecd8f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureSampleGrad_2ecd8f() { vec4 res = textureGrad(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleGrad_2ecd8f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureSampleGrad_2ecd8f() { vec4 res = textureGrad(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleGrad_2ecd8f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleGrad/468f88.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleGrad/468f88.wgsl.expected.glsl index 107a45fbe8..6c41e56794 100644 --- a/test/intrinsics/gen/textureSampleGrad/468f88.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleGrad/468f88.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureSampleGrad_468f88() { vec4 res = textureGradOffset(arg_0_arg_1, vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleGrad_468f88(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureSampleGrad_468f88() { vec4 res = textureGradOffset(arg_0_arg_1, vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleGrad_468f88(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureSampleGrad_468f88() { vec4 res = textureGradOffset(arg_0_arg_1, vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleGrad_468f88(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleGrad/521263.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleGrad/521263.wgsl.expected.glsl index bfed096299..2eaa8670ba 100644 --- a/test/intrinsics/gen/textureSampleGrad/521263.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleGrad/521263.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureSampleGrad_521263() { vec4 res = textureGrad(arg_0_arg_1, vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleGrad_521263(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureSampleGrad_521263() { vec4 res = textureGrad(arg_0_arg_1, vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleGrad_521263(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureSampleGrad_521263() { vec4 res = textureGrad(arg_0_arg_1, vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleGrad_521263(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleGrad/5312f4.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleGrad/5312f4.wgsl.expected.glsl index c740f157cc..82e411380e 100644 --- a/test/intrinsics/gen/textureSampleGrad/5312f4.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleGrad/5312f4.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureSampleGrad_5312f4() { vec4 res = textureGrad(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleGrad_5312f4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureSampleGrad_5312f4() { vec4 res = textureGrad(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleGrad_5312f4(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureSampleGrad_5312f4() { vec4 res = textureGrad(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleGrad_5312f4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleGrad/872f00.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleGrad/872f00.wgsl.expected.glsl index b8527be1c3..dd67af7862 100644 --- a/test/intrinsics/gen/textureSampleGrad/872f00.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleGrad/872f00.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureSampleGrad_872f00() { vec4 res = textureGradOffset(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleGrad_872f00(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureSampleGrad_872f00() { vec4 res = textureGradOffset(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleGrad_872f00(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureSampleGrad_872f00() { vec4 res = textureGradOffset(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), vec2(0.0f, 0.0f), vec2(0.0f, 0.0f), ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleGrad_872f00(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleGrad/e383db.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleGrad/e383db.wgsl.expected.glsl index 331edfe3ff..76bfe696cd 100644 --- a/test/intrinsics/gen/textureSampleGrad/e383db.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleGrad/e383db.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureSampleGrad_e383db() { vec4 res = textureGrad(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleGrad_e383db(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -50,19 +37,14 @@ void textureSampleGrad_e383db() { vec4 res = textureGrad(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleGrad_e383db(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -79,20 +61,15 @@ void textureSampleGrad_e383db() { vec4 res = textureGrad(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleGrad_e383db(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleGrad/e9a2f7.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleGrad/e9a2f7.wgsl.expected.glsl index ef27adf8b4..320cb922ac 100644 --- a/test/intrinsics/gen/textureSampleGrad/e9a2f7.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleGrad/e9a2f7.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureSampleGrad_e9a2f7() { vec4 res = textureGradOffset(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleGrad_e9a2f7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureSampleGrad_e9a2f7() { vec4 res = textureGradOffset(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleGrad_e9a2f7(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureSampleGrad_e9a2f7() { vec4 res = textureGradOffset(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), vec3(0.0f, 0.0f, 0.0f), ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleGrad_e9a2f7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleLevel/02be59.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleLevel/02be59.wgsl.expected.glsl index cb419ca43d..d35e59044c 100644 --- a/test/intrinsics/gen/textureSampleLevel/02be59.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleLevel/02be59.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureSampleLevel_02be59() { float res = textureLod(arg_0_arg_1, vec2(0.0f, 0.0f), 0).x; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleLevel_02be59(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureLod' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated @@ -50,19 +37,14 @@ void textureSampleLevel_02be59() { float res = textureLod(arg_0_arg_1, vec2(0.0f, 0.0f), 0).x; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleLevel_02be59(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureLod' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated @@ -79,20 +61,15 @@ void textureSampleLevel_02be59() { float res = textureLod(arg_0_arg_1, vec2(0.0f, 0.0f), 0).x; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleLevel_02be59(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureLod' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleLevel/0bdd9a.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleLevel/0bdd9a.wgsl.expected.glsl index dbc14531da..c78abcac96 100644 --- a/test/intrinsics/gen/textureSampleLevel/0bdd9a.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleLevel/0bdd9a.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureSampleLevel_0bdd9a() { vec4 res = textureLod(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleLevel_0bdd9a(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -50,19 +37,14 @@ void textureSampleLevel_0bdd9a() { vec4 res = textureLod(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleLevel_0bdd9a(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -79,20 +61,15 @@ void textureSampleLevel_0bdd9a() { vec4 res = textureLod(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleLevel_0bdd9a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleLevel/1b0291.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleLevel/1b0291.wgsl.expected.glsl index 772230323e..fe01f53f3b 100644 --- a/test/intrinsics/gen/textureSampleLevel/1b0291.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleLevel/1b0291.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureSampleLevel_1b0291() { float res = textureLod(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), 0).x; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleLevel_1b0291(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureLod' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated @@ -50,19 +37,14 @@ void textureSampleLevel_1b0291() { float res = textureLod(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), 0).x; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleLevel_1b0291(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureLod' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated @@ -79,20 +61,15 @@ void textureSampleLevel_1b0291() { float res = textureLod(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), 0).x; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleLevel_1b0291(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureLod' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleLevel/1bf73e.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleLevel/1bf73e.wgsl.expected.glsl index c383326460..720dd30d1e 100644 --- a/test/intrinsics/gen/textureSampleLevel/1bf73e.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleLevel/1bf73e.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureSampleLevel_1bf73e() { float res = textureLod(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 0).x; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleLevel_1bf73e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureLod' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated @@ -50,19 +37,14 @@ void textureSampleLevel_1bf73e() { float res = textureLod(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 0).x; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleLevel_1bf73e(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureLod' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated @@ -79,20 +61,15 @@ void textureSampleLevel_1bf73e() { float res = textureLod(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 0).x; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleLevel_1bf73e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureLod' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleLevel/302be4.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleLevel/302be4.wgsl.expected.glsl index 394a15c8c5..8a12180dd6 100644 --- a/test/intrinsics/gen/textureSampleLevel/302be4.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleLevel/302be4.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureSampleLevel_302be4() { vec4 res = textureLod(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleLevel_302be4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureSampleLevel_302be4() { vec4 res = textureLod(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleLevel_302be4(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureSampleLevel_302be4() { vec4 res = textureLod(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleLevel_302be4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleLevel/47daa4.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleLevel/47daa4.wgsl.expected.glsl index 50c9e1e592..a41ec42e2b 100644 --- a/test/intrinsics/gen/textureSampleLevel/47daa4.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleLevel/47daa4.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureSampleLevel_47daa4() { float res = textureLodOffset(arg_0_arg_1, vec2(0.0f, 0.0f), 0, ivec2(0, 0)).x; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleLevel_47daa4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureLodOffset' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated @@ -50,19 +37,14 @@ void textureSampleLevel_47daa4() { float res = textureLodOffset(arg_0_arg_1, vec2(0.0f, 0.0f), 0, ivec2(0, 0)).x; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleLevel_47daa4(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureLodOffset' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated @@ -79,20 +61,15 @@ void textureSampleLevel_47daa4() { float res = textureLodOffset(arg_0_arg_1, vec2(0.0f, 0.0f), 0, ivec2(0, 0)).x; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleLevel_47daa4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureLodOffset' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleLevel/690d95.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleLevel/690d95.wgsl.expected.glsl index 7bff4d0fbe..b316472b5d 100644 --- a/test/intrinsics/gen/textureSampleLevel/690d95.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleLevel/690d95.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureSampleLevel_690d95() { vec4 res = textureLodOffset(arg_0_arg_1, vec2(0.0f, 0.0f), 1.0f, ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleLevel_690d95(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureSampleLevel_690d95() { vec4 res = textureLodOffset(arg_0_arg_1, vec2(0.0f, 0.0f), 1.0f, ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleLevel_690d95(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureSampleLevel_690d95() { vec4 res = textureLodOffset(arg_0_arg_1, vec2(0.0f, 0.0f), 1.0f, ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleLevel_690d95(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleLevel/979816.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleLevel/979816.wgsl.expected.glsl index 2484ec5da4..74de764425 100644 --- a/test/intrinsics/gen/textureSampleLevel/979816.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleLevel/979816.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureSampleLevel_979816() { vec4 res = textureLod(arg_0_arg_1, vec2(0.0f, 0.0f), 0.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleLevel_979816(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureSampleLevel_979816() { vec4 res = textureLod(arg_0_arg_1, vec2(0.0f, 0.0f), 0.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleLevel_979816(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureSampleLevel_979816() { vec4 res = textureLod(arg_0_arg_1, vec2(0.0f, 0.0f), 0.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleLevel_979816(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleLevel/9bd37b.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleLevel/9bd37b.wgsl.expected.glsl index e660e98a48..579f820360 100644 --- a/test/intrinsics/gen/textureSampleLevel/9bd37b.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleLevel/9bd37b.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureSampleLevel_9bd37b() { vec4 res = textureLodOffset(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), 1.0f, ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleLevel_9bd37b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureSampleLevel_9bd37b() { vec4 res = textureLodOffset(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), 1.0f, ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleLevel_9bd37b(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureSampleLevel_9bd37b() { vec4 res = textureLodOffset(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), 1.0f, ivec3(0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleLevel_9bd37b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleLevel/a4af26.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleLevel/a4af26.wgsl.expected.glsl index 2a2dadce82..b50f0624af 100644 --- a/test/intrinsics/gen/textureSampleLevel/a4af26.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleLevel/a4af26.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureSampleLevel_a4af26() { vec4 res = textureLodOffset(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 1.0f, ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleLevel_a4af26(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureSampleLevel_a4af26() { vec4 res = textureLodOffset(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 1.0f, ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleLevel_a4af26(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureSampleLevel_a4af26() { vec4 res = textureLodOffset(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 1.0f, ivec2(0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleLevel_a4af26(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleLevel/abfcc0.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleLevel/abfcc0.wgsl.expected.glsl index 2c839e5d09..af97c442ae 100644 --- a/test/intrinsics/gen/textureSampleLevel/abfcc0.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleLevel/abfcc0.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureSampleLevel_abfcc0() { vec4 res = textureLod(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleLevel_abfcc0(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureSampleLevel_abfcc0() { vec4 res = textureLod(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleLevel_abfcc0(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureSampleLevel_abfcc0() { vec4 res = textureLod(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleLevel_abfcc0(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleLevel/ae5e39.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleLevel/ae5e39.wgsl.expected.glsl index f6c7b8a0dc..f617dbb2e8 100644 --- a/test/intrinsics/gen/textureSampleLevel/ae5e39.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleLevel/ae5e39.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureSampleLevel_ae5e39() { float res = textureLod(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), 0).x; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleLevel_ae5e39(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -50,19 +37,14 @@ void textureSampleLevel_ae5e39() { float res = textureLod(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), 0).x; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleLevel_ae5e39(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated @@ -79,20 +61,15 @@ void textureSampleLevel_ae5e39() { float res = textureLod(arg_0_arg_1, vec4(0.0f, 0.0f, 0.0f, float(1)), 0).x; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleLevel_ae5e39(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleLevel/ba93b3.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleLevel/ba93b3.wgsl.expected.glsl index cfdb547bf6..d44d8064bb 100644 --- a/test/intrinsics/gen/textureSampleLevel/ba93b3.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleLevel/ba93b3.wgsl.expected.glsl @@ -9,31 +9,18 @@ void textureSampleLevel_ba93b3() { float res = textureLodOffset(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 0, ivec2(0, 0)).x; } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleLevel_ba93b3(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureLodOffset' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated @@ -50,19 +37,14 @@ void textureSampleLevel_ba93b3() { float res = textureLodOffset(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 0, ivec2(0, 0)).x; } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleLevel_ba93b3(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureLodOffset' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated @@ -79,20 +61,15 @@ void textureSampleLevel_ba93b3() { float res = textureLodOffset(arg_0_arg_1, vec3(0.0f, 0.0f, float(1)), 0, ivec2(0, 0)).x; } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleLevel_ba93b3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureLodOffset' : no matching overloaded function found ERROR: 0:7: '' : compilation terminated diff --git a/test/intrinsics/gen/textureSampleLevel/c32df7.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleLevel/c32df7.wgsl.expected.glsl index 97a3f726e4..bb08590948 100644 --- a/test/intrinsics/gen/textureSampleLevel/c32df7.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleLevel/c32df7.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureSampleLevel_c32df7() { vec4 res = textureLod(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleLevel_c32df7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureSampleLevel_c32df7() { vec4 res = textureLod(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleLevel_c32df7(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureSampleLevel_c32df7() { vec4 res = textureLod(arg_0_arg_1, vec3(0.0f, 0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleLevel_c32df7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureSampleLevel/c6aca6.wgsl.expected.glsl b/test/intrinsics/gen/textureSampleLevel/c6aca6.wgsl.expected.glsl index c4375e55ae..ce9d41360f 100644 --- a/test/intrinsics/gen/textureSampleLevel/c6aca6.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureSampleLevel/c6aca6.wgsl.expected.glsl @@ -7,31 +7,18 @@ void textureSampleLevel_c6aca6() { vec4 res = textureLod(arg_0_arg_1, vec2(0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureSampleLevel_c6aca6(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -41,19 +28,14 @@ void textureSampleLevel_c6aca6() { vec4 res = textureLod(arg_0_arg_1, vec2(0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureSampleLevel_c6aca6(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -63,17 +45,12 @@ void textureSampleLevel_c6aca6() { vec4 res = textureLod(arg_0_arg_1, vec2(0.0f, 0.0f), 1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureSampleLevel_c6aca6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/05ce15.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/05ce15.wgsl.expected.glsl index 37a91f0d6b..0ca1141ea7 100644 --- a/test/intrinsics/gen/textureStore/05ce15.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/05ce15.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_05ce15() { imageStore(arg_0_1, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_05ce15(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_05ce15() { imageStore(arg_0_1, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_05ce15(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_05ce15() { imageStore(arg_0_1, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_05ce15(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/064c7f.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/064c7f.wgsl.expected.glsl index 19110dbfa7..4d133a857f 100644 --- a/test/intrinsics/gen/textureStore/064c7f.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/064c7f.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_064c7f() { imageStore(arg_0_1, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_064c7f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureStore_064c7f() { imageStore(arg_0_1, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_064c7f(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureStore_064c7f() { imageStore(arg_0_1, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_064c7f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureStore/068641.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/068641.wgsl.expected.glsl index 85d4b9fdd1..1340b383b4 100644 --- a/test/intrinsics/gen/textureStore/068641.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/068641.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_068641() { imageStore(arg_0_1, ivec3(0, 0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_068641(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_068641() { imageStore(arg_0_1, ivec3(0, 0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_068641(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_068641() { imageStore(arg_0_1, ivec3(0, 0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_068641(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/0af6b5.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/0af6b5.wgsl.expected.glsl index e127986e7e..b79098829f 100644 --- a/test/intrinsics/gen/textureStore/0af6b5.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/0af6b5.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_0af6b5() { imageStore(arg_0_1, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_0af6b5(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_0af6b5() { imageStore(arg_0_1, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_0af6b5(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_0af6b5() { imageStore(arg_0_1, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_0af6b5(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/0c3dff.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/0c3dff.wgsl.expected.glsl index cdd5c97aef..68e939488a 100644 --- a/test/intrinsics/gen/textureStore/0c3dff.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/0c3dff.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_0c3dff() { imageStore(arg_0_1, ivec2(0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_0c3dff(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_0c3dff() { imageStore(arg_0_1, ivec2(0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_0c3dff(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_0c3dff() { imageStore(arg_0_1, ivec2(0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_0c3dff(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/102722.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/102722.wgsl.expected.glsl index f893594d31..47e6a3e7da 100644 --- a/test/intrinsics/gen/textureStore/102722.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/102722.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_102722() { imageStore(arg_0_1, 1, uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_102722(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureStore_102722() { imageStore(arg_0_1, 1, uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_102722(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureStore_102722() { imageStore(arg_0_1, 1, uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_102722(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureStore/1bbd08.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/1bbd08.wgsl.expected.glsl index 231d6ff2b8..830fb910a7 100644 --- a/test/intrinsics/gen/textureStore/1bbd08.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/1bbd08.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_1bbd08() { imageStore(arg_0_1, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_1bbd08(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_1bbd08() { imageStore(arg_0_1, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_1bbd08(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_1bbd08() { imageStore(arg_0_1, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_1bbd08(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/1c02e7.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/1c02e7.wgsl.expected.glsl index 906d185d21..2ceb65ed76 100644 --- a/test/intrinsics/gen/textureStore/1c02e7.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/1c02e7.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_1c02e7() { imageStore(arg_0_1, ivec3(0, 0, 1), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_1c02e7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_1c02e7() { imageStore(arg_0_1, ivec3(0, 0, 1), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_1c02e7(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_1c02e7() { imageStore(arg_0_1, ivec3(0, 0, 1), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_1c02e7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/22d955.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/22d955.wgsl.expected.glsl index 6de31cacdd..83ebec04ba 100644 --- a/test/intrinsics/gen/textureStore/22d955.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/22d955.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_22d955() { imageStore(arg_0_1, ivec3(0, 0, 1), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_22d955(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_22d955() { imageStore(arg_0_1, ivec3(0, 0, 1), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_22d955(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_22d955() { imageStore(arg_0_1, ivec3(0, 0, 1), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_22d955(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/26bf70.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/26bf70.wgsl.expected.glsl index 9398a7e91a..41f13195a5 100644 --- a/test/intrinsics/gen/textureStore/26bf70.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/26bf70.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_26bf70() { imageStore(arg_0_1, ivec2(0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_26bf70(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_26bf70() { imageStore(arg_0_1, ivec2(0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_26bf70(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_26bf70() { imageStore(arg_0_1, ivec2(0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_26bf70(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/2796b4.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/2796b4.wgsl.expected.glsl index 9c2d7fff16..c97a566a13 100644 --- a/test/intrinsics/gen/textureStore/2796b4.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/2796b4.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_2796b4() { imageStore(arg_0_1, ivec3(0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_2796b4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureStore_2796b4() { imageStore(arg_0_1, ivec3(0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_2796b4(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureStore_2796b4() { imageStore(arg_0_1, ivec3(0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_2796b4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureStore/2ac6c7.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/2ac6c7.wgsl.expected.glsl index 4b15eaa1b3..b550e81af8 100644 --- a/test/intrinsics/gen/textureStore/2ac6c7.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/2ac6c7.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_2ac6c7() { imageStore(arg_0_1, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_2ac6c7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureStore_2ac6c7() { imageStore(arg_0_1, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_2ac6c7(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureStore_2ac6c7() { imageStore(arg_0_1, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_2ac6c7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureStore/2eb2a4.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/2eb2a4.wgsl.expected.glsl index de17a70eaa..d0eb830215 100644 --- a/test/intrinsics/gen/textureStore/2eb2a4.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/2eb2a4.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_2eb2a4() { imageStore(arg_0_1, 1, uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_2eb2a4(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureStore_2eb2a4() { imageStore(arg_0_1, 1, uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_2eb2a4(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureStore_2eb2a4() { imageStore(arg_0_1, 1, uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_2eb2a4(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureStore/2ed2a3.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/2ed2a3.wgsl.expected.glsl index 6c5f37e937..d5c681c3ff 100644 --- a/test/intrinsics/gen/textureStore/2ed2a3.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/2ed2a3.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_2ed2a3() { imageStore(arg_0_1, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_2ed2a3(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureStore_2ed2a3() { imageStore(arg_0_1, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_2ed2a3(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureStore_2ed2a3() { imageStore(arg_0_1, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_2ed2a3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureStore/31745b.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/31745b.wgsl.expected.glsl index cc698dcf59..8ab0724a65 100644 --- a/test/intrinsics/gen/textureStore/31745b.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/31745b.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_31745b() { imageStore(arg_0_1, ivec2(0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_31745b(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureStore_31745b() { imageStore(arg_0_1, ivec2(0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_31745b(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureStore_31745b() { imageStore(arg_0_1, ivec2(0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_31745b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureStore/32f368.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/32f368.wgsl.expected.glsl index 226f284a37..eb44f0f25c 100644 --- a/test/intrinsics/gen/textureStore/32f368.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/32f368.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_32f368() { imageStore(arg_0_1, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_32f368(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_32f368() { imageStore(arg_0_1, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_32f368(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_32f368() { imageStore(arg_0_1, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_32f368(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/331aee.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/331aee.wgsl.expected.glsl index 0a51372fe9..fed483dd50 100644 --- a/test/intrinsics/gen/textureStore/331aee.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/331aee.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_331aee() { imageStore(arg_0_1, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_331aee(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_331aee() { imageStore(arg_0_1, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_331aee(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_331aee() { imageStore(arg_0_1, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_331aee(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/38e8d7.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/38e8d7.wgsl.expected.glsl index 2a5a1be79f..c5ac7b663e 100644 --- a/test/intrinsics/gen/textureStore/38e8d7.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/38e8d7.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_38e8d7() { imageStore(arg_0_1, ivec3(0, 0, 1), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_38e8d7(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_38e8d7() { imageStore(arg_0_1, ivec3(0, 0, 1), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_38e8d7(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_38e8d7() { imageStore(arg_0_1, ivec3(0, 0, 1), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_38e8d7(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/3a52ac.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/3a52ac.wgsl.expected.glsl index 9534df4f15..2e892b4fe5 100644 --- a/test/intrinsics/gen/textureStore/3a52ac.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/3a52ac.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_3a52ac() { imageStore(arg_0_1, ivec3(0, 0, 1), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_3a52ac(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_3a52ac() { imageStore(arg_0_1, ivec3(0, 0, 1), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_3a52ac(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_3a52ac() { imageStore(arg_0_1, ivec3(0, 0, 1), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_3a52ac(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/3bb7a1.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/3bb7a1.wgsl.expected.glsl index 6dccb92f66..fbfe1a99a0 100644 --- a/test/intrinsics/gen/textureStore/3bb7a1.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/3bb7a1.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_3bb7a1() { imageStore(arg_0_1, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_3bb7a1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_3bb7a1() { imageStore(arg_0_1, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_3bb7a1(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_3bb7a1() { imageStore(arg_0_1, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_3bb7a1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/3bec15.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/3bec15.wgsl.expected.glsl index dc7578c719..b767a9aef6 100644 --- a/test/intrinsics/gen/textureStore/3bec15.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/3bec15.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_3bec15() { imageStore(arg_0_1, 1, uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_3bec15(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureStore_3bec15() { imageStore(arg_0_1, 1, uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_3bec15(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureStore_3bec15() { imageStore(arg_0_1, 1, uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_3bec15(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureStore/441ba8.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/441ba8.wgsl.expected.glsl index 4051914d0c..0d67525b03 100644 --- a/test/intrinsics/gen/textureStore/441ba8.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/441ba8.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_441ba8() { imageStore(arg_0_1, ivec3(0, 0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_441ba8(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_441ba8() { imageStore(arg_0_1, ivec3(0, 0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_441ba8(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_441ba8() { imageStore(arg_0_1, ivec3(0, 0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_441ba8(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/4fc057.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/4fc057.wgsl.expected.glsl index 848ecfb71e..345f6851a2 100644 --- a/test/intrinsics/gen/textureStore/4fc057.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/4fc057.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_4fc057() { imageStore(arg_0_1, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_4fc057(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_4fc057() { imageStore(arg_0_1, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_4fc057(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_4fc057() { imageStore(arg_0_1, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_4fc057(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/5a2f8f.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/5a2f8f.wgsl.expected.glsl index 7c355c269a..6a73b359fd 100644 --- a/test/intrinsics/gen/textureStore/5a2f8f.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/5a2f8f.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_5a2f8f() { imageStore(arg_0_1, 1, ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_5a2f8f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureStore_5a2f8f() { imageStore(arg_0_1, 1, ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_5a2f8f(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureStore_5a2f8f() { imageStore(arg_0_1, 1, ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_5a2f8f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureStore/60975f.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/60975f.wgsl.expected.glsl index 2f11b81ccf..65ba86ac88 100644 --- a/test/intrinsics/gen/textureStore/60975f.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/60975f.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_60975f() { imageStore(arg_0_1, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_60975f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_60975f() { imageStore(arg_0_1, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_60975f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_60975f() { imageStore(arg_0_1, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_60975f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/682fd6.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/682fd6.wgsl.expected.glsl index 05c42da39e..5b4b7c6a1d 100644 --- a/test/intrinsics/gen/textureStore/682fd6.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/682fd6.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_682fd6() { imageStore(arg_0_1, ivec2(0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_682fd6(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureStore_682fd6() { imageStore(arg_0_1, ivec2(0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_682fd6(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureStore_682fd6() { imageStore(arg_0_1, ivec2(0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_682fd6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureStore/6b75c3.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/6b75c3.wgsl.expected.glsl index 40e7774a64..cedcba4025 100644 --- a/test/intrinsics/gen/textureStore/6b75c3.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/6b75c3.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_6b75c3() { imageStore(arg_0_1, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_6b75c3(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureStore_6b75c3() { imageStore(arg_0_1, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_6b75c3(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureStore_6b75c3() { imageStore(arg_0_1, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_6b75c3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureStore/6b80d2.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/6b80d2.wgsl.expected.glsl index 648d74040b..c338242ff5 100644 --- a/test/intrinsics/gen/textureStore/6b80d2.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/6b80d2.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_6b80d2() { imageStore(arg_0_1, 1, ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_6b80d2(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureStore_6b80d2() { imageStore(arg_0_1, 1, ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_6b80d2(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureStore_6b80d2() { imageStore(arg_0_1, 1, ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_6b80d2(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureStore/6cff2e.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/6cff2e.wgsl.expected.glsl index e42d2a7313..bd2b8bb9c3 100644 --- a/test/intrinsics/gen/textureStore/6cff2e.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/6cff2e.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_6cff2e() { imageStore(arg_0_1, ivec2(0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_6cff2e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_6cff2e() { imageStore(arg_0_1, ivec2(0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_6cff2e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_6cff2e() { imageStore(arg_0_1, ivec2(0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_6cff2e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/6da692.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/6da692.wgsl.expected.glsl index 40998d2f13..19eaa4f4ee 100644 --- a/test/intrinsics/gen/textureStore/6da692.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/6da692.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_6da692() { imageStore(arg_0_1, ivec3(0, 0, 1), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_6da692(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_6da692() { imageStore(arg_0_1, ivec3(0, 0, 1), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_6da692(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_6da692() { imageStore(arg_0_1, ivec3(0, 0, 1), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_6da692(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/731349.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/731349.wgsl.expected.glsl index 85c9f9f8ff..b73e16aa45 100644 --- a/test/intrinsics/gen/textureStore/731349.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/731349.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_731349() { imageStore(arg_0_1, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_731349(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_731349() { imageStore(arg_0_1, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_731349(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_731349() { imageStore(arg_0_1, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_731349(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/752da6.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/752da6.wgsl.expected.glsl index b752f92aa8..d0697ba187 100644 --- a/test/intrinsics/gen/textureStore/752da6.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/752da6.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_752da6() { imageStore(arg_0_1, ivec2(0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_752da6(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_752da6() { imageStore(arg_0_1, ivec2(0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_752da6(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_752da6() { imageStore(arg_0_1, ivec2(0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_752da6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/77c0ae.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/77c0ae.wgsl.expected.glsl index 90de71e9c2..e019a3517b 100644 --- a/test/intrinsics/gen/textureStore/77c0ae.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/77c0ae.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_77c0ae() { imageStore(arg_0_1, ivec2(0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_77c0ae(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_77c0ae() { imageStore(arg_0_1, ivec2(0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_77c0ae(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_77c0ae() { imageStore(arg_0_1, ivec2(0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_77c0ae(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/7cec8d.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/7cec8d.wgsl.expected.glsl index aaa1cde69b..e001ffd8d9 100644 --- a/test/intrinsics/gen/textureStore/7cec8d.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/7cec8d.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_7cec8d() { imageStore(arg_0_1, ivec3(0, 0, 1), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_7cec8d(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_7cec8d() { imageStore(arg_0_1, ivec3(0, 0, 1), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_7cec8d(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_7cec8d() { imageStore(arg_0_1, ivec3(0, 0, 1), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_7cec8d(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/7f7fae.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/7f7fae.wgsl.expected.glsl index ca11490ed0..b9b560841e 100644 --- a/test/intrinsics/gen/textureStore/7f7fae.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/7f7fae.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_7f7fae() { imageStore(arg_0_1, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_7f7fae(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureStore_7f7fae() { imageStore(arg_0_1, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_7f7fae(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureStore_7f7fae() { imageStore(arg_0_1, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_7f7fae(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureStore/804942.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/804942.wgsl.expected.glsl index 96b41327fa..7d494d6b9b 100644 --- a/test/intrinsics/gen/textureStore/804942.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/804942.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_804942() { imageStore(arg_0_1, ivec2(0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_804942(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_804942() { imageStore(arg_0_1, ivec2(0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_804942(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_804942() { imageStore(arg_0_1, ivec2(0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_804942(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/805dae.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/805dae.wgsl.expected.glsl index c3a8b6943c..b13210aeb9 100644 --- a/test/intrinsics/gen/textureStore/805dae.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/805dae.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_805dae() { imageStore(arg_0_1, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_805dae(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_805dae() { imageStore(arg_0_1, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_805dae(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_805dae() { imageStore(arg_0_1, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_805dae(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/83bcc1.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/83bcc1.wgsl.expected.glsl index 78ab18d24b..a31201e17d 100644 --- a/test/intrinsics/gen/textureStore/83bcc1.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/83bcc1.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_83bcc1() { imageStore(arg_0_1, 1, uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_83bcc1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureStore_83bcc1() { imageStore(arg_0_1, 1, uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_83bcc1(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureStore_83bcc1() { imageStore(arg_0_1, 1, uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_83bcc1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureStore/872747.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/872747.wgsl.expected.glsl index a0a3487e08..71a5c4134e 100644 --- a/test/intrinsics/gen/textureStore/872747.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/872747.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_872747() { imageStore(arg_0_1, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_872747(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureStore_872747() { imageStore(arg_0_1, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_872747(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureStore_872747() { imageStore(arg_0_1, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_872747(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureStore/8e0479.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/8e0479.wgsl.expected.glsl index 0a9786f684..f1a9d8b336 100644 --- a/test/intrinsics/gen/textureStore/8e0479.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/8e0479.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_8e0479() { imageStore(arg_0_1, ivec3(0, 0, 1), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_8e0479(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_8e0479() { imageStore(arg_0_1, ivec3(0, 0, 1), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_8e0479(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_8e0479() { imageStore(arg_0_1, ivec3(0, 0, 1), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_8e0479(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/8f71a1.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/8f71a1.wgsl.expected.glsl index 13f51c8c54..2861408659 100644 --- a/test/intrinsics/gen/textureStore/8f71a1.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/8f71a1.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_8f71a1() { imageStore(arg_0_1, ivec3(0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_8f71a1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_8f71a1() { imageStore(arg_0_1, ivec3(0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_8f71a1(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_8f71a1() { imageStore(arg_0_1, ivec3(0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_8f71a1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/969534.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/969534.wgsl.expected.glsl index e72df96a2e..3b70dd98bf 100644 --- a/test/intrinsics/gen/textureStore/969534.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/969534.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_969534() { imageStore(arg_0_1, 1, ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_969534(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureStore_969534() { imageStore(arg_0_1, 1, ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_969534(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureStore_969534() { imageStore(arg_0_1, 1, ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_969534(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureStore/9a3ecc.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/9a3ecc.wgsl.expected.glsl index 6cf74aed3c..3f62bee1b5 100644 --- a/test/intrinsics/gen/textureStore/9a3ecc.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/9a3ecc.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_9a3ecc() { imageStore(arg_0_1, ivec3(0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_9a3ecc(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_9a3ecc() { imageStore(arg_0_1, ivec3(0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_9a3ecc(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_9a3ecc() { imageStore(arg_0_1, ivec3(0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_9a3ecc(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/9d9cd5.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/9d9cd5.wgsl.expected.glsl index 84d3e1d637..6e1b913099 100644 --- a/test/intrinsics/gen/textureStore/9d9cd5.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/9d9cd5.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_9d9cd5() { imageStore(arg_0_1, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_9d9cd5(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_9d9cd5() { imageStore(arg_0_1, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_9d9cd5(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_9d9cd5() { imageStore(arg_0_1, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_9d9cd5(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/9e3ec5.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/9e3ec5.wgsl.expected.glsl index 3c61f8de7f..26bea3df8b 100644 --- a/test/intrinsics/gen/textureStore/9e3ec5.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/9e3ec5.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_9e3ec5() { imageStore(arg_0_1, ivec2(0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_9e3ec5(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_9e3ec5() { imageStore(arg_0_1, ivec2(0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_9e3ec5(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_9e3ec5() { imageStore(arg_0_1, ivec2(0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_9e3ec5(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/ac67aa.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/ac67aa.wgsl.expected.glsl index 9aa0f0ada2..c2df5bf258 100644 --- a/test/intrinsics/gen/textureStore/ac67aa.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/ac67aa.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_ac67aa() { imageStore(arg_0_1, ivec3(0, 0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_ac67aa(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureStore_ac67aa() { imageStore(arg_0_1, ivec3(0, 0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_ac67aa(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureStore_ac67aa() { imageStore(arg_0_1, ivec3(0, 0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_ac67aa(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureStore/b706b1.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/b706b1.wgsl.expected.glsl index 005a4b0736..879b6cc199 100644 --- a/test/intrinsics/gen/textureStore/b706b1.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/b706b1.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_b706b1() { imageStore(arg_0_1, ivec3(0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_b706b1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_b706b1() { imageStore(arg_0_1, ivec3(0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_b706b1(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_b706b1() { imageStore(arg_0_1, ivec3(0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_b706b1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/bbcb7f.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/bbcb7f.wgsl.expected.glsl index 2444cd86ad..d7b3b15d4b 100644 --- a/test/intrinsics/gen/textureStore/bbcb7f.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/bbcb7f.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_bbcb7f() { imageStore(arg_0_1, ivec2(0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_bbcb7f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_bbcb7f() { imageStore(arg_0_1, ivec2(0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_bbcb7f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_bbcb7f() { imageStore(arg_0_1, ivec2(0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_bbcb7f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/be6e30.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/be6e30.wgsl.expected.glsl index 191c3d8f54..63ab0cf37b 100644 --- a/test/intrinsics/gen/textureStore/be6e30.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/be6e30.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_be6e30() { imageStore(arg_0_1, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_be6e30(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_be6e30() { imageStore(arg_0_1, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_be6e30(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_be6e30() { imageStore(arg_0_1, ivec2(0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_be6e30(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/bf775c.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/bf775c.wgsl.expected.glsl index cd820c6f43..2e6251a011 100644 --- a/test/intrinsics/gen/textureStore/bf775c.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/bf775c.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_bf775c() { imageStore(arg_0_1, 1, ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_bf775c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureStore_bf775c() { imageStore(arg_0_1, 1, ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_bf775c(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureStore_bf775c() { imageStore(arg_0_1, 1, ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_bf775c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'iimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureStore/c5af1e.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/c5af1e.wgsl.expected.glsl index 41ebd4f99d..0515d1bb53 100644 --- a/test/intrinsics/gen/textureStore/c5af1e.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/c5af1e.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_c5af1e() { imageStore(arg_0_1, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_c5af1e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_c5af1e() { imageStore(arg_0_1, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_c5af1e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_c5af1e() { imageStore(arg_0_1, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_c5af1e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/c863be.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/c863be.wgsl.expected.glsl index 1b134c9c31..d3312abc20 100644 --- a/test/intrinsics/gen/textureStore/c863be.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/c863be.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_c863be() { imageStore(arg_0_1, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_c863be(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureStore_c863be() { imageStore(arg_0_1, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_c863be(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureStore_c863be() { imageStore(arg_0_1, ivec3(0, 0, 1), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_c863be(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureStore/d73b5c.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/d73b5c.wgsl.expected.glsl index f5e63f8ccb..c9bc003c7f 100644 --- a/test/intrinsics/gen/textureStore/d73b5c.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/d73b5c.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_d73b5c() { imageStore(arg_0_1, 1, ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_d73b5c(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureStore_d73b5c() { imageStore(arg_0_1, 1, ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_d73b5c(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureStore_d73b5c() { imageStore(arg_0_1, 1, ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_d73b5c(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureStore/dd7d81.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/dd7d81.wgsl.expected.glsl index a03d4474d2..d3fd691311 100644 --- a/test/intrinsics/gen/textureStore/dd7d81.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/dd7d81.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_dd7d81() { imageStore(arg_0_1, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_dd7d81(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_dd7d81() { imageStore(arg_0_1, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_dd7d81(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_dd7d81() { imageStore(arg_0_1, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_dd7d81(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/dde364.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/dde364.wgsl.expected.glsl index 22bef326ba..c1dc405f3e 100644 --- a/test/intrinsics/gen/textureStore/dde364.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/dde364.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_dde364() { imageStore(arg_0_1, ivec3(0, 0, 1), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_dde364(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureStore_dde364() { imageStore(arg_0_1, ivec3(0, 0, 1), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_dde364(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureStore_dde364() { imageStore(arg_0_1, ivec3(0, 0, 1), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_dde364(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureStore/e885e8.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/e885e8.wgsl.expected.glsl index fb1e77d857..4201b3c0fd 100644 --- a/test/intrinsics/gen/textureStore/e885e8.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/e885e8.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_e885e8() { imageStore(arg_0_1, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_e885e8(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureStore_e885e8() { imageStore(arg_0_1, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_e885e8(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureStore_e885e8() { imageStore(arg_0_1, 1, vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_e885e8(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureStore/eb702f.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/eb702f.wgsl.expected.glsl index 614d7fd7a9..7f1de04655 100644 --- a/test/intrinsics/gen/textureStore/eb702f.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/eb702f.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_eb702f() { imageStore(arg_0_1, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_eb702f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_eb702f() { imageStore(arg_0_1, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_eb702f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_eb702f() { imageStore(arg_0_1, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_eb702f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/eb78b9.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/eb78b9.wgsl.expected.glsl index e86a52f87c..a2a839d13c 100644 --- a/test/intrinsics/gen/textureStore/eb78b9.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/eb78b9.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_eb78b9() { imageStore(arg_0_1, ivec3(0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_eb78b9(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_eb78b9() { imageStore(arg_0_1, ivec3(0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_eb78b9(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_eb78b9() { imageStore(arg_0_1, ivec3(0, 0, 0), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_eb78b9(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/ee6acc.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/ee6acc.wgsl.expected.glsl index d61f6745a0..ca789f325d 100644 --- a/test/intrinsics/gen/textureStore/ee6acc.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/ee6acc.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_ee6acc() { imageStore(arg_0_1, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_ee6acc(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureStore_ee6acc() { imageStore(arg_0_1, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_ee6acc(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureStore_ee6acc() { imageStore(arg_0_1, ivec3(0, 0, 0), vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_ee6acc(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureStore/ef9f2f.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/ef9f2f.wgsl.expected.glsl index 9947cb581b..2353ba7204 100644 --- a/test/intrinsics/gen/textureStore/ef9f2f.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/ef9f2f.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_ef9f2f() { imageStore(arg_0_1, ivec3(0, 0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_ef9f2f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_ef9f2f() { imageStore(arg_0_1, ivec3(0, 0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_ef9f2f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_ef9f2f() { imageStore(arg_0_1, ivec3(0, 0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_ef9f2f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/f8dead.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/f8dead.wgsl.expected.glsl index d8adbadc00..684867cf84 100644 --- a/test/intrinsics/gen/textureStore/f8dead.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/f8dead.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_f8dead() { imageStore(arg_0_1, ivec3(0, 0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_f8dead(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_f8dead() { imageStore(arg_0_1, ivec3(0, 0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_f8dead(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_f8dead() { imageStore(arg_0_1, ivec3(0, 0, 0), uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_f8dead(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/textureStore/f9be83.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/f9be83.wgsl.expected.glsl index 79479080b1..9b801913fa 100644 --- a/test/intrinsics/gen/textureStore/f9be83.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/f9be83.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_f9be83() { imageStore(arg_0_1, ivec3(0, 0, 1), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_f9be83(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -48,19 +35,14 @@ void textureStore_f9be83() { imageStore(arg_0_1, ivec3(0, 0, 1), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_f9be83(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated @@ -76,20 +58,15 @@ void textureStore_f9be83() { imageStore(arg_0_1, ivec3(0, 0, 1), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_f9be83(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/intrinsics/gen/textureStore/fb9a8f.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/fb9a8f.wgsl.expected.glsl index 4c10233841..bdcf537b0d 100644 --- a/test/intrinsics/gen/textureStore/fb9a8f.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/fb9a8f.wgsl.expected.glsl @@ -8,31 +8,18 @@ void textureStore_fb9a8f() { imageStore(arg_0_1, 1, uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_fb9a8f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -49,19 +36,14 @@ void textureStore_fb9a8f() { imageStore(arg_0_1, 1, uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_fb9a8f(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier @@ -78,20 +60,15 @@ void textureStore_fb9a8f() { imageStore(arg_0_1, 1, uvec4(0u, 0u, 0u, 0u)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_fb9a8f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'uimage1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier diff --git a/test/intrinsics/gen/textureStore/fbf53f.wgsl.expected.glsl b/test/intrinsics/gen/textureStore/fbf53f.wgsl.expected.glsl index 1a0cd07df1..3fbbf80325 100644 --- a/test/intrinsics/gen/textureStore/fbf53f.wgsl.expected.glsl +++ b/test/intrinsics/gen/textureStore/fbf53f.wgsl.expected.glsl @@ -6,31 +6,18 @@ void textureStore_fbf53f() { imageStore(arg_0_1, ivec3(0, 0, 1), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { textureStore_fbf53f(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -39,19 +26,14 @@ void textureStore_fbf53f() { imageStore(arg_0_1, ivec3(0, 0, 1), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { textureStore_fbf53f(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -60,17 +42,12 @@ void textureStore_fbf53f() { imageStore(arg_0_1, ivec3(0, 0, 1), ivec4(0, 0, 0, 0)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { textureStore_fbf53f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/transpose/2585cd.wgsl.expected.glsl b/test/intrinsics/gen/transpose/2585cd.wgsl.expected.glsl index cdac204610..7bae060919 100644 --- a/test/intrinsics/gen/transpose/2585cd.wgsl.expected.glsl +++ b/test/intrinsics/gen/transpose/2585cd.wgsl.expected.glsl @@ -5,31 +5,18 @@ void transpose_2585cd() { mat3x4 res = transpose(mat4x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { transpose_2585cd(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void transpose_2585cd() { mat3x4 res = transpose(mat4x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { transpose_2585cd(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void transpose_2585cd() { mat3x4 res = transpose(mat4x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { transpose_2585cd(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/transpose/31d679.wgsl.expected.glsl b/test/intrinsics/gen/transpose/31d679.wgsl.expected.glsl index 006212b8cd..d4d80d99c2 100644 --- a/test/intrinsics/gen/transpose/31d679.wgsl.expected.glsl +++ b/test/intrinsics/gen/transpose/31d679.wgsl.expected.glsl @@ -5,31 +5,18 @@ void transpose_31d679() { mat2 res = transpose(mat2(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { transpose_31d679(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void transpose_31d679() { mat2 res = transpose(mat2(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { transpose_31d679(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void transpose_31d679() { mat2 res = transpose(mat2(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { transpose_31d679(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/transpose/31e37e.wgsl.expected.glsl b/test/intrinsics/gen/transpose/31e37e.wgsl.expected.glsl index 0b22417250..881af10e32 100644 --- a/test/intrinsics/gen/transpose/31e37e.wgsl.expected.glsl +++ b/test/intrinsics/gen/transpose/31e37e.wgsl.expected.glsl @@ -5,31 +5,18 @@ void transpose_31e37e() { mat2x4 res = transpose(mat4x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { transpose_31e37e(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void transpose_31e37e() { mat2x4 res = transpose(mat4x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { transpose_31e37e(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void transpose_31e37e() { mat2x4 res = transpose(mat4x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { transpose_31e37e(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/transpose/4ce359.wgsl.expected.glsl b/test/intrinsics/gen/transpose/4ce359.wgsl.expected.glsl index 56568c4a22..a476a04e82 100644 --- a/test/intrinsics/gen/transpose/4ce359.wgsl.expected.glsl +++ b/test/intrinsics/gen/transpose/4ce359.wgsl.expected.glsl @@ -5,31 +5,18 @@ void transpose_4ce359() { mat4x2 res = transpose(mat2x4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { transpose_4ce359(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void transpose_4ce359() { mat4x2 res = transpose(mat2x4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { transpose_4ce359(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void transpose_4ce359() { mat4x2 res = transpose(mat2x4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { transpose_4ce359(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/transpose/4dc9a1.wgsl.expected.glsl b/test/intrinsics/gen/transpose/4dc9a1.wgsl.expected.glsl index 4a9f2d1368..e981ed7923 100644 --- a/test/intrinsics/gen/transpose/4dc9a1.wgsl.expected.glsl +++ b/test/intrinsics/gen/transpose/4dc9a1.wgsl.expected.glsl @@ -5,31 +5,18 @@ void transpose_4dc9a1() { mat3x2 res = transpose(mat2x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { transpose_4dc9a1(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void transpose_4dc9a1() { mat3x2 res = transpose(mat2x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { transpose_4dc9a1(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void transpose_4dc9a1() { mat3x2 res = transpose(mat2x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { transpose_4dc9a1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/transpose/854336.wgsl.expected.glsl b/test/intrinsics/gen/transpose/854336.wgsl.expected.glsl index 10e90c403a..5daee5d678 100644 --- a/test/intrinsics/gen/transpose/854336.wgsl.expected.glsl +++ b/test/intrinsics/gen/transpose/854336.wgsl.expected.glsl @@ -5,31 +5,18 @@ void transpose_854336() { mat3 res = transpose(mat3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { transpose_854336(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void transpose_854336() { mat3 res = transpose(mat3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { transpose_854336(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void transpose_854336() { mat3 res = transpose(mat3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { transpose_854336(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/transpose/c1b600.wgsl.expected.glsl b/test/intrinsics/gen/transpose/c1b600.wgsl.expected.glsl index 6f8842b663..b905fd610c 100644 --- a/test/intrinsics/gen/transpose/c1b600.wgsl.expected.glsl +++ b/test/intrinsics/gen/transpose/c1b600.wgsl.expected.glsl @@ -5,31 +5,18 @@ void transpose_c1b600() { mat4 res = transpose(mat4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { transpose_c1b600(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void transpose_c1b600() { mat4 res = transpose(mat4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { transpose_c1b600(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void transpose_c1b600() { mat4 res = transpose(mat4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { transpose_c1b600(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/transpose/d8f8ba.wgsl.expected.glsl b/test/intrinsics/gen/transpose/d8f8ba.wgsl.expected.glsl index 99f51a5d1d..86c06ad722 100644 --- a/test/intrinsics/gen/transpose/d8f8ba.wgsl.expected.glsl +++ b/test/intrinsics/gen/transpose/d8f8ba.wgsl.expected.glsl @@ -5,31 +5,18 @@ void transpose_d8f8ba() { mat4x3 res = transpose(mat3x4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { transpose_d8f8ba(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void transpose_d8f8ba() { mat4x3 res = transpose(mat3x4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { transpose_d8f8ba(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void transpose_d8f8ba() { mat4x3 res = transpose(mat3x4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { transpose_d8f8ba(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/transpose/ed4bdc.wgsl.expected.glsl b/test/intrinsics/gen/transpose/ed4bdc.wgsl.expected.glsl index d6088094f6..338112de09 100644 --- a/test/intrinsics/gen/transpose/ed4bdc.wgsl.expected.glsl +++ b/test/intrinsics/gen/transpose/ed4bdc.wgsl.expected.glsl @@ -5,31 +5,18 @@ void transpose_ed4bdc() { mat2x3 res = transpose(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { transpose_ed4bdc(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void transpose_ed4bdc() { mat2x3 res = transpose(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { transpose_ed4bdc(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void transpose_ed4bdc() { mat2x3 res = transpose(mat3x2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { transpose_ed4bdc(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/trunc/562d05.wgsl.expected.glsl b/test/intrinsics/gen/trunc/562d05.wgsl.expected.glsl index 7c0765d761..64d05c96ec 100644 --- a/test/intrinsics/gen/trunc/562d05.wgsl.expected.glsl +++ b/test/intrinsics/gen/trunc/562d05.wgsl.expected.glsl @@ -5,31 +5,18 @@ void trunc_562d05() { vec3 res = trunc(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { trunc_562d05(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void trunc_562d05() { vec3 res = trunc(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { trunc_562d05(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void trunc_562d05() { vec3 res = trunc(vec3(0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { trunc_562d05(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/trunc/e183aa.wgsl.expected.glsl b/test/intrinsics/gen/trunc/e183aa.wgsl.expected.glsl index dedadcccce..3241d0bab0 100644 --- a/test/intrinsics/gen/trunc/e183aa.wgsl.expected.glsl +++ b/test/intrinsics/gen/trunc/e183aa.wgsl.expected.glsl @@ -5,31 +5,18 @@ void trunc_e183aa() { vec4 res = trunc(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { trunc_e183aa(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void trunc_e183aa() { vec4 res = trunc(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { trunc_e183aa(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void trunc_e183aa() { vec4 res = trunc(vec4(0.0f, 0.0f, 0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { trunc_e183aa(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/trunc/eb83df.wgsl.expected.glsl b/test/intrinsics/gen/trunc/eb83df.wgsl.expected.glsl index 7ebd6076e0..160d8cf1a1 100644 --- a/test/intrinsics/gen/trunc/eb83df.wgsl.expected.glsl +++ b/test/intrinsics/gen/trunc/eb83df.wgsl.expected.glsl @@ -5,31 +5,18 @@ void trunc_eb83df() { float res = trunc(1.0f); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { trunc_eb83df(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void trunc_eb83df() { float res = trunc(1.0f); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { trunc_eb83df(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void trunc_eb83df() { float res = trunc(1.0f); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { trunc_eb83df(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/trunc/f370d3.wgsl.expected.glsl b/test/intrinsics/gen/trunc/f370d3.wgsl.expected.glsl index feddb14729..c3e3eee0ee 100644 --- a/test/intrinsics/gen/trunc/f370d3.wgsl.expected.glsl +++ b/test/intrinsics/gen/trunc/f370d3.wgsl.expected.glsl @@ -5,31 +5,18 @@ void trunc_f370d3() { vec2 res = trunc(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { trunc_f370d3(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -37,19 +24,14 @@ void trunc_f370d3() { vec2 res = trunc(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { trunc_f370d3(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -57,17 +39,12 @@ void trunc_f370d3() { vec2 res = trunc(vec2(0.0f, 0.0f)); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { trunc_f370d3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/gen/unpack2x16float/32a5cf.wgsl.expected.glsl b/test/intrinsics/gen/unpack2x16float/32a5cf.wgsl.expected.glsl index 7dfd286d38..e3911b0ba0 100644 --- a/test/intrinsics/gen/unpack2x16float/32a5cf.wgsl.expected.glsl +++ b/test/intrinsics/gen/unpack2x16float/32a5cf.wgsl.expected.glsl @@ -13,31 +13,18 @@ void unpack2x16float_32a5cf() { vec2 res = tint_unpack2x16float(1u); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { unpack2x16float_32a5cf(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp highp uint' and a right operand of type ' const int' (or there is no acceptable conversion) ERROR: 0:6: '' : compilation terminated @@ -58,19 +45,14 @@ void unpack2x16float_32a5cf() { vec2 res = tint_unpack2x16float(1u); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { unpack2x16float_32a5cf(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp mediump uint' and a right operand of type ' const int' (or there is no acceptable conversion) ERROR: 0:6: '' : compilation terminated @@ -91,20 +73,15 @@ void unpack2x16float_32a5cf() { vec2 res = tint_unpack2x16float(1u); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { unpack2x16float_32a5cf(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp highp uint' and a right operand of type ' const int' (or there is no acceptable conversion) ERROR: 0:6: '' : compilation terminated diff --git a/test/intrinsics/gen/unpack2x16snorm/b4aea6.wgsl.expected.glsl b/test/intrinsics/gen/unpack2x16snorm/b4aea6.wgsl.expected.glsl index 70c2c61f05..ea62982f45 100644 --- a/test/intrinsics/gen/unpack2x16snorm/b4aea6.wgsl.expected.glsl +++ b/test/intrinsics/gen/unpack2x16snorm/b4aea6.wgsl.expected.glsl @@ -14,31 +14,18 @@ void unpack2x16snorm_b4aea6() { vec2 res = tint_unpack2x16snorm(1u); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { unpack2x16snorm_b4aea6(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'int2' : undeclared identifier ERROR: 0:6: '' : compilation terminated @@ -60,19 +47,14 @@ void unpack2x16snorm_b4aea6() { vec2 res = tint_unpack2x16snorm(1u); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { unpack2x16snorm_b4aea6(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'int2' : undeclared identifier ERROR: 0:6: '' : compilation terminated @@ -94,20 +76,15 @@ void unpack2x16snorm_b4aea6() { vec2 res = tint_unpack2x16snorm(1u); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { unpack2x16snorm_b4aea6(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'int2' : undeclared identifier ERROR: 0:6: '' : compilation terminated diff --git a/test/intrinsics/gen/unpack2x16unorm/7699c0.wgsl.expected.glsl b/test/intrinsics/gen/unpack2x16unorm/7699c0.wgsl.expected.glsl index 7b78901978..6c41b74601 100644 --- a/test/intrinsics/gen/unpack2x16unorm/7699c0.wgsl.expected.glsl +++ b/test/intrinsics/gen/unpack2x16unorm/7699c0.wgsl.expected.glsl @@ -14,31 +14,18 @@ void unpack2x16unorm_7699c0() { vec2 res = tint_unpack2x16unorm(1u); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { unpack2x16unorm_7699c0(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'uint2' : undeclared identifier ERROR: 0:6: '' : compilation terminated @@ -60,19 +47,14 @@ void unpack2x16unorm_7699c0() { vec2 res = tint_unpack2x16unorm(1u); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { unpack2x16unorm_7699c0(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'uint2' : undeclared identifier ERROR: 0:6: '' : compilation terminated @@ -94,20 +76,15 @@ void unpack2x16unorm_7699c0() { vec2 res = tint_unpack2x16unorm(1u); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { unpack2x16unorm_7699c0(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'uint2' : undeclared identifier ERROR: 0:6: '' : compilation terminated diff --git a/test/intrinsics/gen/unpack4x8snorm/523fb3.wgsl.expected.glsl b/test/intrinsics/gen/unpack4x8snorm/523fb3.wgsl.expected.glsl index 6a7ff11f4f..8f3ec12d08 100644 --- a/test/intrinsics/gen/unpack4x8snorm/523fb3.wgsl.expected.glsl +++ b/test/intrinsics/gen/unpack4x8snorm/523fb3.wgsl.expected.glsl @@ -14,31 +14,18 @@ void unpack4x8snorm_523fb3() { vec4 res = tint_unpack4x8snorm(1u); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { unpack4x8snorm_523fb3(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'int4' : undeclared identifier ERROR: 0:6: '' : compilation terminated @@ -60,19 +47,14 @@ void unpack4x8snorm_523fb3() { vec4 res = tint_unpack4x8snorm(1u); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { unpack4x8snorm_523fb3(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'int4' : undeclared identifier ERROR: 0:6: '' : compilation terminated @@ -94,20 +76,15 @@ void unpack4x8snorm_523fb3() { vec4 res = tint_unpack4x8snorm(1u); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { unpack4x8snorm_523fb3(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'int4' : undeclared identifier ERROR: 0:6: '' : compilation terminated diff --git a/test/intrinsics/gen/unpack4x8unorm/750c74.wgsl.expected.glsl b/test/intrinsics/gen/unpack4x8unorm/750c74.wgsl.expected.glsl index ab15ddd97a..369b2266e3 100644 --- a/test/intrinsics/gen/unpack4x8unorm/750c74.wgsl.expected.glsl +++ b/test/intrinsics/gen/unpack4x8unorm/750c74.wgsl.expected.glsl @@ -14,31 +14,18 @@ void unpack4x8unorm_750c74() { vec4 res = tint_unpack4x8unorm(1u); } -struct tint_symbol { - vec4 value; -}; - -vec4 vertex_main_inner() { +vec4 vertex_main() { unpack4x8unorm_750c74(); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol vertex_main() { - vec4 inner_result = vertex_main_inner(); - tint_symbol wrapper_result = tint_symbol(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = vertex_main(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vertex_main(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'uint4' : undeclared identifier ERROR: 0:6: '' : compilation terminated @@ -60,19 +47,14 @@ void unpack4x8unorm_750c74() { vec4 res = tint_unpack4x8unorm(1u); } -struct tint_symbol { - vec4 value; -}; - void fragment_main() { unpack4x8unorm_750c74(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'uint4' : undeclared identifier ERROR: 0:6: '' : compilation terminated @@ -94,20 +76,15 @@ void unpack4x8unorm_750c74() { vec4 res = tint_unpack4x8unorm(1u); } -struct tint_symbol { - vec4 value; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { unpack4x8unorm_750c74(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'uint4' : undeclared identifier ERROR: 0:6: '' : compilation terminated diff --git a/test/intrinsics/gen/workgroupBarrier/a17f7f.wgsl.expected.glsl b/test/intrinsics/gen/workgroupBarrier/a17f7f.wgsl.expected.glsl index 0ce18a635e..71ce5cb662 100644 --- a/test/intrinsics/gen/workgroupBarrier/a17f7f.wgsl.expected.glsl +++ b/test/intrinsics/gen/workgroupBarrier/a17f7f.wgsl.expected.glsl @@ -5,13 +5,12 @@ void workgroupBarrier_a17f7f() { memoryBarrierShared(); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { workgroupBarrier_a17f7f(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/ignore/call.wgsl.expected.glsl b/test/intrinsics/ignore/call.wgsl.expected.glsl index d74ad98fe9..e86c541afa 100644 --- a/test/intrinsics/ignore/call.wgsl.expected.glsl +++ b/test/intrinsics/ignore/call.wgsl.expected.glsl @@ -9,13 +9,12 @@ int f(int a, int b, int c) { return ((a * b) + c); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { f(1, 2, 3); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/intrinsics/ignore/runtime_array.wgsl.expected.glsl b/test/intrinsics/ignore/runtime_array.wgsl.expected.glsl index 679f1cbadb..8061643dc9 100644 --- a/test/intrinsics/ignore/runtime_array.wgsl.expected.glsl +++ b/test/intrinsics/ignore/runtime_array.wgsl.expected.glsl @@ -8,13 +8,12 @@ precision mediump float; layout(binding = 0) buffer S_1 { int arr[]; } s; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { s.arr; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/intrinsics/ignore/storage_buffer.wgsl.expected.glsl b/test/intrinsics/ignore/storage_buffer.wgsl.expected.glsl index 42d9060b18..1504315161 100644 --- a/test/intrinsics/ignore/storage_buffer.wgsl.expected.glsl +++ b/test/intrinsics/ignore/storage_buffer.wgsl.expected.glsl @@ -16,14 +16,13 @@ struct S { layout(binding = 0) buffer S_1 { int i; } s; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { s; s.i; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/intrinsics/ignore/uniform_buffer.wgsl.expected.glsl b/test/intrinsics/ignore/uniform_buffer.wgsl.expected.glsl index 1bd914a9bc..91b43696b8 100644 --- a/test/intrinsics/ignore/uniform_buffer.wgsl.expected.glsl +++ b/test/intrinsics/ignore/uniform_buffer.wgsl.expected.glsl @@ -17,14 +17,13 @@ layout(binding = 0) uniform S_1 { int i; } u; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { u; u.i; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/intrinsics/modf.wgsl.expected.glsl b/test/intrinsics/modf.wgsl.expected.glsl index b258447825..dbb6f560a7 100644 --- a/test/intrinsics/modf.wgsl.expected.glsl +++ b/test/intrinsics/modf.wgsl.expected.glsl @@ -16,18 +16,17 @@ modf_result tint_modf(float param_0) { } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { modf_result res = tint_modf(1.230000019f); float tint_symbol_1 = res.fract; float whole = res.whole; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:12: '{ } style initializers' : not supported with this profile: es ERROR: 0:12: '' : compilation terminated diff --git a/test/intrinsics/radians.spvasm.expected.glsl b/test/intrinsics/radians.spvasm.expected.glsl index 9941550626..891cca0307 100644 --- a/test/intrinsics/radians.spvasm.expected.glsl +++ b/test/intrinsics/radians.spvasm.expected.glsl @@ -14,13 +14,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/intrinsics/repeated_use.wgsl.expected.glsl b/test/intrinsics/repeated_use.wgsl.expected.glsl index 78014c0a43..f759523680 100644 --- a/test/intrinsics/repeated_use.wgsl.expected.glsl +++ b/test/intrinsics/repeated_use.wgsl.expected.glsl @@ -76,7 +76,6 @@ bool tint_isNormal_3(float param_0) { } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { tint_isNormal(vec4(0.0f, 0.0f, 0.0f, 0.0f)); tint_isNormal(vec4(1.0f)); @@ -90,13 +89,13 @@ void tint_symbol() { tint_isNormal_3(1.0f); tint_isNormal_3(2.0f); tint_isNormal_3(3.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint4' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/intrinsics/textureDimensions/depth_ms.spvasm.expected.glsl b/test/intrinsics/textureDimensions/depth_ms.spvasm.expected.glsl index 1f3b12fe91..fdf94c2c28 100644 --- a/test/intrinsics/textureDimensions/depth_ms.spvasm.expected.glsl +++ b/test/intrinsics/textureDimensions/depth_ms.spvasm.expected.glsl @@ -25,32 +25,19 @@ struct vertex_main_out { vec4 tint_symbol_1_1; }; -struct tint_symbol_3 { - vec4 tint_symbol_1_1; -}; - -vertex_main_out vertex_main_inner() { +vertex_main_out vertex_main() { vertex_main_1(); - vertex_main_out tint_symbol_4 = vertex_main_out(tint_symbol_1); - return tint_symbol_4; + vertex_main_out tint_symbol_3 = vertex_main_out(tint_symbol_1); + return tint_symbol_3; } -tint_symbol_3 vertex_main() { - vertex_main_out inner_result = vertex_main_inner(); - tint_symbol_3 wrapper_result = tint_symbol_3(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.tint_symbol_1_1 = inner_result.tint_symbol_1_1; - return wrapper_result; -} - - void main() { - tint_symbol_3 outputs; - outputs = vertex_main(); - gl_Position = outputs.tint_symbol_1_1; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vertex_main_out inner_result = vertex_main(); + gl_Position = inner_result.tint_symbol_1_1; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -66,10 +53,6 @@ struct vertex_main_out { vec4 tint_symbol_1_1; }; -struct tint_symbol_3 { - vec4 tint_symbol_1_1; -}; - void fragment_main_1() { textureDimensions_f60bdb(); return; @@ -77,13 +60,12 @@ void fragment_main_1() { void fragment_main() { fragment_main_1(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -99,22 +81,17 @@ struct vertex_main_out { vec4 tint_symbol_1_1; }; -struct tint_symbol_3 { - vec4 tint_symbol_1_1; -}; - void compute_main_1() { textureDimensions_f60bdb(); return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { compute_main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/textureGather/f32/alpha.wgsl.expected.glsl b/test/intrinsics/textureGather/f32/alpha.wgsl.expected.glsl index a33d0bddd2..c49cedfd30 100644 --- a/test/intrinsics/textureGather/f32/alpha.wgsl.expected.glsl +++ b/test/intrinsics/textureGather/f32/alpha.wgsl.expected.glsl @@ -5,10 +5,9 @@ uniform highp sampler2D t_s; void tint_symbol() { vec4 res = textureGather(t_s, vec2(0.0f, 0.0f), 3); - return; } void main() { tint_symbol(); + return; } - diff --git a/test/intrinsics/textureGather/f32/blue.wgsl.expected.glsl b/test/intrinsics/textureGather/f32/blue.wgsl.expected.glsl index 924fd2ce65..af5fc44f0f 100644 --- a/test/intrinsics/textureGather/f32/blue.wgsl.expected.glsl +++ b/test/intrinsics/textureGather/f32/blue.wgsl.expected.glsl @@ -5,10 +5,9 @@ uniform highp sampler2D t_s; void tint_symbol() { vec4 res = textureGather(t_s, vec2(0.0f, 0.0f), 2); - return; } void main() { tint_symbol(); + return; } - diff --git a/test/intrinsics/textureGather/f32/green.wgsl.expected.glsl b/test/intrinsics/textureGather/f32/green.wgsl.expected.glsl index cc9b7d16bc..d0d5dbe8ba 100644 --- a/test/intrinsics/textureGather/f32/green.wgsl.expected.glsl +++ b/test/intrinsics/textureGather/f32/green.wgsl.expected.glsl @@ -5,10 +5,9 @@ uniform highp sampler2D t_s; void tint_symbol() { vec4 res = textureGather(t_s, vec2(0.0f, 0.0f), 1); - return; } void main() { tint_symbol(); + return; } - diff --git a/test/intrinsics/textureGather/f32/red.wgsl.expected.glsl b/test/intrinsics/textureGather/f32/red.wgsl.expected.glsl index 231dce5014..c1a257176b 100644 --- a/test/intrinsics/textureGather/f32/red.wgsl.expected.glsl +++ b/test/intrinsics/textureGather/f32/red.wgsl.expected.glsl @@ -5,10 +5,9 @@ uniform highp sampler2D t_s; void tint_symbol() { vec4 res = textureGather(t_s, vec2(0.0f, 0.0f), 0); - return; } void main() { tint_symbol(); + return; } - diff --git a/test/intrinsics/textureGather/i32/alpha.wgsl.expected.glsl b/test/intrinsics/textureGather/i32/alpha.wgsl.expected.glsl index 320f50fe28..5215de2c25 100644 --- a/test/intrinsics/textureGather/i32/alpha.wgsl.expected.glsl +++ b/test/intrinsics/textureGather/i32/alpha.wgsl.expected.glsl @@ -5,10 +5,9 @@ uniform highp isampler2D t_s; void tint_symbol() { ivec4 res = textureGather(t_s, vec2(0.0f, 0.0f), 3); - return; } void main() { tint_symbol(); + return; } - diff --git a/test/intrinsics/textureGather/i32/blue.wgsl.expected.glsl b/test/intrinsics/textureGather/i32/blue.wgsl.expected.glsl index 200e7e54ec..1efabfab53 100644 --- a/test/intrinsics/textureGather/i32/blue.wgsl.expected.glsl +++ b/test/intrinsics/textureGather/i32/blue.wgsl.expected.glsl @@ -5,10 +5,9 @@ uniform highp isampler2D t_s; void tint_symbol() { ivec4 res = textureGather(t_s, vec2(0.0f, 0.0f), 2); - return; } void main() { tint_symbol(); + return; } - diff --git a/test/intrinsics/textureGather/i32/green.wgsl.expected.glsl b/test/intrinsics/textureGather/i32/green.wgsl.expected.glsl index 02ab2d55cf..ea50a62167 100644 --- a/test/intrinsics/textureGather/i32/green.wgsl.expected.glsl +++ b/test/intrinsics/textureGather/i32/green.wgsl.expected.glsl @@ -5,10 +5,9 @@ uniform highp isampler2D t_s; void tint_symbol() { ivec4 res = textureGather(t_s, vec2(0.0f, 0.0f), 1); - return; } void main() { tint_symbol(); + return; } - diff --git a/test/intrinsics/textureGather/i32/red.wgsl.expected.glsl b/test/intrinsics/textureGather/i32/red.wgsl.expected.glsl index 6c7d9a0cb1..3013d47994 100644 --- a/test/intrinsics/textureGather/i32/red.wgsl.expected.glsl +++ b/test/intrinsics/textureGather/i32/red.wgsl.expected.glsl @@ -5,10 +5,9 @@ uniform highp isampler2D t_s; void tint_symbol() { ivec4 res = textureGather(t_s, vec2(0.0f, 0.0f), 0); - return; } void main() { tint_symbol(); + return; } - diff --git a/test/intrinsics/textureGather/u32/alpha.wgsl.expected.glsl b/test/intrinsics/textureGather/u32/alpha.wgsl.expected.glsl index 58ca174590..087d1a2988 100644 --- a/test/intrinsics/textureGather/u32/alpha.wgsl.expected.glsl +++ b/test/intrinsics/textureGather/u32/alpha.wgsl.expected.glsl @@ -5,10 +5,9 @@ uniform highp usampler2D t_s; void tint_symbol() { uvec4 res = textureGather(t_s, vec2(0.0f, 0.0f), 3); - return; } void main() { tint_symbol(); + return; } - diff --git a/test/intrinsics/textureGather/u32/blue.wgsl.expected.glsl b/test/intrinsics/textureGather/u32/blue.wgsl.expected.glsl index ec6b81acc5..3329a19829 100644 --- a/test/intrinsics/textureGather/u32/blue.wgsl.expected.glsl +++ b/test/intrinsics/textureGather/u32/blue.wgsl.expected.glsl @@ -5,10 +5,9 @@ uniform highp usampler2D t_s; void tint_symbol() { uvec4 res = textureGather(t_s, vec2(0.0f, 0.0f), 2); - return; } void main() { tint_symbol(); + return; } - diff --git a/test/intrinsics/textureGather/u32/green.wgsl.expected.glsl b/test/intrinsics/textureGather/u32/green.wgsl.expected.glsl index 235a063235..832b1d2b48 100644 --- a/test/intrinsics/textureGather/u32/green.wgsl.expected.glsl +++ b/test/intrinsics/textureGather/u32/green.wgsl.expected.glsl @@ -5,10 +5,9 @@ uniform highp usampler2D t_s; void tint_symbol() { uvec4 res = textureGather(t_s, vec2(0.0f, 0.0f), 1); - return; } void main() { tint_symbol(); + return; } - diff --git a/test/intrinsics/textureGather/u32/red.wgsl.expected.glsl b/test/intrinsics/textureGather/u32/red.wgsl.expected.glsl index 8791f6e601..df0ef7bfb5 100644 --- a/test/intrinsics/textureGather/u32/red.wgsl.expected.glsl +++ b/test/intrinsics/textureGather/u32/red.wgsl.expected.glsl @@ -5,10 +5,9 @@ uniform highp usampler2D t_s; void tint_symbol() { uvec4 res = textureGather(t_s, vec2(0.0f, 0.0f), 0); - return; } void main() { tint_symbol(); + return; } - diff --git a/test/intrinsics/textureLoad/depth_ms.spvasm.expected.glsl b/test/intrinsics/textureLoad/depth_ms.spvasm.expected.glsl index d492ec7a5a..639f6c4dc7 100644 --- a/test/intrinsics/textureLoad/depth_ms.spvasm.expected.glsl +++ b/test/intrinsics/textureLoad/depth_ms.spvasm.expected.glsl @@ -25,32 +25,19 @@ struct vertex_main_out { vec4 tint_symbol_1_1; }; -struct tint_symbol_3 { - vec4 tint_symbol_1_1; -}; - -vertex_main_out vertex_main_inner() { +vertex_main_out vertex_main() { vertex_main_1(); - vertex_main_out tint_symbol_4 = vertex_main_out(tint_symbol_1); - return tint_symbol_4; + vertex_main_out tint_symbol_3 = vertex_main_out(tint_symbol_1); + return tint_symbol_3; } -tint_symbol_3 vertex_main() { - vertex_main_out inner_result = vertex_main_inner(); - tint_symbol_3 wrapper_result = tint_symbol_3(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.tint_symbol_1_1 = inner_result.tint_symbol_1_1; - return wrapper_result; -} - - void main() { - tint_symbol_3 outputs; - outputs = vertex_main(); - gl_Position = outputs.tint_symbol_1_1; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vertex_main_out inner_result = vertex_main(); + gl_Position = inner_result.tint_symbol_1_1; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; @@ -66,10 +53,6 @@ struct vertex_main_out { vec4 tint_symbol_1_1; }; -struct tint_symbol_3 { - vec4 tint_symbol_1_1; -}; - void fragment_main_1() { textureLoad_6273b1(); return; @@ -77,13 +60,12 @@ void fragment_main_1() { void fragment_main() { fragment_main_1(); - return; } void main() { fragment_main(); + return; } - #version 310 es precision mediump float; @@ -99,22 +81,17 @@ struct vertex_main_out { vec4 tint_symbol_1_1; }; -struct tint_symbol_3 { - vec4 tint_symbol_1_1; -}; - void compute_main_1() { textureLoad_6273b1(); return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { compute_main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - diff --git a/test/intrinsics/textureNumSamples/depth_ms.spvasm.expected.glsl b/test/intrinsics/textureNumSamples/depth_ms.spvasm.expected.glsl index 037730fd45..d0f876785c 100644 --- a/test/intrinsics/textureNumSamples/depth_ms.spvasm.expected.glsl +++ b/test/intrinsics/textureNumSamples/depth_ms.spvasm.expected.glsl @@ -27,32 +27,19 @@ struct vertex_main_out { vec4 tint_symbol_1_1; }; -struct tint_symbol_3 { - vec4 tint_symbol_1_1; -}; - -vertex_main_out vertex_main_inner() { +vertex_main_out vertex_main() { vertex_main_1(); - vertex_main_out tint_symbol_4 = vertex_main_out(tint_symbol_1); - return tint_symbol_4; + vertex_main_out tint_symbol_3 = vertex_main_out(tint_symbol_1); + return tint_symbol_3; } -tint_symbol_3 vertex_main() { - vertex_main_out inner_result = vertex_main_inner(); - tint_symbol_3 wrapper_result = tint_symbol_3(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.tint_symbol_1_1 = inner_result.tint_symbol_1_1; - return wrapper_result; -} - - void main() { - tint_symbol_3 outputs; - outputs = vertex_main(); - gl_Position = outputs.tint_symbol_1_1; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vertex_main_out inner_result = vertex_main(); + gl_Position = inner_result.tint_symbol_1_1; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - Error parsing GLSL shader: ERROR: 0:8: 'textureSamples' : no matching overloaded function found ERROR: 0:8: '=' : cannot convert from ' const float' to ' temp highp int' @@ -76,10 +63,6 @@ struct vertex_main_out { vec4 tint_symbol_1_1; }; -struct tint_symbol_3 { - vec4 tint_symbol_1_1; -}; - void fragment_main_1() { textureNumSamples_a3c8a0(); return; @@ -87,13 +70,12 @@ void fragment_main_1() { void fragment_main() { fragment_main_1(); - return; } void main() { fragment_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureSamples' : no matching overloaded function found ERROR: 0:7: '=' : cannot convert from ' const float' to ' temp mediump int' @@ -117,25 +99,20 @@ struct vertex_main_out { vec4 tint_symbol_1_1; }; -struct tint_symbol_3 { - vec4 tint_symbol_1_1; -}; - void compute_main_1() { textureNumSamples_a3c8a0(); return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void compute_main() { compute_main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { compute_main(); + return; } - Error parsing GLSL shader: ERROR: 0:7: 'textureSamples' : no matching overloaded function found ERROR: 0:7: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/layout/storage/mat2x2/f32.wgsl.expected.glsl b/test/layout/storage/mat2x2/f32.wgsl.expected.glsl index e5f8b53d3b..931fe1dac2 100644 --- a/test/layout/storage/mat2x2/f32.wgsl.expected.glsl +++ b/test/layout/storage/mat2x2/f32.wgsl.expected.glsl @@ -8,14 +8,13 @@ struct SSBO { layout(binding = 0) buffer SSBO_1 { mat2 m; } ssbo; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { mat2 v = ssbo.m; ssbo.m = v; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/layout/storage/mat2x2/stride/16.spvasm.expected.glsl b/test/layout/storage/mat2x2/stride/16.spvasm.expected.glsl index e125413e9e..aca2256026 100644 --- a/test/layout/storage/mat2x2/stride/16.spvasm.expected.glsl +++ b/test/layout/storage/mat2x2/stride/16.spvasm.expected.glsl @@ -27,13 +27,12 @@ void f_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { f_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/let/global/global.wgsl.expected.glsl b/test/let/global/global.wgsl.expected.glsl index ec327ce2ab..797dbaf28f 100644 --- a/test/let/global/global.wgsl.expected.glsl +++ b/test/let/global/global.wgsl.expected.glsl @@ -1,29 +1,17 @@ #version 310 es precision mediump float; +layout(location = 0) out vec4 value; struct MyStruct { float f1; }; -struct tint_symbol_1 { - vec4 value; -}; - -vec4 tint_symbol_inner() { +vec4 tint_symbol() { return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol_1 tint_symbol() { - vec4 inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} -layout(location = 0) out vec4 value; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - value = outputs.value; + vec4 inner_result = tint_symbol(); + value = inner_result; + return; } - diff --git a/test/let/inferred/function.wgsl.expected.glsl b/test/let/inferred/function.wgsl.expected.glsl index ec327ce2ab..797dbaf28f 100644 --- a/test/let/inferred/function.wgsl.expected.glsl +++ b/test/let/inferred/function.wgsl.expected.glsl @@ -1,29 +1,17 @@ #version 310 es precision mediump float; +layout(location = 0) out vec4 value; struct MyStruct { float f1; }; -struct tint_symbol_1 { - vec4 value; -}; - -vec4 tint_symbol_inner() { +vec4 tint_symbol() { return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol_1 tint_symbol() { - vec4 inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} -layout(location = 0) out vec4 value; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - value = outputs.value; + vec4 inner_result = tint_symbol(); + value = inner_result; + return; } - diff --git a/test/loops/continue_in_switch.wgsl.expected.glsl b/test/loops/continue_in_switch.wgsl.expected.glsl index 2b26425c39..3435a1554f 100644 --- a/test/loops/continue_in_switch.wgsl.expected.glsl +++ b/test/loops/continue_in_switch.wgsl.expected.glsl @@ -1,7 +1,6 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { { for(int i = 0; (i < 4); i = (i + 1)) { @@ -16,10 +15,10 @@ void f() { } } } - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/loops/loop.wgsl.expected.glsl b/test/loops/loop.wgsl.expected.glsl index 81b6873435..04f42c4011 100644 --- a/test/loops/loop.wgsl.expected.glsl +++ b/test/loops/loop.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int f() { int i = 0; while (true) { diff --git a/test/loops/loop_with_continuing.wgsl.expected.glsl b/test/loops/loop_with_continuing.wgsl.expected.glsl index 768d31af69..d4b52d3034 100644 --- a/test/loops/loop_with_continuing.wgsl.expected.glsl +++ b/test/loops/loop_with_continuing.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int f() { int i = 0; while (true) { diff --git a/test/loops/nested_loops.wgsl.expected.glsl b/test/loops/nested_loops.wgsl.expected.glsl index 56fcb75ffc..50c0bfc6d7 100644 --- a/test/loops/nested_loops.wgsl.expected.glsl +++ b/test/loops/nested_loops.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int f() { int i = 0; int j = 0; diff --git a/test/loops/nested_loops_with_continuing.wgsl.expected.glsl b/test/loops/nested_loops_with_continuing.wgsl.expected.glsl index 67fbaf7ee6..b096d76a7a 100644 --- a/test/loops/nested_loops_with_continuing.wgsl.expected.glsl +++ b/test/loops/nested_loops_with_continuing.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - int f() { int i = 0; int j = 0; diff --git a/test/ptr_ref/access/matrix.spvasm.expected.glsl b/test/ptr_ref/access/matrix.spvasm.expected.glsl index f6f23597c3..6c65c7704c 100644 --- a/test/ptr_ref/access/matrix.spvasm.expected.glsl +++ b/test/ptr_ref/access/matrix.spvasm.expected.glsl @@ -8,13 +8,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/access/matrix.wgsl.expected.glsl b/test/ptr_ref/access/matrix.wgsl.expected.glsl index f08f729c5e..f6caf8b37b 100644 --- a/test/ptr_ref/access/matrix.wgsl.expected.glsl +++ b/test/ptr_ref/access/matrix.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { mat3 m = mat3(vec3(1.0f, 2.0f, 3.0f), vec3(4.0f, 5.0f, 6.0f), vec3(7.0f, 8.0f, 9.0f)); m[1] = vec3(5.0f, 5.0f, 5.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/copy/ptr_copy.spvasm.expected.glsl b/test/ptr_ref/copy/ptr_copy.spvasm.expected.glsl index 9fa5aa1019..3a58404d2e 100644 --- a/test/ptr_ref/copy/ptr_copy.spvasm.expected.glsl +++ b/test/ptr_ref/copy/ptr_copy.spvasm.expected.glsl @@ -6,13 +6,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/load/global/i32.spvasm.expected.glsl b/test/ptr_ref/load/global/i32.spvasm.expected.glsl index 0d72c7d2db..7835a4e9bd 100644 --- a/test/ptr_ref/load/global/i32.spvasm.expected.glsl +++ b/test/ptr_ref/load/global/i32.spvasm.expected.glsl @@ -7,13 +7,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/load/global/i32.wgsl.expected.glsl b/test/ptr_ref/load/global/i32.wgsl.expected.glsl index 42d01348c5..81649f59fa 100644 --- a/test/ptr_ref/load/global/i32.wgsl.expected.glsl +++ b/test/ptr_ref/load/global/i32.wgsl.expected.glsl @@ -2,13 +2,12 @@ precision mediump float; int I = 0; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { int use = (I + 1); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/load/global/struct_field.spvasm.expected.glsl b/test/ptr_ref/load/global/struct_field.spvasm.expected.glsl index e3cb845ce7..c346181403 100644 --- a/test/ptr_ref/load/global/struct_field.spvasm.expected.glsl +++ b/test/ptr_ref/load/global/struct_field.spvasm.expected.glsl @@ -13,13 +13,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/load/global/struct_field.wgsl.expected.glsl b/test/ptr_ref/load/global/struct_field.wgsl.expected.glsl index 5248de86c4..21fe14c0b9 100644 --- a/test/ptr_ref/load/global/struct_field.wgsl.expected.glsl +++ b/test/ptr_ref/load/global/struct_field.wgsl.expected.glsl @@ -6,13 +6,12 @@ struct S { }; S V = S(0); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { int i = V.i; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/load/local/i32.spvasm.expected.glsl b/test/ptr_ref/load/local/i32.spvasm.expected.glsl index 0d7cd5310d..e7070ee5ac 100644 --- a/test/ptr_ref/load/local/i32.spvasm.expected.glsl +++ b/test/ptr_ref/load/local/i32.spvasm.expected.glsl @@ -8,13 +8,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/load/local/i32.wgsl.expected.glsl b/test/ptr_ref/load/local/i32.wgsl.expected.glsl index d810e0a2d5..28669e2e49 100644 --- a/test/ptr_ref/load/local/i32.wgsl.expected.glsl +++ b/test/ptr_ref/load/local/i32.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { int i = 123; int use = (i + 1); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/load/local/ptr_function.wgsl.expected.glsl b/test/ptr_ref/load/local/ptr_function.wgsl.expected.glsl index d810e0a2d5..28669e2e49 100644 --- a/test/ptr_ref/load/local/ptr_function.wgsl.expected.glsl +++ b/test/ptr_ref/load/local/ptr_function.wgsl.expected.glsl @@ -1,14 +1,13 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { int i = 123; int use = (i + 1); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/load/local/ptr_private.wgsl.expected.glsl b/test/ptr_ref/load/local/ptr_private.wgsl.expected.glsl index 4cc2e08b4e..ac8ce2ed76 100644 --- a/test/ptr_ref/load/local/ptr_private.wgsl.expected.glsl +++ b/test/ptr_ref/load/local/ptr_private.wgsl.expected.glsl @@ -2,13 +2,12 @@ precision mediump float; int i = 123; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { int use = (i + 1); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/load/local/ptr_storage.wgsl.expected.glsl b/test/ptr_ref/load/local/ptr_storage.wgsl.expected.glsl index ec7a6ae440..eda6fc637e 100644 --- a/test/ptr_ref/load/local/ptr_storage.wgsl.expected.glsl +++ b/test/ptr_ref/load/local/ptr_storage.wgsl.expected.glsl @@ -8,13 +8,12 @@ struct S { layout(binding = 0) buffer S_1 { int a; } v; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { int use = (v.a + 1); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/load/local/ptr_uniform.wgsl.expected.glsl b/test/ptr_ref/load/local/ptr_uniform.wgsl.expected.glsl index 664cbb164a..c8e4f2193c 100644 --- a/test/ptr_ref/load/local/ptr_uniform.wgsl.expected.glsl +++ b/test/ptr_ref/load/local/ptr_uniform.wgsl.expected.glsl @@ -9,13 +9,12 @@ layout(binding = 0) uniform S_1 { int a; } v; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { int use = (v.a + 1); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/load/local/ptr_workgroup.wgsl.expected.glsl b/test/ptr_ref/load/local/ptr_workgroup.wgsl.expected.glsl index 8e17712528..c601cc7709 100644 --- a/test/ptr_ref/load/local/ptr_workgroup.wgsl.expected.glsl +++ b/test/ptr_ref/load/local/ptr_workgroup.wgsl.expected.glsl @@ -2,11 +2,7 @@ precision mediump float; shared int i; -struct tint_symbol_2 { - uint local_invocation_index; -}; - -void tint_symbol_inner(uint local_invocation_index) { +void tint_symbol(uint local_invocation_index) { { i = 0; } @@ -16,15 +12,7 @@ void tint_symbol_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.local_invocation_index); +void main() { + tint_symbol(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - tint_symbol(inputs); -} - diff --git a/test/ptr_ref/load/local/struct_field.spvasm.expected.glsl b/test/ptr_ref/load/local/struct_field.spvasm.expected.glsl index ca5baef640..911ddfa94d 100644 --- a/test/ptr_ref/load/local/struct_field.spvasm.expected.glsl +++ b/test/ptr_ref/load/local/struct_field.spvasm.expected.glsl @@ -13,13 +13,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/load/local/struct_field.wgsl.expected.glsl b/test/ptr_ref/load/local/struct_field.wgsl.expected.glsl index bffaaf1478..972dc26223 100644 --- a/test/ptr_ref/load/local/struct_field.wgsl.expected.glsl +++ b/test/ptr_ref/load/local/struct_field.wgsl.expected.glsl @@ -5,14 +5,14 @@ struct S { int i; }; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { S V = S(0); int i = V.i; return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/load/param/ptr.spvasm.expected.glsl b/test/ptr_ref/load/param/ptr.spvasm.expected.glsl index 7ed789b3c2..71fd1ce8b8 100644 --- a/test/ptr_ref/load/param/ptr.spvasm.expected.glsl +++ b/test/ptr_ref/load/param/ptr.spvasm.expected.glsl @@ -13,13 +13,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/load/param/ptr.wgsl.expected.glsl b/test/ptr_ref/load/param/ptr.wgsl.expected.glsl index c55ebb3f9b..bf43c8aaf3 100644 --- a/test/ptr_ref/load/param/ptr.wgsl.expected.glsl +++ b/test/ptr_ref/load/param/ptr.wgsl.expected.glsl @@ -5,14 +5,13 @@ int func(int value, inout int pointer) { return (value + pointer); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { int i = 123; int r = func(i, i); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/store/global/i32.spvasm.expected.glsl b/test/ptr_ref/store/global/i32.spvasm.expected.glsl index 502f0c8de9..ca1d6fc405 100644 --- a/test/ptr_ref/store/global/i32.spvasm.expected.glsl +++ b/test/ptr_ref/store/global/i32.spvasm.expected.glsl @@ -8,13 +8,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/store/global/i32.wgsl.expected.glsl b/test/ptr_ref/store/global/i32.wgsl.expected.glsl index 7935a1b1ac..5cc295b6ef 100644 --- a/test/ptr_ref/store/global/i32.wgsl.expected.glsl +++ b/test/ptr_ref/store/global/i32.wgsl.expected.glsl @@ -2,14 +2,13 @@ precision mediump float; int I = 0; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { I = 123; I = ((100 + 20) + 3); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/store/global/struct_field.spvasm.expected.glsl b/test/ptr_ref/store/global/struct_field.spvasm.expected.glsl index e298bd868b..dcde08800d 100644 --- a/test/ptr_ref/store/global/struct_field.spvasm.expected.glsl +++ b/test/ptr_ref/store/global/struct_field.spvasm.expected.glsl @@ -11,13 +11,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/store/local/i32.spvasm.expected.glsl b/test/ptr_ref/store/local/i32.spvasm.expected.glsl index 61d339c7af..188a6fed1b 100644 --- a/test/ptr_ref/store/local/i32.spvasm.expected.glsl +++ b/test/ptr_ref/store/local/i32.spvasm.expected.glsl @@ -9,13 +9,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/store/local/i32.wgsl.expected.glsl b/test/ptr_ref/store/local/i32.wgsl.expected.glsl index 4adf704d50..8231764821 100644 --- a/test/ptr_ref/store/local/i32.wgsl.expected.glsl +++ b/test/ptr_ref/store/local/i32.wgsl.expected.glsl @@ -1,15 +1,14 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { int i = 123; i = 123; i = ((100 + 20) + 3); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/store/local/struct_field.spvasm.expected.glsl b/test/ptr_ref/store/local/struct_field.spvasm.expected.glsl index 8cab3a70d2..33c17b2b8c 100644 --- a/test/ptr_ref/store/local/struct_field.spvasm.expected.glsl +++ b/test/ptr_ref/store/local/struct_field.spvasm.expected.glsl @@ -11,13 +11,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/store/param/ptr.spvasm.expected.glsl b/test/ptr_ref/store/param/ptr.spvasm.expected.glsl index 807ddc65fa..137fb057dd 100644 --- a/test/ptr_ref/store/param/ptr.spvasm.expected.glsl +++ b/test/ptr_ref/store/param/ptr.spvasm.expected.glsl @@ -13,13 +13,12 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/ptr_ref/store/param/ptr.wgsl.expected.glsl b/test/ptr_ref/store/param/ptr.wgsl.expected.glsl index 02abe6321d..6599e3bf6c 100644 --- a/test/ptr_ref/store/param/ptr.wgsl.expected.glsl +++ b/test/ptr_ref/store/param/ptr.wgsl.expected.glsl @@ -5,14 +5,13 @@ void func(int value, inout int pointer) { pointer = value; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { int i = 123; func(123, i); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/samples/compute_boids.wgsl.expected.glsl b/test/samples/compute_boids.wgsl.expected.glsl index e96bfa7610..d44de14f4d 100644 --- a/test/samples/compute_boids.wgsl.expected.glsl +++ b/test/samples/compute_boids.wgsl.expected.glsl @@ -1,26 +1,45 @@ #version 310 es precision mediump float; -struct tint_symbol_2 { - vec2 a_particlePos; - vec2 a_particleVel; - vec2 a_pos; +layout(location = 0) in vec2 a_particlePos_1; +layout(location = 1) in vec2 a_particleVel_1; +layout(location = 2) in vec2 a_pos_1; +struct Particle { + vec2 pos; + vec2 vel; }; -struct tint_symbol_3 { - vec4 value; +struct SimParams { + float deltaT; + float rule1Distance; + float rule2Distance; + float rule3Distance; + float rule1Scale; + float rule2Scale; + float rule3Scale; }; -vec4 vert_main_inner(vec2 a_particlePos, vec2 a_particleVel, vec2 a_pos) { +struct Particles { + Particle particles[5]; +}; + +vec4 vert_main(vec2 a_particlePos, vec2 a_particleVel, vec2 a_pos) { float angle = -(atan(a_particleVel.x, a_particleVel.y)); vec2 pos = vec2(((a_pos.x * cos(angle)) - (a_pos.y * sin(angle))), ((a_pos.x * sin(angle)) + (a_pos.y * cos(angle)))); return vec4((pos + a_particlePos), 0.0f, 1.0f); } -struct tint_symbol_4 { - vec4 value; -}; +void main() { + vec4 inner_result = vert_main(a_particlePos_1, a_particleVel_1, a_pos_1); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; +} +#version 310 es +precision mediump float; +layout(location = 0) out vec4 value; struct Particle { vec2 pos; vec2 vel; @@ -40,108 +59,18 @@ struct Particles { Particle particles[5]; }; -struct tint_symbol_6 { - uvec3 tint_symbol; -}; - -tint_symbol_3 vert_main(tint_symbol_2 tint_symbol_1) { - vec4 inner_result = vert_main_inner(tint_symbol_1.a_particlePos, tint_symbol_1.a_particleVel, tint_symbol_1.a_pos); - tint_symbol_3 wrapper_result = tint_symbol_3(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} -layout(location = 0) in vec2 a_particlePos; -layout(location = 1) in vec2 a_particleVel; -layout(location = 2) in vec2 a_pos; - - -void main() { - tint_symbol_2 inputs; - inputs.a_particlePos = a_particlePos; - inputs.a_particleVel = a_particleVel; - inputs.a_pos = a_pos; - tint_symbol_3 outputs; - outputs = vert_main(inputs); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; -} - -#version 310 es -precision mediump float; - -struct tint_symbol_2 { - vec2 a_particlePos; - vec2 a_particleVel; - vec2 a_pos; -}; - -struct tint_symbol_3 { - vec4 value; -}; - -struct tint_symbol_4 { - vec4 value; -}; - -vec4 frag_main_inner() { +vec4 frag_main() { return vec4(1.0f, 1.0f, 1.0f, 1.0f); } -struct Particle { - vec2 pos; - vec2 vel; -}; - -struct SimParams { - float deltaT; - float rule1Distance; - float rule2Distance; - float rule3Distance; - float rule1Scale; - float rule2Scale; - float rule3Scale; -}; - -struct Particles { - Particle particles[5]; -}; - -struct tint_symbol_6 { - uvec3 tint_symbol; -}; - -tint_symbol_4 frag_main() { - vec4 inner_result_1 = frag_main_inner(); - tint_symbol_4 wrapper_result_1 = tint_symbol_4(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result_1.value = inner_result_1; - return wrapper_result_1; -} -layout(location = 0) out vec4 value; - void main() { - tint_symbol_4 outputs; - outputs = frag_main(); - value = outputs.value; + vec4 inner_result = frag_main(); + value = inner_result; + return; } - #version 310 es precision mediump float; -struct tint_symbol_2 { - vec2 a_particlePos; - vec2 a_particleVel; - vec2 a_pos; -}; - -struct tint_symbol_3 { - vec4 value; -}; - -struct tint_symbol_4 { - vec4 value; -}; - struct Particle { vec2 pos; vec2 vel; @@ -177,11 +106,7 @@ layout(binding = 1) buffer Particles_1 { layout(binding = 2) buffer Particles_2 { Particle particles[5]; } particlesB; -struct tint_symbol_6 { - uvec3 tint_symbol; -}; - -void comp_main_inner(uvec3 tint_symbol) { +void comp_main(uvec3 tint_symbol) { uint index = tint_symbol.x; if ((index >= 5u)) { return; @@ -241,15 +166,7 @@ void comp_main_inner(uvec3 tint_symbol) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void comp_main(tint_symbol_6 tint_symbol_5) { - comp_main_inner(tint_symbol_5.tint_symbol); +void main() { + comp_main(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_6 inputs; - inputs.tint_symbol = gl_GlobalInvocationID; - comp_main(inputs); -} - diff --git a/test/samples/cube.wgsl.expected.glsl b/test/samples/cube.wgsl.expected.glsl index 4e7e02e2a8..ffa40ce4bf 100644 --- a/test/samples/cube.wgsl.expected.glsl +++ b/test/samples/cube.wgsl.expected.glsl @@ -1,6 +1,9 @@ #version 310 es precision mediump float; +layout(location = 0) in vec4 cur_position_1; +layout(location = 1) in vec4 color_1; +layout(location = 0) out vec4 vtxFragColor_1; struct Uniforms { mat4 modelViewProjectionMatrix; }; @@ -19,59 +22,27 @@ struct VertexOutput { vec4 Position; }; -struct tint_symbol_3 { - vec4 cur_position; - vec4 color; -}; - -struct tint_symbol_4 { - vec4 vtxFragColor; - vec4 Position; -}; - -VertexOutput vtx_main_inner(VertexInput tint_symbol) { +VertexOutput vtx_main(VertexInput tint_symbol) { VertexOutput tint_symbol_1 = VertexOutput(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); tint_symbol_1.Position = (uniforms.modelViewProjectionMatrix * tint_symbol.cur_position); tint_symbol_1.vtxFragColor = tint_symbol.color; return tint_symbol_1; } -struct tint_symbol_6 { - vec4 fragColor; -}; - -struct tint_symbol_7 { - vec4 value; -}; - -tint_symbol_4 vtx_main(tint_symbol_3 tint_symbol_2) { - VertexInput tint_symbol_8 = VertexInput(tint_symbol_2.cur_position, tint_symbol_2.color); - VertexOutput inner_result = vtx_main_inner(tint_symbol_8); - tint_symbol_4 wrapper_result = tint_symbol_4(vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.vtxFragColor = inner_result.vtxFragColor; - wrapper_result.Position = inner_result.Position; - return wrapper_result; -} -layout(location = 0) in vec4 cur_position; -layout(location = 1) in vec4 color; -layout(location = 0) out vec4 vtxFragColor; - - void main() { - tint_symbol_3 inputs; - inputs.cur_position = cur_position; - inputs.color = color; - tint_symbol_4 outputs; - outputs = vtx_main(inputs); - vtxFragColor = outputs.vtxFragColor; - gl_Position = outputs.Position; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + VertexInput tint_symbol_2 = VertexInput(cur_position_1, color_1); + VertexOutput inner_result = vtx_main(tint_symbol_2); + vtxFragColor_1 = inner_result.vtxFragColor; + gl_Position = inner_result.Position; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; +layout(location = 0) in vec4 fragColor_1; +layout(location = 0) out vec4 value; struct Uniforms { mat4 modelViewProjectionMatrix; }; @@ -86,42 +57,12 @@ struct VertexOutput { vec4 Position; }; -struct tint_symbol_3 { - vec4 cur_position; - vec4 color; -}; - -struct tint_symbol_4 { - vec4 vtxFragColor; - vec4 Position; -}; - -struct tint_symbol_6 { - vec4 fragColor; -}; - -struct tint_symbol_7 { - vec4 value; -}; - -vec4 frag_main_inner(vec4 fragColor) { +vec4 frag_main(vec4 fragColor) { return fragColor; } -tint_symbol_7 frag_main(tint_symbol_6 tint_symbol_5) { - vec4 inner_result_1 = frag_main_inner(tint_symbol_5.fragColor); - tint_symbol_7 wrapper_result_1 = tint_symbol_7(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result_1.value = inner_result_1; - return wrapper_result_1; -} -layout(location = 0) in vec4 fragColor; -layout(location = 0) out vec4 value; - void main() { - tint_symbol_6 inputs; - inputs.fragColor = fragColor; - tint_symbol_7 outputs; - outputs = frag_main(inputs); - value = outputs.value; + vec4 inner_result = frag_main(fragColor_1); + value = inner_result; + return; } - diff --git a/test/samples/function.wgsl.expected.glsl b/test/samples/function.wgsl.expected.glsl index 7f72a2a8dd..e3233185e3 100644 --- a/test/samples/function.wgsl.expected.glsl +++ b/test/samples/function.wgsl.expected.glsl @@ -1,12 +1,11 @@ #version 310 es precision mediump float; -layout(local_size_x = 2, local_size_y = 1, local_size_z = 1) in; void ep() { - return; } +layout(local_size_x = 2, local_size_y = 1, local_size_z = 1) in; void main() { ep(); + return; } - diff --git a/test/samples/simple.wgsl.expected.glsl b/test/samples/simple.wgsl.expected.glsl index d84bf76177..995583f921 100644 --- a/test/samples/simple.wgsl.expected.glsl +++ b/test/samples/simple.wgsl.expected.glsl @@ -1,30 +1,18 @@ #version 310 es precision mediump float; +layout(location = 0) out vec4 value; void bar() { } -struct tint_symbol_1 { - vec4 value; -}; - -vec4 tint_symbol_inner() { +vec4 tint_symbol() { vec2 a = vec2(0.0f, 0.0f); bar(); return vec4(0.400000006f, 0.400000006f, 0.800000012f, 1.0f); } -tint_symbol_1 tint_symbol() { - vec4 inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} -layout(location = 0) out vec4 value; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - value = outputs.value; + vec4 inner_result = tint_symbol(); + value = inner_result; + return; } - diff --git a/test/samples/simple_vertex.spvasm.expected.glsl b/test/samples/simple_vertex.spvasm.expected.glsl index 818a292e4e..e2d9123cc8 100644 --- a/test/samples/simple_vertex.spvasm.expected.glsl +++ b/test/samples/simple_vertex.spvasm.expected.glsl @@ -11,29 +11,16 @@ struct main_out { vec4 tint_symbol; }; -struct tint_symbol_2 { - vec4 tint_symbol; -}; - -main_out tint_symbol_1_inner() { +main_out tint_symbol_1() { main_1(); - main_out tint_symbol_3 = main_out(tint_symbol); - return tint_symbol_3; + main_out tint_symbol_2 = main_out(tint_symbol); + return tint_symbol_2; } -tint_symbol_2 tint_symbol_1() { - main_out inner_result = tint_symbol_1_inner(); - tint_symbol_2 wrapper_result = tint_symbol_2(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.tint_symbol = inner_result.tint_symbol; - return wrapper_result; -} - - void main() { - tint_symbol_2 outputs; - outputs = tint_symbol_1(); - gl_Position = outputs.tint_symbol; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + main_out inner_result = tint_symbol_1(); + gl_Position = inner_result.tint_symbol; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - diff --git a/test/samples/triangle.wgsl.expected.glsl b/test/samples/triangle.wgsl.expected.glsl index 012baae0bc..c69afa9f77 100644 --- a/test/samples/triangle.wgsl.expected.glsl +++ b/test/samples/triangle.wgsl.expected.glsl @@ -2,71 +2,27 @@ precision mediump float; const vec2 pos[3] = vec2[3](vec2(0.0f, 0.5f), vec2(-0.5f, -0.5f), vec2(0.5f, -0.5f)); -struct tint_symbol_1 { - uint VertexIndex; -}; - -struct tint_symbol_2 { - vec4 value; -}; - -vec4 vtx_main_inner(uint VertexIndex) { +vec4 vtx_main(uint VertexIndex) { return vec4(pos[VertexIndex], 0.0f, 1.0f); } -struct tint_symbol_3 { - vec4 value; -}; - -tint_symbol_2 vtx_main(tint_symbol_1 tint_symbol) { - vec4 inner_result = vtx_main_inner(tint_symbol.VertexIndex); - tint_symbol_2 wrapper_result = tint_symbol_2(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - - void main() { - tint_symbol_1 inputs; - inputs.VertexIndex = uint(gl_VertexID); - tint_symbol_2 outputs; - outputs = vtx_main(inputs); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = vtx_main(uint(gl_VertexID)); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; -struct tint_symbol_1 { - uint VertexIndex; -}; - -struct tint_symbol_2 { - vec4 value; -}; - -struct tint_symbol_3 { - vec4 value; -}; - -vec4 frag_main_inner() { +layout(location = 0) out vec4 value; +vec4 frag_main() { return vec4(1.0f, 0.0f, 0.0f, 1.0f); } -tint_symbol_3 frag_main() { - vec4 inner_result_1 = frag_main_inner(); - tint_symbol_3 wrapper_result_1 = tint_symbol_3(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result_1.value = inner_result_1; - return wrapper_result_1; -} -layout(location = 0) out vec4 value; - void main() { - tint_symbol_3 outputs; - outputs = frag_main(); - value = outputs.value; + vec4 inner_result = frag_main(); + value = inner_result; + return; } - diff --git a/test/shader_io/compute_input_builtins.wgsl.expected.glsl b/test/shader_io/compute_input_builtins.wgsl.expected.glsl index fe53acf08e..3c58f73ae7 100644 --- a/test/shader_io/compute_input_builtins.wgsl.expected.glsl +++ b/test/shader_io/compute_input_builtins.wgsl.expected.glsl @@ -1,36 +1,12 @@ #version 310 es precision mediump float; -struct tint_symbol_2 { - uvec3 local_invocation_id; - uint local_invocation_index; - uvec3 global_invocation_id; - uvec3 workgroup_id; - uvec3 num_workgroups; -}; - -void tint_symbol_inner(uvec3 local_invocation_id, uint local_invocation_index, uvec3 global_invocation_id, uvec3 workgroup_id, uvec3 num_workgroups) { +void tint_symbol(uvec3 local_invocation_id, uint local_invocation_index, uvec3 global_invocation_id, uvec3 workgroup_id, uvec3 num_workgroups) { uint foo = ((((local_invocation_id.x + local_invocation_index) + global_invocation_id.x) + workgroup_id.x) + num_workgroups.x); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.local_invocation_id, tint_symbol_1.local_invocation_index, tint_symbol_1.global_invocation_id, tint_symbol_1.workgroup_id, tint_symbol_1.num_workgroups); +void main() { + tint_symbol(gl_LocalInvocationID, gl_LocalInvocationIndex, gl_GlobalInvocationID, gl_WorkGroupID, gl_NumWorkGroups); return; } - - - - - - -void main() { - tint_symbol_2 inputs; - inputs.local_invocation_id = gl_LocalInvocationID; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - inputs.global_invocation_id = gl_GlobalInvocationID; - inputs.workgroup_id = gl_WorkGroupID; - inputs.num_workgroups = gl_NumWorkGroups; - tint_symbol(inputs); -} - diff --git a/test/shader_io/compute_input_builtins_struct.wgsl.expected.glsl b/test/shader_io/compute_input_builtins_struct.wgsl.expected.glsl index 3c72c7823e..776ec7e9a6 100644 --- a/test/shader_io/compute_input_builtins_struct.wgsl.expected.glsl +++ b/test/shader_io/compute_input_builtins_struct.wgsl.expected.glsl @@ -9,37 +9,13 @@ struct ComputeInputs { uvec3 num_workgroups; }; -struct tint_symbol_2 { - uvec3 local_invocation_id; - uint local_invocation_index; - uvec3 global_invocation_id; - uvec3 workgroup_id; - uvec3 num_workgroups; -}; - -void tint_symbol_inner(ComputeInputs inputs) { +void tint_symbol(ComputeInputs inputs) { uint foo = ((((inputs.local_invocation_id.x + inputs.local_invocation_index) + inputs.global_invocation_id.x) + inputs.workgroup_id.x) + inputs.num_workgroups.x); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - ComputeInputs tint_symbol_3 = ComputeInputs(tint_symbol_1.local_invocation_id, tint_symbol_1.local_invocation_index, tint_symbol_1.global_invocation_id, tint_symbol_1.workgroup_id, tint_symbol_1.num_workgroups); - tint_symbol_inner(tint_symbol_3); +void main() { + ComputeInputs tint_symbol_1 = ComputeInputs(gl_LocalInvocationID, gl_LocalInvocationIndex, gl_GlobalInvocationID, gl_WorkGroupID, gl_NumWorkGroups); + tint_symbol(tint_symbol_1); return; } - - - - - - -void main() { - tint_symbol_2 inputs; - inputs.local_invocation_id = gl_LocalInvocationID; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - inputs.global_invocation_id = gl_GlobalInvocationID; - inputs.workgroup_id = gl_WorkGroupID; - inputs.num_workgroups = gl_NumWorkGroups; - tint_symbol(inputs); -} - diff --git a/test/shader_io/compute_input_mixed.wgsl.expected.glsl b/test/shader_io/compute_input_mixed.wgsl.expected.glsl index 5ce9f3802d..6b3683f7ca 100644 --- a/test/shader_io/compute_input_mixed.wgsl.expected.glsl +++ b/test/shader_io/compute_input_mixed.wgsl.expected.glsl @@ -9,35 +9,14 @@ struct ComputeInputs1 { uvec3 workgroup_id; }; -struct tint_symbol_2 { - uvec3 local_invocation_id; - uint local_invocation_index; - uvec3 global_invocation_id; - uvec3 workgroup_id; -}; - -void tint_symbol_inner(ComputeInputs0 inputs0, uint local_invocation_index, uvec3 global_invocation_id, ComputeInputs1 inputs1) { +void tint_symbol(ComputeInputs0 inputs0, uint local_invocation_index, uvec3 global_invocation_id, ComputeInputs1 inputs1) { uint foo = (((inputs0.local_invocation_id.x + local_invocation_index) + global_invocation_id.x) + inputs1.workgroup_id.x); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - ComputeInputs0 tint_symbol_3 = ComputeInputs0(tint_symbol_1.local_invocation_id); - ComputeInputs1 tint_symbol_4 = ComputeInputs1(tint_symbol_1.workgroup_id); - tint_symbol_inner(tint_symbol_3, tint_symbol_1.local_invocation_index, tint_symbol_1.global_invocation_id, tint_symbol_4); +void main() { + ComputeInputs0 tint_symbol_1 = ComputeInputs0(gl_LocalInvocationID); + ComputeInputs1 tint_symbol_2 = ComputeInputs1(gl_WorkGroupID); + tint_symbol(tint_symbol_1, gl_LocalInvocationIndex, gl_GlobalInvocationID, tint_symbol_2); return; } - - - - - -void main() { - tint_symbol_2 inputs; - inputs.local_invocation_id = gl_LocalInvocationID; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - inputs.global_invocation_id = gl_GlobalInvocationID; - inputs.workgroup_id = gl_WorkGroupID; - tint_symbol(inputs); -} - diff --git a/test/shader_io/fragment_input_builtins.wgsl.expected.glsl b/test/shader_io/fragment_input_builtins.wgsl.expected.glsl index 68435f1b9b..fa8c48e723 100644 --- a/test/shader_io/fragment_input_builtins.wgsl.expected.glsl +++ b/test/shader_io/fragment_input_builtins.wgsl.expected.glsl @@ -3,41 +3,20 @@ SKIP: FAILED #version 310 es precision mediump float; -struct tint_symbol_2 { - vec4 position; - bool front_facing; - uint sample_index; - uint sample_mask; -}; - -void tint_symbol_inner(vec4 position, bool front_facing, uint sample_index, uint sample_mask) { +void tint_symbol(vec4 position, bool front_facing, uint sample_index, uint sample_mask) { if (front_facing) { vec4 foo = position; uint bar = (sample_index + sample_mask); } } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.position, tint_symbol_1.front_facing, tint_symbol_1.sample_index, tint_symbol_1.sample_mask); +void main() { + tint_symbol(gl_FragCoord, gl_FrontFacing, uint(gl_SampleID), uint(gl_SampleMask[0])); return; } - - - - - -void main() { - tint_symbol_2 inputs; - inputs.position = gl_FragCoord; - inputs.front_facing = gl_FrontFacing; - inputs.sample_index = uint(gl_SampleID); - inputs.sample_mask = uint(gl_SampleMask); - tint_symbol(inputs); -} - Error parsing GLSL shader: -ERROR: 0:31: 'gl_SampleID' : required extension not requested: GL_OES_sample_variables -ERROR: 0:31: '' : compilation terminated +ERROR: 0:12: 'gl_SampleID' : required extension not requested: GL_OES_sample_variables +ERROR: 0:12: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/shader_io/fragment_input_builtins_struct.wgsl.expected.glsl b/test/shader_io/fragment_input_builtins_struct.wgsl.expected.glsl index f53cb1185d..9ac60b919d 100644 --- a/test/shader_io/fragment_input_builtins_struct.wgsl.expected.glsl +++ b/test/shader_io/fragment_input_builtins_struct.wgsl.expected.glsl @@ -10,42 +10,21 @@ struct FragmentInputs { uint sample_mask; }; -struct tint_symbol_2 { - vec4 position; - bool front_facing; - uint sample_index; - uint sample_mask; -}; - -void tint_symbol_inner(FragmentInputs inputs) { +void tint_symbol(FragmentInputs inputs) { if (inputs.front_facing) { vec4 foo = inputs.position; uint bar = (inputs.sample_index + inputs.sample_mask); } } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - FragmentInputs tint_symbol_3 = FragmentInputs(tint_symbol_1.position, tint_symbol_1.front_facing, tint_symbol_1.sample_index, tint_symbol_1.sample_mask); - tint_symbol_inner(tint_symbol_3); +void main() { + FragmentInputs tint_symbol_1 = FragmentInputs(gl_FragCoord, gl_FrontFacing, uint(gl_SampleID), uint(gl_SampleMask[0])); + tint_symbol(tint_symbol_1); return; } - - - - - -void main() { - tint_symbol_2 inputs; - inputs.position = gl_FragCoord; - inputs.front_facing = gl_FrontFacing; - inputs.sample_index = uint(gl_SampleID); - inputs.sample_mask = uint(gl_SampleMask); - tint_symbol(inputs); -} - Error parsing GLSL shader: -ERROR: 0:39: 'gl_SampleID' : required extension not requested: GL_OES_sample_variables -ERROR: 0:39: '' : compilation terminated +ERROR: 0:19: 'gl_SampleID' : required extension not requested: GL_OES_sample_variables +ERROR: 0:19: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/shader_io/fragment_input_locations.wgsl.expected.glsl b/test/shader_io/fragment_input_locations.wgsl.expected.glsl index bd55ab7d59..67b0176c8c 100644 --- a/test/shader_io/fragment_input_locations.wgsl.expected.glsl +++ b/test/shader_io/fragment_input_locations.wgsl.expected.glsl @@ -1,35 +1,18 @@ #version 310 es precision mediump float; -struct tint_symbol_2 { - int loc0; - uint loc1; - float loc2; - vec4 loc3; -}; - -void tint_symbol_inner(int loc0, uint loc1, float loc2, vec4 loc3) { +layout(location = 0) flat in int loc0_1; +layout(location = 1) flat in uint loc1_1; +layout(location = 2) in float loc2_1; +layout(location = 3) in vec4 loc3_1; +void tint_symbol(int loc0, uint loc1, float loc2, vec4 loc3) { int i = loc0; uint u = loc1; float f = loc2; vec4 v = loc3; } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.loc0, tint_symbol_1.loc1, tint_symbol_1.loc2, tint_symbol_1.loc3); +void main() { + tint_symbol(loc0_1, loc1_1, loc2_1, loc3_1); return; } -layout(location = 0) flat in int loc0; -layout(location = 1) flat in uint loc1; -layout(location = 2) in float loc2; -layout(location = 3) in vec4 loc3; - -void main() { - tint_symbol_2 inputs; - inputs.loc0 = loc0; - inputs.loc1 = loc1; - inputs.loc2 = loc2; - inputs.loc3 = loc3; - tint_symbol(inputs); -} - diff --git a/test/shader_io/fragment_input_locations_struct.wgsl.expected.glsl b/test/shader_io/fragment_input_locations_struct.wgsl.expected.glsl index fd2ae1cd13..aeffb600e0 100644 --- a/test/shader_io/fragment_input_locations_struct.wgsl.expected.glsl +++ b/test/shader_io/fragment_input_locations_struct.wgsl.expected.glsl @@ -1,6 +1,10 @@ #version 310 es precision mediump float; +layout(location = 0) flat in int loc0_1; +layout(location = 1) flat in uint loc1_1; +layout(location = 2) in float loc2_1; +layout(location = 3) in vec4 loc3_1; struct FragmentInputs { int loc0; uint loc1; @@ -8,36 +12,15 @@ struct FragmentInputs { vec4 loc3; }; -struct tint_symbol_2 { - int loc0; - uint loc1; - float loc2; - vec4 loc3; -}; - -void tint_symbol_inner(FragmentInputs inputs) { +void tint_symbol(FragmentInputs inputs) { int i = inputs.loc0; uint u = inputs.loc1; float f = inputs.loc2; vec4 v = inputs.loc3; } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - FragmentInputs tint_symbol_3 = FragmentInputs(tint_symbol_1.loc0, tint_symbol_1.loc1, tint_symbol_1.loc2, tint_symbol_1.loc3); - tint_symbol_inner(tint_symbol_3); +void main() { + FragmentInputs tint_symbol_1 = FragmentInputs(loc0_1, loc1_1, loc2_1, loc3_1); + tint_symbol(tint_symbol_1); return; } -layout(location = 0) flat in int loc0; -layout(location = 1) flat in uint loc1; -layout(location = 2) in float loc2; -layout(location = 3) in vec4 loc3; - -void main() { - tint_symbol_2 inputs; - inputs.loc0 = loc0; - inputs.loc1 = loc1; - inputs.loc2 = loc2; - inputs.loc3 = loc3; - tint_symbol(inputs); -} - diff --git a/test/shader_io/fragment_input_mixed.wgsl.expected.glsl b/test/shader_io/fragment_input_mixed.wgsl.expected.glsl index b9ecb1cbf4..7c742041d7 100644 --- a/test/shader_io/fragment_input_mixed.wgsl.expected.glsl +++ b/test/shader_io/fragment_input_mixed.wgsl.expected.glsl @@ -3,6 +3,10 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) flat in int loc0_1; +layout(location = 1) flat in uint loc1_1; +layout(location = 3) in vec4 loc3_1; +layout(location = 2) in float loc2_1; struct FragmentInputs0 { vec4 position; int loc0; @@ -13,18 +17,7 @@ struct FragmentInputs1 { uint sample_mask; }; -struct tint_symbol_2 { - int loc0; - uint loc1; - float loc2; - vec4 loc3; - vec4 position; - bool front_facing; - uint sample_index; - uint sample_mask; -}; - -void tint_symbol_inner(FragmentInputs0 inputs0, bool front_facing, uint loc1, uint sample_index, FragmentInputs1 inputs1, float loc2) { +void tint_symbol(FragmentInputs0 inputs0, bool front_facing, uint loc1, uint sample_index, FragmentInputs1 inputs1, float loc2) { if (front_facing) { vec4 foo = inputs0.position; uint bar = (sample_index + inputs1.sample_mask); @@ -35,37 +28,15 @@ void tint_symbol_inner(FragmentInputs0 inputs0, bool front_facing, uint loc1, ui } } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - FragmentInputs0 tint_symbol_3 = FragmentInputs0(tint_symbol_1.position, tint_symbol_1.loc0); - FragmentInputs1 tint_symbol_4 = FragmentInputs1(tint_symbol_1.loc3, tint_symbol_1.sample_mask); - tint_symbol_inner(tint_symbol_3, tint_symbol_1.front_facing, tint_symbol_1.loc1, tint_symbol_1.sample_index, tint_symbol_4, tint_symbol_1.loc2); +void main() { + FragmentInputs0 tint_symbol_1 = FragmentInputs0(gl_FragCoord, loc0_1); + FragmentInputs1 tint_symbol_2 = FragmentInputs1(loc3_1, uint(gl_SampleMask[0])); + tint_symbol(tint_symbol_1, gl_FrontFacing, loc1_1, uint(gl_SampleID), tint_symbol_2, loc2_1); return; } -layout(location = 0) flat in int loc0; -layout(location = 1) flat in uint loc1; -layout(location = 2) in float loc2; -layout(location = 3) in vec4 loc3; - - - - - -void main() { - tint_symbol_2 inputs; - inputs.loc0 = loc0; - inputs.loc1 = loc1; - inputs.loc2 = loc2; - inputs.loc3 = loc3; - inputs.position = gl_FragCoord; - inputs.front_facing = gl_FrontFacing; - inputs.sample_index = uint(gl_SampleID); - inputs.sample_mask = uint(gl_SampleMask); - tint_symbol(inputs); -} - Error parsing GLSL shader: -ERROR: 0:59: 'gl_SampleID' : required extension not requested: GL_OES_sample_variables -ERROR: 0:59: '' : compilation terminated +ERROR: 0:31: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:31: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/shader_io/fragment_output_builtins.wgsl.expected.glsl b/test/shader_io/fragment_output_builtins.wgsl.expected.glsl index 5051cbc9ed..1d587241d3 100644 --- a/test/shader_io/fragment_output_builtins.wgsl.expected.glsl +++ b/test/shader_io/fragment_output_builtins.wgsl.expected.glsl @@ -3,64 +3,30 @@ SKIP: FAILED #version 310 es precision mediump float; -struct tint_symbol { - float value; -}; - -float main1_inner() { +float main1() { return 1.0f; } -struct tint_symbol_1 { - uint value; -}; - -tint_symbol main1() { - float inner_result = main1_inner(); - tint_symbol wrapper_result = tint_symbol(0.0f); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol outputs; - outputs = main1(); - gl_FragDepth = outputs.value; + float inner_result = main1(); + gl_FragDepth = inner_result; + return; } - #version 310 es precision mediump float; -struct tint_symbol { - float value; -}; - -struct tint_symbol_1 { - uint value; -}; - -uint main2_inner() { +uint main2() { return 1u; } -tint_symbol_1 main2() { - uint inner_result_1 = main2_inner(); - tint_symbol_1 wrapper_result_1 = tint_symbol_1(0u); - wrapper_result_1.value = inner_result_1; - return wrapper_result_1; -} - - void main() { - tint_symbol_1 outputs; - outputs = main2(); - gl_SampleMask = outputs.value; + uint inner_result = main2(); + gl_SampleMask[0] = inner_result; + return; } - Error parsing GLSL shader: -ERROR: 0:27: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:27: '' : compilation terminated +ERROR: 0:10: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:10: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/shader_io/fragment_output_builtins_struct.wgsl.expected.glsl b/test/shader_io/fragment_output_builtins_struct.wgsl.expected.glsl index 44aa003908..0dce88a69f 100644 --- a/test/shader_io/fragment_output_builtins_struct.wgsl.expected.glsl +++ b/test/shader_io/fragment_output_builtins_struct.wgsl.expected.glsl @@ -8,36 +8,20 @@ struct FragmentOutputs { uint sample_mask; }; -struct tint_symbol_1 { - float frag_depth; - uint sample_mask; -}; - -FragmentOutputs tint_symbol_inner() { - FragmentOutputs tint_symbol_2 = FragmentOutputs(1.0f, 1u); - return tint_symbol_2; +FragmentOutputs tint_symbol() { + FragmentOutputs tint_symbol_1 = FragmentOutputs(1.0f, 1u); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - FragmentOutputs inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(0.0f, 0u); - wrapper_result.frag_depth = inner_result.frag_depth; - wrapper_result.sample_mask = inner_result.sample_mask; - return wrapper_result; -} - - - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - gl_FragDepth = outputs.frag_depth; - gl_SampleMask = outputs.sample_mask; + FragmentOutputs inner_result = tint_symbol(); + gl_FragDepth = inner_result.frag_depth; + gl_SampleMask[0] = inner_result.sample_mask; + return; } - Error parsing GLSL shader: -ERROR: 0:33: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:33: '' : compilation terminated +ERROR: 0:17: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:17: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/shader_io/fragment_output_locations.wgsl.expected.glsl b/test/shader_io/fragment_output_locations.wgsl.expected.glsl index a82449b08d..7bcae9c6c2 100644 --- a/test/shader_io/fragment_output_locations.wgsl.expected.glsl +++ b/test/shader_io/fragment_output_locations.wgsl.expected.glsl @@ -1,148 +1,52 @@ #version 310 es precision mediump float; -struct tint_symbol { - int value; -}; - -int main0_inner() { +layout(location = 0) out int value; +int main0() { return 1; } -struct tint_symbol_1 { - uint value; -}; - -struct tint_symbol_2 { - float value; -}; - -struct tint_symbol_3 { - vec4 value; -}; - -tint_symbol main0() { - int inner_result = main0_inner(); - tint_symbol wrapper_result = tint_symbol(0); - wrapper_result.value = inner_result; - return wrapper_result; -} -layout(location = 0) out int value; - void main() { - tint_symbol outputs; - outputs = main0(); - value = outputs.value; + int inner_result = main0(); + value = inner_result; + return; } - #version 310 es precision mediump float; -struct tint_symbol { - int value; -}; - -struct tint_symbol_1 { - uint value; -}; - -uint main1_inner() { +layout(location = 1) out uint value; +uint main1() { return 1u; } -struct tint_symbol_2 { - float value; -}; - -struct tint_symbol_3 { - vec4 value; -}; - -tint_symbol_1 main1() { - uint inner_result_1 = main1_inner(); - tint_symbol_1 wrapper_result_1 = tint_symbol_1(0u); - wrapper_result_1.value = inner_result_1; - return wrapper_result_1; -} -layout(location = 1) out uint value; - void main() { - tint_symbol_1 outputs; - outputs = main1(); - value = outputs.value; + uint inner_result = main1(); + value = inner_result; + return; } - #version 310 es precision mediump float; -struct tint_symbol { - int value; -}; - -struct tint_symbol_1 { - uint value; -}; - -struct tint_symbol_2 { - float value; -}; - -float main2_inner() { +layout(location = 2) out float value; +float main2() { return 1.0f; } -struct tint_symbol_3 { - vec4 value; -}; - -tint_symbol_2 main2() { - float inner_result_2 = main2_inner(); - tint_symbol_2 wrapper_result_2 = tint_symbol_2(0.0f); - wrapper_result_2.value = inner_result_2; - return wrapper_result_2; -} -layout(location = 2) out float value; - void main() { - tint_symbol_2 outputs; - outputs = main2(); - value = outputs.value; + float inner_result = main2(); + value = inner_result; + return; } - #version 310 es precision mediump float; -struct tint_symbol { - int value; -}; - -struct tint_symbol_1 { - uint value; -}; - -struct tint_symbol_2 { - float value; -}; - -struct tint_symbol_3 { - vec4 value; -}; - -vec4 main3_inner() { +layout(location = 3) out vec4 value; +vec4 main3() { return vec4(1.0f, 2.0f, 3.0f, 4.0f); } -tint_symbol_3 main3() { - vec4 inner_result_3 = main3_inner(); - tint_symbol_3 wrapper_result_3 = tint_symbol_3(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result_3.value = inner_result_3; - return wrapper_result_3; -} -layout(location = 3) out vec4 value; - void main() { - tint_symbol_3 outputs; - outputs = main3(); - value = outputs.value; + vec4 inner_result = main3(); + value = inner_result; + return; } - diff --git a/test/shader_io/fragment_output_locations_struct.wgsl.expected.glsl b/test/shader_io/fragment_output_locations_struct.wgsl.expected.glsl index 05914adc24..9c9a78e173 100644 --- a/test/shader_io/fragment_output_locations_struct.wgsl.expected.glsl +++ b/test/shader_io/fragment_output_locations_struct.wgsl.expected.glsl @@ -1,6 +1,10 @@ #version 310 es precision mediump float; +layout(location = 0) out int loc0_1; +layout(location = 1) out uint loc1_1; +layout(location = 2) out float loc2_1; +layout(location = 3) out vec4 loc3_1; struct FragmentOutputs { int loc0; uint loc1; @@ -8,38 +12,16 @@ struct FragmentOutputs { vec4 loc3; }; -struct tint_symbol_1 { - int loc0; - uint loc1; - float loc2; - vec4 loc3; -}; - -FragmentOutputs tint_symbol_inner() { - FragmentOutputs tint_symbol_2 = FragmentOutputs(1, 1u, 1.0f, vec4(1.0f, 2.0f, 3.0f, 4.0f)); - return tint_symbol_2; +FragmentOutputs tint_symbol() { + FragmentOutputs tint_symbol_1 = FragmentOutputs(1, 1u, 1.0f, vec4(1.0f, 2.0f, 3.0f, 4.0f)); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - FragmentOutputs inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(0, 0u, 0.0f, vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.loc0 = inner_result.loc0; - wrapper_result.loc1 = inner_result.loc1; - wrapper_result.loc2 = inner_result.loc2; - wrapper_result.loc3 = inner_result.loc3; - return wrapper_result; -} -layout(location = 0) out int loc0; -layout(location = 1) out uint loc1; -layout(location = 2) out float loc2; -layout(location = 3) out vec4 loc3; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - loc0 = outputs.loc0; - loc1 = outputs.loc1; - loc2 = outputs.loc2; - loc3 = outputs.loc3; + FragmentOutputs inner_result = tint_symbol(); + loc0_1 = inner_result.loc0; + loc1_1 = inner_result.loc1; + loc2_1 = inner_result.loc2; + loc3_1 = inner_result.loc3; + return; } - diff --git a/test/shader_io/fragment_output_mixed.wgsl.expected.glsl b/test/shader_io/fragment_output_mixed.wgsl.expected.glsl index 8bc4c9f9d4..2344346b3d 100644 --- a/test/shader_io/fragment_output_mixed.wgsl.expected.glsl +++ b/test/shader_io/fragment_output_mixed.wgsl.expected.glsl @@ -3,6 +3,10 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out int loc0_1; +layout(location = 1) out uint loc1_1; +layout(location = 2) out float loc2_1; +layout(location = 3) out vec4 loc3_1; struct FragmentOutputs { int loc0; float frag_depth; @@ -12,52 +16,24 @@ struct FragmentOutputs { vec4 loc3; }; -struct tint_symbol_1 { - int loc0; - uint loc1; - float loc2; - vec4 loc3; - float frag_depth; - uint sample_mask; -}; - -FragmentOutputs tint_symbol_inner() { - FragmentOutputs tint_symbol_2 = FragmentOutputs(1, 2.0f, 1u, 1.0f, 2u, vec4(1.0f, 2.0f, 3.0f, 4.0f)); - return tint_symbol_2; +FragmentOutputs tint_symbol() { + FragmentOutputs tint_symbol_1 = FragmentOutputs(1, 2.0f, 1u, 1.0f, 2u, vec4(1.0f, 2.0f, 3.0f, 4.0f)); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - FragmentOutputs inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(0, 0u, 0.0f, vec4(0.0f, 0.0f, 0.0f, 0.0f), 0.0f, 0u); - wrapper_result.loc0 = inner_result.loc0; - wrapper_result.frag_depth = inner_result.frag_depth; - wrapper_result.loc1 = inner_result.loc1; - wrapper_result.loc2 = inner_result.loc2; - wrapper_result.sample_mask = inner_result.sample_mask; - wrapper_result.loc3 = inner_result.loc3; - return wrapper_result; -} -layout(location = 0) out int loc0; -layout(location = 1) out uint loc1; -layout(location = 2) out float loc2; -layout(location = 3) out vec4 loc3; - - - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - loc0 = outputs.loc0; - loc1 = outputs.loc1; - loc2 = outputs.loc2; - loc3 = outputs.loc3; - gl_FragDepth = outputs.frag_depth; - gl_SampleMask = outputs.sample_mask; + FragmentOutputs inner_result = tint_symbol(); + loc0_1 = inner_result.loc0; + gl_FragDepth = inner_result.frag_depth; + loc1_1 = inner_result.loc1; + loc2_1 = inner_result.loc2; + gl_SampleMask[0] = inner_result.sample_mask; + loc3_1 = inner_result.loc3; + return; } - Error parsing GLSL shader: -ERROR: 0:53: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:53: '' : compilation terminated +ERROR: 0:28: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:28: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/shader_io/interpolate_input_parameters.wgsl.expected.glsl b/test/shader_io/interpolate_input_parameters.wgsl.expected.glsl index 39a7ae95ec..bb459d1ff9 100644 --- a/test/shader_io/interpolate_input_parameters.wgsl.expected.glsl +++ b/test/shader_io/interpolate_input_parameters.wgsl.expected.glsl @@ -1,43 +1,18 @@ #version 310 es precision mediump float; -struct tint_symbol_3 { - float none; - float tint_symbol_1; - float perspective_center; - float perspective_centroid; - float perspective_sample; - float linear_center; - float linear_centroid; - float linear_sample; -}; - -void tint_symbol_inner(float none, float tint_symbol_1, float perspective_center, float perspective_centroid, float perspective_sample, float linear_center, float linear_centroid, float linear_sample) { +layout(location = 0) in float none_1; +layout(location = 1) flat in float tint_symbol_1_1; +layout(location = 2) in float perspective_center_1; +layout(location = 3) centroid in float perspective_centroid_1; +layout(location = 4) in float perspective_sample_1; +layout(location = 5) in float linear_center_1; +layout(location = 6) centroid in float linear_centroid_1; +layout(location = 7) in float linear_sample_1; +void tint_symbol(float none, float tint_symbol_1, float perspective_center, float perspective_centroid, float perspective_sample, float linear_center, float linear_centroid, float linear_sample) { } -void tint_symbol(tint_symbol_3 tint_symbol_2) { - tint_symbol_inner(tint_symbol_2.none, tint_symbol_2.tint_symbol_1, tint_symbol_2.perspective_center, tint_symbol_2.perspective_centroid, tint_symbol_2.perspective_sample, tint_symbol_2.linear_center, tint_symbol_2.linear_centroid, tint_symbol_2.linear_sample); - return; -} -layout(location = 0) in float none; -layout(location = 1) flat in float tint_symbol_1; -layout(location = 2) in float perspective_center; -layout(location = 3) centroid in float perspective_centroid; -layout(location = 4) in float perspective_sample; -layout(location = 5) in float linear_center; -layout(location = 6) centroid in float linear_centroid; -layout(location = 7) in float linear_sample; - void main() { - tint_symbol_3 inputs; - inputs.none = none; - inputs.tint_symbol_1 = tint_symbol_1; - inputs.perspective_center = perspective_center; - inputs.perspective_centroid = perspective_centroid; - inputs.perspective_sample = perspective_sample; - inputs.linear_center = linear_center; - inputs.linear_centroid = linear_centroid; - inputs.linear_sample = linear_sample; - tint_symbol(inputs); + tint_symbol(none_1, tint_symbol_1_1, perspective_center_1, perspective_centroid_1, perspective_sample_1, linear_center_1, linear_centroid_1, linear_sample_1); + return; } - diff --git a/test/shader_io/interpolate_input_struct.wgsl.expected.glsl b/test/shader_io/interpolate_input_struct.wgsl.expected.glsl index 7c062cd966..2bb8a90e62 100644 --- a/test/shader_io/interpolate_input_struct.wgsl.expected.glsl +++ b/test/shader_io/interpolate_input_struct.wgsl.expected.glsl @@ -1,6 +1,14 @@ #version 310 es precision mediump float; +layout(location = 0) in float none_1; +layout(location = 1) flat in float tint_symbol_3; +layout(location = 2) in float perspective_center_1; +layout(location = 3) centroid in float perspective_centroid_1; +layout(location = 4) in float perspective_sample_1; +layout(location = 5) in float linear_center_1; +layout(location = 6) centroid in float linear_centroid_1; +layout(location = 7) in float linear_sample_1; struct In { float none; float tint_symbol; @@ -12,44 +20,11 @@ struct In { float linear_sample; }; -struct tint_symbol_4 { - float none; - float tint_symbol; - float perspective_center; - float perspective_centroid; - float perspective_sample; - float linear_center; - float linear_centroid; - float linear_sample; -}; - -void tint_symbol_1_inner(In tint_symbol_2) { +void tint_symbol_1(In tint_symbol_2) { } -void tint_symbol_1(tint_symbol_4 tint_symbol_3) { - In tint_symbol_5 = In(tint_symbol_3.none, tint_symbol_3.tint_symbol, tint_symbol_3.perspective_center, tint_symbol_3.perspective_centroid, tint_symbol_3.perspective_sample, tint_symbol_3.linear_center, tint_symbol_3.linear_centroid, tint_symbol_3.linear_sample); - tint_symbol_1_inner(tint_symbol_5); - return; -} -layout(location = 0) in float none; -layout(location = 1) flat in float tint_symbol; -layout(location = 2) in float perspective_center; -layout(location = 3) centroid in float perspective_centroid; -layout(location = 4) in float perspective_sample; -layout(location = 5) in float linear_center; -layout(location = 6) centroid in float linear_centroid; -layout(location = 7) in float linear_sample; - void main() { - tint_symbol_4 inputs; - inputs.none = none; - inputs.tint_symbol = tint_symbol; - inputs.perspective_center = perspective_center; - inputs.perspective_centroid = perspective_centroid; - inputs.perspective_sample = perspective_sample; - inputs.linear_center = linear_center; - inputs.linear_centroid = linear_centroid; - inputs.linear_sample = linear_sample; - tint_symbol_1(inputs); + In tint_symbol_4 = In(none_1, tint_symbol_3, perspective_center_1, perspective_centroid_1, perspective_sample_1, linear_center_1, linear_centroid_1, linear_sample_1); + tint_symbol_1(tint_symbol_4); + return; } - diff --git a/test/shader_io/interpolate_integers.wgsl.expected.glsl b/test/shader_io/interpolate_integers.wgsl.expected.glsl index d6abebfcab..23e68312f5 100644 --- a/test/shader_io/interpolate_integers.wgsl.expected.glsl +++ b/test/shader_io/interpolate_integers.wgsl.expected.glsl @@ -1,6 +1,10 @@ #version 310 es precision mediump float; +layout(location = 0) flat out int i_1; +layout(location = 1) flat out uint u_1; +layout(location = 2) flat out ivec4 vi_1; +layout(location = 3) flat out uvec4 vu_1; struct Interface { int i; uint u; @@ -9,62 +13,30 @@ struct Interface { vec4 pos; }; -struct tint_symbol { - int i; - uint u; - ivec4 vi; - uvec4 vu; - vec4 pos; -}; - -Interface vert_main_inner() { - Interface tint_symbol_4 = Interface(0, 0u, ivec4(0, 0, 0, 0), uvec4(0u, 0u, 0u, 0u), vec4(0.0f, 0.0f, 0.0f, 0.0f)); - return tint_symbol_4; +Interface vert_main() { + Interface tint_symbol = Interface(0, 0u, ivec4(0, 0, 0, 0), uvec4(0u, 0u, 0u, 0u), vec4(0.0f, 0.0f, 0.0f, 0.0f)); + return tint_symbol; } -struct tint_symbol_2 { - int i; - uint u; - ivec4 vi; - uvec4 vu; - vec4 pos; -}; - -struct tint_symbol_3 { - int value; -}; - -tint_symbol vert_main() { - Interface inner_result = vert_main_inner(); - tint_symbol wrapper_result = tint_symbol(0, 0u, ivec4(0, 0, 0, 0), uvec4(0u, 0u, 0u, 0u), vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.i = inner_result.i; - wrapper_result.u = inner_result.u; - wrapper_result.vi = inner_result.vi; - wrapper_result.vu = inner_result.vu; - wrapper_result.pos = inner_result.pos; - return wrapper_result; -} -layout(location = 0) flat out int i; -layout(location = 1) flat out uint u; -layout(location = 2) flat out ivec4 vi; -layout(location = 3) flat out uvec4 vu; - - void main() { - tint_symbol outputs; - outputs = vert_main(); - i = outputs.i; - u = outputs.u; - vi = outputs.vi; - vu = outputs.vu; - gl_Position = outputs.pos; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + Interface inner_result = vert_main(); + i_1 = inner_result.i; + u_1 = inner_result.u; + vi_1 = inner_result.vi; + vu_1 = inner_result.vu; + gl_Position = inner_result.pos; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; +layout(location = 0) flat in int i_1; +layout(location = 1) flat in uint u_1; +layout(location = 2) flat in ivec4 vi_1; +layout(location = 3) flat in uvec4 vu_1; +layout(location = 0) out int value; struct Interface { int i; uint u; @@ -73,53 +45,13 @@ struct Interface { vec4 pos; }; -struct tint_symbol { - int i; - uint u; - ivec4 vi; - uvec4 vu; - vec4 pos; -}; - -struct tint_symbol_2 { - int i; - uint u; - ivec4 vi; - uvec4 vu; - vec4 pos; -}; - -struct tint_symbol_3 { - int value; -}; - -int frag_main_inner(Interface inputs) { +int frag_main(Interface inputs) { return inputs.i; } -tint_symbol_3 frag_main(tint_symbol_2 tint_symbol_1) { - Interface tint_symbol_4 = Interface(tint_symbol_1.i, tint_symbol_1.u, tint_symbol_1.vi, tint_symbol_1.vu, tint_symbol_1.pos); - int inner_result_1 = frag_main_inner(tint_symbol_4); - tint_symbol_3 wrapper_result_1 = tint_symbol_3(0); - wrapper_result_1.value = inner_result_1; - return wrapper_result_1; -} -layout(location = 0) flat in int i; -layout(location = 1) flat in uint u; -layout(location = 2) flat in ivec4 vi; -layout(location = 3) flat in uvec4 vu; - -layout(location = 0) out int value; - void main() { - tint_symbol_2 inputs; - inputs.i = i; - inputs.u = u; - inputs.vi = vi; - inputs.vu = vu; - inputs.pos = gl_FragCoord; - tint_symbol_3 outputs; - outputs = frag_main(inputs); - value = outputs.value; + Interface tint_symbol = Interface(i_1, u_1, vi_1, vu_1, gl_FragCoord); + int inner_result = frag_main(tint_symbol); + value = inner_result; + return; } - diff --git a/test/shader_io/interpolate_return_struct.wgsl.expected.glsl b/test/shader_io/interpolate_return_struct.wgsl.expected.glsl index 27a4b0f3f6..5d0b07f846 100644 --- a/test/shader_io/interpolate_return_struct.wgsl.expected.glsl +++ b/test/shader_io/interpolate_return_struct.wgsl.expected.glsl @@ -1,6 +1,14 @@ #version 310 es precision mediump float; +layout(location = 0) out float none_1; +layout(location = 1) flat out float tint_symbol_2; +layout(location = 2) out float perspective_center_1; +layout(location = 3) centroid out float perspective_centroid_1; +layout(location = 4) out float perspective_sample_1; +layout(location = 5) out float linear_center_1; +layout(location = 6) centroid out float linear_centroid_1; +layout(location = 7) out float linear_sample_1; struct Out { vec4 pos; float none; @@ -13,60 +21,23 @@ struct Out { float linear_sample; }; -struct tint_symbol_2 { - float none; - float tint_symbol; - float perspective_center; - float perspective_centroid; - float perspective_sample; - float linear_center; - float linear_centroid; - float linear_sample; - vec4 pos; -}; - -Out tint_symbol_1_inner() { +Out tint_symbol_1() { Out tint_symbol_3 = Out(vec4(0.0f, 0.0f, 0.0f, 0.0f), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); return tint_symbol_3; } -tint_symbol_2 tint_symbol_1() { - Out inner_result = tint_symbol_1_inner(); - tint_symbol_2 wrapper_result = tint_symbol_2(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.pos = inner_result.pos; - wrapper_result.none = inner_result.none; - wrapper_result.tint_symbol = inner_result.tint_symbol; - wrapper_result.perspective_center = inner_result.perspective_center; - wrapper_result.perspective_centroid = inner_result.perspective_centroid; - wrapper_result.perspective_sample = inner_result.perspective_sample; - wrapper_result.linear_center = inner_result.linear_center; - wrapper_result.linear_centroid = inner_result.linear_centroid; - wrapper_result.linear_sample = inner_result.linear_sample; - return wrapper_result; -} -layout(location = 0) out float none; -layout(location = 1) flat out float tint_symbol; -layout(location = 2) out float perspective_center; -layout(location = 3) centroid out float perspective_centroid; -layout(location = 4) out float perspective_sample; -layout(location = 5) out float linear_center; -layout(location = 6) centroid out float linear_centroid; -layout(location = 7) out float linear_sample; - - void main() { - tint_symbol_2 outputs; - outputs = tint_symbol_1(); - none = outputs.none; - tint_symbol = outputs.tint_symbol; - perspective_center = outputs.perspective_center; - perspective_centroid = outputs.perspective_centroid; - perspective_sample = outputs.perspective_sample; - linear_center = outputs.linear_center; - linear_centroid = outputs.linear_centroid; - linear_sample = outputs.linear_sample; - gl_Position = outputs.pos; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + Out inner_result = tint_symbol_1(); + gl_Position = inner_result.pos; + none_1 = inner_result.none; + tint_symbol_2 = inner_result.tint_symbol; + perspective_center_1 = inner_result.perspective_center; + perspective_centroid_1 = inner_result.perspective_centroid; + perspective_sample_1 = inner_result.perspective_sample; + linear_center_1 = inner_result.linear_center; + linear_centroid_1 = inner_result.linear_centroid; + linear_sample_1 = inner_result.linear_sample; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - diff --git a/test/shader_io/invariant.wgsl.expected.glsl b/test/shader_io/invariant.wgsl.expected.glsl index e80be2cce1..f8f98d7a32 100644 --- a/test/shader_io/invariant.wgsl.expected.glsl +++ b/test/shader_io/invariant.wgsl.expected.glsl @@ -1,27 +1,14 @@ #version 310 es precision mediump float; -struct tint_symbol_1 { - vec4 value; -}; - -vec4 tint_symbol_inner() { +vec4 tint_symbol() { return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol_1 tint_symbol() { - vec4 inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = tint_symbol(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - diff --git a/test/shader_io/invariant_struct_member.wgsl.expected.glsl b/test/shader_io/invariant_struct_member.wgsl.expected.glsl index df27cb03a4..5f01801e30 100644 --- a/test/shader_io/invariant_struct_member.wgsl.expected.glsl +++ b/test/shader_io/invariant_struct_member.wgsl.expected.glsl @@ -5,28 +5,15 @@ struct Out { vec4 pos; }; -struct tint_symbol_1 { - vec4 pos; -}; - -Out tint_symbol_inner() { - Out tint_symbol_2 = Out(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - return tint_symbol_2; +Out tint_symbol() { + Out tint_symbol_1 = Out(vec4(0.0f, 0.0f, 0.0f, 0.0f)); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - Out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.pos = inner_result.pos; - return wrapper_result; -} - - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - gl_Position = outputs.pos; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + Out inner_result = tint_symbol(); + gl_Position = inner_result.pos; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - diff --git a/test/shader_io/shared_struct_different_stages.wgsl.expected.glsl b/test/shader_io/shared_struct_different_stages.wgsl.expected.glsl index 5ca3021db1..cac9b6b6f8 100644 --- a/test/shader_io/shared_struct_different_stages.wgsl.expected.glsl +++ b/test/shader_io/shared_struct_different_stages.wgsl.expected.glsl @@ -1,91 +1,46 @@ #version 310 es precision mediump float; +layout(location = 1) out float col1_1; +layout(location = 2) out float col2_1; struct Interface { float col1; float col2; vec4 pos; }; -struct tint_symbol { - float col1; - float col2; - vec4 pos; -}; - -Interface vert_main_inner() { - Interface tint_symbol_3 = Interface(0.400000006f, 0.600000024f, vec4(0.0f, 0.0f, 0.0f, 0.0f)); - return tint_symbol_3; +Interface vert_main() { + Interface tint_symbol = Interface(0.400000006f, 0.600000024f, vec4(0.0f, 0.0f, 0.0f, 0.0f)); + return tint_symbol; } -struct tint_symbol_2 { - float col1; - float col2; - vec4 pos; -}; - -tint_symbol vert_main() { - Interface inner_result = vert_main_inner(); - tint_symbol wrapper_result = tint_symbol(0.0f, 0.0f, vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.col1 = inner_result.col1; - wrapper_result.col2 = inner_result.col2; - wrapper_result.pos = inner_result.pos; - return wrapper_result; -} -layout(location = 1) out float col1; -layout(location = 2) out float col2; - - void main() { - tint_symbol outputs; - outputs = vert_main(); - col1 = outputs.col1; - col2 = outputs.col2; - gl_Position = outputs.pos; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + Interface inner_result = vert_main(); + col1_1 = inner_result.col1; + col2_1 = inner_result.col2; + gl_Position = inner_result.pos; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; +layout(location = 1) in float col1_1; +layout(location = 2) in float col2_1; struct Interface { float col1; float col2; vec4 pos; }; -struct tint_symbol { - float col1; - float col2; - vec4 pos; -}; - -struct tint_symbol_2 { - float col1; - float col2; - vec4 pos; -}; - -void frag_main_inner(Interface colors) { +void frag_main(Interface colors) { float r = colors.col1; float g = colors.col2; } -void frag_main(tint_symbol_2 tint_symbol_1) { - Interface tint_symbol_3 = Interface(tint_symbol_1.col1, tint_symbol_1.col2, tint_symbol_1.pos); - frag_main_inner(tint_symbol_3); +void main() { + Interface tint_symbol = Interface(col1_1, col2_1, gl_FragCoord); + frag_main(tint_symbol); return; } -layout(location = 1) in float col1; -layout(location = 2) in float col2; - - -void main() { - tint_symbol_2 inputs; - inputs.col1 = col1; - inputs.col2 = col2; - inputs.pos = gl_FragCoord; - frag_main(inputs); -} - diff --git a/test/shader_io/shared_struct_helper_function.wgsl.expected.glsl b/test/shader_io/shared_struct_helper_function.wgsl.expected.glsl index aea561ab04..34fecd54a4 100644 --- a/test/shader_io/shared_struct_helper_function.wgsl.expected.glsl +++ b/test/shader_io/shared_struct_helper_function.wgsl.expected.glsl @@ -1,92 +1,52 @@ #version 310 es precision mediump float; +layout(location = 0) flat out int loc0_1; struct VertexOutput { vec4 pos; int loc0; }; VertexOutput foo(float x) { - VertexOutput tint_symbol_2 = VertexOutput(vec4(x, x, x, 1.0f), 42); - return tint_symbol_2; + VertexOutput tint_symbol = VertexOutput(vec4(x, x, x, 1.0f), 42); + return tint_symbol; } -struct tint_symbol { - int loc0; - vec4 pos; -}; - -VertexOutput vert_main1_inner() { +VertexOutput vert_main1() { return foo(0.5f); } -struct tint_symbol_1 { - int loc0; - vec4 pos; -}; - -tint_symbol vert_main1() { - VertexOutput inner_result = vert_main1_inner(); - tint_symbol wrapper_result = tint_symbol(0, vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.pos = inner_result.pos; - wrapper_result.loc0 = inner_result.loc0; - return wrapper_result; -} -layout(location = 0) flat out int loc0; - - void main() { - tint_symbol outputs; - outputs = vert_main1(); - loc0 = outputs.loc0; - gl_Position = outputs.pos; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + VertexOutput inner_result = vert_main1(); + gl_Position = inner_result.pos; + loc0_1 = inner_result.loc0; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - #version 310 es precision mediump float; +layout(location = 0) flat out int loc0_1; struct VertexOutput { vec4 pos; int loc0; }; VertexOutput foo(float x) { - VertexOutput tint_symbol_2 = VertexOutput(vec4(x, x, x, 1.0f), 42); - return tint_symbol_2; + VertexOutput tint_symbol = VertexOutput(vec4(x, x, x, 1.0f), 42); + return tint_symbol; } -struct tint_symbol { - int loc0; - vec4 pos; -}; - -struct tint_symbol_1 { - int loc0; - vec4 pos; -}; - -VertexOutput vert_main2_inner() { +VertexOutput vert_main2() { return foo(0.25f); } -tint_symbol_1 vert_main2() { - VertexOutput inner_result_1 = vert_main2_inner(); - tint_symbol_1 wrapper_result_1 = tint_symbol_1(0, vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result_1.pos = inner_result_1.pos; - wrapper_result_1.loc0 = inner_result_1.loc0; - return wrapper_result_1; -} -layout(location = 0) flat out int loc0; - - void main() { - tint_symbol_1 outputs; - outputs = vert_main2(); - loc0 = outputs.loc0; - gl_Position = outputs.pos; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + VertexOutput inner_result = vert_main2(); + gl_Position = inner_result.pos; + loc0_1 = inner_result.loc0; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - diff --git a/test/shader_io/shared_struct_storage_buffer.wgsl.expected.glsl b/test/shader_io/shared_struct_storage_buffer.wgsl.expected.glsl index 25f66459ab..69b31556bd 100644 --- a/test/shader_io/shared_struct_storage_buffer.wgsl.expected.glsl +++ b/test/shader_io/shared_struct_storage_buffer.wgsl.expected.glsl @@ -3,6 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) in float f_1; +layout(location = 1) flat in uint u_1; struct S { float f; uint u; @@ -14,39 +16,21 @@ layout(binding = 0) buffer S_1 { uint u; vec4 v; } tint_symbol; -struct tint_symbol_3 { - float f; - uint u; - vec4 v; -}; - -void frag_main_inner(S tint_symbol_1) { +void frag_main(S tint_symbol_1) { float f = tint_symbol_1.f; uint u = tint_symbol_1.u; vec4 v = tint_symbol_1.v; tint_symbol = tint_symbol_1; } -void frag_main(tint_symbol_3 tint_symbol_2) { - S tint_symbol_4 = S(tint_symbol_2.f, tint_symbol_2.u, tint_symbol_2.v); - frag_main_inner(tint_symbol_4); +void main() { + S tint_symbol_2 = S(f_1, u_1, gl_FragCoord); + frag_main(tint_symbol_2); return; } -layout(location = 0) in float f; -layout(location = 1) flat in uint u; - - -void main() { - tint_symbol_3 inputs; - inputs.f = f; - inputs.u = u; - inputs.v = gl_FragCoord; - frag_main(inputs); -} - Error parsing GLSL shader: -ERROR: 0:25: 'assign' : cannot convert from ' in structure{ global mediump float f, global mediump uint u, global mediump 4-component vector of float v}' to 'layout( binding=0 column_major shared) buffer block{layout( column_major shared) buffer mediump float f, layout( column_major shared) buffer mediump uint u, layout( column_major shared) buffer mediump 4-component vector of float v}' -ERROR: 0:25: '' : compilation terminated +ERROR: 0:21: 'assign' : cannot convert from ' in structure{ global mediump float f, global mediump uint u, global mediump 4-component vector of float v}' to 'layout( binding=0 column_major shared) buffer block{layout( column_major shared) buffer mediump float f, layout( column_major shared) buffer mediump uint u, layout( column_major shared) buffer mediump 4-component vector of float v}' +ERROR: 0:21: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/shader_io/vertex_input_builtins.wgsl.expected.glsl b/test/shader_io/vertex_input_builtins.wgsl.expected.glsl index 5fc5936ff4..b8984e1b1d 100644 --- a/test/shader_io/vertex_input_builtins.wgsl.expected.glsl +++ b/test/shader_io/vertex_input_builtins.wgsl.expected.glsl @@ -1,38 +1,15 @@ #version 310 es precision mediump float; -struct tint_symbol_2 { - uint vertex_index; - uint instance_index; -}; - -struct tint_symbol_3 { - vec4 value; -}; - -vec4 tint_symbol_inner(uint vertex_index, uint instance_index) { +vec4 tint_symbol(uint vertex_index, uint instance_index) { uint foo = (vertex_index + instance_index); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) { - vec4 inner_result = tint_symbol_inner(tint_symbol_1.vertex_index, tint_symbol_1.instance_index); - tint_symbol_3 wrapper_result = tint_symbol_3(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - - - void main() { - tint_symbol_2 inputs; - inputs.vertex_index = uint(gl_VertexID); - inputs.instance_index = uint(gl_InstanceID); - tint_symbol_3 outputs; - outputs = tint_symbol(inputs); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = tint_symbol(uint(gl_VertexID), uint(gl_InstanceID)); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - diff --git a/test/shader_io/vertex_input_builtins_struct.wgsl.expected.glsl b/test/shader_io/vertex_input_builtins_struct.wgsl.expected.glsl index 159c575144..2df40792b0 100644 --- a/test/shader_io/vertex_input_builtins_struct.wgsl.expected.glsl +++ b/test/shader_io/vertex_input_builtins_struct.wgsl.expected.glsl @@ -6,39 +6,16 @@ struct VertexInputs { uint instance_index; }; -struct tint_symbol_2 { - uint vertex_index; - uint instance_index; -}; - -struct tint_symbol_3 { - vec4 value; -}; - -vec4 tint_symbol_inner(VertexInputs inputs) { +vec4 tint_symbol(VertexInputs inputs) { uint foo = (inputs.vertex_index + inputs.instance_index); return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) { - VertexInputs tint_symbol_4 = VertexInputs(tint_symbol_1.vertex_index, tint_symbol_1.instance_index); - vec4 inner_result = tint_symbol_inner(tint_symbol_4); - tint_symbol_3 wrapper_result = tint_symbol_3(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - - - void main() { - tint_symbol_2 inputs; - inputs.vertex_index = uint(gl_VertexID); - inputs.instance_index = uint(gl_InstanceID); - tint_symbol_3 outputs; - outputs = tint_symbol(inputs); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + VertexInputs tint_symbol_1 = VertexInputs(uint(gl_VertexID), uint(gl_InstanceID)); + vec4 inner_result = tint_symbol(tint_symbol_1); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - diff --git a/test/shader_io/vertex_input_locations.wgsl.expected.glsl b/test/shader_io/vertex_input_locations.wgsl.expected.glsl index ff2bf50f12..2cf1f18263 100644 --- a/test/shader_io/vertex_input_locations.wgsl.expected.glsl +++ b/test/shader_io/vertex_input_locations.wgsl.expected.glsl @@ -1,18 +1,11 @@ #version 310 es precision mediump float; -struct tint_symbol_2 { - int loc0; - uint loc1; - float loc2; - vec4 loc3; -}; - -struct tint_symbol_3 { - vec4 value; -}; - -vec4 tint_symbol_inner(int loc0, uint loc1, float loc2, vec4 loc3) { +layout(location = 0) in int loc0_1; +layout(location = 1) in uint loc1_1; +layout(location = 2) in float loc2_1; +layout(location = 3) in vec4 loc3_1; +vec4 tint_symbol(int loc0, uint loc1, float loc2, vec4 loc3) { int i = loc0; uint u = loc1; float f = loc2; @@ -20,28 +13,10 @@ vec4 tint_symbol_inner(int loc0, uint loc1, float loc2, vec4 loc3) { return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) { - vec4 inner_result = tint_symbol_inner(tint_symbol_1.loc0, tint_symbol_1.loc1, tint_symbol_1.loc2, tint_symbol_1.loc3); - tint_symbol_3 wrapper_result = tint_symbol_3(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} -layout(location = 0) in int loc0; -layout(location = 1) in uint loc1; -layout(location = 2) in float loc2; -layout(location = 3) in vec4 loc3; - - void main() { - tint_symbol_2 inputs; - inputs.loc0 = loc0; - inputs.loc1 = loc1; - inputs.loc2 = loc2; - inputs.loc3 = loc3; - tint_symbol_3 outputs; - outputs = tint_symbol(inputs); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = tint_symbol(loc0_1, loc1_1, loc2_1, loc3_1); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - diff --git a/test/shader_io/vertex_input_locations_struct.wgsl.expected.glsl b/test/shader_io/vertex_input_locations_struct.wgsl.expected.glsl index ba1db5d73d..10cfd1132c 100644 --- a/test/shader_io/vertex_input_locations_struct.wgsl.expected.glsl +++ b/test/shader_io/vertex_input_locations_struct.wgsl.expected.glsl @@ -1,6 +1,10 @@ #version 310 es precision mediump float; +layout(location = 0) in int loc0_1; +layout(location = 1) in uint loc1_1; +layout(location = 2) in float loc2_1; +layout(location = 3) in vec4 loc3_1; struct VertexInputs { int loc0; uint loc1; @@ -8,18 +12,7 @@ struct VertexInputs { vec4 loc3; }; -struct tint_symbol_2 { - int loc0; - uint loc1; - float loc2; - vec4 loc3; -}; - -struct tint_symbol_3 { - vec4 value; -}; - -vec4 tint_symbol_inner(VertexInputs inputs) { +vec4 tint_symbol(VertexInputs inputs) { int i = inputs.loc0; uint u = inputs.loc1; float f = inputs.loc2; @@ -27,29 +20,11 @@ vec4 tint_symbol_inner(VertexInputs inputs) { return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) { - VertexInputs tint_symbol_4 = VertexInputs(tint_symbol_1.loc0, tint_symbol_1.loc1, tint_symbol_1.loc2, tint_symbol_1.loc3); - vec4 inner_result = tint_symbol_inner(tint_symbol_4); - tint_symbol_3 wrapper_result = tint_symbol_3(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} -layout(location = 0) in int loc0; -layout(location = 1) in uint loc1; -layout(location = 2) in float loc2; -layout(location = 3) in vec4 loc3; - - void main() { - tint_symbol_2 inputs; - inputs.loc0 = loc0; - inputs.loc1 = loc1; - inputs.loc2 = loc2; - inputs.loc3 = loc3; - tint_symbol_3 outputs; - outputs = tint_symbol(inputs); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + VertexInputs tint_symbol_1 = VertexInputs(loc0_1, loc1_1, loc2_1, loc3_1); + vec4 inner_result = tint_symbol(tint_symbol_1); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - diff --git a/test/shader_io/vertex_input_mixed.wgsl.expected.glsl b/test/shader_io/vertex_input_mixed.wgsl.expected.glsl index 29796379dc..86480f6491 100644 --- a/test/shader_io/vertex_input_mixed.wgsl.expected.glsl +++ b/test/shader_io/vertex_input_mixed.wgsl.expected.glsl @@ -1,6 +1,10 @@ #version 310 es precision mediump float; +layout(location = 0) in int loc0_1; +layout(location = 1) in uint loc1_1; +layout(location = 2) in float loc2_1; +layout(location = 3) in vec4 loc3_1; struct VertexInputs0 { uint vertex_index; int loc0; @@ -11,20 +15,7 @@ struct VertexInputs1 { vec4 loc3; }; -struct tint_symbol_2 { - int loc0; - uint loc1; - float loc2; - vec4 loc3; - uint vertex_index; - uint instance_index; -}; - -struct tint_symbol_3 { - vec4 value; -}; - -vec4 tint_symbol_inner(VertexInputs0 inputs0, uint loc1, uint instance_index, VertexInputs1 inputs1) { +vec4 tint_symbol(VertexInputs0 inputs0, uint loc1, uint instance_index, VertexInputs1 inputs1) { uint foo = (inputs0.vertex_index + instance_index); int i = inputs0.loc0; uint u = loc1; @@ -33,34 +24,12 @@ vec4 tint_symbol_inner(VertexInputs0 inputs0, uint loc1, uint instance_index, Ve return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) { - VertexInputs0 tint_symbol_4 = VertexInputs0(tint_symbol_1.vertex_index, tint_symbol_1.loc0); - VertexInputs1 tint_symbol_5 = VertexInputs1(tint_symbol_1.loc2, tint_symbol_1.loc3); - vec4 inner_result = tint_symbol_inner(tint_symbol_4, tint_symbol_1.loc1, tint_symbol_1.instance_index, tint_symbol_5); - tint_symbol_3 wrapper_result = tint_symbol_3(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} -layout(location = 0) in int loc0; -layout(location = 1) in uint loc1; -layout(location = 2) in float loc2; -layout(location = 3) in vec4 loc3; - - - - void main() { - tint_symbol_2 inputs; - inputs.loc0 = loc0; - inputs.loc1 = loc1; - inputs.loc2 = loc2; - inputs.loc3 = loc3; - inputs.vertex_index = uint(gl_VertexID); - inputs.instance_index = uint(gl_InstanceID); - tint_symbol_3 outputs; - outputs = tint_symbol(inputs); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + VertexInputs0 tint_symbol_1 = VertexInputs0(uint(gl_VertexID), loc0_1); + VertexInputs1 tint_symbol_2 = VertexInputs1(loc2_1, loc3_1); + vec4 inner_result = tint_symbol(tint_symbol_1, loc1_1, uint(gl_InstanceID), tint_symbol_2); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - diff --git a/test/shader_io/vertex_output_builtins.wgsl.expected.glsl b/test/shader_io/vertex_output_builtins.wgsl.expected.glsl index b963e6200d..eda2ca250b 100644 --- a/test/shader_io/vertex_output_builtins.wgsl.expected.glsl +++ b/test/shader_io/vertex_output_builtins.wgsl.expected.glsl @@ -1,27 +1,14 @@ #version 310 es precision mediump float; -struct tint_symbol_1 { - vec4 value; -}; - -vec4 tint_symbol_inner() { +vec4 tint_symbol() { return vec4(1.0f, 2.0f, 3.0f, 4.0f); } -tint_symbol_1 tint_symbol() { - vec4 inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} - - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - gl_Position = outputs.value; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + vec4 inner_result = tint_symbol(); + gl_Position = inner_result; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - diff --git a/test/shader_io/vertex_output_builtins_struct.wgsl.expected.glsl b/test/shader_io/vertex_output_builtins_struct.wgsl.expected.glsl index 5206366ce1..07fcbdca54 100644 --- a/test/shader_io/vertex_output_builtins_struct.wgsl.expected.glsl +++ b/test/shader_io/vertex_output_builtins_struct.wgsl.expected.glsl @@ -5,28 +5,15 @@ struct VertexOutputs { vec4 position; }; -struct tint_symbol_1 { - vec4 position; -}; - -VertexOutputs tint_symbol_inner() { - VertexOutputs tint_symbol_2 = VertexOutputs(vec4(1.0f, 2.0f, 3.0f, 4.0f)); - return tint_symbol_2; +VertexOutputs tint_symbol() { + VertexOutputs tint_symbol_1 = VertexOutputs(vec4(1.0f, 2.0f, 3.0f, 4.0f)); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - VertexOutputs inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.position = inner_result.position; - return wrapper_result; -} - - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - gl_Position = outputs.position; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + VertexOutputs inner_result = tint_symbol(); + gl_Position = inner_result.position; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - diff --git a/test/shader_io/vertex_output_locations_struct.wgsl.expected.glsl b/test/shader_io/vertex_output_locations_struct.wgsl.expected.glsl index a1f89aeb8f..ba1a70dad0 100644 --- a/test/shader_io/vertex_output_locations_struct.wgsl.expected.glsl +++ b/test/shader_io/vertex_output_locations_struct.wgsl.expected.glsl @@ -1,6 +1,10 @@ #version 310 es precision mediump float; +layout(location = 0) flat out int loc0_1; +layout(location = 1) flat out uint loc1_1; +layout(location = 2) out float loc2_1; +layout(location = 3) out vec4 loc3_1; struct VertexOutputs { int loc0; uint loc1; @@ -9,44 +13,19 @@ struct VertexOutputs { vec4 position; }; -struct tint_symbol_1 { - int loc0; - uint loc1; - float loc2; - vec4 loc3; - vec4 position; -}; - -VertexOutputs tint_symbol_inner() { - VertexOutputs tint_symbol_2 = VertexOutputs(1, 1u, 1.0f, vec4(1.0f, 2.0f, 3.0f, 4.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); - return tint_symbol_2; +VertexOutputs tint_symbol() { + VertexOutputs tint_symbol_1 = VertexOutputs(1, 1u, 1.0f, vec4(1.0f, 2.0f, 3.0f, 4.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - VertexOutputs inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(0, 0u, 0.0f, vec4(0.0f, 0.0f, 0.0f, 0.0f), vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.loc0 = inner_result.loc0; - wrapper_result.loc1 = inner_result.loc1; - wrapper_result.loc2 = inner_result.loc2; - wrapper_result.loc3 = inner_result.loc3; - wrapper_result.position = inner_result.position; - return wrapper_result; -} -layout(location = 0) flat out int loc0; -layout(location = 1) flat out uint loc1; -layout(location = 2) out float loc2; -layout(location = 3) out vec4 loc3; - - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - loc0 = outputs.loc0; - loc1 = outputs.loc1; - loc2 = outputs.loc2; - loc3 = outputs.loc3; - gl_Position = outputs.position; - gl_Position.z = 2.0 * gl_Position.z - gl_Position.w; - gl_Position.y = -gl_Position.y; + VertexOutputs inner_result = tint_symbol(); + loc0_1 = inner_result.loc0; + loc1_1 = inner_result.loc1; + loc2_1 = inner_result.loc2; + loc3_1 = inner_result.loc3; + gl_Position = inner_result.position; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; } - diff --git a/test/shadowing/alias/let.wgsl.expected.glsl b/test/shadowing/alias/let.wgsl.expected.glsl index f084e64d54..5044436ea6 100644 --- a/test/shadowing/alias/let.wgsl.expected.glsl +++ b/test/shadowing/alias/let.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { { int a_1 = 0; diff --git a/test/shadowing/alias/param.wgsl.expected.glsl b/test/shadowing/alias/param.wgsl.expected.glsl index b685a99857..5a0a77e9e8 100644 --- a/test/shadowing/alias/param.wgsl.expected.glsl +++ b/test/shadowing/alias/param.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f(int a_1) { int b = a_1; } diff --git a/test/shadowing/alias/var.wgsl.expected.glsl b/test/shadowing/alias/var.wgsl.expected.glsl index f084e64d54..5044436ea6 100644 --- a/test/shadowing/alias/var.wgsl.expected.glsl +++ b/test/shadowing/alias/var.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { { int a_1 = 0; diff --git a/test/shadowing/function/let.wgsl.expected.glsl b/test/shadowing/function/let.wgsl.expected.glsl index ad0de52784..d653a86285 100644 --- a/test/shadowing/function/let.wgsl.expected.glsl +++ b/test/shadowing/function/let.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void a() { { int a_1 = 1; diff --git a/test/shadowing/function/param.wgsl.expected.glsl b/test/shadowing/function/param.wgsl.expected.glsl index 00ac116389..56a01bd23c 100644 --- a/test/shadowing/function/param.wgsl.expected.glsl +++ b/test/shadowing/function/param.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void a(int a_1) { int b = a_1; } diff --git a/test/shadowing/function/var.wgsl.expected.glsl b/test/shadowing/function/var.wgsl.expected.glsl index 6b283c8a08..9f37e92667 100644 --- a/test/shadowing/function/var.wgsl.expected.glsl +++ b/test/shadowing/function/var.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct a { int a; }; diff --git a/test/shadowing/param/function.wgsl.expected.glsl b/test/shadowing/param/function.wgsl.expected.glsl index 3a4f23ebf2..f039a157e9 100644 --- a/test/shadowing/param/function.wgsl.expected.glsl +++ b/test/shadowing/param/function.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void a(int a_1) { { int a_2 = a_1; diff --git a/test/shadowing/param/let.wgsl.expected.glsl b/test/shadowing/param/let.wgsl.expected.glsl index 6c7a3b5d82..1b4f45fa74 100644 --- a/test/shadowing/param/let.wgsl.expected.glsl +++ b/test/shadowing/param/let.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f(int a) { { int b = a; diff --git a/test/shadowing/param/var.wgsl.expected.glsl b/test/shadowing/param/var.wgsl.expected.glsl index fc665c4bbe..b78cdf3496 100644 --- a/test/shadowing/param/var.wgsl.expected.glsl +++ b/test/shadowing/param/var.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f(int a) { { int a_1 = a; diff --git a/test/shadowing/struct/let.wgsl.expected.glsl b/test/shadowing/struct/let.wgsl.expected.glsl index 6b283c8a08..9f37e92667 100644 --- a/test/shadowing/struct/let.wgsl.expected.glsl +++ b/test/shadowing/struct/let.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct a { int a; }; diff --git a/test/shadowing/struct/param.wgsl.expected.glsl b/test/shadowing/struct/param.wgsl.expected.glsl index e039dded5a..7ede4e9d3e 100644 --- a/test/shadowing/struct/param.wgsl.expected.glsl +++ b/test/shadowing/struct/param.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct a { int a; }; diff --git a/test/shadowing/struct/var.wgsl.expected.glsl b/test/shadowing/struct/var.wgsl.expected.glsl index 6b283c8a08..9f37e92667 100644 --- a/test/shadowing/struct/var.wgsl.expected.glsl +++ b/test/shadowing/struct/var.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct a { int a; }; diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_body.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_body.wgsl.expected.glsl index a66dfcdaca..70da6a8d3b 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_body.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_body.wgsl.expected.glsl @@ -17,7 +17,6 @@ layout(binding = 4) uniform Uniforms_1 { uint i; } uniforms; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { InnerS v = InnerS(0); OuterS s1 = OuterS(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))); @@ -26,10 +25,10 @@ void tint_symbol() { s1.a1[uniforms.i] = v; } } - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_continuing.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_continuing.wgsl.expected.glsl index 4b6e2b5ea8..b1e9af3bbe 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_continuing.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_continuing.wgsl.expected.glsl @@ -17,7 +17,6 @@ layout(binding = 4) uniform Uniforms_1 { uint i; } uniforms; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { InnerS v = InnerS(0); OuterS s1 = OuterS(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))); @@ -26,10 +25,10 @@ void tint_symbol() { i = (i + 1); } } - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_init.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_init.wgsl.expected.glsl index ae870ac8a8..656ae481bc 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_init.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/in_for_loop_init.wgsl.expected.glsl @@ -17,7 +17,6 @@ layout(binding = 4) uniform Uniforms_1 { uint i; } uniforms; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { InnerS v = InnerS(0); OuterS s1 = OuterS(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))); @@ -26,10 +25,10 @@ void tint_symbol() { for(s1.a1[uniforms.i] = v; (i < 4); i = (i + 1)) { } } - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/indexing_with_side_effect_func.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/indexing_with_side_effect_func.wgsl.expected.glsl index 6f268589af..a5fbc3cad3 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/indexing_with_side_effect_func.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/indexing_with_side_effect_func.wgsl.expected.glsl @@ -29,15 +29,14 @@ layout(binding = 4) uniform Uniforms_1 { uint j; } uniforms; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { InnerS v = InnerS(0); OuterS s = OuterS(S1[8](S1(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))), S1(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))), S1(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))), S1(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))), S1(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))), S1(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))), S1(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))), S1(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))))); s.a1[getNextIndex()].a2[uniforms.j] = v; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_array.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_array.wgsl.expected.glsl index 3a11502990..423aebc314 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_array.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_array.wgsl.expected.glsl @@ -17,15 +17,14 @@ layout(binding = 4) uniform Uniforms_1 { uint i; } uniforms; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { InnerS v = InnerS(0); OuterS s1 = OuterS(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))); s1.a1[uniforms.i] = v; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_array.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_array.wgsl.expected.glsl index 5a6cc5e985..da1702c581 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_array.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_array.wgsl.expected.glsl @@ -19,15 +19,14 @@ layout(binding = 4) uniform Uniforms_1 { uint j; } uniforms; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { InnerS v = InnerS(0); OuterS s1 = OuterS(InnerS[8][8](InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0)), InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0)), InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0)), InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0)), InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0)), InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0)), InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0)), InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0)))); s1.a1[uniforms.i][uniforms.j] = v; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct.wgsl.expected.glsl index 7501db286d..8a70eb44a9 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct.wgsl.expected.glsl @@ -21,15 +21,14 @@ layout(binding = 4) uniform Uniforms_1 { uint i; } uniforms; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { InnerS v = InnerS(0); OuterS s1 = OuterS(S1[8](S1(InnerS(0)), S1(InnerS(0)), S1(InnerS(0)), S1(InnerS(0)), S1(InnerS(0)), S1(InnerS(0)), S1(InnerS(0)), S1(InnerS(0)))); s1.a1[uniforms.i].s2 = v; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct_array.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct_array.wgsl.expected.glsl index ac27dfdc1b..fc3b5d07e2 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct_array.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_array_struct_array.wgsl.expected.glsl @@ -23,15 +23,14 @@ layout(binding = 4) uniform Uniforms_1 { uint j; } uniforms; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { InnerS v = InnerS(0); OuterS s = OuterS(S1[8](S1(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))), S1(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))), S1(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))), S1(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))), S1(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))), S1(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))), S1(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))), S1(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))))); s.a1[uniforms.i].a2[uniforms.j] = v; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array.wgsl.expected.glsl index 4d78cf61df..cf0aef0301 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array.wgsl.expected.glsl @@ -16,14 +16,13 @@ layout(binding = 4) uniform Uniforms_1 { layout(binding = 0) buffer OuterS_1 { InnerS a1[]; } s1; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { InnerS v = InnerS(0); s1.a1[uniforms.i] = v; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array_struct_array.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array_struct_array.wgsl.expected.glsl index f31f4e560d..28a11c1d71 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array_struct_array.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_dynamic_array_struct_array.wgsl.expected.glsl @@ -22,14 +22,13 @@ layout(binding = 4) uniform Uniforms_1 { layout(binding = 0) buffer OuterS_1 { S1 a1[]; } s; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { InnerS v = InnerS(0); s.a1[uniforms.i].a2[uniforms.j] = v; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_matrix.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_matrix.wgsl.expected.glsl index e950c13ad9..98dbfd659c 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_matrix.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_matrix.wgsl.expected.glsl @@ -13,15 +13,14 @@ layout(binding = 4) uniform Uniforms_1 { uint i; } uniforms; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { OuterS s1 = OuterS(mat2x4(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f)); s1.m1[uniforms.i] = vec4(1.0f); s1.m1[uniforms.i][uniforms.i] = 1.0f; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_multiple_arrays.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_multiple_arrays.wgsl.expected.glsl index f1183be611..a4067c0ee4 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_multiple_arrays.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_multiple_arrays.wgsl.expected.glsl @@ -18,16 +18,15 @@ layout(binding = 4) uniform Uniforms_1 { uint i; } uniforms; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { InnerS v = InnerS(0); OuterS s1 = OuterS(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0)), InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))); s1.a1[uniforms.i] = v; s1.a2[uniforms.i] = v; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_struct_array.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_struct_array.wgsl.expected.glsl index 9a696fbdf2..a7d675b170 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_struct_array.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_struct_array.wgsl.expected.glsl @@ -21,15 +21,14 @@ layout(binding = 4) uniform Uniforms_1 { uint i; } uniforms; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { InnerS v = InnerS(0); OuterS s1 = OuterS(S1(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0)))); s1.s2.a[uniforms.i] = v; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/struct_vector.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/struct_vector.wgsl.expected.glsl index d3ceff4598..8cda8e555a 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/struct_vector.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/struct_vector.wgsl.expected.glsl @@ -13,14 +13,13 @@ layout(binding = 4) uniform Uniforms_1 { uint i; } uniforms; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { OuterS s1 = OuterS(vec3(0.0f, 0.0f, 0.0f)); s1.v1[uniforms.i] = 1.0f; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/vector_assign.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/vector_assign.wgsl.expected.glsl index e6f7d4305c..7ee613c418 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/vector_assign.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/vector_assign.wgsl.expected.glsl @@ -17,16 +17,15 @@ uint f(uint i) { return (i + 1u); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { OuterS s1 = OuterS(uint[8](0u, 0u, 0u, 0u, 0u, 0u, 0u, 0u)); vec3 v = vec3(0.0f, 0.0f, 0.0f); v[s1.a1[uniforms.i]] = 1.0f; v[f(s1.a1[uniforms.i])] = 1.0f; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/via_pointer.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/via_pointer.wgsl.expected.glsl index 5f8a2aa753..b1c086f3fe 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/via_pointer.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/via_pointer.wgsl.expected.glsl @@ -17,16 +17,15 @@ layout(binding = 4) uniform Uniforms_1 { uint i; } uniforms; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { InnerS v = InnerS(0); OuterS s1 = OuterS(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))); uint p_save = uniforms.i; s1.a1[p_save] = v; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/indexed_assign_to_array_in_struct/via_pointer_arg.wgsl.expected.glsl b/test/statements/assign/indexed_assign_to_array_in_struct/via_pointer_arg.wgsl.expected.glsl index c9b611c8b1..de6dbc7178 100644 --- a/test/statements/assign/indexed_assign_to_array_in_struct/via_pointer_arg.wgsl.expected.glsl +++ b/test/statements/assign/indexed_assign_to_array_in_struct/via_pointer_arg.wgsl.expected.glsl @@ -22,14 +22,13 @@ void f(inout OuterS p) { p.a1[uniforms.i] = v; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { OuterS s1 = OuterS(InnerS[8](InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0), InnerS(0))); f(s1); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/phony/addr_of_non_constructable.wgsl.expected.glsl b/test/statements/assign/phony/addr_of_non_constructable.wgsl.expected.glsl index 425e6a45c4..09eb4864dc 100644 --- a/test/statements/assign/phony/addr_of_non_constructable.wgsl.expected.glsl +++ b/test/statements/assign/phony/addr_of_non_constructable.wgsl.expected.glsl @@ -4,12 +4,11 @@ precision mediump float; layout(binding = 0) buffer S_1 { int arr[]; } s; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/phony/addr_of_runtime_array.wgsl.expected.glsl b/test/statements/assign/phony/addr_of_runtime_array.wgsl.expected.glsl index 425e6a45c4..09eb4864dc 100644 --- a/test/statements/assign/phony/addr_of_runtime_array.wgsl.expected.glsl +++ b/test/statements/assign/phony/addr_of_runtime_array.wgsl.expected.glsl @@ -4,12 +4,11 @@ precision mediump float; layout(binding = 0) buffer S_1 { int arr[]; } s; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/phony/call.wgsl.expected.glsl b/test/statements/assign/phony/call.wgsl.expected.glsl index 2d825c68f8..dc676cb6d8 100644 --- a/test/statements/assign/phony/call.wgsl.expected.glsl +++ b/test/statements/assign/phony/call.wgsl.expected.glsl @@ -5,13 +5,12 @@ int f(int a, int b, int c) { return ((a * b) + c); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { f(1, 2, 3); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/phony/multiple_side_effects.wgsl.expected.glsl b/test/statements/assign/phony/multiple_side_effects.wgsl.expected.glsl index e615282a67..9e1281f5ab 100644 --- a/test/statements/assign/phony/multiple_side_effects.wgsl.expected.glsl +++ b/test/statements/assign/phony/multiple_side_effects.wgsl.expected.glsl @@ -8,13 +8,12 @@ int f(int a, int b, int c) { void phony_sink(int p0, int p1, int p2) { } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { phony_sink(f(1, 2, 3), f(4, 5, 6), f(7, f(8, 9, 10), 11)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/phony/storage_buffer.wgsl.expected.glsl b/test/statements/assign/phony/storage_buffer.wgsl.expected.glsl index 1e69b6965a..44d8fcc9d8 100644 --- a/test/statements/assign/phony/storage_buffer.wgsl.expected.glsl +++ b/test/statements/assign/phony/storage_buffer.wgsl.expected.glsl @@ -8,12 +8,11 @@ struct S { layout(binding = 0) buffer S_1 { int i; } s; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/assign/phony/uniform_buffer.wgsl.expected.glsl b/test/statements/assign/phony/uniform_buffer.wgsl.expected.glsl index 709afc7ba7..51b42133dd 100644 --- a/test/statements/assign/phony/uniform_buffer.wgsl.expected.glsl +++ b/test/statements/assign/phony/uniform_buffer.wgsl.expected.glsl @@ -9,12 +9,11 @@ layout(binding = 0) uniform S_1 { int i; } u; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/statements/for/basic.wgsl.expected.glsl b/test/statements/for/basic.wgsl.expected.glsl index b76e0d45ec..a624dcb364 100644 --- a/test/statements/for/basic.wgsl.expected.glsl +++ b/test/statements/for/basic.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void some_loop_body() { } diff --git a/test/statements/for/complex.wgsl.expected.glsl b/test/statements/for/complex.wgsl.expected.glsl index 14f0d9f268..39f675ddda 100644 --- a/test/statements/for/complex.wgsl.expected.glsl +++ b/test/statements/for/complex.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void some_loop_body() { } diff --git a/test/statements/for/condition/array_ctor.wgsl.expected.glsl b/test/statements/for/condition/array_ctor.wgsl.expected.glsl index 0bf1e030f6..42330bb79f 100644 --- a/test/statements/for/condition/array_ctor.wgsl.expected.glsl +++ b/test/statements/for/condition/array_ctor.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { int i = 0; while (true) { diff --git a/test/statements/for/condition/basic.wgsl.expected.glsl b/test/statements/for/condition/basic.wgsl.expected.glsl index fb35e67248..5e1d92ffa1 100644 --- a/test/statements/for/condition/basic.wgsl.expected.glsl +++ b/test/statements/for/condition/basic.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { int i = 0; { diff --git a/test/statements/for/condition/struct_ctor.wgsl.expected.glsl b/test/statements/for/condition/struct_ctor.wgsl.expected.glsl index 10033aa54f..853168f8e5 100644 --- a/test/statements/for/condition/struct_ctor.wgsl.expected.glsl +++ b/test/statements/for/condition/struct_ctor.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { int i; }; diff --git a/test/statements/for/continuing/array_ctor.wgsl.expected.glsl b/test/statements/for/continuing/array_ctor.wgsl.expected.glsl index 35bd624d43..d40e419bd5 100644 --- a/test/statements/for/continuing/array_ctor.wgsl.expected.glsl +++ b/test/statements/for/continuing/array_ctor.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { int i = 0; while (true) { diff --git a/test/statements/for/continuing/basic.wgsl.expected.glsl b/test/statements/for/continuing/basic.wgsl.expected.glsl index 812cf5c664..cb625adf12 100644 --- a/test/statements/for/continuing/basic.wgsl.expected.glsl +++ b/test/statements/for/continuing/basic.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { int i = 0; { diff --git a/test/statements/for/continuing/struct_ctor.wgsl.expected.glsl b/test/statements/for/continuing/struct_ctor.wgsl.expected.glsl index 89e6829be5..014a37a9e7 100644 --- a/test/statements/for/continuing/struct_ctor.wgsl.expected.glsl +++ b/test/statements/for/continuing/struct_ctor.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { int i; }; diff --git a/test/statements/for/empty.wgsl.expected.glsl b/test/statements/for/empty.wgsl.expected.glsl index 65c9bf36c1..097b941150 100644 --- a/test/statements/for/empty.wgsl.expected.glsl +++ b/test/statements/for/empty.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { { for(; false; ) { diff --git a/test/statements/for/initializer/array_ctor.wgsl.expected.glsl b/test/statements/for/initializer/array_ctor.wgsl.expected.glsl index f91ffbf615..7a30f6d696 100644 --- a/test/statements/for/initializer/array_ctor.wgsl.expected.glsl +++ b/test/statements/for/initializer/array_ctor.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { int tint_symbol[1] = int[1](1); { diff --git a/test/statements/for/initializer/basic.wgsl.expected.glsl b/test/statements/for/initializer/basic.wgsl.expected.glsl index f65c124346..de3e1e6bfa 100644 --- a/test/statements/for/initializer/basic.wgsl.expected.glsl +++ b/test/statements/for/initializer/basic.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { { for(int i = 0; false; ) { diff --git a/test/statements/for/initializer/struct_ctor.wgsl.expected.glsl b/test/statements/for/initializer/struct_ctor.wgsl.expected.glsl index 330a47c5d4..834287fd85 100644 --- a/test/statements/for/initializer/struct_ctor.wgsl.expected.glsl +++ b/test/statements/for/initializer/struct_ctor.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - struct S { int i; }; diff --git a/test/statements/for/scoping.wgsl.expected.glsl b/test/statements/for/scoping.wgsl.expected.glsl index 3d8df6a180..d9ee405bd4 100644 --- a/test/statements/for/scoping.wgsl.expected.glsl +++ b/test/statements/for/scoping.wgsl.expected.glsl @@ -5,11 +5,6 @@ layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void unused_entry_point() { return; } - -void main() { - unused_entry_point(); -} - void f() { { for(int must_not_collide = 0; ; ) { diff --git a/test/statements/switch/common.wgsl.expected.glsl b/test/statements/switch/common.wgsl.expected.glsl index c0345aa4ca..bd29110a01 100644 --- a/test/statements/switch/common.wgsl.expected.glsl +++ b/test/statements/switch/common.wgsl.expected.glsl @@ -1,7 +1,6 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int i = 0; int result = 0; @@ -23,10 +22,10 @@ void f() { break; } } - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/statements/switch/fallthrough.wgsl.expected.glsl b/test/statements/switch/fallthrough.wgsl.expected.glsl index f5215bf4e9..6a4628d5da 100644 --- a/test/statements/switch/fallthrough.wgsl.expected.glsl +++ b/test/statements/switch/fallthrough.wgsl.expected.glsl @@ -1,7 +1,6 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int i = 0; switch(i) { @@ -12,10 +11,10 @@ void f() { break; } } - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/statements/switch/only_default_case.wgsl.expected.glsl b/test/statements/switch/only_default_case.wgsl.expected.glsl index e1cb68be46..0e94201320 100644 --- a/test/statements/switch/only_default_case.wgsl.expected.glsl +++ b/test/statements/switch/only_default_case.wgsl.expected.glsl @@ -1,7 +1,6 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void f() { int i = 0; int result = 0; @@ -11,10 +10,10 @@ void f() { break; } } - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { f(); + return; } - diff --git a/test/struct/type_constructor.wgsl.expected.glsl b/test/struct/type_constructor.wgsl.expected.glsl index f32e92ee2d..12a8bfd0d7 100644 --- a/test/struct/type_constructor.wgsl.expected.glsl +++ b/test/struct/type_constructor.wgsl.expected.glsl @@ -23,7 +23,6 @@ struct T { int a[2]; }; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { int x = 42; S1 empty = S1(0, 0, 0, 0); @@ -60,10 +59,10 @@ void tint_symbol() { int tint_symbol_18[2] = int[2](1, (aosoa_nonempty[0].a[0] + 1)); T tint_symbol_19 = T(tint_symbol_18); T aosoa_nonempty_with_expr[2] = T[2](tint_symbol_19, aosoa_nonempty[1]); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/function_scope_declarations.wgsl.expected.glsl b/test/types/function_scope_declarations.wgsl.expected.glsl index 735d21526a..942b076448 100644 --- a/test/types/function_scope_declarations.wgsl.expected.glsl +++ b/test/types/function_scope_declarations.wgsl.expected.glsl @@ -5,7 +5,6 @@ struct S { float a; }; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { bool bool_var = false; bool bool_let = false; @@ -27,10 +26,10 @@ void tint_symbol() { float arr_let[4] = float[4](0.0f, 0.0f, 0.0f, 0.0f); S struct_var = S(0.0f); S struct_let = S(0.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/function_scope_var_conversions.wgsl.expected.glsl b/test/types/function_scope_var_conversions.wgsl.expected.glsl index b42e9ae4bc..fd75b67702 100644 --- a/test/types/function_scope_var_conversions.wgsl.expected.glsl +++ b/test/types/function_scope_var_conversions.wgsl.expected.glsl @@ -1,7 +1,6 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { bool bool_var1 = bool(123u); bool bool_var2 = bool(123); @@ -24,10 +23,10 @@ void tint_symbol() { uvec3 v3u32_var3 = uvec3(bvec3(true)); bvec3 v3bool_var4 = bvec3(bvec2(vec2(123.0f)), true); bvec4 v4bool_var5 = bvec4(bvec2(vec2(123.0f, 0.0f)), bvec2(true, bool(float(0.0f)))); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/module_scope_let.wgsl.expected.glsl b/test/types/module_scope_let.wgsl.expected.glsl index aca7b1680e..5890360f6a 100644 --- a/test/types/module_scope_let.wgsl.expected.glsl +++ b/test/types/module_scope_let.wgsl.expected.glsl @@ -5,12 +5,11 @@ struct S { float a; }; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/module_scope_var.wgsl.expected.glsl b/test/types/module_scope_var.wgsl.expected.glsl index 06071a3839..75f809085d 100644 --- a/test/types/module_scope_var.wgsl.expected.glsl +++ b/test/types/module_scope_var.wgsl.expected.glsl @@ -15,7 +15,6 @@ vec4 v4f32_var = vec4(0.0f, 0.0f, 0.0f, 0.0f); mat2x3 m2x3_var = mat2x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); float arr_var[4] = float[4](0.0f, 0.0f, 0.0f, 0.0f); S struct_var = S(0.0f); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { bool_var = false; i32_var = 0; @@ -29,10 +28,10 @@ void tint_symbol() { arr_var = tint_symbol_1; S tint_symbol_2 = S(0.0f); struct_var = tint_symbol_2; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/module_scope_var_conversions.wgsl.expected.glsl b/test/types/module_scope_var_conversions.wgsl.expected.glsl index 14db4ac70e..75cc41789a 100644 --- a/test/types/module_scope_var_conversions.wgsl.expected.glsl +++ b/test/types/module_scope_var_conversions.wgsl.expected.glsl @@ -21,7 +21,6 @@ uvec3 v3u32_var2 = uvec3(vec3(1.0f)); uvec3 v3u32_var3 = uvec3(bvec3(true)); bvec3 v3bool_var4 = bvec3(bvec2(vec2(123.0f)), true); bvec4 v4bool_var5 = bvec4(bvec2(vec2(123.0f, 0.0f)), bvec2(true, bool(float(0.0f)))); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { bool_var1 = false; bool_var2 = false; @@ -43,10 +42,10 @@ void tint_symbol() { v3u32_var1 = uvec3(0u, 0u, 0u); v3u32_var2 = uvec3(0u, 0u, 0u); v3u32_var3 = uvec3(0u, 0u, 0u); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/module_scope_var_initializers.wgsl.expected.glsl b/test/types/module_scope_var_initializers.wgsl.expected.glsl index 06071a3839..75f809085d 100644 --- a/test/types/module_scope_var_initializers.wgsl.expected.glsl +++ b/test/types/module_scope_var_initializers.wgsl.expected.glsl @@ -15,7 +15,6 @@ vec4 v4f32_var = vec4(0.0f, 0.0f, 0.0f, 0.0f); mat2x3 m2x3_var = mat2x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); float arr_var[4] = float[4](0.0f, 0.0f, 0.0f, 0.0f); S struct_var = S(0.0f); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { bool_var = false; i32_var = 0; @@ -29,10 +28,10 @@ void tint_symbol() { arr_var = tint_symbol_1; S tint_symbol_2 = S(0.0f); struct_var = tint_symbol_2; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/parameters.wgsl.expected.glsl b/test/types/parameters.wgsl.expected.glsl index aca7b1680e..5890360f6a 100644 --- a/test/types/parameters.wgsl.expected.glsl +++ b/test/types/parameters.wgsl.expected.glsl @@ -5,12 +5,11 @@ struct S { float a; }; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/return_types.wgsl.expected.glsl b/test/types/return_types.wgsl.expected.glsl index aca7b1680e..5890360f6a 100644 --- a/test/types/return_types.wgsl.expected.glsl +++ b/test/types/return_types.wgsl.expected.glsl @@ -5,12 +5,11 @@ struct S { float a; }; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/sampler.wgsl.expected.glsl b/test/types/sampler.wgsl.expected.glsl index 4be746b236..035eaa1a1d 100644 --- a/test/types/sampler.wgsl.expected.glsl +++ b/test/types/sampler.wgsl.expected.glsl @@ -1,12 +1,11 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/struct_members.wgsl.expected.glsl b/test/types/struct_members.wgsl.expected.glsl index d123ec4a69..edf65ffb31 100644 --- a/test/types/struct_members.wgsl.expected.glsl +++ b/test/types/struct_members.wgsl.expected.glsl @@ -18,13 +18,12 @@ struct S { S_inner member_struct; }; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { S s = S(false, 0, 0u, 0.0f, ivec2(0, 0), uvec3(0u, 0u, 0u), vec4(0.0f, 0.0f, 0.0f, 0.0f), mat2x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f), float[4](0.0f, 0.0f, 0.0f, 0.0f), S_inner(0.0f)); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/texture/depth/2d.wgsl.expected.glsl b/test/types/texture/depth/2d.wgsl.expected.glsl index 4be746b236..035eaa1a1d 100644 --- a/test/types/texture/depth/2d.wgsl.expected.glsl +++ b/test/types/texture/depth/2d.wgsl.expected.glsl @@ -1,12 +1,11 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/texture/depth/2d_array.wgsl.expected.glsl b/test/types/texture/depth/2d_array.wgsl.expected.glsl index 4be746b236..035eaa1a1d 100644 --- a/test/types/texture/depth/2d_array.wgsl.expected.glsl +++ b/test/types/texture/depth/2d_array.wgsl.expected.glsl @@ -1,12 +1,11 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/texture/depth/cube.wgsl.expected.glsl b/test/types/texture/depth/cube.wgsl.expected.glsl index 4be746b236..035eaa1a1d 100644 --- a/test/types/texture/depth/cube.wgsl.expected.glsl +++ b/test/types/texture/depth/cube.wgsl.expected.glsl @@ -1,12 +1,11 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/texture/depth/cube_array.wgsl.expected.glsl b/test/types/texture/depth/cube_array.wgsl.expected.glsl index 4be746b236..035eaa1a1d 100644 --- a/test/types/texture/depth/cube_array.wgsl.expected.glsl +++ b/test/types/texture/depth/cube_array.wgsl.expected.glsl @@ -1,12 +1,11 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/texture/multisampled/2d.wgsl.expected.glsl b/test/types/texture/multisampled/2d.wgsl.expected.glsl index 4be746b236..035eaa1a1d 100644 --- a/test/types/texture/multisampled/2d.wgsl.expected.glsl +++ b/test/types/texture/multisampled/2d.wgsl.expected.glsl @@ -1,12 +1,11 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/texture/sampled/1d.wgsl.expected.glsl b/test/types/texture/sampled/1d.wgsl.expected.glsl index 4be746b236..035eaa1a1d 100644 --- a/test/types/texture/sampled/1d.wgsl.expected.glsl +++ b/test/types/texture/sampled/1d.wgsl.expected.glsl @@ -1,12 +1,11 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/texture/sampled/2d.wgsl.expected.glsl b/test/types/texture/sampled/2d.wgsl.expected.glsl index 4be746b236..035eaa1a1d 100644 --- a/test/types/texture/sampled/2d.wgsl.expected.glsl +++ b/test/types/texture/sampled/2d.wgsl.expected.glsl @@ -1,12 +1,11 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/texture/sampled/2d_array.wgsl.expected.glsl b/test/types/texture/sampled/2d_array.wgsl.expected.glsl index 4be746b236..035eaa1a1d 100644 --- a/test/types/texture/sampled/2d_array.wgsl.expected.glsl +++ b/test/types/texture/sampled/2d_array.wgsl.expected.glsl @@ -1,12 +1,11 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/texture/sampled/3d.wgsl.expected.glsl b/test/types/texture/sampled/3d.wgsl.expected.glsl index 4be746b236..035eaa1a1d 100644 --- a/test/types/texture/sampled/3d.wgsl.expected.glsl +++ b/test/types/texture/sampled/3d.wgsl.expected.glsl @@ -1,12 +1,11 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/texture/sampled/cube.wgsl.expected.glsl b/test/types/texture/sampled/cube.wgsl.expected.glsl index 4be746b236..035eaa1a1d 100644 --- a/test/types/texture/sampled/cube.wgsl.expected.glsl +++ b/test/types/texture/sampled/cube.wgsl.expected.glsl @@ -1,12 +1,11 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/texture/sampled/cube_array.wgsl.expected.glsl b/test/types/texture/sampled/cube_array.wgsl.expected.glsl index 4be746b236..035eaa1a1d 100644 --- a/test/types/texture/sampled/cube_array.wgsl.expected.glsl +++ b/test/types/texture/sampled/cube_array.wgsl.expected.glsl @@ -1,12 +1,11 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/texture/storage/1d.wgsl.expected.glsl b/test/types/texture/storage/1d.wgsl.expected.glsl index 4be746b236..035eaa1a1d 100644 --- a/test/types/texture/storage/1d.wgsl.expected.glsl +++ b/test/types/texture/storage/1d.wgsl.expected.glsl @@ -1,12 +1,11 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/texture/storage/2d.wgsl.expected.glsl b/test/types/texture/storage/2d.wgsl.expected.glsl index 4be746b236..035eaa1a1d 100644 --- a/test/types/texture/storage/2d.wgsl.expected.glsl +++ b/test/types/texture/storage/2d.wgsl.expected.glsl @@ -1,12 +1,11 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/texture/storage/2d_array.wgsl.expected.glsl b/test/types/texture/storage/2d_array.wgsl.expected.glsl index 4be746b236..035eaa1a1d 100644 --- a/test/types/texture/storage/2d_array.wgsl.expected.glsl +++ b/test/types/texture/storage/2d_array.wgsl.expected.glsl @@ -1,12 +1,11 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/types/texture/storage/3d.wgsl.expected.glsl b/test/types/texture/storage/3d.wgsl.expected.glsl index 4be746b236..035eaa1a1d 100644 --- a/test/types/texture/storage/3d.wgsl.expected.glsl +++ b/test/types/texture/storage/3d.wgsl.expected.glsl @@ -1,12 +1,11 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - 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 4121e4da77..ec8695da06 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 @@ -25,13 +25,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated 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 70cdb2d5eb..32d48826d7 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 @@ -25,13 +25,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated 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 e4b3e9de11..e371a239dd 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 @@ -25,13 +25,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier 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 91e212b2f3..7f918795db 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 @@ -26,13 +26,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated 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 d84e95964a..320675383f 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 @@ -26,13 +26,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated 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 f1b5383c18..d606dc56d2 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 @@ -26,13 +26,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated 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 4dafa7f081..c91d5032be 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 @@ -26,13 +26,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated 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 e5c74b4354..a68ba3bbfb 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 @@ -26,13 +26,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated 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 8f33cd37ac..d850b056e6 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:23: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:23: '=' : cannot convert from ' const float' to ' temp mediump int' 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 5630b464c2..f84f06cf58 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:23: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:23: '=' : cannot convert from ' const float' to ' temp mediump int' 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 7dd285878e..4889a75a04 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:23: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:23: '=' : cannot convert from ' const float' to ' temp mediump int' 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 c13536d70b..44ddcb5980 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:23: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:23: '=' : cannot convert from ' const float' to ' temp mediump int' 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 c3233edd4e..5e70fed154 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated 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 8f33cd37ac..d850b056e6 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:23: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:23: '=' : cannot convert from ' const float' to ' temp mediump int' 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 5630b464c2..f84f06cf58 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:23: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:23: '=' : cannot convert from ' const float' to ' temp mediump int' 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 c13536d70b..44ddcb5980 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:23: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:23: '=' : cannot convert from ' const float' to ' temp mediump int' 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 c3233edd4e..5e70fed154 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated 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 e9dcdc167a..224db3a558 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:23: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:23: '' : compilation terminated 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 f3fde9143b..ed11575a00 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:23: 'textureSamples' : no matching overloaded function found ERROR: 0:23: '=' : cannot convert from ' const float' to ' temp mediump int' 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 4ff11e5bf0..a76b0791e7 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:23: 'textureSamples' : no matching overloaded function found ERROR: 0:23: '' : compilation terminated 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 79328513cf..9a35a8e0cd 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:23: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:23: '' : compilation terminated 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 3e63cc0ec0..4ad3ddcdaa 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated 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 79328513cf..9a35a8e0cd 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:23: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:23: '' : compilation terminated 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 3e63cc0ec0..4ad3ddcdaa 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated 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 fe1fc27e97..649714b686 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 @@ -29,13 +29,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:23: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:23: '' : compilation terminated 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 050e16096c..16fe00aecb 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:23: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:23: '' : compilation terminated 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 05602d7b65..83f1c0e512 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 @@ -29,13 +29,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:24: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:24: '' : compilation terminated 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 ed9e982f18..3e10a01e2f 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:23: 'textureOffset' : no matching overloaded function found ERROR: 0:23: '' : compilation terminated 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 04b51c2866..0f527926ee 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 @@ -29,13 +29,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:24: 'textureOffset' : no matching overloaded function found ERROR: 0:24: '' : compilation terminated 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 ccdcc0d998..3e14f13c82 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:23: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:23: '' : compilation terminated 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 39ad56a0f3..2023f1f547 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 @@ -29,13 +29,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'samplerCubeArray' : Reserved word. ERROR: 0:4: '' : compilation terminated 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 050e16096c..16fe00aecb 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:23: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:23: '' : compilation terminated 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 05602d7b65..83f1c0e512 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 @@ -29,13 +29,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:24: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:24: '' : compilation terminated 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 ed9e982f18..3e10a01e2f 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 @@ -28,13 +28,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:23: 'textureOffset' : no matching overloaded function found ERROR: 0:23: '' : compilation terminated 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 04b51c2866..0f527926ee 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 @@ -29,13 +29,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:24: 'textureOffset' : no matching overloaded function found ERROR: 0:24: '' : compilation terminated 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 b41b32e8c8..ba0a97a9d9 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 @@ -29,13 +29,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:24: 'textureLod' : no matching overloaded function found ERROR: 0:24: '' : compilation terminated 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 cb7959bb32..9a443a9578 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 @@ -32,13 +32,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - 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 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 c2929f1a61..36fdc5082e 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 @@ -26,13 +26,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:20: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:20: '' : compilation terminated 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 c2929f1a61..36fdc5082e 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 @@ -26,13 +26,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:20: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:20: '' : compilation terminated 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 022fec9cb8..3d0551fc94 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 @@ -29,13 +29,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:24: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:24: '' : compilation terminated 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 bbf595c857..be82c2c4c4 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 @@ -29,13 +29,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:24: 'textureOffset' : no matching overloaded function found ERROR: 0:24: '' : compilation terminated 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 b939ed558f..73b24ad4f2 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 @@ -29,13 +29,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated diff --git a/test/unittest/reader/spirv/ImageWrite_ConvertTexelOperand_Arity_SpvParserHandleTest_ImageAccessTest_Variable_4.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageWrite_ConvertTexelOperand_Arity_SpvParserHandleTest_ImageAccessTest_Variable_4.spvasm.expected.glsl index 7b1704870d..cff10d555e 100644 --- a/test/unittest/reader/spirv/ImageWrite_ConvertTexelOperand_Arity_SpvParserHandleTest_ImageAccessTest_Variable_4.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageWrite_ConvertTexelOperand_Arity_SpvParserHandleTest_ImageAccessTest_Variable_4.spvasm.expected.glsl @@ -24,13 +24,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/unittest/reader/spirv/ImageWrite_ConvertTexelOperand_Arity_SpvParserHandleTest_ImageAccessTest_Variable_5.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageWrite_ConvertTexelOperand_Arity_SpvParserHandleTest_ImageAccessTest_Variable_5.spvasm.expected.glsl index 4521389667..4412b95768 100644 --- a/test/unittest/reader/spirv/ImageWrite_ConvertTexelOperand_Arity_SpvParserHandleTest_ImageAccessTest_Variable_5.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageWrite_ConvertTexelOperand_Arity_SpvParserHandleTest_ImageAccessTest_Variable_5.spvasm.expected.glsl @@ -24,13 +24,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated diff --git a/test/unittest/reader/spirv/ImageWrite_ConvertTexelOperand_Arity_SpvParserHandleTest_ImageAccessTest_Variable_6.spvasm.expected.glsl b/test/unittest/reader/spirv/ImageWrite_ConvertTexelOperand_Arity_SpvParserHandleTest_ImageAccessTest_Variable_6.spvasm.expected.glsl index 7af7e0210d..0f1f46b98e 100644 --- a/test/unittest/reader/spirv/ImageWrite_ConvertTexelOperand_Arity_SpvParserHandleTest_ImageAccessTest_Variable_6.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/ImageWrite_ConvertTexelOperand_Arity_SpvParserHandleTest_ImageAccessTest_Variable_6.spvasm.expected.glsl @@ -24,13 +24,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated 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 ef37dc3bcd..bd6a5b0c57 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 @@ -25,13 +25,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:19: 'textureSamples' : no matching overloaded function found ERROR: 0:19: '' : compilation terminated 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 c7d6336b6d..9a9cc5c21c 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 @@ -26,13 +26,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:20: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:20: '' : compilation terminated 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 91e212b2f3..7f918795db 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 @@ -26,13 +26,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated 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 c44d565c0f..35020aad25 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 @@ -26,13 +26,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:20: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:20: '' : compilation terminated 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 1c639c921b..7f6f121288 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 @@ -25,13 +25,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated 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 f8adcc29a7..7d58180495 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 @@ -25,13 +25,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated 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 6321d0e94e..a4a48423e1 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 @@ -25,13 +25,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image1D' : Reserved word. WARNING: 0:4: 'layout' : useless application of layout qualifier 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 25158b4a2a..9f13868064 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 @@ -11,13 +11,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated 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 d49cbd427f..00462813dd 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 @@ -11,13 +11,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'image load-store format' : not supported with this profile: es ERROR: 0:4: '' : compilation terminated 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 e6d0619e37..72709a38eb 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 @@ -11,13 +11,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:4: 'sampler1D' : Reserved word. ERROR: 0:4: '' : compilation terminated 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 a9954156dc..b35bfaa621 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 @@ -11,13 +11,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureQueryLevels' : no matching overloaded function found ERROR: 0:6: '' : compilation terminated 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 c0765369b3..4ed812de65 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 @@ -11,13 +11,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'textureSamples' : no matching overloaded function found ERROR: 0:6: '' : compilation terminated 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 b8cfc8b866..9c6e1b057b 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 @@ -12,13 +12,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:7: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:7: '' : compilation terminated 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 69330dcddf..f5952b4ec2 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 @@ -12,13 +12,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:7: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:7: '' : compilation terminated 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 69330dcddf..f5952b4ec2 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 @@ -12,13 +12,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:7: '=' : cannot convert from ' global highp 4-component vector of float' to ' temp mediump float' ERROR: 0:7: '' : compilation terminated diff --git a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_0.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_0.spvasm.expected.glsl index ab58934540..2367041a5f 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_0.spvasm.expected.glsl @@ -36,16 +36,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'int4' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_1.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_1.spvasm.expected.glsl index 65c3ce5a22..e54ecf4819 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_1.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_1.spvasm.expected.glsl @@ -36,16 +36,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint4' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_2.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_2.spvasm.expected.glsl index 25b1438936..db086707d3 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_2.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_2.spvasm.expected.glsl @@ -36,16 +36,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'int2' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_3.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_3.spvasm.expected.glsl index e8c6e78000..990e9ed5ae 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_3.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_3.spvasm.expected.glsl @@ -36,16 +36,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint2' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_4.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_4.spvasm.expected.glsl index b616d815b7..9f34b41140 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_4.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataPacking_Valid_4.spvasm.expected.glsl @@ -36,16 +36,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint2' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_0.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_0.spvasm.expected.glsl index 7f7f710308..fd349a8799 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_0.spvasm.expected.glsl @@ -37,16 +37,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'int4' : undeclared identifier ERROR: 0:6: '' : compilation terminated diff --git a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_1.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_1.spvasm.expected.glsl index ace2c18257..ec19124a77 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_1.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_1.spvasm.expected.glsl @@ -37,16 +37,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'uint4' : undeclared identifier ERROR: 0:6: '' : compilation terminated diff --git a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_2.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_2.spvasm.expected.glsl index 37d9b1a15c..cfa6431ccd 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_2.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_2.spvasm.expected.glsl @@ -37,16 +37,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'int2' : undeclared identifier ERROR: 0:6: '' : compilation terminated diff --git a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_3.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_3.spvasm.expected.glsl index 42eaecc6f7..7b645324df 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_3.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_3.spvasm.expected.glsl @@ -37,16 +37,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'uint2' : undeclared identifier ERROR: 0:6: '' : compilation terminated diff --git a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_4.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_4.spvasm.expected.glsl index e9c3f07692..549c390b56 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_4.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_DataUnpacking_Valid_4.spvasm.expected.glsl @@ -36,16 +36,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp highp uint' and a right operand of type ' const int' (or there is no acceptable conversion) ERROR: 0:6: '' : compilation terminated diff --git a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_FloatingFloatingFloating_Scalar_2.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_FloatingFloatingFloating_Scalar_2.spvasm.expected.glsl index f3abfdf337..fd9f71d621 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_FloatingFloatingFloating_Scalar_2.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_FloatingFloatingFloating_Scalar_2.spvasm.expected.glsl @@ -30,16 +30,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:27: 'mad' : no matching overloaded function found ERROR: 0:27: '' : compilation terminated diff --git a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_FloatingFloatingFloating_Vector_2.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_FloatingFloatingFloating_Vector_2.spvasm.expected.glsl index c8d0e8cbd0..b0c65847f0 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_FloatingFloatingFloating_Vector_2.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_FloatingFloatingFloating_Vector_2.spvasm.expected.glsl @@ -30,16 +30,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:27: 'mad' : no matching overloaded function found ERROR: 0:27: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' diff --git a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_Floating_Scalar_11.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_Floating_Scalar_11.spvasm.expected.glsl index e77fb64f25..df643c69ee 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_Floating_Scalar_11.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_Floating_Scalar_11.spvasm.expected.glsl @@ -30,16 +30,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:27: 'frac' : no matching overloaded function found ERROR: 0:27: '' : compilation terminated diff --git a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_Floating_Scalar_12.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_Floating_Scalar_12.spvasm.expected.glsl index 924627a464..9678ca6496 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_Floating_Scalar_12.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_Floating_Scalar_12.spvasm.expected.glsl @@ -30,16 +30,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:27: 'rsqrt' : no matching overloaded function found ERROR: 0:27: '' : compilation terminated diff --git a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_Floating_Vector_11.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_Floating_Vector_11.spvasm.expected.glsl index f6462e6a02..65eaab60d4 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_Floating_Vector_11.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_Floating_Vector_11.spvasm.expected.glsl @@ -30,16 +30,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:27: 'frac' : no matching overloaded function found ERROR: 0:27: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' diff --git a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_Floating_Vector_12.spvasm.expected.glsl b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_Floating_Vector_12.spvasm.expected.glsl index 441335c706..d88893e26b 100644 --- a/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_Floating_Vector_12.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/Samples_SpvParserTest_GlslStd450_Floating_Floating_Vector_12.spvasm.expected.glsl @@ -30,16 +30,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:27: 'rsqrt' : no matching overloaded function found ERROR: 0:27: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' diff --git a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_0.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_0.spvasm.expected.glsl index 4c9e1f9979..019f563799 100644 --- a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_0.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddx' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_1.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_1.spvasm.expected.glsl index 4a7faf0dd5..2da4a9680c 100644 --- a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_1.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_1.spvasm.expected.glsl @@ -11,13 +11,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'ddx' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' diff --git a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_10.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_10.spvasm.expected.glsl index 2256d98f86..95775f1a80 100644 --- a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_10.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_10.spvasm.expected.glsl @@ -11,13 +11,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'ddx_fine' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' diff --git a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_11.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_11.spvasm.expected.glsl index c0e2e14a1a..e423873d54 100644 --- a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_11.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_11.spvasm.expected.glsl @@ -11,13 +11,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'ddx_fine' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' diff --git a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_12.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_12.spvasm.expected.glsl index dc514d8c19..31226b60c9 100644 --- a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_12.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_12.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddy_fine' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_13.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_13.spvasm.expected.glsl index fda6138c96..12ea7a6fda 100644 --- a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_13.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_13.spvasm.expected.glsl @@ -11,13 +11,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'ddy_fine' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' diff --git a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_14.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_14.spvasm.expected.glsl index 635aeac72d..e4cf1510c9 100644 --- a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_14.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_14.spvasm.expected.glsl @@ -11,13 +11,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'ddy_fine' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' diff --git a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_18.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_18.spvasm.expected.glsl index 7337c86de8..2739ce4ebc 100644 --- a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_18.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_18.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddx_coarse' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_19.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_19.spvasm.expected.glsl index dac0f4cf68..a3fe73c5cd 100644 --- a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_19.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_19.spvasm.expected.glsl @@ -11,13 +11,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'ddx_coarse' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' diff --git a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_2.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_2.spvasm.expected.glsl index f05af780c5..3d2217b8f2 100644 --- a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_2.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_2.spvasm.expected.glsl @@ -11,13 +11,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'ddx' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' diff --git a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_20.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_20.spvasm.expected.glsl index 6542079d31..a45a0a51ca 100644 --- a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_20.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_20.spvasm.expected.glsl @@ -11,13 +11,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'ddx_coarse' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' diff --git a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_21.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_21.spvasm.expected.glsl index ff0447fe41..cf08a02eec 100644 --- a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_21.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_21.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddy_coarse' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_22.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_22.spvasm.expected.glsl index caa15308aa..47fd024e76 100644 --- a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_22.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_22.spvasm.expected.glsl @@ -11,13 +11,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'ddy_coarse' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' diff --git a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_23.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_23.spvasm.expected.glsl index 144461ce1e..7e97ae4bfb 100644 --- a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_23.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_23.spvasm.expected.glsl @@ -11,13 +11,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'ddy_coarse' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' diff --git a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_3.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_3.spvasm.expected.glsl index 545205b294..bc7f163750 100644 --- a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_3.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_3.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddy' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_4.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_4.spvasm.expected.glsl index 3ba58ceffb..ec5fe6012a 100644 --- a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_4.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_4.spvasm.expected.glsl @@ -11,13 +11,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'ddy' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' diff --git a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_5.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_5.spvasm.expected.glsl index 78db9a9054..48836c625f 100644 --- a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_5.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_5.spvasm.expected.glsl @@ -11,13 +11,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: 'ddy' : no matching overloaded function found ERROR: 0:6: '=' : cannot convert from ' const float' to ' temp mediump 3-component vector of float' diff --git a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_9.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_9.spvasm.expected.glsl index 6e3763e7a1..c6c4cc9d59 100644 --- a/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_9.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvBinaryDerivativeTest_SpvBinaryDerivativeTest_Derivatives_9.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: 'ddx_fine' : no matching overloaded function found ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvFUnordTest_FUnordEqual_Vector.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvFUnordTest_FUnordEqual_Vector.spvasm.expected.glsl index 052c8ca076..795babea3b 100644 --- a/test/unittest/reader/spirv/SpvFUnordTest_FUnordEqual_Vector.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvFUnordTest_FUnordEqual_Vector.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '!' : wrong operand type no operation '!' exists that takes an operand of type const 2-component vector of bool (or there is no acceptable conversion) ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvFUnordTest_FUnordGreaterThanEqual_Vector.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvFUnordTest_FUnordGreaterThanEqual_Vector.spvasm.expected.glsl index a98df47ca1..c56133f048 100644 --- a/test/unittest/reader/spirv/SpvFUnordTest_FUnordGreaterThanEqual_Vector.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvFUnordTest_FUnordGreaterThanEqual_Vector.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '!' : wrong operand type no operation '!' exists that takes an operand of type const 2-component vector of bool (or there is no acceptable conversion) ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvFUnordTest_FUnordGreaterThan_Vector.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvFUnordTest_FUnordGreaterThan_Vector.spvasm.expected.glsl index 99e7ee9a2c..f78d5be4ed 100644 --- a/test/unittest/reader/spirv/SpvFUnordTest_FUnordGreaterThan_Vector.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvFUnordTest_FUnordGreaterThan_Vector.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '!' : wrong operand type no operation '!' exists that takes an operand of type const 2-component vector of bool (or there is no acceptable conversion) ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvFUnordTest_FUnordLessThanEqual_Vector.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvFUnordTest_FUnordLessThanEqual_Vector.spvasm.expected.glsl index eee2525bb8..cf5d8324cf 100644 --- a/test/unittest/reader/spirv/SpvFUnordTest_FUnordLessThanEqual_Vector.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvFUnordTest_FUnordLessThanEqual_Vector.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '!' : wrong operand type no operation '!' exists that takes an operand of type const 2-component vector of bool (or there is no acceptable conversion) ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvFUnordTest_FUnordLessThan_Vector.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvFUnordTest_FUnordLessThan_Vector.spvasm.expected.glsl index b64a1ec726..8674bdd982 100644 --- a/test/unittest/reader/spirv/SpvFUnordTest_FUnordLessThan_Vector.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvFUnordTest_FUnordLessThan_Vector.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '!' : wrong operand type no operation '!' exists that takes an operand of type const 2-component vector of bool (or there is no acceptable conversion) ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvFUnordTest_FUnordNotEqual_Vector.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvFUnordTest_FUnordNotEqual_Vector.spvasm.expected.glsl index 13dcb9a102..b4351707ae 100644 --- a/test/unittest/reader/spirv/SpvFUnordTest_FUnordNotEqual_Vector.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvFUnordTest_FUnordNotEqual_Vector.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '!' : wrong operand type no operation '!' exists that takes an operand of type const 2-component vector of bool (or there is no acceptable conversion) ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvLogicalTest_Select_VecBoolCond_VectorParams.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvLogicalTest_Select_VecBoolCond_VectorParams.spvasm.expected.glsl index 4bcaaf7191..19e5f948ad 100644 --- a/test/unittest/reader/spirv/SpvLogicalTest_Select_VecBoolCond_VectorParams.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvLogicalTest_Select_VecBoolCond_VectorParams.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : boolean expression expected ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_BuiltinVar_SampleMask_In_Signed.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_BuiltinVar_SampleMask_In_Signed.spvasm.expected.glsl index 7e97341d30..2b992911d0 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_BuiltinVar_SampleMask_In_Signed.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_BuiltinVar_SampleMask_In_Signed.spvasm.expected.glsl @@ -8,30 +8,18 @@ void main_1() { return; } -struct tint_symbol_2 { - uint x_1_param; -}; - -void tint_symbol_inner(uint x_1_param) { +void tint_symbol(uint x_1_param) { x_1[0] = int(x_1_param); main_1(); } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_1_param); +void main() { + tint_symbol(uint(gl_SampleMask[0])); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_1_param = uint(gl_SampleMask); - tint_symbol(inputs); -} - Error parsing GLSL shader: -ERROR: 0:26: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:26: '' : compilation terminated +ERROR: 0:15: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:15: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_BuiltinVar_SampleMask_In_Unsigned.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_BuiltinVar_SampleMask_In_Unsigned.spvasm.expected.glsl index 3e36874702..44302f45b8 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_BuiltinVar_SampleMask_In_Unsigned.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_BuiltinVar_SampleMask_In_Unsigned.spvasm.expected.glsl @@ -8,30 +8,18 @@ void main_1() { return; } -struct tint_symbol_2 { - uint x_1_param; -}; - -void tint_symbol_inner(uint x_1_param) { +void tint_symbol(uint x_1_param) { x_1[0] = x_1_param; main_1(); } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_1_param); +void main() { + tint_symbol(uint(gl_SampleMask[0])); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_1_param = uint(gl_SampleMask); - tint_symbol(inputs); -} - Error parsing GLSL shader: -ERROR: 0:26: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:26: '' : compilation terminated +ERROR: 0:15: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:15: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_BuiltinVar_SampleMask_Out_Signed_Initializer.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_BuiltinVar_SampleMask_Out_Signed_Initializer.spvasm.expected.glsl index 8d3186a01a..b6cf43f26d 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_BuiltinVar_SampleMask_Out_Signed_Initializer.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_BuiltinVar_SampleMask_Out_Signed_Initializer.spvasm.expected.glsl @@ -12,33 +12,20 @@ struct main_out { uint x_1_1; }; -struct tint_symbol_1 { - uint x_1_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(uint(x_1[0])); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(uint(x_1[0])); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(0u); - wrapper_result.x_1_1 = inner_result.x_1_1; - return wrapper_result; -} - - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - gl_SampleMask = outputs.x_1_1; + main_out inner_result = tint_symbol(); + gl_SampleMask[0] = inner_result.x_1_1; + return; } - Error parsing GLSL shader: -ERROR: 0:34: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:34: '' : compilation terminated +ERROR: 0:21: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:21: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_BuiltinVar_SampleMask_Out_Unsigned_Initializer.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_BuiltinVar_SampleMask_Out_Unsigned_Initializer.spvasm.expected.glsl index 4d43631602..48269aaf5e 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_BuiltinVar_SampleMask_Out_Unsigned_Initializer.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_BuiltinVar_SampleMask_Out_Unsigned_Initializer.spvasm.expected.glsl @@ -12,33 +12,20 @@ struct main_out { uint x_1_1; }; -struct tint_symbol_1 { - uint x_1_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_1[0]); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_1[0]); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(0u); - wrapper_result.x_1_1 = inner_result.x_1_1; - return wrapper_result; -} - - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - gl_SampleMask = outputs.x_1_1; + main_out inner_result = tint_symbol(); + gl_SampleMask[0] = inner_result.x_1_1; + return; } - Error parsing GLSL shader: -ERROR: 0:34: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:34: '' : compilation terminated +ERROR: 0:21: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:21: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_Interpolation_Flat_Vertex_In.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_Interpolation_Flat_Vertex_In.spvasm.expected.glsl new file mode 100644 index 0000000000..db21d74963 --- /dev/null +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_EntryPointWrapping_Interpolation_Flat_Vertex_In.spvasm.expected.glsl @@ -0,0 +1,52 @@ +SKIP: FAILED + +#version 310 es +precision mediump float; + +layout(location = 1) flat in uint x_1_param_1; +layout(location = 2) flat in uvec2 x_2_param_1; +layout(location = 3) flat in int x_3_param_1; +layout(location = 4) flat in ivec2 x_4_param_1; +layout(location = 5) flat in float x_5_param_1; +layout(location = 6) flat in vec2 x_6_param_1; +uint x_1 = 0u; +uvec2 x_2 = uvec2(0u, 0u); +int x_3 = 0; +ivec2 x_4 = ivec2(0, 0); +float x_5 = 0.0f; +vec2 x_6 = vec2(0.0f, 0.0f); +vec4 x_8 = vec4(0.0f, 0.0f, 0.0f, 0.0f); +void main_1() { + return; +} + +struct main_out { + vec4 x_8_1; +}; + +main_out tint_symbol(uint x_1_param, uvec2 x_2_param, int x_3_param, ivec2 x_4_param, float x_5_param, vec2 x_6_param) { + x_1 = x_1_param; + x_2 = x_2_param; + x_3 = x_3_param; + x_4 = x_4_param; + x_5 = x_5_param; + x_6 = x_6_param; + main_1(); + main_out tint_symbol_1 = main_out(x_8); + return tint_symbol_1; +} + +void main() { + main_out inner_result = tint_symbol(x_1_param_1, x_2_param_1, x_3_param_1, x_4_param_1, x_5_param_1, x_6_param_1); + gl_Position = inner_result.x_8_1; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; +} +Error parsing GLSL shader: +ERROR: 0:4: '' : vertex input cannot be further qualified +ERROR: 0:4: '' : compilation terminated +ERROR: 2 compilation errors. No code generated. + + + diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_I32_Load_AccessChain.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_I32_Load_AccessChain.spvasm.expected.glsl index 5286cdbe78..b0827e8127 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_I32_Load_AccessChain.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_I32_Load_AccessChain.spvasm.expected.glsl @@ -9,30 +9,18 @@ void main_1() { return; } -struct tint_symbol_2 { - uint x_1_param; -}; - -void tint_symbol_inner(uint x_1_param) { +void tint_symbol(uint x_1_param) { x_1 = int(x_1_param); main_1(); } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_1_param); +void main() { + tint_symbol(uint(gl_SampleID)); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_1_param = uint(gl_SampleID); - tint_symbol(inputs); -} - Error parsing GLSL shader: -ERROR: 0:27: 'gl_SampleID' : required extension not requested: GL_OES_sample_variables -ERROR: 0:27: '' : compilation terminated +ERROR: 0:16: 'gl_SampleID' : required extension not requested: GL_OES_sample_variables +ERROR: 0:16: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_I32_Load_CopyObject.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_I32_Load_CopyObject.spvasm.expected.glsl index 5286cdbe78..b0827e8127 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_I32_Load_CopyObject.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_I32_Load_CopyObject.spvasm.expected.glsl @@ -9,30 +9,18 @@ void main_1() { return; } -struct tint_symbol_2 { - uint x_1_param; -}; - -void tint_symbol_inner(uint x_1_param) { +void tint_symbol(uint x_1_param) { x_1 = int(x_1_param); main_1(); } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_1_param); +void main() { + tint_symbol(uint(gl_SampleID)); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_1_param = uint(gl_SampleID); - tint_symbol(inputs); -} - Error parsing GLSL shader: -ERROR: 0:27: 'gl_SampleID' : required extension not requested: GL_OES_sample_variables -ERROR: 0:27: '' : compilation terminated +ERROR: 0:16: 'gl_SampleID' : required extension not requested: GL_OES_sample_variables +ERROR: 0:16: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_I32_Load_Direct.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_I32_Load_Direct.spvasm.expected.glsl index 5286cdbe78..b0827e8127 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_I32_Load_Direct.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_I32_Load_Direct.spvasm.expected.glsl @@ -9,30 +9,18 @@ void main_1() { return; } -struct tint_symbol_2 { - uint x_1_param; -}; - -void tint_symbol_inner(uint x_1_param) { +void tint_symbol(uint x_1_param) { x_1 = int(x_1_param); main_1(); } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_1_param); +void main() { + tint_symbol(uint(gl_SampleID)); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_1_param = uint(gl_SampleID); - tint_symbol(inputs); -} - Error parsing GLSL shader: -ERROR: 0:27: 'gl_SampleID' : required extension not requested: GL_OES_sample_variables -ERROR: 0:27: '' : compilation terminated +ERROR: 0:16: 'gl_SampleID' : required extension not requested: GL_OES_sample_variables +ERROR: 0:16: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_U32_Load_AccessChain.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_U32_Load_AccessChain.spvasm.expected.glsl index af4104a355..9a1398c567 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_U32_Load_AccessChain.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_U32_Load_AccessChain.spvasm.expected.glsl @@ -9,30 +9,18 @@ void main_1() { return; } -struct tint_symbol_2 { - uint x_1_param; -}; - -void tint_symbol_inner(uint x_1_param) { +void tint_symbol(uint x_1_param) { x_1 = x_1_param; main_1(); } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_1_param); +void main() { + tint_symbol(uint(gl_SampleID)); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_1_param = uint(gl_SampleID); - tint_symbol(inputs); -} - Error parsing GLSL shader: -ERROR: 0:27: 'gl_SampleID' : required extension not requested: GL_OES_sample_variables -ERROR: 0:27: '' : compilation terminated +ERROR: 0:16: 'gl_SampleID' : required extension not requested: GL_OES_sample_variables +ERROR: 0:16: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_U32_Load_CopyObject.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_U32_Load_CopyObject.spvasm.expected.glsl index af4104a355..9a1398c567 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_U32_Load_CopyObject.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_U32_Load_CopyObject.spvasm.expected.glsl @@ -9,30 +9,18 @@ void main_1() { return; } -struct tint_symbol_2 { - uint x_1_param; -}; - -void tint_symbol_inner(uint x_1_param) { +void tint_symbol(uint x_1_param) { x_1 = x_1_param; main_1(); } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_1_param); +void main() { + tint_symbol(uint(gl_SampleID)); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_1_param = uint(gl_SampleID); - tint_symbol(inputs); -} - Error parsing GLSL shader: -ERROR: 0:27: 'gl_SampleID' : required extension not requested: GL_OES_sample_variables -ERROR: 0:27: '' : compilation terminated +ERROR: 0:16: 'gl_SampleID' : required extension not requested: GL_OES_sample_variables +ERROR: 0:16: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_U32_Load_Direct.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_U32_Load_Direct.spvasm.expected.glsl index af4104a355..9a1398c567 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_U32_Load_Direct.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleId_U32_Load_Direct.spvasm.expected.glsl @@ -9,30 +9,18 @@ void main_1() { return; } -struct tint_symbol_2 { - uint x_1_param; -}; - -void tint_symbol_inner(uint x_1_param) { +void tint_symbol(uint x_1_param) { x_1 = x_1_param; main_1(); } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_1_param); +void main() { + tint_symbol(uint(gl_SampleID)); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_1_param = uint(gl_SampleID); - tint_symbol(inputs); -} - Error parsing GLSL shader: -ERROR: 0:27: 'gl_SampleID' : required extension not requested: GL_OES_sample_variables -ERROR: 0:27: '' : compilation terminated +ERROR: 0:16: 'gl_SampleID' : required extension not requested: GL_OES_sample_variables +ERROR: 0:16: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_I32_AccessChain.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_I32_AccessChain.spvasm.expected.glsl index 0e69117839..5377a90a71 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_I32_AccessChain.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_I32_AccessChain.spvasm.expected.glsl @@ -9,30 +9,18 @@ void main_1() { return; } -struct tint_symbol_2 { - uint x_1_param; -}; - -void tint_symbol_inner(uint x_1_param) { +void tint_symbol(uint x_1_param) { x_1[0] = int(x_1_param); main_1(); } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_1_param); +void main() { + tint_symbol(uint(gl_SampleMask[0])); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_1_param = uint(gl_SampleMask); - tint_symbol(inputs); -} - Error parsing GLSL shader: -ERROR: 0:27: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:27: '' : compilation terminated +ERROR: 0:16: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:16: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_I32_CopyObject.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_I32_CopyObject.spvasm.expected.glsl index 0e69117839..5377a90a71 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_I32_CopyObject.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_I32_CopyObject.spvasm.expected.glsl @@ -9,30 +9,18 @@ void main_1() { return; } -struct tint_symbol_2 { - uint x_1_param; -}; - -void tint_symbol_inner(uint x_1_param) { +void tint_symbol(uint x_1_param) { x_1[0] = int(x_1_param); main_1(); } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_1_param); +void main() { + tint_symbol(uint(gl_SampleMask[0])); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_1_param = uint(gl_SampleMask); - tint_symbol(inputs); -} - Error parsing GLSL shader: -ERROR: 0:27: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:27: '' : compilation terminated +ERROR: 0:16: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:16: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_I32_Direct.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_I32_Direct.spvasm.expected.glsl index 26c9ad079f..883f06b984 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_I32_Direct.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_I32_Direct.spvasm.expected.glsl @@ -9,30 +9,18 @@ void main_1() { return; } -struct tint_symbol_2 { - uint x_1_param; -}; - -void tint_symbol_inner(uint x_1_param) { +void tint_symbol(uint x_1_param) { x_1[0] = int(x_1_param); main_1(); } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_1_param); +void main() { + tint_symbol(uint(gl_SampleMask[0])); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_1_param = uint(gl_SampleMask); - tint_symbol(inputs); -} - Error parsing GLSL shader: -ERROR: 0:27: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:27: '' : compilation terminated +ERROR: 0:16: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:16: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_U32_AccessChain.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_U32_AccessChain.spvasm.expected.glsl index 21b026787b..efc266d3d4 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_U32_AccessChain.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_U32_AccessChain.spvasm.expected.glsl @@ -9,30 +9,18 @@ void main_1() { return; } -struct tint_symbol_2 { - uint x_1_param; -}; - -void tint_symbol_inner(uint x_1_param) { +void tint_symbol(uint x_1_param) { x_1[0] = x_1_param; main_1(); } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_1_param); +void main() { + tint_symbol(uint(gl_SampleMask[0])); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_1_param = uint(gl_SampleMask); - tint_symbol(inputs); -} - Error parsing GLSL shader: -ERROR: 0:27: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:27: '' : compilation terminated +ERROR: 0:16: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:16: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_U32_CopyObject.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_U32_CopyObject.spvasm.expected.glsl index 21b026787b..efc266d3d4 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_U32_CopyObject.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_U32_CopyObject.spvasm.expected.glsl @@ -9,30 +9,18 @@ void main_1() { return; } -struct tint_symbol_2 { - uint x_1_param; -}; - -void tint_symbol_inner(uint x_1_param) { +void tint_symbol(uint x_1_param) { x_1[0] = x_1_param; main_1(); } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_1_param); +void main() { + tint_symbol(uint(gl_SampleMask[0])); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_1_param = uint(gl_SampleMask); - tint_symbol(inputs); -} - Error parsing GLSL shader: -ERROR: 0:27: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:27: '' : compilation terminated +ERROR: 0:16: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:16: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_U32_Direct.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_U32_Direct.spvasm.expected.glsl index 545c475434..760f16f82e 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_U32_Direct.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_U32_Direct.spvasm.expected.glsl @@ -9,30 +9,18 @@ void main_1() { return; } -struct tint_symbol_2 { - uint x_1_param; -}; - -void tint_symbol_inner(uint x_1_param) { +void tint_symbol(uint x_1_param) { x_1[0] = x_1_param; main_1(); } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_1_param); +void main() { + tint_symbol(uint(gl_SampleMask[0])); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_1_param = uint(gl_SampleMask); - tint_symbol(inputs); -} - Error parsing GLSL shader: -ERROR: 0:27: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:27: '' : compilation terminated +ERROR: 0:16: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:16: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_WithStride.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_WithStride.spvasm.expected.glsl index 545c475434..760f16f82e 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_WithStride.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_In_WithStride.spvasm.expected.glsl @@ -9,30 +9,18 @@ void main_1() { return; } -struct tint_symbol_2 { - uint x_1_param; -}; - -void tint_symbol_inner(uint x_1_param) { +void tint_symbol(uint x_1_param) { x_1[0] = x_1_param; main_1(); } -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_1_param); +void main() { + tint_symbol(uint(gl_SampleMask[0])); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_1_param = uint(gl_SampleMask); - tint_symbol(inputs); -} - Error parsing GLSL shader: -ERROR: 0:27: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:27: '' : compilation terminated +ERROR: 0:16: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:16: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_I32_AccessChain.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_I32_AccessChain.spvasm.expected.glsl index a71ff026e2..3bb9956aa0 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_I32_AccessChain.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_I32_AccessChain.spvasm.expected.glsl @@ -13,33 +13,20 @@ struct main_out { uint x_1_1; }; -struct tint_symbol_1 { - uint x_1_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(uint(x_1[0])); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(uint(x_1[0])); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(0u); - wrapper_result.x_1_1 = inner_result.x_1_1; - return wrapper_result; -} - - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - gl_SampleMask = outputs.x_1_1; + main_out inner_result = tint_symbol(); + gl_SampleMask[0] = inner_result.x_1_1; + return; } - Error parsing GLSL shader: -ERROR: 0:35: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:35: '' : compilation terminated +ERROR: 0:22: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:22: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_I32_CopyObject.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_I32_CopyObject.spvasm.expected.glsl index a71ff026e2..3bb9956aa0 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_I32_CopyObject.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_I32_CopyObject.spvasm.expected.glsl @@ -13,33 +13,20 @@ struct main_out { uint x_1_1; }; -struct tint_symbol_1 { - uint x_1_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(uint(x_1[0])); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(uint(x_1[0])); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(0u); - wrapper_result.x_1_1 = inner_result.x_1_1; - return wrapper_result; -} - - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - gl_SampleMask = outputs.x_1_1; + main_out inner_result = tint_symbol(); + gl_SampleMask[0] = inner_result.x_1_1; + return; } - Error parsing GLSL shader: -ERROR: 0:35: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:35: '' : compilation terminated +ERROR: 0:22: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:22: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_I32_Direct.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_I32_Direct.spvasm.expected.glsl index a71ff026e2..3bb9956aa0 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_I32_Direct.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_I32_Direct.spvasm.expected.glsl @@ -13,33 +13,20 @@ struct main_out { uint x_1_1; }; -struct tint_symbol_1 { - uint x_1_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(uint(x_1[0])); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(uint(x_1[0])); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(0u); - wrapper_result.x_1_1 = inner_result.x_1_1; - return wrapper_result; -} - - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - gl_SampleMask = outputs.x_1_1; + main_out inner_result = tint_symbol(); + gl_SampleMask[0] = inner_result.x_1_1; + return; } - Error parsing GLSL shader: -ERROR: 0:35: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:35: '' : compilation terminated +ERROR: 0:22: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:22: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_U32_AccessChain.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_U32_AccessChain.spvasm.expected.glsl index c37a82a7d6..673165fa68 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_U32_AccessChain.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_U32_AccessChain.spvasm.expected.glsl @@ -13,33 +13,20 @@ struct main_out { uint x_1_1; }; -struct tint_symbol_1 { - uint x_1_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_1[0]); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_1[0]); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(0u); - wrapper_result.x_1_1 = inner_result.x_1_1; - return wrapper_result; -} - - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - gl_SampleMask = outputs.x_1_1; + main_out inner_result = tint_symbol(); + gl_SampleMask[0] = inner_result.x_1_1; + return; } - Error parsing GLSL shader: -ERROR: 0:35: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:35: '' : compilation terminated +ERROR: 0:22: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:22: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_U32_CopyObject.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_U32_CopyObject.spvasm.expected.glsl index c37a82a7d6..673165fa68 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_U32_CopyObject.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_U32_CopyObject.spvasm.expected.glsl @@ -13,33 +13,20 @@ struct main_out { uint x_1_1; }; -struct tint_symbol_1 { - uint x_1_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_1[0]); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_1[0]); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(0u); - wrapper_result.x_1_1 = inner_result.x_1_1; - return wrapper_result; -} - - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - gl_SampleMask = outputs.x_1_1; + main_out inner_result = tint_symbol(); + gl_SampleMask[0] = inner_result.x_1_1; + return; } - Error parsing GLSL shader: -ERROR: 0:35: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:35: '' : compilation terminated +ERROR: 0:22: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:22: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_U32_Direct.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_U32_Direct.spvasm.expected.glsl index c37a82a7d6..673165fa68 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_U32_Direct.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_U32_Direct.spvasm.expected.glsl @@ -13,33 +13,20 @@ struct main_out { uint x_1_1; }; -struct tint_symbol_1 { - uint x_1_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_1[0]); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_1[0]); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(0u); - wrapper_result.x_1_1 = inner_result.x_1_1; - return wrapper_result; -} - - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - gl_SampleMask = outputs.x_1_1; + main_out inner_result = tint_symbol(); + gl_SampleMask[0] = inner_result.x_1_1; + return; } - Error parsing GLSL shader: -ERROR: 0:35: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:35: '' : compilation terminated +ERROR: 0:22: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:22: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_WithStride.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_WithStride.spvasm.expected.glsl index c37a82a7d6..673165fa68 100644 --- a/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_WithStride.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvModuleScopeVarParserTest_SampleMask_Out_WithStride.spvasm.expected.glsl @@ -13,33 +13,20 @@ struct main_out { uint x_1_1; }; -struct tint_symbol_1 { - uint x_1_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_1[0]); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_1[0]); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(0u); - wrapper_result.x_1_1 = inner_result.x_1_1; - return wrapper_result; -} - - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - gl_SampleMask = outputs.x_1_1; + main_out inner_result = tint_symbol(); + gl_SampleMask[0] = inner_result.x_1_1; + return; } - Error parsing GLSL shader: -ERROR: 0:35: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables -ERROR: 0:35: '' : compilation terminated +ERROR: 0:22: 'gl_SampleMask' : required extension not requested: GL_OES_sample_variables +ERROR: 0:22: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/unittest/reader/spirv/SpvParserFunctionVarTest_EmitStatement_UseInPhiCountsAsUse.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserFunctionVarTest_EmitStatement_UseInPhiCountsAsUse.spvasm.expected.glsl index c2423a3950..6def1e9bbe 100644 --- a/test/unittest/reader/spirv/SpvParserFunctionVarTest_EmitStatement_UseInPhiCountsAsUse.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserFunctionVarTest_EmitStatement_UseInPhiCountsAsUse.spvasm.expected.glsl @@ -23,13 +23,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:12: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' const bool' and a right operand of type ' const bool' (or there is no acceptable conversion) ERROR: 0:12: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromAccessChain.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromAccessChain.spvasm.expected.glsl index ff5659a645..6e4715f2f0 100644 --- a/test/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromAccessChain.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromAccessChain.spvasm.expected.glsl @@ -22,13 +22,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: '' : array size required ERROR: 0:7: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromVar.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromVar.spvasm.expected.glsl index ff5659a645..6e4715f2f0 100644 --- a/test/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromVar.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserMemoryTest_ArrayLength_FromVar.spvasm.expected.glsl @@ -22,13 +22,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: '' : array size required ERROR: 0:7: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvParserMemoryTest_EmitStatement_AccessChain_Struct_RuntimeArray.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserMemoryTest_EmitStatement_AccessChain_Struct_RuntimeArray.spvasm.expected.glsl index e499bff8d1..2447bc00df 100644 --- a/test/unittest/reader/spirv/SpvParserMemoryTest_EmitStatement_AccessChain_Struct_RuntimeArray.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserMemoryTest_EmitStatement_AccessChain_Struct_RuntimeArray.spvasm.expected.glsl @@ -19,13 +19,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: '' : array size required ERROR: 0:7: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_Cascaded.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_Cascaded.spvasm.expected.glsl index 87c2d6d8cd..f100aa6e10 100644 --- a/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_Cascaded.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_Cascaded.spvasm.expected.glsl @@ -19,13 +19,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: '' : array size required ERROR: 0:7: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded.spvasm.expected.glsl index f8e81e7d6f..6b48d1925e 100644 --- a/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded.spvasm.expected.glsl @@ -20,13 +20,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: '' : array size required ERROR: 0:7: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded_InBoundsAccessChain.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded_InBoundsAccessChain.spvasm.expected.glsl index f8e81e7d6f..6b48d1925e 100644 --- a/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded_InBoundsAccessChain.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_ThroughAccessChain_NonCascaded_InBoundsAccessChain.spvasm.expected.glsl @@ -20,13 +20,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: '' : array size required ERROR: 0:7: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_TypesAndVarDeclarations.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_TypesAndVarDeclarations.spvasm.expected.glsl index 894d2d77d6..9501ceae0c 100644 --- a/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_TypesAndVarDeclarations.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserMemoryTest_RemapStorageBuffer_TypesAndVarDeclarations.spvasm.expected.glsl @@ -14,13 +14,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:6: '' : array size required ERROR: 0:7: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvParserTest_FRem_SpvBinaryArithTest_EmitExpression_0.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserTest_FRem_SpvBinaryArithTest_EmitExpression_0.spvasm.expected.glsl index de6fcdd122..7b1c35621c 100644 --- a/test/unittest/reader/spirv/SpvParserTest_FRem_SpvBinaryArithTest_EmitExpression_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserTest_FRem_SpvBinaryArithTest_EmitExpression_0.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' const float' and a right operand of type ' const float' (or there is no acceptable conversion) ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvParserTest_FRem_SpvBinaryArithTest_EmitExpression_1.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserTest_FRem_SpvBinaryArithTest_EmitExpression_1.spvasm.expected.glsl index c8111692cc..40f51bd6df 100644 --- a/test/unittest/reader/spirv/SpvParserTest_FRem_SpvBinaryArithTest_EmitExpression_1.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserTest_FRem_SpvBinaryArithTest_EmitExpression_1.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' const 2-component vector of float' and a right operand of type ' const 2-component vector of float' (or there is no acceptable conversion) ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvParserTest_LogicalAnd_SpvBinaryLogicalTest_EmitExpression_0.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserTest_LogicalAnd_SpvBinaryLogicalTest_EmitExpression_0.spvasm.expected.glsl index 038414feab..55da344e38 100644 --- a/test/unittest/reader/spirv/SpvParserTest_LogicalAnd_SpvBinaryLogicalTest_EmitExpression_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserTest_LogicalAnd_SpvBinaryLogicalTest_EmitExpression_0.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' const bool' and a right operand of type ' const bool' (or there is no acceptable conversion) ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvParserTest_LogicalAnd_SpvBinaryLogicalTest_EmitExpression_1.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserTest_LogicalAnd_SpvBinaryLogicalTest_EmitExpression_1.spvasm.expected.glsl index ff590fa151..2a8b7957dc 100644 --- a/test/unittest/reader/spirv/SpvParserTest_LogicalAnd_SpvBinaryLogicalTest_EmitExpression_1.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserTest_LogicalAnd_SpvBinaryLogicalTest_EmitExpression_1.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' const 2-component vector of bool' and a right operand of type ' const 2-component vector of bool' (or there is no acceptable conversion) ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvParserTest_LogicalOr_SpvBinaryLogicalTest_EmitExpression_0.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserTest_LogicalOr_SpvBinaryLogicalTest_EmitExpression_0.spvasm.expected.glsl index cef60d7f1b..b8752adb97 100644 --- a/test/unittest/reader/spirv/SpvParserTest_LogicalOr_SpvBinaryLogicalTest_EmitExpression_0.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserTest_LogicalOr_SpvBinaryLogicalTest_EmitExpression_0.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '|' : wrong operand types: no operation '|' exists that takes a left-hand operand of type ' const bool' and a right operand of type ' const bool' (or there is no acceptable conversion) ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvParserTest_LogicalOr_SpvBinaryLogicalTest_EmitExpression_1.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvParserTest_LogicalOr_SpvBinaryLogicalTest_EmitExpression_1.spvasm.expected.glsl index 13a2f5c10f..e83a55db46 100644 --- a/test/unittest/reader/spirv/SpvParserTest_LogicalOr_SpvBinaryLogicalTest_EmitExpression_1.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvParserTest_LogicalOr_SpvBinaryLogicalTest_EmitExpression_1.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '|' : wrong operand types: no operation '|' exists that takes a left-hand operand of type ' const 2-component vector of bool' and a right operand of type ' const 2-component vector of bool' (or there is no acceptable conversion) ERROR: 0:5: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_IntVector_IntVector.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_IntVector_IntVector.spvasm.expected.glsl index cbeafe1907..a822cbbeec 100644 --- a/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_IntVector_IntVector.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_IntVector_IntVector.spvasm.expected.glsl @@ -12,16 +12,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'countbits' : no matching overloaded function found ERROR: 0:9: '=' : cannot convert from ' const float' to ' temp highp 2-component vector of int' diff --git a/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_IntVector_UintVector.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_IntVector_UintVector.spvasm.expected.glsl index b468bf0f11..2c3f17f7e4 100644 --- a/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_IntVector_UintVector.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_IntVector_UintVector.spvasm.expected.glsl @@ -12,16 +12,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'countbits' : no matching overloaded function found ERROR: 0:9: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_Int_Int.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_Int_Int.spvasm.expected.glsl index 0b2857699d..360303941c 100644 --- a/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_Int_Int.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_Int_Int.spvasm.expected.glsl @@ -12,16 +12,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'countbits' : no matching overloaded function found ERROR: 0:9: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_Int_Uint.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_Int_Uint.spvasm.expected.glsl index d05dca25cf..42c8966f23 100644 --- a/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_Int_Uint.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_Int_Uint.spvasm.expected.glsl @@ -12,16 +12,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'countbits' : no matching overloaded function found ERROR: 0:9: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_UintVector_IntVector.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_UintVector_IntVector.spvasm.expected.glsl index 40403394d2..520709275f 100644 --- a/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_UintVector_IntVector.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_UintVector_IntVector.spvasm.expected.glsl @@ -12,16 +12,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'countbits' : no matching overloaded function found ERROR: 0:9: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_UintVector_UintVector.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_UintVector_UintVector.spvasm.expected.glsl index 77c801ee72..ff83998d12 100644 --- a/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_UintVector_UintVector.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_UintVector_UintVector.spvasm.expected.glsl @@ -12,16 +12,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'countbits' : no matching overloaded function found ERROR: 0:9: '=' : cannot convert from ' const float' to ' temp highp 2-component vector of uint' diff --git a/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_Uint_Int.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_Uint_Int.spvasm.expected.glsl index 4c2933cbc2..73cc16b036 100644 --- a/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_Uint_Int.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_Uint_Int.spvasm.expected.glsl @@ -12,16 +12,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'countbits' : no matching overloaded function found ERROR: 0:9: '' : compilation terminated diff --git a/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_Uint_Uint.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_Uint_Uint.spvasm.expected.glsl index aa5b9c3d1a..1a2543746a 100644 --- a/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_Uint_Uint.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvUnaryBitTest_BitCount_Uint_Uint.spvasm.expected.glsl @@ -12,16 +12,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'countbits' : no matching overloaded function found ERROR: 0:9: '=' : cannot convert from ' const float' to ' temp highp uint' diff --git a/test/unittest/reader/spirv/SpvUnaryBitTest_BitReverse_IntVector_IntVector.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvUnaryBitTest_BitReverse_IntVector_IntVector.spvasm.expected.glsl index d944a7f35a..e52852fff7 100644 --- a/test/unittest/reader/spirv/SpvUnaryBitTest_BitReverse_IntVector_IntVector.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvUnaryBitTest_BitReverse_IntVector_IntVector.spvasm.expected.glsl @@ -12,16 +12,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'reversebits' : no matching overloaded function found ERROR: 0:9: '=' : cannot convert from ' const float' to ' temp highp 2-component vector of int' diff --git a/test/unittest/reader/spirv/SpvUnaryBitTest_BitReverse_Int_Int.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvUnaryBitTest_BitReverse_Int_Int.spvasm.expected.glsl index dfc6bce79e..665192977f 100644 --- a/test/unittest/reader/spirv/SpvUnaryBitTest_BitReverse_Int_Int.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvUnaryBitTest_BitReverse_Int_Int.spvasm.expected.glsl @@ -12,16 +12,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'reversebits' : no matching overloaded function found ERROR: 0:9: '=' : cannot convert from ' const float' to ' temp highp int' diff --git a/test/unittest/reader/spirv/SpvUnaryBitTest_BitReverse_UintVector_UintVector.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvUnaryBitTest_BitReverse_UintVector_UintVector.spvasm.expected.glsl index e600c81868..84503b2611 100644 --- a/test/unittest/reader/spirv/SpvUnaryBitTest_BitReverse_UintVector_UintVector.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvUnaryBitTest_BitReverse_UintVector_UintVector.spvasm.expected.glsl @@ -12,16 +12,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'reversebits' : no matching overloaded function found ERROR: 0:9: '=' : cannot convert from ' const float' to ' temp highp 2-component vector of uint' diff --git a/test/unittest/reader/spirv/SpvUnaryBitTest_BitReverse_Uint_Uint.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvUnaryBitTest_BitReverse_Uint_Uint.spvasm.expected.glsl index c42716262f..f66b801387 100644 --- a/test/unittest/reader/spirv/SpvUnaryBitTest_BitReverse_Uint_Uint.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvUnaryBitTest_BitReverse_Uint_Uint.spvasm.expected.glsl @@ -12,16 +12,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:9: 'reversebits' : no matching overloaded function found ERROR: 0:9: '=' : cannot convert from ' const float' to ' temp highp uint' diff --git a/test/unittest/reader/spirv/SpvUnaryLogicalTest_LogicalNot_Vector.spvasm.expected.glsl b/test/unittest/reader/spirv/SpvUnaryLogicalTest_LogicalNot_Vector.spvasm.expected.glsl index b2641fdf9e..01e2b29a44 100644 --- a/test/unittest/reader/spirv/SpvUnaryLogicalTest_LogicalNot_Vector.spvasm.expected.glsl +++ b/test/unittest/reader/spirv/SpvUnaryLogicalTest_LogicalNot_Vector.spvasm.expected.glsl @@ -10,13 +10,12 @@ void main_1() { void tint_symbol() { main_1(); - return; } void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '!' : wrong operand type no operation '!' exists that takes an operand of type const 2-component vector of bool (or there is no acceptable conversion) ERROR: 0:5: '' : compilation terminated diff --git a/test/var/inferred/function.wgsl.expected.glsl b/test/var/inferred/function.wgsl.expected.glsl index ec327ce2ab..797dbaf28f 100644 --- a/test/var/inferred/function.wgsl.expected.glsl +++ b/test/var/inferred/function.wgsl.expected.glsl @@ -1,29 +1,17 @@ #version 310 es precision mediump float; +layout(location = 0) out vec4 value; struct MyStruct { float f1; }; -struct tint_symbol_1 { - vec4 value; -}; - -vec4 tint_symbol_inner() { +vec4 tint_symbol() { return vec4(0.0f, 0.0f, 0.0f, 0.0f); } -tint_symbol_1 tint_symbol() { - vec4 inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.value = inner_result; - return wrapper_result; -} -layout(location = 0) out vec4 value; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - value = outputs.value; + vec4 inner_result = tint_symbol(); + value = inner_result; + return; } - diff --git a/test/var/initialization/function/array.wgsl.expected.glsl b/test/var/initialization/function/array.wgsl.expected.glsl index f3c3ba7dd8..fde5eb78a7 100644 --- a/test/var/initialization/function/array.wgsl.expected.glsl +++ b/test/var/initialization/function/array.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { int v[3] = int[3](0, 0, 0); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/initialization/function/matrix.wgsl.expected.glsl b/test/var/initialization/function/matrix.wgsl.expected.glsl index 9c74a59134..0c2c827967 100644 --- a/test/var/initialization/function/matrix.wgsl.expected.glsl +++ b/test/var/initialization/function/matrix.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { mat2x3 v = mat2x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/initialization/function/scalar.wgsl.expected.glsl b/test/var/initialization/function/scalar.wgsl.expected.glsl index 159b09230a..109c321318 100644 --- a/test/var/initialization/function/scalar.wgsl.expected.glsl +++ b/test/var/initialization/function/scalar.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { int v = 0; - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/initialization/function/struct.wgsl.expected.glsl b/test/var/initialization/function/struct.wgsl.expected.glsl index 2062576329..3cf59c5639 100644 --- a/test/var/initialization/function/struct.wgsl.expected.glsl +++ b/test/var/initialization/function/struct.wgsl.expected.glsl @@ -6,13 +6,12 @@ struct S { float b; }; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { S v = S(0, 0.0f); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/initialization/function/vector.wgsl.expected.glsl b/test/var/initialization/function/vector.wgsl.expected.glsl index ed2c8d1993..2d1c158fad 100644 --- a/test/var/initialization/function/vector.wgsl.expected.glsl +++ b/test/var/initialization/function/vector.wgsl.expected.glsl @@ -1,13 +1,12 @@ #version 310 es precision mediump float; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { ivec3 v = ivec3(0, 0, 0); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/initialization/private/array.wgsl.expected.glsl b/test/var/initialization/private/array.wgsl.expected.glsl index 05a9731eed..52ecf93257 100644 --- a/test/var/initialization/private/array.wgsl.expected.glsl +++ b/test/var/initialization/private/array.wgsl.expected.glsl @@ -2,12 +2,11 @@ precision mediump float; int v[3] = int[3](0, 0, 0); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/initialization/private/matrix.wgsl.expected.glsl b/test/var/initialization/private/matrix.wgsl.expected.glsl index f9b2340098..978af1abed 100644 --- a/test/var/initialization/private/matrix.wgsl.expected.glsl +++ b/test/var/initialization/private/matrix.wgsl.expected.glsl @@ -2,12 +2,11 @@ precision mediump float; mat2x3 v = mat2x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/initialization/private/scalar.wgsl.expected.glsl b/test/var/initialization/private/scalar.wgsl.expected.glsl index 4c2177862b..3ac79efffd 100644 --- a/test/var/initialization/private/scalar.wgsl.expected.glsl +++ b/test/var/initialization/private/scalar.wgsl.expected.glsl @@ -2,12 +2,11 @@ precision mediump float; int v = 0; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/initialization/private/struct.wgsl.expected.glsl b/test/var/initialization/private/struct.wgsl.expected.glsl index 8bb397c630..7226444558 100644 --- a/test/var/initialization/private/struct.wgsl.expected.glsl +++ b/test/var/initialization/private/struct.wgsl.expected.glsl @@ -7,12 +7,11 @@ struct S { }; S v = S(0, 0.0f); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/initialization/private/vector.wgsl.expected.glsl b/test/var/initialization/private/vector.wgsl.expected.glsl index d894156c8d..add8b0c0f2 100644 --- a/test/var/initialization/private/vector.wgsl.expected.glsl +++ b/test/var/initialization/private/vector.wgsl.expected.glsl @@ -2,12 +2,11 @@ precision mediump float; ivec3 v = ivec3(0, 0, 0); -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/initialization/workgroup/array.wgsl.expected.glsl b/test/var/initialization/workgroup/array.wgsl.expected.glsl index 61851d8e0c..adbf51ce7f 100644 --- a/test/var/initialization/workgroup/array.wgsl.expected.glsl +++ b/test/var/initialization/workgroup/array.wgsl.expected.glsl @@ -2,11 +2,7 @@ precision mediump float; shared int v[3]; -struct tint_symbol_2 { - uint local_invocation_index; -}; - -void tint_symbol_inner(uint local_invocation_index) { +void tint_symbol(uint local_invocation_index) { { for(uint idx = local_invocation_index; (idx < 3u); idx = (idx + 1u)) { uint i = idx; @@ -17,15 +13,7 @@ void tint_symbol_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.local_invocation_index); +void main() { + tint_symbol(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - tint_symbol(inputs); -} - diff --git a/test/var/initialization/workgroup/matrix.wgsl.expected.glsl b/test/var/initialization/workgroup/matrix.wgsl.expected.glsl index facd6b06ed..0738874a13 100644 --- a/test/var/initialization/workgroup/matrix.wgsl.expected.glsl +++ b/test/var/initialization/workgroup/matrix.wgsl.expected.glsl @@ -2,11 +2,7 @@ precision mediump float; shared mat2x3 v; -struct tint_symbol_2 { - uint local_invocation_index; -}; - -void tint_symbol_inner(uint local_invocation_index) { +void tint_symbol(uint local_invocation_index) { { v = mat2x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); } @@ -14,15 +10,7 @@ void tint_symbol_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.local_invocation_index); +void main() { + tint_symbol(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - tint_symbol(inputs); -} - diff --git a/test/var/initialization/workgroup/scalar.wgsl.expected.glsl b/test/var/initialization/workgroup/scalar.wgsl.expected.glsl index 6e9244b9e4..dc95a7de3f 100644 --- a/test/var/initialization/workgroup/scalar.wgsl.expected.glsl +++ b/test/var/initialization/workgroup/scalar.wgsl.expected.glsl @@ -2,11 +2,7 @@ precision mediump float; shared int v; -struct tint_symbol_2 { - uint local_invocation_index; -}; - -void tint_symbol_inner(uint local_invocation_index) { +void tint_symbol(uint local_invocation_index) { { v = 0; } @@ -14,15 +10,7 @@ void tint_symbol_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.local_invocation_index); +void main() { + tint_symbol(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - tint_symbol(inputs); -} - diff --git a/test/var/initialization/workgroup/struct.wgsl.expected.glsl b/test/var/initialization/workgroup/struct.wgsl.expected.glsl index a0db087fa6..87458fb9b6 100644 --- a/test/var/initialization/workgroup/struct.wgsl.expected.glsl +++ b/test/var/initialization/workgroup/struct.wgsl.expected.glsl @@ -7,28 +7,16 @@ struct S { }; shared S v; -struct tint_symbol_2 { - uint local_invocation_index; -}; - -void tint_symbol_inner(uint local_invocation_index) { +void tint_symbol(uint local_invocation_index) { { - S tint_symbol_3 = S(0, 0.0f); - v = tint_symbol_3; + S tint_symbol_1 = S(0, 0.0f); + v = tint_symbol_1; } memoryBarrierShared(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.local_invocation_index); +void main() { + tint_symbol(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - tint_symbol(inputs); -} - diff --git a/test/var/initialization/workgroup/vector.wgsl.expected.glsl b/test/var/initialization/workgroup/vector.wgsl.expected.glsl index e710bb2907..917de43cee 100644 --- a/test/var/initialization/workgroup/vector.wgsl.expected.glsl +++ b/test/var/initialization/workgroup/vector.wgsl.expected.glsl @@ -2,11 +2,7 @@ precision mediump float; shared ivec3 v; -struct tint_symbol_2 { - uint local_invocation_index; -}; - -void tint_symbol_inner(uint local_invocation_index) { +void tint_symbol(uint local_invocation_index) { { v = ivec3(0, 0, 0); } @@ -14,15 +10,7 @@ void tint_symbol_inner(uint local_invocation_index) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.local_invocation_index); +void main() { + tint_symbol(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - tint_symbol(inputs); -} - diff --git a/test/var/override/named/no_init/bool.wgsl.expected.glsl b/test/var/override/named/no_init/bool.wgsl.expected.glsl index 788b030f71..c182ddf9c3 100644 --- a/test/var/override/named/no_init/bool.wgsl.expected.glsl +++ b/test/var/override/named/no_init/bool.wgsl.expected.glsl @@ -7,15 +7,14 @@ precision mediump float; #error spec constant required for constant id 0 #endif const bool o = WGSL_SPEC_CONSTANT_0; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '#error' : spec constant required for constant id 0 ERROR: 0:6: '' : missing #endif diff --git a/test/var/override/named/no_init/f32.wgsl.expected.glsl b/test/var/override/named/no_init/f32.wgsl.expected.glsl index ba600558b3..44c356ae96 100644 --- a/test/var/override/named/no_init/f32.wgsl.expected.glsl +++ b/test/var/override/named/no_init/f32.wgsl.expected.glsl @@ -7,15 +7,14 @@ precision mediump float; #error spec constant required for constant id 0 #endif const float o = WGSL_SPEC_CONSTANT_0; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '#error' : spec constant required for constant id 0 ERROR: 0:6: '' : missing #endif diff --git a/test/var/override/named/no_init/i32.wgsl.expected.glsl b/test/var/override/named/no_init/i32.wgsl.expected.glsl index f2096f52be..0a75ccbcb1 100644 --- a/test/var/override/named/no_init/i32.wgsl.expected.glsl +++ b/test/var/override/named/no_init/i32.wgsl.expected.glsl @@ -7,15 +7,14 @@ precision mediump float; #error spec constant required for constant id 0 #endif const int o = WGSL_SPEC_CONSTANT_0; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '#error' : spec constant required for constant id 0 ERROR: 0:6: '' : missing #endif diff --git a/test/var/override/named/no_init/u32.wgsl.expected.glsl b/test/var/override/named/no_init/u32.wgsl.expected.glsl index 94bdd23d0c..cba073167c 100644 --- a/test/var/override/named/no_init/u32.wgsl.expected.glsl +++ b/test/var/override/named/no_init/u32.wgsl.expected.glsl @@ -7,15 +7,14 @@ precision mediump float; #error spec constant required for constant id 0 #endif const uint o = WGSL_SPEC_CONSTANT_0; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '#error' : spec constant required for constant id 0 ERROR: 0:6: '' : missing #endif diff --git a/test/var/override/named/val_init/bool.wgsl.expected.glsl b/test/var/override/named/val_init/bool.wgsl.expected.glsl index 44a7de1108..e739f3f0f8 100644 --- a/test/var/override/named/val_init/bool.wgsl.expected.glsl +++ b/test/var/override/named/val_init/bool.wgsl.expected.glsl @@ -5,12 +5,11 @@ precision mediump float; #define WGSL_SPEC_CONSTANT_0 true #endif const bool o = WGSL_SPEC_CONSTANT_0; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/override/named/val_init/f32.wgsl.expected.glsl b/test/var/override/named/val_init/f32.wgsl.expected.glsl index a0849a3dd7..8e7ca9195a 100644 --- a/test/var/override/named/val_init/f32.wgsl.expected.glsl +++ b/test/var/override/named/val_init/f32.wgsl.expected.glsl @@ -5,12 +5,11 @@ precision mediump float; #define WGSL_SPEC_CONSTANT_0 1.0f #endif const float o = WGSL_SPEC_CONSTANT_0; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/override/named/val_init/i32.wgsl.expected.glsl b/test/var/override/named/val_init/i32.wgsl.expected.glsl index 5d536fce0a..51c905a58c 100644 --- a/test/var/override/named/val_init/i32.wgsl.expected.glsl +++ b/test/var/override/named/val_init/i32.wgsl.expected.glsl @@ -5,12 +5,11 @@ precision mediump float; #define WGSL_SPEC_CONSTANT_0 1 #endif const int o = WGSL_SPEC_CONSTANT_0; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/override/named/val_init/u32.wgsl.expected.glsl b/test/var/override/named/val_init/u32.wgsl.expected.glsl index fd5bad1888..1e3043fd34 100644 --- a/test/var/override/named/val_init/u32.wgsl.expected.glsl +++ b/test/var/override/named/val_init/u32.wgsl.expected.glsl @@ -5,12 +5,11 @@ precision mediump float; #define WGSL_SPEC_CONSTANT_0 1u #endif const uint o = WGSL_SPEC_CONSTANT_0; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/override/named/zero_init/bool.wgsl.expected.glsl b/test/var/override/named/zero_init/bool.wgsl.expected.glsl index fc98806442..aa5de1ed2c 100644 --- a/test/var/override/named/zero_init/bool.wgsl.expected.glsl +++ b/test/var/override/named/zero_init/bool.wgsl.expected.glsl @@ -5,12 +5,11 @@ precision mediump float; #define WGSL_SPEC_CONSTANT_0 false #endif const bool o = WGSL_SPEC_CONSTANT_0; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/override/named/zero_init/f32.wgsl.expected.glsl b/test/var/override/named/zero_init/f32.wgsl.expected.glsl index 0f0bfb3d16..48eeb64883 100644 --- a/test/var/override/named/zero_init/f32.wgsl.expected.glsl +++ b/test/var/override/named/zero_init/f32.wgsl.expected.glsl @@ -5,12 +5,11 @@ precision mediump float; #define WGSL_SPEC_CONSTANT_0 0.0f #endif const float o = WGSL_SPEC_CONSTANT_0; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/override/named/zero_init/i32.wgsl.expected.glsl b/test/var/override/named/zero_init/i32.wgsl.expected.glsl index c2c5f490a7..85deaa5e6b 100644 --- a/test/var/override/named/zero_init/i32.wgsl.expected.glsl +++ b/test/var/override/named/zero_init/i32.wgsl.expected.glsl @@ -5,12 +5,11 @@ precision mediump float; #define WGSL_SPEC_CONSTANT_0 0 #endif const int o = WGSL_SPEC_CONSTANT_0; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/override/named/zero_init/u32.wgsl.expected.glsl b/test/var/override/named/zero_init/u32.wgsl.expected.glsl index 962eeeef70..7b326bd64d 100644 --- a/test/var/override/named/zero_init/u32.wgsl.expected.glsl +++ b/test/var/override/named/zero_init/u32.wgsl.expected.glsl @@ -5,12 +5,11 @@ precision mediump float; #define WGSL_SPEC_CONSTANT_0 0u #endif const uint o = WGSL_SPEC_CONSTANT_0; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/override/numbered/no_init/bool.wgsl.expected.glsl b/test/var/override/numbered/no_init/bool.wgsl.expected.glsl index a1fd32ce23..62e77f2b7c 100644 --- a/test/var/override/numbered/no_init/bool.wgsl.expected.glsl +++ b/test/var/override/numbered/no_init/bool.wgsl.expected.glsl @@ -7,15 +7,14 @@ precision mediump float; #error spec constant required for constant id 1234 #endif const bool o = WGSL_SPEC_CONSTANT_1234; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '#error' : spec constant required for constant id 1234 ERROR: 0:6: '' : missing #endif diff --git a/test/var/override/numbered/no_init/f32.wgsl.expected.glsl b/test/var/override/numbered/no_init/f32.wgsl.expected.glsl index ace6cfeb05..07e1b48a0c 100644 --- a/test/var/override/numbered/no_init/f32.wgsl.expected.glsl +++ b/test/var/override/numbered/no_init/f32.wgsl.expected.glsl @@ -7,15 +7,14 @@ precision mediump float; #error spec constant required for constant id 1234 #endif const float o = WGSL_SPEC_CONSTANT_1234; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '#error' : spec constant required for constant id 1234 ERROR: 0:6: '' : missing #endif diff --git a/test/var/override/numbered/no_init/i32.wgsl.expected.glsl b/test/var/override/numbered/no_init/i32.wgsl.expected.glsl index 7ba93a5168..58d5bd7d19 100644 --- a/test/var/override/numbered/no_init/i32.wgsl.expected.glsl +++ b/test/var/override/numbered/no_init/i32.wgsl.expected.glsl @@ -7,15 +7,14 @@ precision mediump float; #error spec constant required for constant id 1234 #endif const int o = WGSL_SPEC_CONSTANT_1234; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '#error' : spec constant required for constant id 1234 ERROR: 0:6: '' : missing #endif diff --git a/test/var/override/numbered/no_init/u32.wgsl.expected.glsl b/test/var/override/numbered/no_init/u32.wgsl.expected.glsl index 80d9e41085..dd791dcfd5 100644 --- a/test/var/override/numbered/no_init/u32.wgsl.expected.glsl +++ b/test/var/override/numbered/no_init/u32.wgsl.expected.glsl @@ -7,15 +7,14 @@ precision mediump float; #error spec constant required for constant id 1234 #endif const uint o = WGSL_SPEC_CONSTANT_1234; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '#error' : spec constant required for constant id 1234 ERROR: 0:6: '' : missing #endif diff --git a/test/var/override/numbered/val_init/bool.wgsl.expected.glsl b/test/var/override/numbered/val_init/bool.wgsl.expected.glsl index e72288d1da..a82548316b 100644 --- a/test/var/override/numbered/val_init/bool.wgsl.expected.glsl +++ b/test/var/override/numbered/val_init/bool.wgsl.expected.glsl @@ -5,12 +5,11 @@ precision mediump float; #define WGSL_SPEC_CONSTANT_1234 true #endif const bool o = WGSL_SPEC_CONSTANT_1234; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/override/numbered/val_init/f32.wgsl.expected.glsl b/test/var/override/numbered/val_init/f32.wgsl.expected.glsl index 264a4819ba..805c5f3f7f 100644 --- a/test/var/override/numbered/val_init/f32.wgsl.expected.glsl +++ b/test/var/override/numbered/val_init/f32.wgsl.expected.glsl @@ -5,12 +5,11 @@ precision mediump float; #define WGSL_SPEC_CONSTANT_1234 1.0f #endif const float o = WGSL_SPEC_CONSTANT_1234; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/override/numbered/val_init/i32.wgsl.expected.glsl b/test/var/override/numbered/val_init/i32.wgsl.expected.glsl index ff99d268f9..dda2ff9a0e 100644 --- a/test/var/override/numbered/val_init/i32.wgsl.expected.glsl +++ b/test/var/override/numbered/val_init/i32.wgsl.expected.glsl @@ -5,12 +5,11 @@ precision mediump float; #define WGSL_SPEC_CONSTANT_1234 1 #endif const int o = WGSL_SPEC_CONSTANT_1234; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/override/numbered/val_init/u32.wgsl.expected.glsl b/test/var/override/numbered/val_init/u32.wgsl.expected.glsl index a6d6f0b622..d5bbf03145 100644 --- a/test/var/override/numbered/val_init/u32.wgsl.expected.glsl +++ b/test/var/override/numbered/val_init/u32.wgsl.expected.glsl @@ -5,12 +5,11 @@ precision mediump float; #define WGSL_SPEC_CONSTANT_1234 1u #endif const uint o = WGSL_SPEC_CONSTANT_1234; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/override/numbered/zero_init/bool.wgsl.expected.glsl b/test/var/override/numbered/zero_init/bool.wgsl.expected.glsl index 55bbfa4e2c..7cd240b0eb 100644 --- a/test/var/override/numbered/zero_init/bool.wgsl.expected.glsl +++ b/test/var/override/numbered/zero_init/bool.wgsl.expected.glsl @@ -5,12 +5,11 @@ precision mediump float; #define WGSL_SPEC_CONSTANT_1234 false #endif const bool o = WGSL_SPEC_CONSTANT_1234; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/override/numbered/zero_init/f32.wgsl.expected.glsl b/test/var/override/numbered/zero_init/f32.wgsl.expected.glsl index 21bf19f437..7b208ab181 100644 --- a/test/var/override/numbered/zero_init/f32.wgsl.expected.glsl +++ b/test/var/override/numbered/zero_init/f32.wgsl.expected.glsl @@ -5,12 +5,11 @@ precision mediump float; #define WGSL_SPEC_CONSTANT_1234 0.0f #endif const float o = WGSL_SPEC_CONSTANT_1234; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/override/numbered/zero_init/i32.wgsl.expected.glsl b/test/var/override/numbered/zero_init/i32.wgsl.expected.glsl index dabd0b77ab..d4566cc47f 100644 --- a/test/var/override/numbered/zero_init/i32.wgsl.expected.glsl +++ b/test/var/override/numbered/zero_init/i32.wgsl.expected.glsl @@ -5,12 +5,11 @@ precision mediump float; #define WGSL_SPEC_CONSTANT_1234 0 #endif const int o = WGSL_SPEC_CONSTANT_1234; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/override/numbered/zero_init/u32.wgsl.expected.glsl b/test/var/override/numbered/zero_init/u32.wgsl.expected.glsl index 80421e97d8..117e6bbc22 100644 --- a/test/var/override/numbered/zero_init/u32.wgsl.expected.glsl +++ b/test/var/override/numbered/zero_init/u32.wgsl.expected.glsl @@ -5,12 +5,11 @@ precision mediump float; #define WGSL_SPEC_CONSTANT_1234 0u #endif const uint o = WGSL_SPEC_CONSTANT_1234; -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - diff --git a/test/var/uses/many_workgroup_vars.wgsl.expected.glsl b/test/var/uses/many_workgroup_vars.wgsl.expected.glsl index a81184b5e6..1ff7afe8c0 100644 --- a/test/var/uses/many_workgroup_vars.wgsl.expected.glsl +++ b/test/var/uses/many_workgroup_vars.wgsl.expected.glsl @@ -101,11 +101,7 @@ shared mat2 m96; shared mat2 m97; shared mat2 m98; shared mat2 m99; -struct tint_symbol_2 { - uint idx; -}; - -void tint_symbol_inner(uint idx) { +void tint_symbol(uint idx) { { m00 = mat2(0.0f, 0.0f, 0.0f, 0.0f); m01 = mat2(0.0f, 0.0f, 0.0f, 0.0f); @@ -312,15 +308,7 @@ void tint_symbol_inner(uint idx) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.idx); +void main() { + tint_symbol(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.idx = uint(gl_LocalInvocationIndex); - tint_symbol(inputs); -} - diff --git a/test/var/uses/private.wgsl.expected.glsl b/test/var/uses/private.wgsl.expected.glsl index a02a261005..dd7392b8b7 100644 --- a/test/var/uses/private.wgsl.expected.glsl +++ b/test/var/uses/private.wgsl.expected.glsl @@ -6,17 +6,16 @@ void uses_a() { a = (a + 1); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main1() { a = 42; uses_a(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { main1(); + return; } - #version 310 es precision mediump float; @@ -25,17 +24,16 @@ void uses_b() { b = (b * 2); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main2() { b = 7; uses_b(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { main2(); + return; } - #version 310 es precision mediump float; @@ -64,30 +62,28 @@ void outer() { no_uses(); } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main3() { outer(); no_uses(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { main3(); + return; } - #version 310 es precision mediump float; void no_uses() { } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main4() { no_uses(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { main4(); + return; } - diff --git a/test/var/uses/workgroup.wgsl.expected.glsl b/test/var/uses/workgroup.wgsl.expected.glsl index d2c86cae3c..2918be4f09 100644 --- a/test/var/uses/workgroup.wgsl.expected.glsl +++ b/test/var/uses/workgroup.wgsl.expected.glsl @@ -6,11 +6,7 @@ void uses_a() { a = (a + 1); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -void main1_inner(uint local_invocation_index) { +void main1(uint local_invocation_index) { { a = 0; } @@ -19,27 +15,11 @@ void main1_inner(uint local_invocation_index) { uses_a(); } -struct tint_symbol_3 { - uint local_invocation_index_1; -}; - -struct tint_symbol_5 { - uint local_invocation_index_2; -}; - layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void main1(tint_symbol_1 tint_symbol) { - main1_inner(tint_symbol.local_invocation_index); +void main() { + main1(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_1 inputs; - inputs.local_invocation_index = uint(gl_LocalInvocationIndex); - main1(inputs); -} - #version 310 es precision mediump float; @@ -48,15 +28,7 @@ void uses_b() { b = (b * 2); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -struct tint_symbol_3 { - uint local_invocation_index_1; -}; - -void main2_inner(uint local_invocation_index_1) { +void main2(uint local_invocation_index_1) { { b = 0; } @@ -65,23 +37,11 @@ void main2_inner(uint local_invocation_index_1) { uses_b(); } -struct tint_symbol_5 { - uint local_invocation_index_2; -}; - layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void main2(tint_symbol_3 tint_symbol_2) { - main2_inner(tint_symbol_2.local_invocation_index_1); +void main() { + main2(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_3 inputs; - inputs.local_invocation_index_1 = uint(gl_LocalInvocationIndex); - main2(inputs); -} - #version 310 es precision mediump float; @@ -110,19 +70,7 @@ void outer() { no_uses(); } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -struct tint_symbol_3 { - uint local_invocation_index_1; -}; - -struct tint_symbol_5 { - uint local_invocation_index_2; -}; - -void main3_inner(uint local_invocation_index_2) { +void main3(uint local_invocation_index_2) { { a = 0; b = 0; @@ -133,43 +81,22 @@ void main3_inner(uint local_invocation_index_2) { } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void main3(tint_symbol_5 tint_symbol_4) { - main3_inner(tint_symbol_4.local_invocation_index_2); +void main() { + main3(gl_LocalInvocationIndex); return; } - - -void main() { - tint_symbol_5 inputs; - inputs.local_invocation_index_2 = uint(gl_LocalInvocationIndex); - main3(inputs); -} - #version 310 es precision mediump float; void no_uses() { } -struct tint_symbol_1 { - uint local_invocation_index; -}; - -struct tint_symbol_3 { - uint local_invocation_index_1; -}; - -struct tint_symbol_5 { - uint local_invocation_index_2; -}; - -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main4() { no_uses(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { main4(); + return; } - diff --git a/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.spvasm.expected.glsl index 93c8bb356c..1c13254412 100644 --- a/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/barrier-in-loop-with-break/0-opt.spvasm.expected.glsl @@ -49,28 +49,16 @@ void main_1() { return; } -struct tint_symbol_4 { - uvec3 tint_symbol_2; -}; - -void tint_symbol_1_inner(uvec3 tint_symbol_2) { +void tint_symbol_1(uvec3 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); } layout(local_size_x = 16, local_size_y = 1, local_size_z = 1) in; -void tint_symbol_1(tint_symbol_4 tint_symbol_3) { - tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); +void main() { + tint_symbol_1(gl_LocalInvocationID); return; } - - -void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_LocalInvocationID; - tint_symbol_1(inputs); -} - Error parsing GLSL shader: ERROR: 0:6: '' : array size required ERROR: 0:7: '' : compilation terminated 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 ff8ddc5ab5..acddae32ba 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 @@ -53,28 +53,16 @@ void main_1() { return; } -struct tint_symbol_4 { - uvec3 tint_symbol_2; -}; - -void tint_symbol_1_inner(uvec3 tint_symbol_2) { +void tint_symbol_1(uvec3 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); } layout(local_size_x = 16, local_size_y = 1, local_size_z = 1) in; -void tint_symbol_1(tint_symbol_4 tint_symbol_3) { - tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); +void main() { + tint_symbol_1(gl_LocalInvocationID); return; } - - -void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_LocalInvocationID; - tint_symbol_1(inputs); -} - Error parsing GLSL shader: ERROR: 0:6: '' : array size required ERROR: 0:7: '' : compilation terminated diff --git a/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.spvasm.expected.glsl index e03004c065..237995c290 100644 --- a/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/control-flow-in-function/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -194,41 +195,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:104: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:104: '' : compilation terminated +ERROR: 0:105: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:105: '' : compilation terminated ERROR: 2 compilation errors. No code generated. 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 c39a0db3f3..abb8a2d933 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 @@ -11,6 +11,7 @@ type Arr_1 = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -70,33 +71,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:33: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' const float' and a right operand of type ' const float' (or there is no acceptable conversion) -ERROR: 0:33: '' : compilation terminated +ERROR: 0:34: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' const float' and a right operand of type ' const float' (or there is no acceptable conversion) +ERROR: 0:34: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.spvasm.expected.glsl index 932f6e3013..6c40edae22 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.spvasm.expected.glsl @@ -4,6 +4,7 @@ warning: use of deprecated intrinsic #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -78,33 +79,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:42: '|' : wrong operand types: no operation '|' exists that takes a left-hand operand of type ' global bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:42: '' : compilation terminated +ERROR: 0:43: '|' : wrong operand types: no operation '|' exists that takes a left-hand operand of type ' global bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:43: '' : compilation terminated ERROR: 2 compilation errors. No code generated. 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 990ae876c8..4782e04ec7 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 @@ -15,6 +15,7 @@ vk-gl-cts/graphicsfuzz/cov-apfloat-module-small-number/0-opt.wgsl:39:22 warning: #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -104,33 +105,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:31: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' const float' and a right operand of type ' const float' (or there is no acceptable conversion) -ERROR: 0:31: '' : compilation terminated +ERROR: 0:32: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' const float' and a right operand of type ' const float' (or there is no acceptable conversion) +ERROR: 0:32: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-tanh/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-tanh/0-opt.spvasm.expected.glsl index 08ce5c5b45..c42e69736d 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-tanh/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-tanh/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); void main_1() { vec4 v = vec4(0.0f, 0.0f, 0.0f, 0.0f); @@ -23,33 +24,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:12: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:12: '' : compilation terminated +ERROR: 0:13: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:13: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.spvasm.expected.glsl index 240e0313d2..4c65bdc782 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-apfloat-unpackunorm-loop/0-opt.spvasm.expected.glsl @@ -10,6 +10,7 @@ vec4 tint_unpack4x8unorm(uint param_0) { } +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -59,30 +60,17 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: ERROR: 0:6: 'uint4' : undeclared identifier ERROR: 0:6: '' : compilation terminated 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 61674516a4..130cb5f98e 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 @@ -14,6 +14,7 @@ vec4 tint_unpack4x8unorm(uint param_0) { } +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -63,30 +64,17 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: ERROR: 0:6: 'uint4' : undeclared identifier ERROR: 0:6: '' : compilation terminated diff --git a/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.spvasm.expected.glsl index 2e0d58b8a6..fe32bd4506 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-bitcount/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -72,42 +73,22 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:39: 'countbits' : no matching overloaded function found -ERROR: 0:39: 'assign' : cannot convert from ' const float' to ' temp mediump int' -ERROR: 0:39: '' : compilation terminated +ERROR: 0:40: 'countbits' : no matching overloaded function found +ERROR: 0:40: 'assign' : cannot convert from ' const float' to ' temp mediump int' +ERROR: 0:40: '' : compilation terminated ERROR: 3 compilation errors. No code generated. 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 29f6381622..c64c3de4e6 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 @@ -11,6 +11,7 @@ type Arr_1 = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -80,42 +81,22 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:39: 'countbits' : no matching overloaded function found -ERROR: 0:39: 'assign' : cannot convert from ' const float' to ' temp mediump int' -ERROR: 0:39: '' : compilation terminated +ERROR: 0:40: 'countbits' : no matching overloaded function found +ERROR: 0:40: 'assign' : cannot convert from ' const float' to ' temp mediump int' +ERROR: 0:40: '' : compilation terminated ERROR: 3 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.spvasm.expected.glsl index 45603042fa..93a8edf16f 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-bitfieldreverse-loop-limit-underflow/0.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -67,33 +68,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:23: 'reversebits' : no matching overloaded function found -ERROR: 0:23: '' : compilation terminated +ERROR: 0:24: 'reversebits' : no matching overloaded function found +ERROR: 0:24: '' : compilation terminated ERROR: 2 compilation errors. No code generated. 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 31c8c48939..a8ff3ff539 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 @@ -7,6 +7,7 @@ type Arr = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -71,33 +72,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:23: 'reversebits' : no matching overloaded function found -ERROR: 0:23: '' : compilation terminated +ERROR: 0:24: 'reversebits' : no matching overloaded function found +ERROR: 0:24: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.spvasm.expected.glsl index ebf33124be..deecf4ff4d 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-color-output-undefined-in-unexecuted-branch/0-opt.spvasm.expected.glsl @@ -10,6 +10,7 @@ vec4 tint_unpack4x8snorm(uint param_0) { } +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -135,38 +136,18 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: ERROR: 0:6: 'int4' : undeclared identifier ERROR: 0:6: '' : compilation terminated 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 2259446db8..89c8827564 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 @@ -22,6 +22,7 @@ vec4 tint_unpack4x8snorm(uint param_0) { } +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -147,38 +148,18 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: ERROR: 0:6: 'int4' : undeclared identifier ERROR: 0:6: '' : compilation terminated diff --git a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-inside-while/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-inside-while/0-opt.spvasm.expected.glsl index 64413c4a04..c1911352e3 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-inside-while/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-const-folding-clamp-inside-while/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); void main_1() { int i = 0; @@ -29,33 +30,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:18: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:18: '' : compilation terminated +ERROR: 0:19: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:19: '' : compilation terminated ERROR: 2 compilation errors. No code generated. 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 900486a4e5..9835939d1b 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 @@ -7,6 +7,7 @@ type Arr = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -38,33 +39,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:18: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' const float' and a right operand of type ' const float' (or there is no acceptable conversion) -ERROR: 0:18: '' : compilation terminated +ERROR: 0:19: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' const float' and a right operand of type ' const float' (or there is no acceptable conversion) +ERROR: 0:19: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-constant-folding-atan-over-tanh/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-constant-folding-atan-over-tanh/0-opt.spvasm.expected.glsl index 82ba3e22b9..f5fd0fdff5 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-constant-folding-atan-over-tanh/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-constant-folding-atan-over-tanh/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); void main_1() { float f = 0.0f; @@ -19,33 +20,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:8: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:8: '' : compilation terminated +ERROR: 0:9: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:9: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.spvasm.expected.glsl index e676744175..0662c7637a 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-dag-combiner-loop-bitfieldreverse/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -53,33 +54,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:28: 'reversebits' : no matching overloaded function found -ERROR: 0:28: '' : compilation terminated +ERROR: 0:29: 'reversebits' : no matching overloaded function found +ERROR: 0:29: '' : compilation terminated ERROR: 2 compilation errors. No code generated. 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 270ef81706..8631354e21 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 @@ -7,6 +7,7 @@ type Arr = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -57,33 +58,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:28: 'reversebits' : no matching overloaded function found -ERROR: 0:28: '' : compilation terminated +ERROR: 0:29: 'reversebits' : no matching overloaded function found +ERROR: 0:29: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.spvasm.expected.glsl index ff629a419a..abe7c04813 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-derivative-uniform-vector-global-loop-count/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -88,33 +89,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:55: 'ddx' : no matching overloaded function found -ERROR: 0:55: '' : compilation terminated +ERROR: 0:56: 'ddx' : no matching overloaded function found +ERROR: 0:56: '' : compilation terminated ERROR: 2 compilation errors. No code generated. 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 a1dd337398..aee6a91ae7 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 @@ -11,6 +11,7 @@ type Arr_1 = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -96,33 +97,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:55: 'ddx' : no matching overloaded function found -ERROR: 0:55: '' : compilation terminated +ERROR: 0:56: 'ddx' : no matching overloaded function found +ERROR: 0:56: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-divide-matrix-transpose-by-constant/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-divide-matrix-transpose-by-constant/0-opt.spvasm.expected.glsl index 6320755cbf..1a75fe7fe2 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-divide-matrix-transpose-by-constant/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-divide-matrix-transpose-by-constant/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); void main_1() { mat2 m = mat2(0.0f, 0.0f, 0.0f, 0.0f); @@ -20,33 +21,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:9: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' global bool' and a right operand of type ' global bool' (or there is no acceptable conversion) -ERROR: 0:9: '' : compilation terminated +ERROR: 0:10: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' global bool' and a right operand of type ' global bool' (or there is no acceptable conversion) +ERROR: 0:10: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-and-const-variable/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-and-const-variable/0.spvasm.expected.glsl index bb9081f665..07c55d634e 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-and-const-variable/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-and-const-variable/0.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); void main_1() { bool a = false; @@ -19,33 +20,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:8: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' const bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:8: '' : compilation terminated +ERROR: 0:9: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' const bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:9: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-and-constant/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-and-constant/0-opt.spvasm.expected.glsl index 1ac4916fe0..b8983357db 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-and-constant/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-and-constant/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; vec4 tint_symbol = vec4(0.0f, 0.0f, 0.0f, 0.0f); vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); void main_1() { @@ -30,41 +31,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:13: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' const bool' (or there is no acceptable conversion) -ERROR: 0:13: '' : compilation terminated +ERROR: 0:14: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' const bool' (or there is no acceptable conversion) +ERROR: 0:14: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-or-constant/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-or-constant/0.spvasm.expected.glsl index 621b4bbc8f..e0962bf51c 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-or-constant/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-fold-logical-or-constant/0.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; vec4 tint_symbol = vec4(0.0f, 0.0f, 0.0f, 0.0f); vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); void main_1() { @@ -19,41 +20,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:8: '|' : wrong operand types: no operation '|' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' const bool' (or there is no acceptable conversion) -ERROR: 0:8: '' : compilation terminated +ERROR: 0:9: '|' : wrong operand types: no operation '|' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' const bool' (or there is no acceptable conversion) +ERROR: 0:9: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fold-shift-gte32/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-fold-shift-gte32/0.spvasm.expected.glsl index 6c4965b66b..a575f8d859 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-fold-shift-gte32/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-fold-shift-gte32/0.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { uint one; }; @@ -61,33 +62,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:50: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:50: '' : compilation terminated +ERROR: 0:51: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:51: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-div-mul/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-div-mul/0-opt.spvasm.expected.glsl index c3ca7d7af8..01f5b059a3 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-div-mul/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-div-mul/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { float one; }; @@ -28,33 +29,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:17: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:17: '' : compilation terminated +ERROR: 0:18: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:18: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-divs/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-divs/0-opt.spvasm.expected.glsl index 8be8ca8430..b2ee6502f6 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-divs/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-divs/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { float four; }; @@ -28,33 +29,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:17: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:17: '' : compilation terminated +ERROR: 0:18: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:18: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-mul-div/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-mul-div/0-opt.spvasm.expected.glsl index abd1a1e143..eb1e063a56 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-mul-div/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-merge-mul-div/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { float one; }; @@ -28,33 +29,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:17: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:17: '' : compilation terminated +ERROR: 0:18: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:18: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.spvasm.expected.glsl index df8d742dc5..bffa90bc93 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -26,33 +27,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:15: '' : boolean expression expected -ERROR: 0:15: '' : compilation terminated +ERROR: 0:16: '' : boolean expression expected +ERROR: 0:16: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.wgsl.expected.glsl index df8d742dc5..bffa90bc93 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-extract/0-opt.wgsl.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -26,33 +27,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:15: '' : boolean expression expected -ERROR: 0:15: '' : compilation terminated +ERROR: 0:16: '' : boolean expression expected +ERROR: 0:16: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.spvasm.expected.glsl index 7f816f4ec3..a6f36552d9 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 threeandfour; }; @@ -31,33 +32,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:17: '' : boolean expression expected -ERROR: 0:17: '' : compilation terminated +ERROR: 0:18: '' : boolean expression expected +ERROR: 0:18: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.wgsl.expected.glsl index 7f816f4ec3..a6f36552d9 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-folding-rules-shuffle-mix/0-opt.wgsl.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 threeandfour; }; @@ -31,33 +32,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:17: '' : boolean expression expected -ERROR: 0:17: '' : compilation terminated +ERROR: 0:18: '' : boolean expression expected +ERROR: 0:18: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.spvasm.expected.glsl index 745c67ca3d..b3a2077e26 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-fract-asin-undefined-never-used/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -53,41 +54,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:34: 'frac' : no matching overloaded function found -ERROR: 0:34: '' : compilation terminated +ERROR: 0:35: 'frac' : no matching overloaded function found +ERROR: 0:35: '' : compilation terminated ERROR: 2 compilation errors. No code generated. 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 4d08ecf28d..0d7cabe7b1 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 @@ -11,6 +11,7 @@ type Arr_1 = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -61,41 +62,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:34: 'frac' : no matching overloaded function found -ERROR: 0:34: '' : compilation terminated +ERROR: 0:35: 'frac' : no matching overloaded function found +ERROR: 0:35: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.spvasm.expected.glsl index cd589ef97d..0ee42ce3d9 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-fract-smoothstep-undefined/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -56,34 +57,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:25: 'frac' : no matching overloaded function found -ERROR: 0:25: 'assign' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' -ERROR: 0:25: '' : compilation terminated +ERROR: 0:26: 'frac' : no matching overloaded function found +ERROR: 0:26: 'assign' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' +ERROR: 0:26: '' : compilation terminated ERROR: 3 compilation errors. No code generated. 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 3eb01e8619..40fa5ab1bc 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 @@ -7,6 +7,7 @@ type Arr = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -60,34 +61,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:25: 'frac' : no matching overloaded function found -ERROR: 0:25: 'assign' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' -ERROR: 0:25: '' : compilation terminated +ERROR: 0:26: 'frac' : no matching overloaded function found +ERROR: 0:26: 'assign' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' +ERROR: 0:26: '' : compilation terminated ERROR: 3 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.spvasm.expected.glsl index 948c9ace13..9dcb6b466b 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-global-loop-counter-main-function-call/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -68,33 +69,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:41: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' const bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:41: '' : compilation terminated +ERROR: 0:42: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' const bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:42: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.spvasm.expected.glsl index a7a4d1186d..fba22664f8 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-increment-multiple-integers/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -90,33 +91,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:33: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:33: '' : compilation terminated +ERROR: 0:34: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:34: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.spvasm.expected.glsl index 924667ccd0..077ea9bfdc 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-and-or-xor-pack-unpack/0-opt.spvasm.expected.glsl @@ -15,6 +15,7 @@ vec4 tint_unpack4x8snorm(uint param_0) { } +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -114,30 +115,17 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint4' : undeclared identifier ERROR: 0:5: '' : compilation terminated 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 6f2da3872e..12038bd0f5 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 @@ -23,6 +23,7 @@ vec4 tint_unpack4x8snorm(uint param_0) { } +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -122,30 +123,17 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint4' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.spvasm.expected.glsl index 4097def644..0942b777c0 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-mul-div-rem-if-undefined-divide-mix/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -77,41 +78,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:32: 'ddx' : no matching overloaded function found -ERROR: 0:32: '' : compilation terminated +ERROR: 0:33: 'ddx' : no matching overloaded function found +ERROR: 0:33: '' : compilation terminated ERROR: 2 compilation errors. No code generated. 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 0bd2ff4d82..4680b6a40f 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 @@ -11,6 +11,7 @@ type Arr_1 = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -85,41 +86,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:32: 'ddx' : no matching overloaded function found -ERROR: 0:32: '' : compilation terminated +ERROR: 0:33: 'ddx' : no matching overloaded function found +ERROR: 0:33: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.spvasm.expected.glsl index 68c29918c8..614a628fc7 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-pack-unpack/0-opt.spvasm.expected.glsl @@ -15,6 +15,7 @@ vec4 tint_unpack4x8snorm(uint param_0) { } +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -106,30 +107,17 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint2' : undeclared identifier ERROR: 0:5: '' : compilation terminated 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 578af5fb88..606777591e 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 @@ -23,6 +23,7 @@ vec4 tint_unpack4x8snorm(uint param_0) { } +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -114,30 +115,17 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint2' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.spvasm.expected.glsl index dc10b7c731..831d9b6d92 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-shifts-mix-mix-clamp/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -94,33 +95,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:63: '' : boolean expression expected -ERROR: 0:63: '' : compilation terminated +ERROR: 0:64: '' : boolean expression expected +ERROR: 0:64: '' : compilation terminated ERROR: 2 compilation errors. No code generated. 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 34dee10698..1e4b69d8d7 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 @@ -11,6 +11,7 @@ type Arr_1 = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -102,33 +103,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:63: '' : boolean expression expected -ERROR: 0:63: '' : compilation terminated +ERROR: 0:64: '' : boolean expression expected +ERROR: 0:64: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.spvasm.expected.glsl index c01ff1b0c4..0f1b8ba963 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-pack-unpack/0-opt.spvasm.expected.glsl @@ -15,6 +15,7 @@ vec4 tint_unpack4x8snorm(uint param_0) { } +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -105,30 +106,17 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint2' : undeclared identifier ERROR: 0:5: '' : compilation terminated 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 1f2976fb34..64925a1871 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 @@ -23,6 +23,7 @@ vec4 tint_unpack4x8snorm(uint param_0) { } +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -113,30 +114,17 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint2' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.spvasm.expected.glsl index daf4a25c6f..bded5843c9 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-combine-simplify-demanded-packsnorm-unpackunorm/0-opt.spvasm.expected.glsl @@ -15,6 +15,7 @@ vec4 tint_unpack4x8unorm(uint param_0) { } +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -107,30 +108,17 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: ERROR: 0:5: 'int4' : undeclared identifier ERROR: 0:5: '' : compilation terminated 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 bb34234fea..471a1b83e6 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 @@ -23,6 +23,7 @@ vec4 tint_unpack4x8unorm(uint param_0) { } +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -115,30 +116,17 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: ERROR: 0:5: 'int4' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.spvasm.expected.glsl index 6e9c639615..b6862f684f 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-inst-value-tracking-inversesqrt/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -35,33 +36,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:19: 'rsqrt' : no matching overloaded function found -ERROR: 0:19: '' : compilation terminated +ERROR: 0:20: 'rsqrt' : no matching overloaded function found +ERROR: 0:20: '' : compilation terminated ERROR: 2 compilation errors. No code generated. 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 7412095786..794bec97dc 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 @@ -7,6 +7,7 @@ type Arr = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -39,33 +40,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:19: 'rsqrt' : no matching overloaded function found -ERROR: 0:19: '' : compilation terminated +ERROR: 0:20: 'rsqrt' : no matching overloaded function found +ERROR: 0:20: '' : compilation terminated ERROR: 2 compilation errors. No code generated. 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 a24ab1bcd0..d67ac88f3e 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 @@ -11,6 +11,7 @@ type Arr_1 = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -58,33 +59,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:37: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump float' and a right operand of type ' global highp float' (or there is no acceptable conversion) -ERROR: 0:37: '' : compilation terminated +ERROR: 0:38: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump float' and a right operand of type ' global highp float' (or there is no acceptable conversion) +ERROR: 0:38: '' : compilation terminated ERROR: 2 compilation errors. No code generated. 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 a4101cc725..35c15b0ce3 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 @@ -11,6 +11,7 @@ type Arr_1 = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -58,33 +59,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:37: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' global highp float' and a right operand of type ' temp mediump float' (or there is no acceptable conversion) -ERROR: 0:37: '' : compilation terminated +ERROR: 0:38: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' global highp float' and a right operand of type ' temp mediump float' (or there is no acceptable conversion) +ERROR: 0:38: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.spvasm.expected.glsl index d0d142749e..116a3a2f93 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-condition-double-negate/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -26,8 +27,8 @@ void main_1() { int x_33 = x_6.x_GLF_uniform_int_values[3].el; int x_35 = x_6.x_GLF_uniform_int_values[5].el; int x_37 = x_6.x_GLF_uniform_int_values[2].el; - int tint_symbol_2[3] = int[3](x_33, x_35, x_37); - arr = tint_symbol_2; + int tint_symbol_1[3] = int[3](x_33, x_35, x_37); + arr = tint_symbol_1; index = 1; while (true) { bool x_51 = false; @@ -86,33 +87,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_3 = main_out(x_GLF_color); - return tint_symbol_3; + main_out tint_symbol_2 = main_out(x_GLF_color); + return tint_symbol_2; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:36: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:36: '' : compilation terminated +ERROR: 0:37: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:37: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.spvasm.expected.glsl index b3674d4d5d..8c65410ee6 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-dfdx-constant-divide/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -81,33 +82,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:54: 'ddx' : no matching overloaded function found -ERROR: 0:54: '' : compilation terminated +ERROR: 0:55: 'ddx' : no matching overloaded function found +ERROR: 0:55: '' : compilation terminated ERROR: 2 compilation errors. No code generated. 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 3480250fee..d34fc48b59 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 @@ -11,6 +11,7 @@ type Arr_1 = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -89,33 +90,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:54: 'ddx' : no matching overloaded function found -ERROR: 0:54: '' : compilation terminated +ERROR: 0:55: 'ddx' : no matching overloaded function found +ERROR: 0:55: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.spvasm.expected.glsl index c262568b20..d07d066520 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-loop-increment-matrix-element-break-after-first-iteration/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -92,41 +93,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:75: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' global bool' and a right operand of type ' global bool' (or there is no acceptable conversion) -ERROR: 0:75: '' : compilation terminated +ERROR: 0:76: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' global bool' and a right operand of type ' global bool' (or there is no acceptable conversion) +ERROR: 0:76: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.spvasm.expected.glsl index 3517d054e4..284ba47599 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-matrix-double-transpose/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -43,33 +44,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:26: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' global bool' and a right operand of type ' global bool' (or there is no acceptable conversion) -ERROR: 0:26: '' : compilation terminated +ERROR: 0:27: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' global bool' and a right operand of type ' global bool' (or there is no acceptable conversion) +ERROR: 0:27: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.spvasm.expected.glsl index 159f5ebcea..793f1f9b2d 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-missing-return-value-function-never-called/0-opt.spvasm.expected.glsl @@ -9,6 +9,7 @@ uint tint_pack4x8unorm(vec4 param_0) { } +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf1 { uint one; }; @@ -70,38 +71,18 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint4' : undeclared identifier ERROR: 0:5: '' : compilation terminated 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 580bf97dea..6cc7b62e73 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 @@ -13,6 +13,7 @@ uint tint_pack4x8unorm(vec4 param_0) { } +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf1 { uint one; }; @@ -74,38 +75,18 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint4' : undeclared identifier ERROR: 0:5: '' : compilation terminated 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 7a79be9463..e5bc8a00e6 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 @@ -7,6 +7,7 @@ type Arr = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -41,33 +42,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:19: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' global highp float' and a right operand of type ' const float' (or there is no acceptable conversion) -ERROR: 0:19: '' : compilation terminated +ERROR: 0:20: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' global highp float' and a right operand of type ' const float' (or there is no acceptable conversion) +ERROR: 0:20: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.spvasm.expected.glsl index 5da05158e6..cd6a9d6c8c 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-nested-functions-accumulate-global-matrix/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf2 { float one; }; @@ -129,41 +130,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:112: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' global bool' and a right operand of type ' global bool' (or there is no acceptable conversion) -ERROR: 0:112: '' : compilation terminated +ERROR: 0:113: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' global bool' and a right operand of type ' global bool' (or there is no acceptable conversion) +ERROR: 0:113: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.spvasm.expected.glsl index 0db518ee86..5c52cb4a2c 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-packhalf-unpackunorm/0-opt.spvasm.expected.glsl @@ -15,6 +15,7 @@ vec4 tint_unpack4x8unorm(uint param_0) { } +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -116,30 +117,17 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint2' : undeclared identifier ERROR: 0:5: '' : compilation terminated 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 6e1e672c0f..d320dbd4b1 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 @@ -23,6 +23,7 @@ vec4 tint_unpack4x8unorm(uint param_0) { } +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -124,30 +125,17 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: ERROR: 0:5: 'uint2' : undeclared identifier ERROR: 0:5: '' : compilation terminated diff --git a/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.spvasm.expected.glsl index 7554d6371b..99d13200f7 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-pow-undefined/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -42,33 +43,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:26: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:26: '' : compilation terminated +ERROR: 0:27: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:27: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-reduce-load-array-replace-extract/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-reduce-load-array-replace-extract/0.spvasm.expected.glsl index fcb1f4334d..5e8bad90a5 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-reduce-load-array-replace-extract/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-reduce-load-array-replace-extract/0.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { int zero; }; @@ -40,33 +41,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:29: '|' : wrong operand types: no operation '|' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:29: '' : compilation terminated +ERROR: 0:30: '|' : wrong operand types: no operation '|' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:30: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.spvasm.expected.glsl index 3aa7fe48d1..393473c808 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-reinitialize-matrix-after-undefined-value/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -81,33 +82,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:64: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' global bool' and a right operand of type ' global bool' (or there is no acceptable conversion) -ERROR: 0:64: '' : compilation terminated +ERROR: 0:65: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' global bool' and a right operand of type ' global bool' (or there is no acceptable conversion) +ERROR: 0:65: '' : compilation terminated ERROR: 2 compilation errors. No code generated. 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 5243039138..97fce96917 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 @@ -11,6 +11,7 @@ type Arr_1 = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -59,33 +60,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:32: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump float' and a right operand of type ' const float' (or there is no acceptable conversion) -ERROR: 0:32: '' : compilation terminated +ERROR: 0:33: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp mediump float' and a right operand of type ' const float' (or there is no acceptable conversion) +ERROR: 0:33: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.spvasm.expected.glsl index fdb27df09d..d0cbc9b919 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { float two; }; @@ -32,41 +33,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:18: 'ddx' : no matching overloaded function found -ERROR: 0:18: '' : compilation terminated +ERROR: 0:19: 'ddx' : no matching overloaded function found +ERROR: 0:19: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.wgsl.expected.glsl index 93fdda15a2..a2523762e1 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-target-lowering-dfdx-cos/0-opt.wgsl.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { float two; }; @@ -36,41 +37,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:18: 'ddx' : no matching overloaded function found -ERROR: 0:18: '' : compilation terminated +ERROR: 0:19: 'ddx' : no matching overloaded function found +ERROR: 0:19: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-transpose-multiply/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-transpose-multiply/0-opt.spvasm.expected.glsl index d2284c07fc..24594c7b46 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-transpose-multiply/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-transpose-multiply/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); void main_1() { mat2 m = mat2(0.0f, 0.0f, 0.0f, 0.0f); @@ -21,33 +22,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:10: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' global bool' and a right operand of type ' global bool' (or there is no acceptable conversion) -ERROR: 0:10: '' : compilation terminated +ERROR: 0:11: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' global bool' and a right operand of type ' global bool' (or there is no acceptable conversion) +ERROR: 0:11: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.spvasm.expected.glsl index 24ddbb4576..d425050677 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-trunc-fract-always-zero/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -54,41 +55,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:34: 'frac' : no matching overloaded function found -ERROR: 0:34: '' : compilation terminated +ERROR: 0:35: 'frac' : no matching overloaded function found +ERROR: 0:35: '' : compilation terminated ERROR: 2 compilation errors. No code generated. 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 1eb2456ccc..614682325c 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 @@ -11,6 +11,7 @@ type Arr_1 = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -62,41 +63,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:34: 'frac' : no matching overloaded function found -ERROR: 0:34: '' : compilation terminated +ERROR: 0:35: 'frac' : no matching overloaded function found +ERROR: 0:35: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.spvasm.expected.glsl index e012d939f6..8c0d1345b8 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-unpack-unorm-mix-always-one/0-opt.spvasm.expected.glsl @@ -10,6 +10,7 @@ vec4 tint_unpack4x8unorm(uint param_0) { } +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { uint el; }; @@ -77,30 +78,17 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: ERROR: 0:6: 'uint4' : undeclared identifier ERROR: 0:6: '' : compilation terminated 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 2e45df0657..af56b5c7f8 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 @@ -22,6 +22,7 @@ vec4 tint_unpack4x8unorm(uint param_0) { } +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { uint el; }; @@ -89,30 +90,17 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: ERROR: 0:6: 'uint4' : undeclared identifier ERROR: 0:6: '' : compilation terminated diff --git a/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.spvasm.expected.glsl index 8d9cc95fa7..d060ee954c 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-unused-access-past-matrix-elements/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -44,8 +45,8 @@ void main_1() { float x_58 = x_6.x_GLF_uniform_float_values[0].el; float x_60 = x_6.x_GLF_uniform_float_values[0].el; float x_62 = x_6.x_GLF_uniform_float_values[0].el; - tint_padded_array_element tint_symbol_2[3] = tint_padded_array_element[3](tint_padded_array_element(x_58), tint_padded_array_element(x_60), tint_padded_array_element(x_62)); - sums = tint_symbol_2; + tint_padded_array_element tint_symbol_1[3] = tint_padded_array_element[3](tint_padded_array_element(x_58), tint_padded_array_element(x_60), tint_padded_array_element(x_62)); + sums = tint_symbol_1; int x_65 = x_8.x_GLF_uniform_int_values[0].el; i = x_65; x_67_phi = x_65; @@ -99,34 +100,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_3 = main_out(x_GLF_color); - return tint_symbol_3; + main_out tint_symbol_2 = main_out(x_GLF_color); + return tint_symbol_2; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:73: '[' : matrix index out of range '4' -ERROR: 0:73: '=' : cannot convert from ' temp mediump 3-component vector of float' to ' temp mediump float' -ERROR: 0:73: '' : compilation terminated +ERROR: 0:74: '[' : matrix index out of range '4' +ERROR: 0:74: '=' : cannot convert from ' temp mediump 3-component vector of float' to ' temp mediump float' +ERROR: 0:74: '' : compilation terminated ERROR: 3 compilation errors. No code generated. 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 e8a53f79e0..7cc77ec722 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 @@ -11,6 +11,7 @@ type Arr_1 = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -52,8 +53,8 @@ void main_1() { float x_58 = x_6.x_GLF_uniform_float_values[0].el; float x_60 = x_6.x_GLF_uniform_float_values[0].el; float x_62 = x_6.x_GLF_uniform_float_values[0].el; - tint_padded_array_element tint_symbol_2[3] = tint_padded_array_element[3](tint_padded_array_element(x_58), tint_padded_array_element(x_60), tint_padded_array_element(x_62)); - sums = tint_symbol_2; + tint_padded_array_element tint_symbol_1[3] = tint_padded_array_element[3](tint_padded_array_element(x_58), tint_padded_array_element(x_60), tint_padded_array_element(x_62)); + sums = tint_symbol_1; int x_65 = x_8.x_GLF_uniform_int_values[0].el; i = x_65; x_67_phi = x_65; @@ -107,34 +108,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_3 = main_out(x_GLF_color); - return tint_symbol_3; + main_out tint_symbol_2 = main_out(x_GLF_color); + return tint_symbol_2; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:73: '[' : matrix index out of range '4' -ERROR: 0:73: '=' : cannot convert from ' temp mediump 3-component vector of float' to ' temp mediump float' -ERROR: 0:73: '' : compilation terminated +ERROR: 0:74: '[' : matrix index out of range '4' +ERROR: 0:74: '=' : cannot convert from ' temp mediump 3-component vector of float' to ' temp mediump float' +ERROR: 0:74: '' : compilation terminated ERROR: 3 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.spvasm.expected.glsl index 229597bb4f..f3909fade5 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-unused-matrix-copy-inside-loop/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { int el; }; @@ -95,33 +96,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:78: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' global bool' and a right operand of type ' global bool' (or there is no acceptable conversion) -ERROR: 0:78: '' : compilation terminated +ERROR: 0:79: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' global bool' and a right operand of type ' global bool' (or there is no acceptable conversion) +ERROR: 0:79: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-unused-component/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-unused-component/0-opt.spvasm.expected.glsl index 89aaf528eb..03a69307fb 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-unused-component/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-unused-component/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); void main_1() { vec2 a = vec2(0.0f, 0.0f); @@ -24,34 +25,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:11: 'frac' : no matching overloaded function found -ERROR: 0:11: 'assign' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' -ERROR: 0:11: '' : compilation terminated +ERROR: 0:12: 'frac' : no matching overloaded function found +ERROR: 0:12: 'assign' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' +ERROR: 0:12: '' : compilation terminated ERROR: 3 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-unused-component/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-unused-component/0-opt.wgsl.expected.glsl index 89aaf528eb..03a69307fb 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-unused-component/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-vector-dce-unused-component/0-opt.wgsl.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); void main_1() { vec2 a = vec2(0.0f, 0.0f); @@ -24,34 +25,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:11: 'frac' : no matching overloaded function found -ERROR: 0:11: 'assign' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' -ERROR: 0:11: '' : compilation terminated +ERROR: 0:12: 'frac' : no matching overloaded function found +ERROR: 0:12: 'assign' : cannot convert from ' const float' to ' temp mediump 2-component vector of float' +ERROR: 0:12: '' : compilation terminated ERROR: 3 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.spvasm.expected.glsl index 5f684ce7dc..a78e4c18c4 100644 --- a/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/cov-write-past-matrix-elements-unused/0.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -38,8 +39,8 @@ void main_1() { if ((x_45 == 1)) { m32[3][x_45] = x_40; } - float tint_symbol_2[3] = float[3](x_40, x_40, x_40); - sums = tint_symbol_2; + float tint_symbol_1[3] = float[3](x_40, x_40, x_40); + sums = tint_symbol_1; x_52_phi = x_45; while (true) { int x_53 = 0; @@ -70,33 +71,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_3 = main_out(x_GLF_color); - return tint_symbol_3; + main_out tint_symbol_2 = main_out(x_GLF_color); + return tint_symbol_2; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:37: '[' : matrix index out of range '3' -ERROR: 0:37: '' : compilation terminated +ERROR: 0:38: '[' : matrix index out of range '3' +ERROR: 0:38: '' : compilation terminated ERROR: 2 compilation errors. No code generated. 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 69875f3dfd..808d973f31 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 @@ -11,6 +11,7 @@ type Arr_1 = @stride(16) array; #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct tint_padded_array_element { float el; }; @@ -46,8 +47,8 @@ void main_1() { if ((x_45 == 1)) { m32[3][x_45] = x_40; } - float tint_symbol_2[3] = float[3](x_40, x_40, x_40); - sums = tint_symbol_2; + float tint_symbol_1[3] = float[3](x_40, x_40, x_40); + sums = tint_symbol_1; x_52_phi = x_45; while (true) { int x_53 = 0; @@ -78,33 +79,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_3 = main_out(x_GLF_color); - return tint_symbol_3; + main_out tint_symbol_2 = main_out(x_GLF_color); + return tint_symbol_2; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:37: '[' : matrix index out of range '3' -ERROR: 0:37: '' : compilation terminated +ERROR: 0:38: '[' : matrix index out of range '3' +ERROR: 0:38: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.spvasm.expected.glsl index 2a18332639..bbe00553f2 100644 --- a/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/loop-dead-if-loop/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -61,33 +62,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:34: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:34: '' : compilation terminated +ERROR: 0:35: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:35: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.spvasm.expected.glsl index 980e746192..91863a8d4e 100644 --- a/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/nested-loops-switch/0.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -79,33 +80,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:45: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:45: '' : compilation terminated +ERROR: 0:46: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:46: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.spvasm.expected.glsl index bfeab0a043..db85f5d73a 100644 --- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -257,41 +258,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:36: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:36: '' : compilation terminated +ERROR: 0:37: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:37: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.spvasm.expected.glsl index 728e211e16..a75f0f6f6e 100644 --- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block/1.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -267,41 +268,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:36: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:36: '' : compilation terminated +ERROR: 0:37: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:37: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.spvasm.expected.glsl index a8566edaff..e8d2725f87 100644 --- a/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/spv-double-branch-to-same-block3/1.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -261,41 +262,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:36: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:36: '' : compilation terminated +ERROR: 0:37: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:37: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.spvasm.expected.glsl index 26f8b155f2..37cb9ef325 100644 --- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/1.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -39,8 +40,8 @@ void main_1() { int x_64_phi = 0; int x_63 = x_63_phi; int x_68[10] = data; - int tint_symbol_6[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - data = tint_symbol_6; + int tint_symbol_3[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + data = tint_symbol_3; data = x_68; int x_69 = (x_63 + 1); x_64_phi = x_69; @@ -341,41 +342,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_7 = main_out(x_GLF_color); - return tint_symbol_7; + main_out tint_symbol_4 = main_out(x_GLF_color); + return tint_symbol_4; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:173: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:173: '' : compilation terminated +ERROR: 0:174: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:174: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.spvasm.expected.glsl index 34de0dbcf3..5b14e49f97 100644 --- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-O-prop-up-mutate-var/2.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -337,41 +338,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:169: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:169: '' : compilation terminated +ERROR: 0:170: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:170: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.spvasm.expected.glsl index c4596a57d8..436b0e2be0 100644 --- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -253,41 +254,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:32: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:32: '' : compilation terminated +ERROR: 0:33: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:33: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.spvasm.expected.glsl index 9125dea01c..9942e20a56 100644 --- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -273,41 +274,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:32: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:32: '' : compilation terminated +ERROR: 0:33: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:33: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.spvasm.expected.glsl index 26d72157e0..f92ed9ef40 100644 --- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/1.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -358,41 +359,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:55: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:55: '' : compilation terminated +ERROR: 0:56: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:56: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.spvasm.expected.glsl index 76950a8242..968c3c2527 100644 --- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-flatten-selection-dead-continues/2-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -357,41 +358,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:54: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:54: '' : compilation terminated +ERROR: 0:55: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:55: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.spvasm.expected.glsl index f03d8f4bd7..c74ad054f5 100644 --- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/1.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -177,8 +178,8 @@ void main_1() { int x_170 = x_91; int x_171 = x_92; int x_173[10] = data; - int tint_symbol_6[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); - data = tint_symbol_6; + int tint_symbol_3[10] = int[10](0, 0, 0, 0, 0, 0, 0, 0, 0, 0); + data = tint_symbol_3; data = x_173; x_89 = ((x_170 + x_171) - 1); x_88 = min(((x_91 + (2 * x_92)) - 1), x_93); @@ -254,41 +255,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_7 = main_out(x_GLF_color); - return tint_symbol_7; + main_out tint_symbol_4 = main_out(x_GLF_color); + return tint_symbol_4; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:32: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:32: '' : compilation terminated +ERROR: 0:33: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:33: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.spvasm.expected.glsl index 99425f8ee9..c2fa1fd41c 100644 --- a/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-func-inline-mutate-var/2.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -248,41 +249,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:32: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:32: '' : compilation terminated +ERROR: 0:33: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:33: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.wgsl.expected.glsl index f062c66a29..1a4f5d282c 100644 --- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-float-mat-determinant-clamp/0.wgsl.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 resolution; }; @@ -84,41 +85,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:26: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp float' and a right operand of type ' global mediump float' (or there is no acceptable conversion) -ERROR: 0:26: '' : compilation terminated +ERROR: 0:27: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp float' and a right operand of type ' global mediump float' (or there is no acceptable conversion) +ERROR: 0:27: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.wgsl.expected.glsl index b4f5b644b3..9d3977be15 100644 --- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-injected-conditional-true/1.wgsl.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 resolution; }; @@ -100,41 +101,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:34: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp float' and a right operand of type ' global mediump float' (or there is no acceptable conversion) -ERROR: 0:34: '' : compilation terminated +ERROR: 0:35: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp float' and a right operand of type ' global mediump float' (or there is no acceptable conversion) +ERROR: 0:35: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.wgsl.expected.glsl index ebadc4014c..257f592dc2 100644 --- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-true-conditional-simple-loop/1.wgsl.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 resolution; }; @@ -116,41 +117,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:34: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp float' and a right operand of type ' global mediump float' (or there is no acceptable conversion) -ERROR: 0:34: '' : compilation terminated +ERROR: 0:35: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp float' and a right operand of type ' global mediump float' (or there is no acceptable conversion) +ERROR: 0:35: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.wgsl.expected.glsl index 80288d17a3..c04d2acd2a 100644 --- a/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/stable-colorgrid-modulo-vec3-values-from-matrix/1.wgsl.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 resolution; }; @@ -89,41 +90,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:26: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp float' and a right operand of type ' global mediump float' (or there is no acceptable conversion) -ERROR: 0:26: '' : compilation terminated +ERROR: 0:27: '%' : wrong operand types: no operation '%' exists that takes a left-hand operand of type ' temp float' and a right operand of type ' global mediump float' (or there is no acceptable conversion) +ERROR: 0:27: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.spvasm.expected.glsl index b8e2a5bb1a..09947dfbb1 100644 --- a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-clamped-conditional-bit-shift/1.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -287,41 +288,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:32: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:32: '' : compilation terminated +ERROR: 0:33: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:33: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.spvasm.expected.glsl index 8f5b8b2240..b261483910 100644 --- a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-for-always-false-if-discard/1.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -342,41 +343,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:136: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:136: '' : compilation terminated +ERROR: 0:137: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:137: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.spvasm.expected.glsl index 1b2c1b295e..8bd4692151 100644 --- a/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/stable-mergesort-reversed-for-loop/1.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 injectionSwitch; }; @@ -263,41 +264,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:32: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:32: '' : compilation terminated +ERROR: 0:33: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:33: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.spvasm.expected.glsl index c0b137cbb8..b5b553c839 100644 --- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 resolution; }; @@ -136,41 +137,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:65: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:65: '' : compilation terminated +ERROR: 0:66: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:66: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.wgsl.expected.glsl index c0b137cbb8..b5b553c839 100644 --- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-array-nested-loop/0-opt.wgsl.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 resolution; }; @@ -136,41 +137,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:65: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:65: '' : compilation terminated +ERROR: 0:66: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:66: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.spvasm.expected.glsl index 6a8426fa31..6a47168160 100644 --- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 resolution; }; @@ -118,41 +119,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:60: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:60: '' : compilation terminated +ERROR: 0:61: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:61: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.wgsl.expected.glsl index 6a8426fa31..6a47168160 100644 --- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/0.wgsl.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 resolution; }; @@ -118,41 +119,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:60: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:60: '' : compilation terminated +ERROR: 0:61: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:61: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.spvasm.expected.glsl index e57336b094..e9e375a493 100644 --- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 resolution; }; @@ -145,41 +146,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:87: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:87: '' : compilation terminated +ERROR: 0:88: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:88: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.wgsl.expected.glsl index e57336b094..e9e375a493 100644 --- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-clamp-conditional-mix/1.wgsl.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 resolution; }; @@ -145,41 +146,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:87: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:87: '' : compilation terminated +ERROR: 0:88: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:88: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.spvasm.expected.glsl index 0389bd3e6f..c1ad3ac86b 100644 --- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-conditional-clamped-float/0.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 resolution; }; @@ -118,41 +119,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:60: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:60: '' : compilation terminated +ERROR: 0:61: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:61: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.spvasm.expected.glsl index 908ee2c52d..4ba0f6fc67 100644 --- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 resolution; }; @@ -121,41 +122,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:61: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:61: '' : compilation terminated +ERROR: 0:62: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:62: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.wgsl.expected.glsl index 908ee2c52d..4ba0f6fc67 100644 --- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/0.wgsl.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { vec2 resolution; }; @@ -121,41 +122,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:61: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:61: '' : compilation terminated +ERROR: 0:62: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:62: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.spvasm.expected.glsl index 6c3fdebb51..8722064506 100644 --- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf1 { vec2 injectionSwitch; }; @@ -165,41 +166,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:69: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:69: '' : compilation terminated +ERROR: 0:70: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:70: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.wgsl.expected.glsl b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.wgsl.expected.glsl index 6c3fdebb51..8722064506 100644 --- a/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.wgsl.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/stable-triangle-nested-for-loop-and-true-if/1.wgsl.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf1 { vec2 injectionSwitch; }; @@ -165,41 +166,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:69: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:69: '' : compilation terminated +ERROR: 0:70: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:70: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.spvasm.expected.glsl index d038c4eecd..5c9dc75026 100644 --- a/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/two-for-loops-with-barrier-function/0-opt.spvasm.expected.glsl @@ -69,16 +69,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 18, local_size_z = 6) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 18, local_size_z = 6) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:9: '' : array size required ERROR: 0:10: '' : compilation terminated 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 21e02c0819..ca234df5f1 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 @@ -73,16 +73,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 18, local_size_z = 6) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 18, local_size_z = 6) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:9: '' : array size required ERROR: 0:10: '' : compilation terminated diff --git a/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.spvasm.expected.glsl index 56002107d2..db14a3588c 100644 --- a/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/two-nested-for-loops-with-returns/0-opt.spvasm.expected.glsl @@ -58,16 +58,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated 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 a5d62b9bbd..e78effd5d0 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 @@ -62,16 +62,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated diff --git a/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.spvasm.expected.glsl index 4479befb7f..b9afdabaa8 100644 --- a/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/unreachable-barrier-in-loops/0-opt.spvasm.expected.glsl @@ -114,28 +114,16 @@ void main_1() { return; } -struct tint_symbol_4 { - uvec3 tint_symbol_2; -}; - -void tint_symbol_1_inner(uvec3 tint_symbol_2) { +void tint_symbol_1(uvec3 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol_1(tint_symbol_4 tint_symbol_3) { - tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); +void main() { + tint_symbol_1(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_GlobalInvocationID; - tint_symbol_1(inputs); -} - Error parsing GLSL shader: ERROR: 0:13: '' : array size required ERROR: 0:14: '' : compilation terminated 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 e1a3cee149..f741d595d9 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 @@ -118,28 +118,16 @@ void main_1() { return; } -struct tint_symbol_4 { - uvec3 tint_symbol_2; -}; - -void tint_symbol_1_inner(uvec3 tint_symbol_2) { +void tint_symbol_1(uvec3 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol_1(tint_symbol_4 tint_symbol_3) { - tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); +void main() { + tint_symbol_1(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_GlobalInvocationID; - tint_symbol_1(inputs); -} - Error parsing GLSL shader: ERROR: 0:13: '' : array size required ERROR: 0:14: '' : compilation terminated diff --git a/test/vk-gl-cts/graphicsfuzz/write-before-break/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/write-before-break/0-opt.spvasm.expected.glsl index 69805a7578..2d3978214d 100644 --- a/test/vk-gl-cts/graphicsfuzz/write-before-break/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/write-before-break/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct buf0 { int injected; }; @@ -73,33 +74,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:56: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:56: '' : compilation terminated +ERROR: 0:57: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:57: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.spvasm.expected.glsl index 3f193c3e82..62a404d6fe 100644 --- a/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/write-red-after-search/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; struct BST { int data; int leftIndex; @@ -346,41 +347,21 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(x_GLF_color); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(x_GLF_color); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} - -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:87: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:87: '' : compilation terminated +ERROR: 0:88: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:88: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/graphicsfuzz/write-red-in-loop-nest/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/graphicsfuzz/write-red-in-loop-nest/0-opt.spvasm.expected.glsl index 6a5e24a47b..5a83706be1 100644 --- a/test/vk-gl-cts/graphicsfuzz/write-red-in-loop-nest/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/graphicsfuzz/write-red-in-loop-nest/0-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out vec4 x_GLF_color_1_1; vec4 x_GLF_color = vec4(0.0f, 0.0f, 0.0f, 0.0f); void main_1() { mat4x3 m43 = mat4x3(0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f); @@ -62,33 +63,20 @@ struct main_out { vec4 x_GLF_color_1; }; -struct tint_symbol_1 { - vec4 x_GLF_color_1; -}; - -main_out tint_symbol_inner() { +main_out tint_symbol() { main_1(); - main_out tint_symbol_2 = main_out(x_GLF_color); - return tint_symbol_2; + main_out tint_symbol_1 = main_out(x_GLF_color); + return tint_symbol_1; } -tint_symbol_1 tint_symbol() { - main_out inner_result = tint_symbol_inner(); - tint_symbol_1 wrapper_result = tint_symbol_1(vec4(0.0f, 0.0f, 0.0f, 0.0f)); - wrapper_result.x_GLF_color_1 = inner_result.x_GLF_color_1; - return wrapper_result; -} -layout(location = 0) out vec4 x_GLF_color_1; - void main() { - tint_symbol_1 outputs; - outputs = tint_symbol(); - x_GLF_color_1 = outputs.x_GLF_color_1; + main_out inner_result = tint_symbol(); + x_GLF_color_1_1 = inner_result.x_GLF_color_1; + return; } - Error parsing GLSL shader: -ERROR: 0:45: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:45: '' : compilation terminated +ERROR: 0:46: '&' : wrong operand types: no operation '&' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:46: '' : compilation terminated ERROR: 2 compilation errors. No code generated. diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.spvasm.expected.glsl index 7b9fd6ba51..e2366a2846 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/arraylength/array-stride-larger-than-element-size/1.spvasm.expected.glsl @@ -32,16 +32,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:9: '' : array size required ERROR: 0:10: '' : compilation terminated 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 65245571d3..a213db562c 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 @@ -36,16 +36,15 @@ void main_1() { return; } -layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void tint_symbol() { main_1(); - return; } +layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; void main() { tint_symbol(); + return; } - Error parsing GLSL shader: ERROR: 0:9: '' : array size required ERROR: 0:10: '' : compilation terminated diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.spvasm.expected.glsl index ad6293e250..d9d2c64549 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthan/0.spvasm.expected.glsl @@ -25,28 +25,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_2_param; -}; - -void tint_symbol_inner(uvec3 x_2_param) { +void tint_symbol(uvec3 x_2_param) { x_2 = x_2_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_2_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_2_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated 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 a2e99dfd1d..68344d44f0 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 @@ -29,28 +29,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_2_param; -}; - -void tint_symbol_inner(uvec3 x_2_param) { +void tint_symbol(uvec3 x_2_param) { x_2 = x_2_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_2_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_2_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.spvasm.expected.glsl index d1c0197701..9fde01f0c5 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_sgreaterthanequal/0.spvasm.expected.glsl @@ -25,28 +25,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_2_param; -}; - -void tint_symbol_inner(uvec3 x_2_param) { +void tint_symbol(uvec3 x_2_param) { x_2 = x_2_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_2_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_2_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated 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 7c584e0a67..926a4ebb87 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 @@ -29,28 +29,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_2_param; -}; - -void tint_symbol_inner(uvec3 x_2_param) { +void tint_symbol(uvec3 x_2_param) { x_2 = x_2_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_2_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_2_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.spvasm.expected.glsl index 422e6c1e09..13404d0cea 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthan/0.spvasm.expected.glsl @@ -25,28 +25,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_2_param; -}; - -void tint_symbol_inner(uvec3 x_2_param) { +void tint_symbol(uvec3 x_2_param) { x_2 = x_2_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_2_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_2_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated 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 12d5533b97..84ad124560 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 @@ -29,28 +29,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_2_param; -}; - -void tint_symbol_inner(uvec3 x_2_param) { +void tint_symbol(uvec3 x_2_param) { x_2 = x_2_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_2_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_2_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.spvasm.expected.glsl index 779119773a..18b1f2afbe 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_int_compare/uint_slessthanequal/0.spvasm.expected.glsl @@ -25,28 +25,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_2_param; -}; - -void tint_symbol_inner(uvec3 x_2_param) { +void tint_symbol(uvec3 x_2_param) { x_2 = x_2_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_2_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_2_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated 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 2ebdf5b9c2..5874bf243c 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 @@ -29,28 +29,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_2_param; -}; - -void tint_symbol_inner(uvec3 x_2_param) { +void tint_symbol(uvec3 x_2_param) { x_2 = x_2_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_2_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_2_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.spvasm.expected.glsl index 0167827e02..251a504274 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_int_uclamp/0-opt.spvasm.expected.glsl @@ -29,28 +29,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_3_param; -}; - -void tint_symbol_inner(uvec3 x_3_param) { +void tint_symbol(uvec3 x_3_param) { x_3 = x_3_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_3_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_3_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated 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 2a69831928..a47b09b5f5 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 @@ -33,28 +33,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_3_param; -}; - -void tint_symbol_inner(uvec3 x_3_param) { +void tint_symbol(uvec3 x_3_param) { x_3 = x_3_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_3_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_3_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.spvasm.expected.glsl index 60f5ad6bdf..c98c63f1f6 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sabs/0-opt.spvasm.expected.glsl @@ -21,28 +21,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_3_param; -}; - -void tint_symbol_inner(uvec3 x_3_param) { +void tint_symbol(uvec3 x_3_param) { x_3 = x_3_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_3_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_3_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated 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 74c1e3a3d1..e0845f79ea 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 @@ -25,28 +25,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_3_param; -}; - -void tint_symbol_inner(uvec3 x_3_param) { +void tint_symbol(uvec3 x_3_param) { x_3 = x_3_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_3_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_3_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.spvasm.expected.glsl index daadbfb954..cd581c80a5 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_sclamp/0-opt.spvasm.expected.glsl @@ -29,28 +29,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_3_param; -}; - -void tint_symbol_inner(uvec3 x_3_param) { +void tint_symbol(uvec3 x_3_param) { x_3 = x_3_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_3_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_3_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated 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 44485c95c6..e156568a5e 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 @@ -33,28 +33,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_3_param; -}; - -void tint_symbol_inner(uvec3 x_3_param) { +void tint_symbol(uvec3 x_3_param) { x_3 = x_3_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_3_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_3_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.spvasm.expected.glsl index ab97231030..52e29ede6e 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smax/0-opt.spvasm.expected.glsl @@ -25,28 +25,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_3_param; -}; - -void tint_symbol_inner(uvec3 x_3_param) { +void tint_symbol(uvec3 x_3_param) { x_3 = x_3_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_3_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_3_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated 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 faef5335f3..16cdc9c7b5 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 @@ -29,28 +29,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_3_param; -}; - -void tint_symbol_inner(uvec3 x_3_param) { +void tint_symbol(uvec3 x_3_param) { x_3 = x_3_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_3_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_3_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.spvasm.expected.glsl index 80abfcfe3c..57bf5a7304 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/glsl_uint_smin/0-opt.spvasm.expected.glsl @@ -25,28 +25,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_3_param; -}; - -void tint_symbol_inner(uvec3 x_3_param) { +void tint_symbol(uvec3 x_3_param) { x_3 = x_3_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_3_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_3_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated 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 09b6341dd9..40efa370eb 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 @@ -29,28 +29,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_3_param; -}; - -void tint_symbol_inner(uvec3 x_3_param) { +void tint_symbol(uvec3 x_3_param) { x_3 = x_3_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_3_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_3_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.spvasm.expected.glsl index 74afb3ce8a..da8852d554 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_sdiv/0-opt.spvasm.expected.glsl @@ -25,28 +25,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_2_param; -}; - -void tint_symbol_inner(uvec3 x_2_param) { +void tint_symbol(uvec3 x_2_param) { x_2 = x_2_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_2_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_2_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated 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 9db4599b17..ad5194bb04 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 @@ -29,28 +29,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_2_param; -}; - -void tint_symbol_inner(uvec3 x_2_param) { +void tint_symbol(uvec3 x_2_param) { x_2 = x_2_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_2_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_2_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated diff --git a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.spvasm.expected.glsl index 09af2540f6..6b2368eb34 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/compute/signed_op/uint_snegate/0-opt.spvasm.expected.glsl @@ -21,28 +21,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_2_param; -}; - -void tint_symbol_inner(uvec3 x_2_param) { +void tint_symbol(uvec3 x_2_param) { x_2 = x_2_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_2_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_2_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated 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 5784b16c61..6cb02de7d4 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 @@ -25,28 +25,16 @@ void main_1() { return; } -struct tint_symbol_2 { - uvec3 x_2_param; -}; - -void tint_symbol_inner(uvec3 x_2_param) { +void tint_symbol(uvec3 x_2_param) { x_2 = x_2_param; main_1(); } layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in; -void tint_symbol(tint_symbol_2 tint_symbol_1) { - tint_symbol_inner(tint_symbol_1.x_2_param); +void main() { + tint_symbol(gl_GlobalInvocationID); return; } - - -void main() { - tint_symbol_2 inputs; - inputs.x_2_param = gl_GlobalInvocationID; - tint_symbol(inputs); -} - Error parsing GLSL shader: ERROR: 0:5: '' : array size required ERROR: 0:6: '' : compilation terminated diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_atomic/0-opt.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_atomic/0-opt.spvasm.expected.glsl new file mode 100644 index 0000000000..31a1292121 --- /dev/null +++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_image_atomic/0-opt.spvasm.expected.glsl @@ -0,0 +1,46 @@ +SKIP: FAILED + +#version 310 es +precision mediump float; + +layout(location = 0) in vec3 x_2_param_1; +layout(location = 1) flat in int x_3_param_1; +layout(location = 0) flat out int x_4_1_1; +vec3 x_2 = vec3(0.0f, 0.0f, 0.0f); +int x_3 = 0; +int x_4 = 0; +vec4 tint_symbol = vec4(0.0f, 0.0f, 0.0f, 0.0f); +void main_1() { + tint_symbol = vec4(x_2, 1.0f); + x_4 = x_3; + return; +} + +struct main_out { + int x_4_1; + vec4 tint_symbol; +}; + +main_out tint_symbol_1(vec3 x_2_param, int x_3_param) { + x_2 = x_2_param; + x_3 = x_3_param; + main_1(); + main_out tint_symbol_2 = main_out(x_4, tint_symbol); + return tint_symbol_2; +} + +void main() { + main_out inner_result = tint_symbol_1(x_2_param_1, x_3_param_1); + x_4_1_1 = inner_result.x_4_1; + gl_Position = inner_result.tint_symbol; + gl_Position.y = -(gl_Position.y); + gl_Position.z = ((2.0f * gl_Position.z) - gl_Position.w); + return; +} +Error parsing GLSL shader: +ERROR: 0:5: '' : vertex input cannot be further qualified +ERROR: 0:5: '' : compilation terminated +ERROR: 2 compilation errors. No code generated. + + + diff --git a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/2-opt.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/2-opt.spvasm.expected.glsl index cda39d28bb..ff8ea5cfce 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/2-opt.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_output_write/2-opt.spvasm.expected.glsl @@ -3,6 +3,7 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) out int out_data_1_1; vec4 tint_symbol = vec4(0.0f, 0.0f, 0.0f, 0.0f); int out_data = 0; void main_1() { @@ -20,41 +21,21 @@ struct main_out { int out_data_1; }; -struct tint_symbol_4 { - vec4 tint_symbol_2; -}; - -struct tint_symbol_5 { - int out_data_1; -}; - -main_out tint_symbol_1_inner(vec4 tint_symbol_2) { +main_out tint_symbol_1(vec4 tint_symbol_2) { tint_symbol = tint_symbol_2; main_1(); - main_out tint_symbol_6 = main_out(out_data); - return tint_symbol_6; + main_out tint_symbol_3 = main_out(out_data); + return tint_symbol_3; } -tint_symbol_5 tint_symbol_1(tint_symbol_4 tint_symbol_3) { - main_out inner_result = tint_symbol_1_inner(tint_symbol_3.tint_symbol_2); - tint_symbol_5 wrapper_result = tint_symbol_5(0); - wrapper_result.out_data_1 = inner_result.out_data_1; - return wrapper_result; -} - -layout(location = 0) out int out_data_1; - void main() { - tint_symbol_4 inputs; - inputs.tint_symbol_2 = gl_FragCoord; - tint_symbol_5 outputs; - outputs = tint_symbol_1(inputs); - out_data_1 = outputs.out_data_1; + main_out inner_result = tint_symbol_1(gl_FragCoord); + out_data_1_1 = inner_result.out_data_1; + return; } - Error parsing GLSL shader: -ERROR: 0:13: '|' : wrong operand types: no operation '|' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) -ERROR: 0:13: '' : compilation terminated +ERROR: 0:14: '|' : wrong operand types: no operation '|' exists that takes a left-hand operand of type ' temp bool' and a right operand of type ' temp bool' (or there is no acceptable conversion) +ERROR: 0:14: '' : 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.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.spvasm.expected.glsl index fe71638056..14953d8033 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/no_ssbo_store/1.spvasm.expected.glsl @@ -3,6 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) flat in int x_3_param_1; +layout(location = 0) out int x_4_1_1; struct S { int field0[]; }; @@ -28,45 +30,22 @@ struct main_out { int x_4_1; }; -struct tint_symbol_2 { - int x_3_param; - vec4 x_2_param; -}; - -struct tint_symbol_3 { - int x_4_1; -}; - -main_out tint_symbol_inner(vec4 x_2_param, int x_3_param) { +main_out tint_symbol(vec4 x_2_param, int x_3_param) { x_2 = x_2_param; x_3 = x_3_param; main_1(); - main_out tint_symbol_4 = main_out(x_4); - return tint_symbol_4; + main_out tint_symbol_1 = main_out(x_4); + return tint_symbol_1; } -tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) { - main_out inner_result = tint_symbol_inner(tint_symbol_1.x_2_param, tint_symbol_1.x_3_param); - tint_symbol_3 wrapper_result = tint_symbol_3(0); - wrapper_result.x_4_1 = inner_result.x_4_1; - return wrapper_result; -} -layout(location = 0) flat in int x_3_param; - -layout(location = 0) out int x_4_1; - void main() { - tint_symbol_2 inputs; - inputs.x_3_param = x_3_param; - inputs.x_2_param = gl_FragCoord; - tint_symbol_3 outputs; - outputs = tint_symbol(inputs); - x_4_1 = outputs.x_4_1; + main_out inner_result = tint_symbol(gl_FragCoord, x_3_param_1); + x_4_1_1 = inner_result.x_4_1; + return; } - Error parsing GLSL shader: -ERROR: 0:5: '' : array size required -ERROR: 0:6: '' : compilation terminated +ERROR: 0:7: '' : array size required +ERROR: 0:8: '' : 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 7b5ffa58c4..b523e0d82f 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 @@ -7,6 +7,8 @@ type RTArr = @stride(4) array; #version 310 es precision mediump float; +layout(location = 0) flat in int x_3_param_1; +layout(location = 0) out int x_4_1_1; struct S { int field0[]; }; @@ -32,45 +34,22 @@ struct main_out { int x_4_1; }; -struct tint_symbol_2 { - int x_3_param; - vec4 x_2_param; -}; - -struct tint_symbol_3 { - int x_4_1; -}; - -main_out tint_symbol_inner(vec4 x_2_param, int x_3_param) { +main_out tint_symbol(vec4 x_2_param, int x_3_param) { x_2 = x_2_param; x_3 = x_3_param; main_1(); - main_out tint_symbol_4 = main_out(x_4); - return tint_symbol_4; + main_out tint_symbol_1 = main_out(x_4); + return tint_symbol_1; } -tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) { - main_out inner_result = tint_symbol_inner(tint_symbol_1.x_2_param, tint_symbol_1.x_3_param); - tint_symbol_3 wrapper_result = tint_symbol_3(0); - wrapper_result.x_4_1 = inner_result.x_4_1; - return wrapper_result; -} -layout(location = 0) flat in int x_3_param; - -layout(location = 0) out int x_4_1; - void main() { - tint_symbol_2 inputs; - inputs.x_3_param = x_3_param; - inputs.x_2_param = gl_FragCoord; - tint_symbol_3 outputs; - outputs = tint_symbol(inputs); - x_4_1 = outputs.x_4_1; + main_out inner_result = tint_symbol(gl_FragCoord, x_3_param_1); + x_4_1_1 = inner_result.x_4_1; + return; } - Error parsing GLSL shader: -ERROR: 0:5: '' : array size required -ERROR: 0:6: '' : compilation terminated +ERROR: 0:7: '' : array size required +ERROR: 0:8: '' : 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.spvasm.expected.glsl b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.spvasm.expected.glsl index 82201ade56..46fb7d66f2 100644 --- a/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.spvasm.expected.glsl +++ b/test/vk-gl-cts/spirv_assembly/instruction/terminate_invocation/ssbo_store_before_terminate/1.spvasm.expected.glsl @@ -3,6 +3,8 @@ SKIP: FAILED #version 310 es precision mediump float; +layout(location = 0) flat in int x_3_param_1; +layout(location = 0) out int x_4_1_1; struct S { int field0[]; }; @@ -29,45 +31,22 @@ struct main_out { int x_4_1; }; -struct tint_symbol_2 { - int x_3_param; - vec4 x_2_param; -}; - -struct tint_symbol_3 { - int x_4_1; -}; - -main_out tint_symbol_inner(vec4 x_2_param, int x_3_param) { +main_out tint_symbol(vec4 x_2_param, int x_3_param) { x_2 = x_2_param; x_3 = x_3_param; main_1(); - main_out tint_symbol_4 = main_out(x_4); - return tint_symbol_4; + main_out tint_symbol_1 = main_out(x_4); + return tint_symbol_1; } -tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) { - main_out inner_result = tint_symbol_inner(tint_symbol_1.x_2_param, tint_symbol_1.x_3_param); - tint_symbol_3 wrapper_result = tint_symbol_3(0); - wrapper_result.x_4_1 = inner_result.x_4_1; - return wrapper_result; -} -layout(location = 0) flat in int x_3_param; - -layout(location = 0) out int x_4_1; - void main() { - tint_symbol_2 inputs; - inputs.x_3_param = x_3_param; - inputs.x_2_param = gl_FragCoord; - tint_symbol_3 outputs; - outputs = tint_symbol(inputs); - x_4_1 = outputs.x_4_1; + main_out inner_result = tint_symbol(gl_FragCoord, x_3_param_1); + x_4_1_1 = inner_result.x_4_1; + return; } - Error parsing GLSL shader: -ERROR: 0:5: '' : array size required -ERROR: 0:6: '' : compilation terminated +ERROR: 0:7: '' : array size required +ERROR: 0:8: '' : 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 e196f128ce..e357ce52a8 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 @@ -7,6 +7,8 @@ type RTArr = @stride(4) array; #version 310 es precision mediump float; +layout(location = 0) flat in int x_3_param_1; +layout(location = 0) out int x_4_1_1; struct S { int field0[]; }; @@ -33,45 +35,22 @@ struct main_out { int x_4_1; }; -struct tint_symbol_2 { - int x_3_param; - vec4 x_2_param; -}; - -struct tint_symbol_3 { - int x_4_1; -}; - -main_out tint_symbol_inner(vec4 x_2_param, int x_3_param) { +main_out tint_symbol(vec4 x_2_param, int x_3_param) { x_2 = x_2_param; x_3 = x_3_param; main_1(); - main_out tint_symbol_4 = main_out(x_4); - return tint_symbol_4; + main_out tint_symbol_1 = main_out(x_4); + return tint_symbol_1; } -tint_symbol_3 tint_symbol(tint_symbol_2 tint_symbol_1) { - main_out inner_result = tint_symbol_inner(tint_symbol_1.x_2_param, tint_symbol_1.x_3_param); - tint_symbol_3 wrapper_result = tint_symbol_3(0); - wrapper_result.x_4_1 = inner_result.x_4_1; - return wrapper_result; -} -layout(location = 0) flat in int x_3_param; - -layout(location = 0) out int x_4_1; - void main() { - tint_symbol_2 inputs; - inputs.x_3_param = x_3_param; - inputs.x_2_param = gl_FragCoord; - tint_symbol_3 outputs; - outputs = tint_symbol(inputs); - x_4_1 = outputs.x_4_1; + main_out inner_result = tint_symbol(gl_FragCoord, x_3_param_1); + x_4_1_1 = inner_result.x_4_1; + return; } - Error parsing GLSL shader: -ERROR: 0:5: '' : array size required -ERROR: 0:6: '' : compilation terminated +ERROR: 0:7: '' : array size required +ERROR: 0:8: '' : compilation terminated ERROR: 2 compilation errors. No code generated.