spirv: Use generic transform to process shader IO

The refactored CanonicalizeEntryPointIO transform makes it much easier
to handle SPIR-V style IO as well, and doing this removes a lot of
duplicated code. Remove all of the SPIR-V transform code for shader IO
and vertex point size.

Bug: tint:920
Change-Id: Id1b97517619b4d2fd09b45d5aee848259f3dfa77
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/60840
Kokoro: Kokoro <noreply+kokoro@google.com>
Commit-Queue: James Price <jrprice@google.com>
Auto-Submit: James Price <jrprice@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>

test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.spvasm.expected.spvasm

@@ -6,8 +6,10 @@
                OpCapability Shader
         %173 = OpExtInstImport "GLSL.std.450"
                OpMemoryModel Logical GLSL450
-               OpEntryPoint Fragment %main "main" %tint_symbol %tint_symbol_2
+               OpEntryPoint Fragment %main "main" %gl_FragCoord_param_1 %x_GLF_color_1_1
                OpExecutionMode %main OriginUpperLeft
+               OpName %gl_FragCoord_param_1 "gl_FragCoord_param_1"
+               OpName %x_GLF_color_1_1 "x_GLF_color_1_1"
                OpName %data "data"
                OpName %temp "temp"
                OpName %buf0 "buf0"
@@ -15,8 +17,6 @@
                OpName %x_28 "x_28"
                OpName %gl_FragCoord "gl_FragCoord"
                OpName %x_GLF_color "x_GLF_color"
-               OpName %tint_symbol "tint_symbol"
-               OpName %tint_symbol_2 "tint_symbol_2"
                OpName %merge_i1_i1_i1_ "merge_i1_i1_i1_"
                OpName %from "from"
                OpName %mid "mid"
@@ -42,40 +42,40 @@
                OpName %grey "grey"
                OpName %main_out "main_out"
                OpMemberName %main_out 0 "x_GLF_color_1"
-               OpName %tint_symbol_3 "tint_symbol_3"
-               OpName %tint_symbol_1 "tint_symbol_1"
+               OpName %main_inner "main_inner"
+               OpName %gl_FragCoord_param "gl_FragCoord_param"
                OpName %main "main"
+               OpDecorate %gl_FragCoord_param_1 BuiltIn FragCoord
+               OpDecorate %x_GLF_color_1_1 Location 0
                OpDecorate %_arr_int_uint_10 ArrayStride 4
                OpDecorate %buf0 Block
                OpMemberDecorate %buf0 0 Offset 0
                OpDecorate %x_28 NonWritable
                OpDecorate %x_28 DescriptorSet 0
                OpDecorate %x_28 Binding 0
-               OpDecorate %tint_symbol BuiltIn FragCoord
-               OpDecorate %tint_symbol_2 Location 0
                OpMemberDecorate %main_out 0 Offset 0
+      %float = OpTypeFloat 32
+    %v4float = OpTypeVector %float 4
+%_ptr_Input_v4float = OpTypePointer Input %v4float
+%gl_FragCoord_param_1 = OpVariable %_ptr_Input_v4float Input
+%_ptr_Output_v4float = OpTypePointer Output %v4float
+          %7 = OpConstantNull %v4float
+%x_GLF_color_1_1 = OpVariable %_ptr_Output_v4float Output %7
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
     %uint_10 = OpConstant %uint 10
 %_arr_int_uint_10 = OpTypeArray %int %uint_10
 %_ptr_Private__arr_int_uint_10 = OpTypePointer Private %_arr_int_uint_10
-          %7 = OpConstantNull %_arr_int_uint_10
-       %data = OpVariable %_ptr_Private__arr_int_uint_10 Private %7
-       %temp = OpVariable %_ptr_Private__arr_int_uint_10 Private %7
-      %float = OpTypeFloat 32
+         %14 = OpConstantNull %_arr_int_uint_10
+       %data = OpVariable %_ptr_Private__arr_int_uint_10 Private %14
+       %temp = OpVariable %_ptr_Private__arr_int_uint_10 Private %14
     %v2float = OpTypeVector %float 2
        %buf0 = OpTypeStruct %v2float
 %_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
        %x_28 = OpVariable %_ptr_Uniform_buf0 Uniform
-    %v4float = OpTypeVector %float 4
 %_ptr_Private_v4float = OpTypePointer Private %v4float
