mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-12-12 06:45:16 +00:00
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
committed by
Tint LUCI CQ
Tint LUCI CQ
parent
11e172ab64
commit
11c6fcdb51
@@ -1,18 +1,18 @@
|
||||
; SPIR-V
|
||||
; Version: 1.3
|
||||
; Generator: Google Tint Compiler; 0
|
||||
; Bound: 215
|
||||
; Bound: 214
|
||||
; Schema: 0
|
||||
OpCapability Shader
|
||||
%152 = OpExtInstImport "GLSL.std.450"
|
||||
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 %buf0 "buf0"
|
||||
OpMemberName %buf0 0 "x_GLF_uniform_int_values"
|
||||
OpName %x_6 "x_6"
|
||||
OpName %x_GLF_color "x_GLF_color"
|
||||
OpName %tint_symbol_1 "tint_symbol_1"
|
||||
OpName %main_1 "main_1"
|
||||
OpName %A "A"
|
||||
OpName %ref "ref"
|
||||
@@ -22,18 +22,22 @@
|
||||
OpName %i_1 "i_1"
|
||||
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 %x_GLF_color_1_1 Location 0
|
||||
OpDecorate %buf0 Block
|
||||
OpMemberDecorate %buf0 0 Offset 0
|
||||
OpDecorate %_arr_int_uint_19 ArrayStride 16
|
||||
OpDecorate %x_6 NonWritable
|
||||
OpDecorate %x_6 DescriptorSet 0
|
||||
OpDecorate %x_6 Binding 0
|
||||
OpDecorate %tint_symbol_1 Location 0
|
||||
OpDecorate %_arr_int_uint_17 ArrayStride 4
|
||||
OpMemberDecorate %main_out 0 Offset 0
|
||||
%float = OpTypeFloat 32
|
||||
%v4float = OpTypeVector %float 4
|
||||
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
||||
%5 = OpConstantNull %v4float
|
||||
%x_GLF_color_1_1 = OpVariable %_ptr_Output_v4float Output %5
|
||||
%int = OpTypeInt 32 1
|
||||
%uint = OpTypeInt 32 0
|
||||
%uint_19 = OpConstant %uint 19
|
||||
@@ -41,13 +45,8 @@
|
||||
%buf0 = OpTypeStruct %_arr_int_uint_19
|
||||
%_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
|
||||
%x_6 = OpVariable %_ptr_Uniform_buf0 Uniform
|
||||
%float = OpTypeFloat 32
|
||||
%v4float = OpTypeVector %float 4
|
||||
%_ptr_Private_v4float = OpTypePointer Private %v4float
|
||||
%12 = OpConstantNull %v4float
|
||||
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %12
|
||||
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
||||
%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %12
|
||||
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
|
||||
%void = OpTypeVoid
|
||||
%15 = OpTypeFunction %void
|
||||
%uint_17 = OpConstant %uint 17
|
||||
@@ -82,7 +81,7 @@
|
||||
%true = OpConstantTrue %bool
|
||||
%false = OpConstantFalse %bool
|
||||
%main_out = OpTypeStruct %v4float
|
||||
%203 = OpTypeFunction %void %main_out
|
||||
%203 = OpTypeFunction %main_out
|
||||
%main_1 = OpFunction %void None %15
|
||||
%18 = OpLabel
|
||||
%A = OpVariable %_ptr_Function__arr_int_uint_17 Function %23
|
||||
@@ -277,18 +276,17 @@
|
||||
%188 = OpLabel
|
||||
OpReturn
|
||||
OpFunctionEnd
|
||||
%tint_symbol_2 = OpFunction %void None %203
|
||||
%tint_symbol = OpFunctionParameter %main_out
|
||||
%207 = OpLabel
|
||||
%208 = OpCompositeExtract %v4float %tint_symbol 0
|
||||
OpStore %tint_symbol_1 %208
|
||||
OpReturn
|
||||
%main_inner = OpFunction %main_out None %203
|
||||
%206 = OpLabel
|
||||
%207 = OpFunctionCall %void %main_1
|
||||
%208 = OpLoad %v4float %x_GLF_color
|
||||
%209 = OpCompositeConstruct %main_out %208
|
||||
OpReturnValue %209
|
||||
OpFunctionEnd
|
||||
%main = OpFunction %void None %15
|
||||
%210 = OpLabel
|
||||
%211 = OpFunctionCall %void %main_1
|
||||
%213 = OpLoad %v4float %x_GLF_color
|
||||
%214 = OpCompositeConstruct %main_out %213
|
||||
%212 = OpFunctionCall %void %tint_symbol_2 %214
|
||||
%211 = OpLabel
|
||||
%212 = OpFunctionCall %main_out %main_inner
|
||||
%213 = OpCompositeExtract %v4float %212 0
|
||||
OpStore %x_GLF_color_1_1 %213
|
||||
OpReturn
|
||||
OpFunctionEnd
|
||||
|
||||
@@ -1,18 +1,18 @@
|
||||
; SPIR-V
|
||||
; Version: 1.3
|
||||
; Generator: Google Tint Compiler; 0
|
||||
; Bound: 215
|
||||
; Bound: 214
|
||||
; Schema: 0
|
||||
OpCapability Shader
|
||||
%152 = OpExtInstImport "GLSL.std.450"
|
||||
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 %buf0 "buf0"
|
||||
OpMemberName %buf0 0 "x_GLF_uniform_int_values"
|
||||
OpName %x_6 "x_6"
|
||||
OpName %x_GLF_color "x_GLF_color"
|
||||
OpName %tint_symbol_1 "tint_symbol_1"
|
||||
OpName %main_1 "main_1"
|
||||
OpName %A "A"
|
||||
OpName %ref "ref"
|
||||
@@ -22,18 +22,22 @@
|
||||
OpName %i_1 "i_1"
|
||||
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 %x_GLF_color_1_1 Location 0
|
||||
OpDecorate %buf0 Block
|
||||
OpMemberDecorate %buf0 0 Offset 0
|
||||
OpDecorate %_arr_int_uint_19 ArrayStride 16
|
||||
OpDecorate %x_6 NonWritable
|
||||
OpDecorate %x_6 DescriptorSet 0
|
||||
OpDecorate %x_6 Binding 0
|
||||
OpDecorate %tint_symbol_1 Location 0
|
||||
OpDecorate %_arr_int_uint_17 ArrayStride 4
|
||||
OpMemberDecorate %main_out 0 Offset 0
|
||||
%float = OpTypeFloat 32
|
||||
%v4float = OpTypeVector %float 4
|
||||
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
||||
%5 = OpConstantNull %v4float
|
||||
%x_GLF_color_1_1 = OpVariable %_ptr_Output_v4float Output %5
|
||||
%int = OpTypeInt 32 1
|
||||
%uint = OpTypeInt 32 0
|
||||
%uint_19 = OpConstant %uint 19
|
||||
@@ -41,13 +45,8 @@
|
||||
%buf0 = OpTypeStruct %_arr_int_uint_19
|
||||
%_ptr_Uniform_buf0 = OpTypePointer Uniform %buf0
|
||||
%x_6 = OpVariable %_ptr_Uniform_buf0 Uniform
|
||||
%float = OpTypeFloat 32
|
||||
%v4float = OpTypeVector %float 4
|
||||
%_ptr_Private_v4float = OpTypePointer Private %v4float
|
||||
%12 = OpConstantNull %v4float
|
||||
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %12
|
||||
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
||||
%tint_symbol_1 = OpVariable %_ptr_Output_v4float Output %12
|
||||
%x_GLF_color = OpVariable %_ptr_Private_v4float Private %5
|
||||
%void = OpTypeVoid
|
||||
%15 = OpTypeFunction %void
|
||||
%uint_17 = OpConstant %uint 17
|
||||
@@ -82,7 +81,7 @@
|
||||
%true = OpConstantTrue %bool
|
||||
%false = OpConstantFalse %bool
|
||||
%main_out = OpTypeStruct %v4float
|
||||
%203 = OpTypeFunction %void %main_out
|
||||
%203 = OpTypeFunction %main_out
|
||||
%main_1 = OpFunction %void None %15
|
||||
%18 = OpLabel
|
||||
%A = OpVariable %_ptr_Function__arr_int_uint_17 Function %23
|
||||
@@ -277,18 +276,17 @@
|
||||
%188 = OpLabel
|
||||
OpReturn
|
||||
OpFunctionEnd
|
||||
%tint_symbol_2 = OpFunction %void None %203
|
||||
%tint_symbol = OpFunctionParameter %main_out
|
||||
%207 = OpLabel
|
||||
%208 = OpCompositeExtract %v4float %tint_symbol 0
|
||||
OpStore %tint_symbol_1 %208
|
||||
OpReturn
|
||||
%main_inner = OpFunction %main_out None %203
|
||||
%206 = OpLabel
|
||||
%207 = OpFunctionCall %void %main_1
|
||||
%208 = OpLoad %v4float %x_GLF_color
|
||||
%209 = OpCompositeConstruct %main_out %208
|
||||
OpReturnValue %209
|
||||
OpFunctionEnd
|
||||
%main = OpFunction %void None %15
|
||||
%210 = OpLabel
|
||||
%211 = OpFunctionCall %void %main_1
|
||||
%213 = OpLoad %v4float %x_GLF_color
|
||||
%214 = OpCompositeConstruct %main_out %213
|
||||
%212 = OpFunctionCall %void %tint_symbol_2 %214
|
||||
%211 = OpLabel
|
||||
%212 = OpFunctionCall %main_out %main_inner
|
||||
%213 = OpCompositeExtract %v4float %212 0
|
||||
OpStore %x_GLF_color_1_1 %213
|
||||
OpReturn
|
||||
OpFunctionEnd
|
||||
|
||||
Reference in New Issue
Block a user