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>
This commit is contained in:
James Price
2021-08-05 17:34:19 +00:00
committed by Tint LUCI CQ
parent 11e172ab64
commit 11c6fcdb51
1981 changed files with 55207 additions and 57171 deletions

View File

@@ -6,8 +6,10 @@
OpCapability Shader
%61 = 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 %buf0 "buf0"
OpMemberName %buf0 0 "x_GLF_uniform_float_values"
OpName %x_7 "x_7"
@@ -16,8 +18,6 @@
OpName %x_10 "x_10"
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 %main_1 "main_1"
OpName %data "data"
OpName %b "b"
@@ -27,9 +27,11 @@
OpName %x_83_phi "x_83_phi"
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 %buf0 Block
OpMemberDecorate %buf0 0 Offset 0
OpDecorate %_arr_float_uint_1 ArrayStride 16
@@ -42,11 +44,15 @@
OpDecorate %x_10 NonWritable
OpDecorate %x_10 DescriptorSet 0
OpDecorate %x_10 Binding 1
OpDecorate %tint_symbol BuiltIn FragCoord
OpDecorate %tint_symbol_2 Location 0
OpDecorate %_arr_v4float_uint_2 ArrayStride 16
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
%uint = OpTypeInt 32 0
%uint_1 = OpConstant %uint 1
%_arr_float_uint_1 = OpTypeArray %float %uint_1
@@ -59,15 +65,9 @@
%buf1 = OpTypeStruct %_arr_int_uint_4
%_ptr_Uniform_buf1 = OpTypePointer Uniform %buf1
%x_10 = OpVariable %_ptr_Uniform_buf1 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
%23 = OpTypeFunction %void
%uint_2 = OpConstant %uint 2
@@ -89,7 +89,7 @@
%int_3 = OpConstant %int 3
%_ptr_Function_v4float = OpTypePointer Function %v4float
%main_out = OpTypeStruct %v4float
%140 = OpTypeFunction %void %main_out
%140 = OpTypeFunction %main_out %v4float
%main_1 = OpFunction %void None %23
%26 = OpLabel
%data = OpVariable %_ptr_Function__arr_v4float_uint_2 Function %31
@@ -217,20 +217,20 @@
OpStore %x_GLF_color %139
OpReturn
OpFunctionEnd
%tint_symbol_3 = OpFunction %void None %140
%tint_symbol_1 = OpFunctionParameter %main_out
%main_inner = OpFunction %main_out None %140
%gl_FragCoord_param = OpFunctionParameter %v4float
%144 = OpLabel
%145 = OpCompositeExtract %v4float %tint_symbol_1 0
OpStore %tint_symbol_2 %145
OpReturn
OpStore %gl_FragCoord %gl_FragCoord_param
%145 = OpFunctionCall %void %main_1
%146 = OpLoad %v4float %x_GLF_color
%147 = OpCompositeConstruct %main_out %146
OpReturnValue %147
OpFunctionEnd
%main = OpFunction %void None %23
%147 = OpLabel
%148 = OpLoad %v4float %tint_symbol
OpStore %gl_FragCoord %148
%149 = OpFunctionCall %void %main_1
%151 = OpLoad %v4float %x_GLF_color
%152 = OpCompositeConstruct %main_out %151
%150 = OpFunctionCall %void %tint_symbol_3 %152
%149 = OpLabel
%151 = OpLoad %v4float %gl_FragCoord_param_1
%150 = OpFunctionCall %main_out %main_inner %151
%152 = OpCompositeExtract %v4float %150 0
OpStore %x_GLF_color_1_1 %152
OpReturn
OpFunctionEnd

View File

@@ -6,8 +6,10 @@
OpCapability Shader
%61 = 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 %buf0 "buf0"
OpMemberName %buf0 0 "x_GLF_uniform_float_values"
OpName %x_7 "x_7"
@@ -16,8 +18,6 @@
OpName %x_10 "x_10"
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 %main_1 "main_1"
OpName %data "data"
OpName %b "b"
@@ -27,9 +27,11 @@
OpName %x_83_phi "x_83_phi"
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 %buf0 Block
OpMemberDecorate %buf0 0 Offset 0
OpDecorate %_arr_float_uint_1 ArrayStride 16
@@ -42,11 +44,15 @@
OpDecorate %x_10 NonWritable
OpDecorate %x_10 DescriptorSet 0
OpDecorate %x_10 Binding 1
OpDecorate %tint_symbol BuiltIn FragCoord
OpDecorate %tint_symbol_2 Location 0
OpDecorate %_arr_v4float_uint_2 ArrayStride 16
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
%uint = OpTypeInt 32 0
%uint_1 = OpConstant %uint 1
%_arr_float_uint_1 = OpTypeArray %float %uint_1
@@ -59,15 +65,9 @@
%buf1 = OpTypeStruct %_arr_int_uint_4
%_ptr_Uniform_buf1 = OpTypePointer Uniform %buf1
%x_10 = OpVariable %_ptr_Uniform_buf1 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
%23 = OpTypeFunction %void
%uint_2 = OpConstant %uint 2
@@ -89,7 +89,7 @@
%int_3 = OpConstant %int 3
%_ptr_Function_v4float = OpTypePointer Function %v4float
%main_out = OpTypeStruct %v4float
%140 = OpTypeFunction %void %main_out
%140 = OpTypeFunction %main_out %v4float
%main_1 = OpFunction %void None %23
%26 = OpLabel
%data = OpVariable %_ptr_Function__arr_v4float_uint_2 Function %31
@@ -217,20 +217,20 @@
OpStore %x_GLF_color %139
OpReturn
OpFunctionEnd
%tint_symbol_3 = OpFunction %void None %140
%tint_symbol_1 = OpFunctionParameter %main_out
%main_inner = OpFunction %main_out None %140
%gl_FragCoord_param = OpFunctionParameter %v4float
%144 = OpLabel
%145 = OpCompositeExtract %v4float %tint_symbol_1 0
OpStore %tint_symbol_2 %145
OpReturn
OpStore %gl_FragCoord %gl_FragCoord_param
%145 = OpFunctionCall %void %main_1
%146 = OpLoad %v4float %x_GLF_color
%147 = OpCompositeConstruct %main_out %146
OpReturnValue %147
OpFunctionEnd
%main = OpFunction %void None %23
%147 = OpLabel
%148 = OpLoad %v4float %tint_symbol
OpStore %gl_FragCoord %148
%149 = OpFunctionCall %void %main_1
%151 = OpLoad %v4float %x_GLF_color
%152 = OpCompositeConstruct %main_out %151
%150 = OpFunctionCall %void %tint_symbol_3 %152
%149 = OpLabel
%151 = OpLoad %v4float %gl_FragCoord_param_1
%150 = OpFunctionCall %main_out %main_inner %151
%152 = OpCompositeExtract %v4float %150 0
OpStore %x_GLF_color_1_1 %152
OpReturn
OpFunctionEnd