-         %17 = OpConstantNull %v4float
-%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %17
-%x_GLF_color = OpVariable %_ptr_Private_v4float Private %17
-%_ptr_Input_v4float = OpTypePointer Input %v4float
-%tint_symbol = OpVariable %_ptr_Input_v4float Input
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-%tint_symbol_2 = OpVariable %_ptr_Output_v4float Output %17
+%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %7
+%x_GLF_color = OpVariable %_ptr_Private_v4float Private %7
        %void = OpTypeVoid
 %_ptr_Function_int = OpTypePointer Function %int
          %23 = OpTypeFunction %void %_ptr_Function_int %_ptr_Function_int %_ptr_Function_int
@@ -119,7 +119,7 @@
     %v3float = OpTypeVector %float 3
     %float_1 = OpConstant %float 1
    %main_out = OpTypeStruct %v4float
-        %396 = OpTypeFunction %void %main_out
+        %396 = OpTypeFunction %main_out %v4float
 %merge_i1_i1_i1_ = OpFunction %void None %23
        %from = OpFunctionParameter %_ptr_Function_int
         %mid = OpFunctionParameter %_ptr_Function_int
@@ -608,20 +608,20 @@
                OpStore %x_GLF_color %395
                OpReturn
                OpFunctionEnd
-%tint_symbol_3 = OpFunction %void None %396
-%tint_symbol_1 = OpFunctionParameter %main_out
+ %main_inner = OpFunction %main_out None %396
+%gl_FragCoord_param = OpFunctionParameter %v4float
         %400 = OpLabel
-        %401 = OpCompositeExtract %v4float %tint_symbol_1 0
-               OpStore %tint_symbol_2 %401
-               OpReturn
+               OpStore %gl_FragCoord %gl_FragCoord_param
+        %401 = OpFunctionCall %void %main_1
+        %402 = OpLoad %v4float %x_GLF_color
+        %403 = OpCompositeConstruct %main_out %402
+               OpReturnValue %403
                OpFunctionEnd
        %main = OpFunction %void None %128
-        %403 = OpLabel
-        %404 = OpLoad %v4float %tint_symbol
-               OpStore %gl_FragCoord %404
-        %405 = OpFunctionCall %void %main_1
-        %407 = OpLoad %v4float %x_GLF_color
-        %408 = OpCompositeConstruct %main_out %407
-        %406 = OpFunctionCall %void %tint_symbol_3 %408
+        %405 = OpLabel
+        %407 = OpLoad %v4float %gl_FragCoord_param_1
+        %406 = OpFunctionCall %main_out %main_inner %407
+        %408 = OpCompositeExtract %v4float %406 0
+               OpStore %x_GLF_color_1_1 %408
                OpReturn
                OpFunctionEnd

test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/0.wgsl.expected.spvasm

@@ -6,8 +6,10 @@
                OpCapability Shader
         %177 = OpExtInstImport "GLSL.std.450"
                OpMemoryModel Logical GLSL450
-               OpEntryPoint Fragment %main "main" %tint_symbol %tint_symbol_2
+               OpEntryPoint Fragment %main "main" %gl_FragCoord_param_1 %x_GLF_color_1_1
                OpExecutionMode %main OriginUpperLeft
+               OpName %gl_FragCoord_param_1 "gl_FragCoord_param_1"
+               OpName %x_GLF_color_1_1 "x_GLF_color_1_1"
                OpName %data "data"
                OpName %temp "temp"
                OpName %buf0 "buf0"
@@ -15,8 +17,6 @@
                OpName %x_28 "x_28"
                OpName %gl_FragCoord "gl_FragCoord"
                OpName %x_GLF_color "x_GLF_color"
-               OpName %tint_symbol "tint_symbol"
-               OpName %tint_symbol_2 "tint_symbol_2"
                OpName %merge_i1_i1_i1_ "merge_i1_i1_i1_"
                OpName %from "from"
                OpName %mid "mid"
@@ -42,40 +42,40 @@
                OpName %grey "grey"
                OpName %main_out "main_out"
                OpMemberName %main_out 0 "x_GLF_color_1"
-               OpName %tint_symbol_3 "tint_symbol_3"
-               OpName %tint_symbol_1 "tint_symbol_1"
+               OpName %main_inner "main_inner"
+               OpName %gl_FragCoord_param "gl_FragCoord_param"
                OpName %main "main"
+               OpDecorate %gl_FragCoord_param_1 BuiltIn FragCoord
+               OpDecorate %x_GLF_color_1_1 Location 0
                OpDecorate %_arr_int_uint_10 ArrayStride 4
                OpDecorate %buf0 Block
                OpMemberDecorate %buf0 0 Offset 0
                OpDecorate %x_28 NonWritable
                OpDecorate %x_28 DescriptorSet 0
                OpDecorate %x_28 Binding 0
