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

@@ -1,30 +1,29 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 39
; Bound: 38
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main" %tint_symbol_1
OpEntryPoint Fragment %main "main" %x_GLF_color_1_1
OpExecutionMode %main OriginUpperLeft
OpName %x_GLF_color_1_1 "x_GLF_color_1_1"
OpName %x_GLF_color "x_GLF_color"
OpName %tint_symbol_1 "tint_symbol_1"
OpName %main_1 "main_1"
OpName %a "a"
OpName %main_out "main_out"
OpMemberName %main_out 0 "x_GLF_color_1"
OpName %tint_symbol_2 "tint_symbol_2"
OpName %tint_symbol "tint_symbol"
OpName %main_inner "main_inner"
OpName %main "main"
OpDecorate %tint_symbol_1 Location 0
OpDecorate %x_GLF_color_1_1 Location 0
OpMemberDecorate %main_out 0 Offset 0
%float = OpTypeFloat 32
%v4float = OpTypeVector %float 4
%_ptr_Private_v4float = OpTypePointer Private %v4float
%5 = OpConstantNull %v4float
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
%_ptr_Output_v4float = OpTypePointer Output %v4float
%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %5
%5 = OpConstantNull %v4float
%x_GLF_color_1_1 = OpVariable %_ptr_Output_v4float Output %5
%_ptr_Private_v4float = OpTypePointer Private %v4float
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
%void = OpTypeVoid
%8 = OpTypeFunction %void
%bool = OpTypeBool
@@ -37,7 +36,7 @@
%float_1 = OpConstant %float 1
%26 = OpConstantComposite %v4float %float_1 %float_0 %float_0 %float_1
%main_out = OpTypeStruct %v4float
%27 = OpTypeFunction %void %main_out
%27 = OpTypeFunction %main_out
%main_1 = OpFunction %void None %8
%11 = OpLabel
%a = OpVariable %_ptr_Function_bool Function %15
@@ -55,18 +54,17 @@
%20 = OpLabel
OpReturn
OpFunctionEnd
%tint_symbol_2 = OpFunction %void None %27
%tint_symbol = OpFunctionParameter %main_out
%31 = OpLabel
%32 = OpCompositeExtract %v4float %tint_symbol 0
OpStore %tint_symbol_1 %32
OpReturn
%main_inner = OpFunction %main_out None %27
%30 = OpLabel
%31 = OpFunctionCall %void %main_1
%32 = OpLoad %v4float %x_GLF_color
%33 = OpCompositeConstruct %main_out %32
OpReturnValue %33
OpFunctionEnd
%main = OpFunction %void None %8
%34 = OpLabel
%35 = OpFunctionCall %void %main_1
%37 = OpLoad %v4float %x_GLF_color
%38 = OpCompositeConstruct %main_out %37
%36 = OpFunctionCall %void %tint_symbol_2 %38
%35 = OpLabel
%36 = OpFunctionCall %main_out %main_inner
%37 = OpCompositeExtract %v4float %36 0
OpStore %x_GLF_color_1_1 %37
OpReturn
OpFunctionEnd

View File

@@ -1,30 +1,29 @@
; SPIR-V
; Version: 1.3
; Generator: Google Tint Compiler; 0
; Bound: 41
; Bound: 40
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main" %tint_symbol_1
OpEntryPoint Fragment %main "main" %x_GLF_color_1_1
OpExecutionMode %main OriginUpperLeft
OpName %x_GLF_color_1_1 "x_GLF_color_1_1"
OpName %x_GLF_color "x_GLF_color"
OpName %tint_symbol_1 "tint_symbol_1"
OpName %main_1 "main_1"
OpName %a "a"
OpName %main_out "main_out"
OpMemberName %main_out 0 "x_GLF_color_1"
OpName %tint_symbol_2 "tint_symbol_2"
OpName %tint_symbol "tint_symbol"
OpName %main_inner "main_inner"
OpName %main "main"
OpDecorate %tint_symbol_1 Location 0
OpDecorate %x_GLF_color_1_1 Location 0
OpMemberDecorate %main_out 0 Offset 0
%float = OpTypeFloat 32
%v4float = OpTypeVector %float 4
%_ptr_Private_v4float = OpTypePointer Private %v4float
%5 = OpConstantNull %v4float
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
%_ptr_Output_v4float = OpTypePointer Output %v4float
%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %5
%5 = OpConstantNull %v4float
%x_GLF_color_1_1 = OpVariable %_ptr_Output_v4float Output %5
%_ptr_Private_v4float = OpTypePointer Private %v4float
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
%void = OpTypeVoid
%8 = OpTypeFunction %void
%bool = OpTypeBool
@@ -37,7 +36,7 @@
%float_1 = OpConstant %float 1
%28 = OpConstantComposite %v4float %float_1 %float_0 %float_0 %float_1
%main_out = OpTypeStruct %v4float
%29 = OpTypeFunction %void %main_out
%29 = OpTypeFunction %main_out
%main_1 = OpFunction %void None %8
%11 = OpLabel
%a = OpVariable %_ptr_Function_bool Function %15
@@ -60,18 +59,17 @@
%22 = OpLabel
OpReturn
OpFunctionEnd
%tint_symbol_2 = OpFunction %void None %29
%tint_symbol = OpFunctionParameter %main_out
%33 = OpLabel
%34 = OpCompositeExtract %v4float %tint_symbol 0
OpStore %tint_symbol_1 %34
OpReturn
%main_inner = OpFunction %main_out None %29
%32 = OpLabel
%33 = OpFunctionCall %void %main_1
%34 = OpLoad %v4float %x_GLF_color
%35 = OpCompositeConstruct %main_out %34
OpReturnValue %35
OpFunctionEnd
%main = OpFunction %void None %8
%36 = OpLabel
%37 = OpFunctionCall %void %main_1
%39 = OpLoad %v4float %x_GLF_color
%40 = OpCompositeConstruct %main_out %39
%38 = OpFunctionCall %void %tint_symbol_2 %40
%37 = OpLabel
%38 = OpFunctionCall %main_out %main_inner
%39 = OpCompositeExtract %v4float %38 0
OpStore %x_GLF_color_1_1 %39
OpReturn
OpFunctionEnd