-               OpDecorate %tint_symbol BuiltIn FragCoord
-               OpDecorate %tint_symbol_2 Location 0
                OpMemberDecorate %main_out 0 Offset 0
+      %float = OpTypeFloat 32
+    %v4float = OpTypeVector %float 4
+%_ptr_Input_v4float = OpTypePointer Input %v4float
+%gl_FragCoord_param_1 = OpVariable %_ptr_Input_v4float Input
+%_ptr_Output_v4float = OpTypePointer Output %v4float
+          %7 = OpConstantNull %v4float
+%x_GLF_color_1_1 = OpVariable %_ptr_Output_v4float Output %7
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
     %uint_10 = OpConstant %uint 10
 %_arr_int_uint_10 = OpTypeArray %int %uint_10
 %_ptr_Private__arr_int_uint_10 = OpTypePointer Private %_arr_int_uint_10
-          %7 = OpConstantNull %_arr_int_uint_10
-       %data = OpVariable %_ptr_Private__arr_int_uint_10 Private %7
-       %temp = OpVariable %_ptr_Private__arr_int_uint_10 Private %7
-      %float = OpTypeFloat 32
+         %14 = OpConstantNull %_arr_int_uint_10
+       %data = OpVariable %_ptr_Private__arr_int_uint_10 Private %14
+       %temp = OpVariable %_ptr_Private__arr_int_uint_10 Private %14
     %v2float = OpTypeVector %float 2
        %buf0 = OpTypeStruct %v2float
 %_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
        %x_28 = OpVariable %_ptr_Uniform_buf0 Uniform
-    %v4float = OpTypeVector %float 4
 %_ptr_Private_v4float = OpTypePointer Private %v4float
-         %17 = OpConstantNull %v4float
-%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %17
-%x_GLF_color = OpVariable %_ptr_Private_v4float Private %17
-%_ptr_Input_v4float = OpTypePointer Input %v4float
-%tint_symbol = OpVariable %_ptr_Input_v4float Input
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-%tint_symbol_2 = OpVariable %_ptr_Output_v4float Output %17
+%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %7
+%x_GLF_color = OpVariable %_ptr_Private_v4float Private %7
        %void = OpTypeVoid
 %_ptr_Function_int = OpTypePointer Function %int
          %23 = OpTypeFunction %void %_ptr_Function_int %_ptr_Function_int %_ptr_Function_int
@@ -119,7 +119,7 @@
     %v3float = OpTypeVector %float 3
     %float_1 = OpConstant %float 1
    %main_out = OpTypeStruct %v4float
-        %400 = OpTypeFunction %void %main_out
+        %400 = OpTypeFunction %main_out %v4float
 %merge_i1_i1_i1_ = OpFunction %void None %23
        %from = OpFunctionParameter %_ptr_Function_int
         %mid = OpFunctionParameter %_ptr_Function_int
@@ -618,20 +618,20 @@
                OpStore %x_GLF_color %399
                OpReturn
                OpFunctionEnd
-%tint_symbol_3 = OpFunction %void None %400
-%tint_symbol_1 = OpFunctionParameter %main_out
+ %main_inner = OpFunction %main_out None %400
+%gl_FragCoord_param = OpFunctionParameter %v4float
         %404 = OpLabel
-        %405 = OpCompositeExtract %v4float %tint_symbol_1 0
-               OpStore %tint_symbol_2 %405
-               OpReturn
+               OpStore %gl_FragCoord %gl_FragCoord_param
+        %405 = OpFunctionCall %void %main_1
+        %406 = OpLoad %v4float %x_GLF_color
+        %407 = OpCompositeConstruct %main_out %406
+               OpReturnValue %407
                OpFunctionEnd
        %main = OpFunction %void None %132
-        %407 = OpLabel
-        %408 = OpLoad %v4float %tint_symbol
-               OpStore %gl_FragCoord %408
-        %409 = OpFunctionCall %void %main_1
-        %411 = OpLoad %v4float %x_GLF_color
-        %412 = OpCompositeConstruct %main_out %411
-        %410 = OpFunctionCall %void %tint_symbol_3 %412
+        %409 = OpLabel
+        %411 = OpLoad %v4float %gl_FragCoord_param_1
+        %410 = OpFunctionCall %main_out %main_inner %411
+        %412 = OpCompositeExtract %v4float %410 0
+               OpStore %x_GLF_color_1_1 %412
                OpReturn
                OpFunctionEnd

test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.spvasm.expected.spvasm

@@ -6,8 +6,10 @@
                OpCapability Shader
         %173 = OpExtInstImport "GLSL.std.450"
                OpMemoryModel Logical GLSL450
-               OpEntryPoint Fragment %main "main" %tint_symbol %tint_symbol_2
+               OpEntryPoint Fragment %main "main" %gl_FragCoord_param_1 %x_GLF_color_1_1
                OpExecutionMode %main OriginUpperLeft
+               OpName %gl_FragCoord_param_1 "gl_FragCoord_param_1"
+               OpName %x_GLF_color_1_1 "x_GLF_color_1_1"
                OpName %data "data"
                OpName %temp "temp"
                OpName %buf0 "buf0"
@@ -15,8 +17,6 @@
                OpName %x_28 "x_28"
                OpName %gl_FragCoord "gl_FragCoord"
                OpName %x_GLF_color "x_GLF_color"
-               OpName %tint_symbol "tint_symbol"
-               OpName %tint_symbol_2 "tint_symbol_2"
                OpName %merge_i1_i1_i1_ "merge_i1_i1_i1_"
                OpName %from "from"
                OpName %mid "mid"
@@ -43,40 +43,40 @@
                OpName %guard233 "guard233"
                OpName %main_out "main_out"
                OpMemberName %main_out 0 "x_GLF_color_1"
-               OpName %tint_symbol_3 "tint_symbol_3"
-               OpName %tint_symbol_1 "tint_symbol_1"
+               OpName %main_inner "main_inner"
+               OpName %gl_FragCoord_param "gl_FragCoord_param"
                OpName %main "main"
+               OpDecorate %gl_FragCoord_param_1 BuiltIn FragCoord
+               OpDecorate %x_GLF_color_1_1 Location 0
                OpDecorate %_arr_int_uint_10 ArrayStride 4
                OpDecorate %buf0 Block
                OpMemberDecorate %buf0 0 Offset 0
                OpDecorate %x_28 NonWritable
                OpDecorate %x_28 DescriptorSet 0
                OpDecorate %x_28 Binding 0
-               OpDecorate %tint_symbol BuiltIn FragCoord
-               OpDecorate %tint_symbol_2 Location 0
                OpMemberDecorate %main_out 0 Offset 0
+      %float = OpTypeFloat 32
+    %v4float = OpTypeVector %float 4
+%_ptr_Input_v4float = OpTypePointer Input %v4float
+%gl_FragCoord_param_1 = OpVariable %_ptr_Input_v4float Input
+%_ptr_Output_v4float = OpTypePointer Output %v4float
+          %7 = OpConstantNull %v4float
+%x_GLF_color_1_1 = OpVariable %_ptr_Output_v4float Output %7
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
     %uint_10 = OpConstant %uint 10
 %_arr_int_uint_10 = OpTypeArray %int %uint_10
 %_ptr_Private__arr_int_uint_10 = OpTypePointer Private %_arr_int_uint_10
-          %7 = OpConstantNull %_arr_int_uint_10
-       %data = OpVariable %_ptr_Private__arr_int_uint_10 Private %7
-       %temp = OpVariable %_ptr_Private__arr_int_uint_10 Private %7
-      %float = OpTypeFloat 32
+         %14 = OpConstantNull %_arr_int_uint_10
+       %data = OpVariable %_ptr_Private__arr_int_uint_10 Private %14
+       %temp = OpVariable %_ptr_Private__arr_int_uint_10 Private %14
     %v2float = OpTypeVector %float 2
        %buf0 = OpTypeStruct %v2float
 %_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
        %x_28 = OpVariable %_ptr_Uniform_buf0 Uniform
-    %v4float = OpTypeVector %float 4
 %_ptr_Private_v4float = OpTypePointer Private %v4float
-         %17 = OpConstantNull %v4float
-%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %17
-%x_GLF_color = OpVariable %_ptr_Private_v4float Private %17
-%_ptr_Input_v4float = OpTypePointer Input %v4float
-%tint_symbol = OpVariable %_ptr_Input_v4float Input
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-%tint_symbol_2 = OpVariable %_ptr_Output_v4float Output %17
+%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %7
+%x_GLF_color = OpVariable %_ptr_Private_v4float Private %7
        %void = OpTypeVoid
 %_ptr_Function_int = OpTypePointer Function %int
          %23 = OpTypeFunction %void %_ptr_Function_int %_ptr_Function_int %_ptr_Function_int
@@ -125,7 +125,7 @@
     %float_0 = OpConstant %float 0
     %v3float = OpTypeVector %float 3
    %main_out = OpTypeStruct %v4float
-        %420 = OpTypeFunction %void %main_out
+        %420 = OpTypeFunction %main_out %v4float
 %merge_i1_i1_i1_ = OpFunction %void None %23
        %from = OpFunctionParameter %_ptr_Function_int
         %mid = OpFunctionParameter %_ptr_Function_int
@@ -649,20 +649,20 @@
                OpStore %x_GLF_color %419
                OpReturn
                OpFunctionEnd
-%tint_symbol_3 = OpFunction %void None %420
-%tint_symbol_1 = OpFunctionParameter %main_out
+ %main_inner = OpFunction %main_out None %420
+%gl_FragCoord_param = OpFunctionParameter %v4float
         %424 = OpLabel
-        %425 = OpCompositeExtract %v4float %tint_symbol_1 0
-               OpStore %tint_symbol_2 %425
-               OpReturn
+               OpStore %gl_FragCoord %gl_FragCoord_param
+        %425 = OpFunctionCall %void %main_1
+        %426 = OpLoad %v4float %x_GLF_color
+        %427 = OpCompositeConstruct %main_out %426
+               OpReturnValue %427
                OpFunctionEnd
        %main = OpFunction %void None %128
-        %427 = OpLabel
-        %428 = OpLoad %v4float %tint_symbol
-               OpStore %gl_FragCoord %428
-        %429 = OpFunctionCall %void %main_1
-        %431 = OpLoad %v4float %x_GLF_color
-        %432 = OpCompositeConstruct %main_out %431
-        %430 = OpFunctionCall %void %tint_symbol_3 %432
+        %429 = OpLabel
+        %431 = OpLoad %v4float %gl_FragCoord_param_1
+        %430 = OpFunctionCall %main_out %main_inner %431
+        %432 = OpCompositeExtract %v4float %430 0
+               OpStore %x_GLF_color_1_1 %432
                OpReturn
                OpFunctionEnd

test/vk-gl-cts/graphicsfuzz/spv-stable-mergesort-dead-code/1.wgsl.expected.spvasm

@@ -6,8 +6,10 @@
                OpCapability Shader
         %177 = OpExtInstImport "GLSL.std.450"
                OpMemoryModel Logical GLSL450
-               OpEntryPoint Fragment %main "main" %tint_symbol %tint_symbol_2
+               OpEntryPoint Fragment %main "main" %gl_FragCoord_param_1 %x_GLF_color_1_1
                OpExecutionMode %main OriginUpperLeft
+               OpName %gl_FragCoord_param_1 "gl_FragCoord_param_1"
+               OpName %x_GLF_color_1_1 "x_GLF_color_1_1"
                OpName %data "data"
                OpName %temp "temp"
                OpName %buf0 "buf0"
@@ -15,8 +17,6 @@
                OpName %x_28 "x_28"
                OpName %gl_FragCoord "gl_FragCoord"
                OpName %x_GLF_color "x_GLF_color"
-               OpName %tint_symbol "tint_symbol"
-               OpName %tint_symbol_2 "tint_symbol_2"
                OpName %merge_i1_i1_i1_ "merge_i1_i1_i1_"
                OpName %from "from"
                OpName %mid "mid"
@@ -43,40 +43,40 @@
                OpName %guard233 "guard233"
                OpName %main_out "main_out"
                OpMemberName %main_out 0 "x_GLF_color_1"
-               OpName %tint_symbol_3 "tint_symbol_3"
-               OpName %tint_symbol_1 "tint_symbol_1"
+               OpName %main_inner "main_inner"
+               OpName %gl_FragCoord_param "gl_FragCoord_param"
                OpName %main "main"
+               OpDecorate %gl_FragCoord_param_1 BuiltIn FragCoord
+               OpDecorate %x_GLF_color_1_1 Location 0
                OpDecorate %_arr_int_uint_10 ArrayStride 4
                OpDecorate %buf0 Block
                OpMemberDecorate %buf0 0 Offset 0
                OpDecorate %x_28 NonWritable
                OpDecorate %x_28 DescriptorSet 0
                OpDecorate %x_28 Binding 0
-               OpDecorate %tint_symbol BuiltIn FragCoord
-               OpDecorate %tint_symbol_2 Location 0
                OpMemberDecorate %main_out 0 Offset 0
+      %float = OpTypeFloat 32
+    %v4float = OpTypeVector %float 4
+%_ptr_Input_v4float = OpTypePointer Input %v4float
+%gl_FragCoord_param_1 = OpVariable %_ptr_Input_v4float Input
+%_ptr_Output_v4float = OpTypePointer Output %v4float
+          %7 = OpConstantNull %v4float
+%x_GLF_color_1_1 = OpVariable %_ptr_Output_v4float Output %7
         %int = OpTypeInt 32 1
        %uint = OpTypeInt 32 0
     %uint_10 = OpConstant %uint 10
 %_arr_int_uint_10 = OpTypeArray %int %uint_10
 %_ptr_Private__arr_int_uint_10 = OpTypePointer Private %_arr_int_uint_10
-          %7 = OpConstantNull %_arr_int_uint_10
-       %data = OpVariable %_ptr_Private__arr_int_uint_10 Private %7
-       %temp = OpVariable %_ptr_Private__arr_int_uint_10 Private %7
-      %float = OpTypeFloat 32
+         %14 = OpConstantNull %_arr_int_uint_10
+       %data = OpVariable %_ptr_Private__arr_int_uint_10 Private %14
+       %temp = OpVariable %_ptr_Private__arr_int_uint_10 Private %14
     %v2float = OpTypeVector %float 2
        %buf0 = OpTypeStruct %v2float
 %_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
        %x_28 = OpVariable %_ptr_Uniform_buf0 Uniform
-    %v4float = OpTypeVector %float 4
 %_ptr_Private_v4float = OpTypePointer Private %v4float
-         %17 = OpConstantNull %v4float
-%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %17
-%x_GLF_color = OpVariable %_ptr_Private_v4float Private %17
-%_ptr_Input_v4float = OpTypePointer Input %v4float
-%tint_symbol = OpVariable %_ptr_Input_v4float Input
-%_ptr_Output_v4float = OpTypePointer Output %v4float
-%tint_symbol_2 = OpVariable %_ptr_Output_v4float Output %17
+%gl_FragCoord = OpVariable %_ptr_Private_v4float Private %7
+%x_GLF_color = OpVariable %_ptr_Private_v4float Private %7
        %void = OpTypeVoid
 %_ptr_Function_int = OpTypePointer Function %int
          %23 = OpTypeFunction %void %_ptr_Function_int %_ptr_Function_int %_ptr_Function_int
@@ -125,7 +125,7 @@
     %float_0 = OpConstant %float 0
     %v3float = OpTypeVector %float 3
    %main_out = OpTypeStruct %v4float
-        %424 = OpTypeFunction %void %main_out
+        %424 = OpTypeFunction %main_out %v4float
 %merge_i1_i1_i1_ = OpFunction %void None %23
        %from = OpFunctionParameter %_ptr_Function_int
         %mid = OpFunctionParameter %_ptr_Function_int
@@ -659,20 +659,20 @@
                OpStore %x_GLF_color %423
                OpReturn
                OpFunctionEnd
-%tint_symbol_3 = OpFunction %void None %424
-%tint_symbol_1 = OpFunctionParameter %main_out
+ %main_inner = OpFunction %main_out None %424
+%gl_FragCoord_param = OpFunctionParameter %v4float
         %428 = OpLabel
-        %429 = OpCompositeExtract %v4float %tint_symbol_1 0
-               OpStore %tint_symbol_2 %429
-               OpReturn
+               OpStore %gl_FragCoord %gl_FragCoord_param
+        %429 = OpFunctionCall %void %main_1
+        %430 = OpLoad %v4float %x_GLF_color
+        %431 = OpCompositeConstruct %main_out %430
+               OpReturnValue %431
                OpFunctionEnd
        %main = OpFunction %void None %132
-        %431 = OpLabel
-        %432 = OpLoad %v4float %tint_symbol
-               OpStore %gl_FragCoord %432
-        %433 = OpFunctionCall %void %main_1
-        %435 = OpLoad %v4float %x_GLF_color
-        %436 = OpCompositeConstruct %main_out %435
-        %434 = OpFunctionCall %void %tint_symbol_3 %436
+        %433 = OpLabel
+        %435 = OpLoad %v4float %gl_FragCoord_param_1
+        %434 = OpFunctionCall %main_out %main_inner %435
+        %436 = OpCompositeExtract %v4float %434 0
+               OpStore %x_GLF_color_1_1 %436
                OpReturn
                OpFunctionEnd