encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-18 01:15:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

spirv: Use generic transform to process shader IO

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

80
test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_graphics/0.spvasm.expected.spvasm
View File

@@ -5,60 +5,60 @@
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint Vertex %main "main" %tint_pointsize %tint_symbol %tint_symbol_2 %tint_symbol_3
OpName %tint_pointsize "tint_pointsize"
OpEntryPoint Vertex %main "main" %position_param_1 %gl_Position_1 %frag_color_1_1 %vertex_point_size
OpName %position_param_1 "position_param_1"
OpName %gl_Position_1 "gl_Position_1"
OpName %frag_color_1_1 "frag_color_1_1"
OpName %vertex_point_size "vertex_point_size"
OpName %position "position"
OpName %frag_color "frag_color"
OpName %block0 "block0"
OpMemberName %block0 0 "in_color"
OpName %x_8 "x_8"
OpName %gl_Position "gl_Position"
OpName %tint_symbol "tint_symbol"
OpName %tint_symbol_2 "tint_symbol_2"
OpName %tint_symbol_3 "tint_symbol_3"
OpName %main_1 "main_1"
OpName %main_out "main_out"
OpMemberName %main_out 0 "gl_Position"
OpMemberName %main_out 1 "frag_color_1"
OpName %tint_symbol_4 "tint_symbol_4"
OpName %tint_symbol_1 "tint_symbol_1"
OpName %main_inner "main_inner"
OpName %position_param "position_param"
OpName %main "main"
OpDecorate %tint_pointsize BuiltIn PointSize
OpDecorate %position_param_1 Location 0
OpDecorate %gl_Position_1 BuiltIn Position
OpDecorate %frag_color_1_1 Location 0
OpDecorate %vertex_point_size BuiltIn PointSize
OpDecorate %block0 Block
OpMemberDecorate %block0 0 Offset 0
OpDecorate %x_8 NonWritable
OpDecorate %x_8 DescriptorSet 0
OpDecorate %x_8 Binding 1
OpDecorate %tint_symbol Location 0
OpDecorate %tint_symbol_2 BuiltIn Position
OpDecorate %tint_symbol_3 Location 0
OpMemberDecorate %main_out 0 Offset 0
OpMemberDecorate %main_out 1 Offset 16
%float = OpTypeFloat 32
%_ptr_Output_float = OpTypePointer Output %float
%4 = OpConstantNull %float
%tint_pointsize = OpVariable %_ptr_Output_float Output %4
%v4float = OpTypeVector %float 4
%_ptr_Input_v4float = OpTypePointer Input %v4float
%position_param_1 = OpVariable %_ptr_Input_v4float Input
%_ptr_Output_v4float = OpTypePointer Output %v4float
%7 = OpConstantNull %v4float
%gl_Position_1 = OpVariable %_ptr_Output_v4float Output %7
%frag_color_1_1 = OpVariable %_ptr_Output_v4float Output %7
%_ptr_Output_float = OpTypePointer Output %float
%11 = OpConstantNull %float
%vertex_point_size = OpVariable %_ptr_Output_float Output %11
%_ptr_Private_v4float = OpTypePointer Private %v4float
%8 = OpConstantNull %v4float
%position = OpVariable %_ptr_Private_v4float Private %8
%frag_color = OpVariable %_ptr_Private_v4float Private %8
%position = OpVariable %_ptr_Private_v4float Private %7
%frag_color = OpVariable %_ptr_Private_v4float Private %7
%block0 = OpTypeStruct %v4float
%_ptr_Uniform_block0 = OpTypePointer Uniform %block0
%x_8 = OpVariable %_ptr_Uniform_block0 Uniform
%gl_Position = OpVariable %_ptr_Private_v4float Private %8
%_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 %8
%tint_symbol_3 = OpVariable %_ptr_Output_v4float Output %8
%gl_Position = OpVariable %_ptr_Private_v4float Private %7
%void = OpTypeVoid
%19 = OpTypeFunction %void
%uint = OpTypeInt 32 0
%uint_0 = OpConstant %uint 0
%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
%main_out = OpTypeStruct %v4float %v4float
%29 = OpTypeFunction %void %main_out
%29 = OpTypeFunction %main_out %v4float
%float_1 = OpConstant %float 1
%main_1 = OpFunction %void None %19
%22 = OpLabel
@@ -69,24 +69,24 @@
OpStore %frag_color %28
OpReturn
OpFunctionEnd
%tint_symbol_4 = OpFunction %void None %29
%tint_symbol_1 = OpFunctionParameter %main_out
%main_inner = OpFunction %main_out None %29
%position_param = OpFunctionParameter %v4float
%33 = OpLabel
%34 = OpCompositeExtract %v4float %tint_symbol_1 0
OpStore %tint_symbol_2 %34
%35 = OpCompositeExtract %v4float %tint_symbol_1 1
OpStore %tint_symbol_3 %35
OpReturn
OpStore %position %position_param
%34 = OpFunctionCall %void %main_1
%35 = OpLoad %v4float %gl_Position
%36 = OpLoad %v4float %frag_color
%37 = OpCompositeConstruct %main_out %35 %36
OpReturnValue %37
OpFunctionEnd
%main = OpFunction %void None %19
%37 = OpLabel
OpStore %tint_pointsize %float_1
%39 = OpLoad %v4float %tint_symbol
OpStore %position %39
%40 = OpFunctionCall %void %main_1
%42 = OpLoad %v4float %gl_Position
%43 = OpLoad %v4float %frag_color
%44 = OpCompositeConstruct %main_out %42 %43
%41 = OpFunctionCall %void %tint_symbol_4 %44
%39 = OpLabel
%41 = OpLoad %v4float %position_param_1
%40 = OpFunctionCall %main_out %main_inner %41
%42 = OpCompositeExtract %v4float %40 0
OpStore %gl_Position_1 %42
%43 = OpCompositeExtract %v4float %40 1
OpStore %frag_color_1_1 %43
OpStore %vertex_point_size %float_1
OpReturn
OpFunctionEnd

80
test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_graphics/0.wgsl.expected.spvasm
View File

@@ -5,60 +5,60 @@
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint Vertex %main "main" %tint_pointsize %tint_symbol %tint_symbol_2 %tint_symbol_3
OpName %tint_pointsize "tint_pointsize"
OpEntryPoint Vertex %main "main" %position_param_1 %gl_Position_1 %frag_color_1_1 %vertex_point_size
OpName %position_param_1 "position_param_1"
OpName %gl_Position_1 "gl_Position_1"
OpName %frag_color_1_1 "frag_color_1_1"
OpName %vertex_point_size "vertex_point_size"
OpName %position "position"
OpName %frag_color "frag_color"
OpName %block0 "block0"
OpMemberName %block0 0 "in_color"
OpName %x_8 "x_8"
OpName %gl_Position "gl_Position"
OpName %tint_symbol "tint_symbol"
OpName %tint_symbol_2 "tint_symbol_2"
OpName %tint_symbol_3 "tint_symbol_3"
OpName %main_1 "main_1"
OpName %main_out "main_out"
OpMemberName %main_out 0 "gl_Position"
OpMemberName %main_out 1 "frag_color_1"
OpName %tint_symbol_4 "tint_symbol_4"
OpName %tint_symbol_1 "tint_symbol_1"
OpName %main_inner "main_inner"
OpName %position_param "position_param"
OpName %main "main"
OpDecorate %tint_pointsize BuiltIn PointSize
OpDecorate %position_param_1 Location 0
OpDecorate %gl_Position_1 BuiltIn Position
OpDecorate %frag_color_1_1 Location 0
OpDecorate %vertex_point_size BuiltIn PointSize
OpDecorate %block0 Block
OpMemberDecorate %block0 0 Offset 0
OpDecorate %x_8 NonWritable
OpDecorate %x_8 DescriptorSet 0
OpDecorate %x_8 Binding 1
OpDecorate %tint_symbol Location 0
OpDecorate %tint_symbol_2 BuiltIn Position
OpDecorate %tint_symbol_3 Location 0
OpMemberDecorate %main_out 0 Offset 0
OpMemberDecorate %main_out 1 Offset 16
%float = OpTypeFloat 32
%_ptr_Output_float = OpTypePointer Output %float
%4 = OpConstantNull %float
%tint_pointsize = OpVariable %_ptr_Output_float Output %4
%v4float = OpTypeVector %float 4
%_ptr_Input_v4float = OpTypePointer Input %v4float
%position_param_1 = OpVariable %_ptr_Input_v4float Input
%_ptr_Output_v4float = OpTypePointer Output %v4float
%7 = OpConstantNull %v4float
%gl_Position_1 = OpVariable %_ptr_Output_v4float Output %7
%frag_color_1_1 = OpVariable %_ptr_Output_v4float Output %7
%_ptr_Output_float = OpTypePointer Output %float
%11 = OpConstantNull %float
%vertex_point_size = OpVariable %_ptr_Output_float Output %11
%_ptr_Private_v4float = OpTypePointer Private %v4float
%8 = OpConstantNull %v4float
%position = OpVariable %_ptr_Private_v4float Private %8
%frag_color = OpVariable %_ptr_Private_v4float Private %8
%position = OpVariable %_ptr_Private_v4float Private %7
%frag_color = OpVariable %_ptr_Private_v4float Private %7
%block0 = OpTypeStruct %v4float
%_ptr_Uniform_block0 = OpTypePointer Uniform %block0
%x_8 = OpVariable %_ptr_Uniform_block0 Uniform
%gl_Position = OpVariable %_ptr_Private_v4float Private %8
%_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 %8
%tint_symbol_3 = OpVariable %_ptr_Output_v4float Output %8
%gl_Position = OpVariable %_ptr_Private_v4float Private %7
%void = OpTypeVoid
%19 = OpTypeFunction %void
%uint = OpTypeInt 32 0
%uint_0 = OpConstant %uint 0
%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
%main_out = OpTypeStruct %v4float %v4float
%29 = OpTypeFunction %void %main_out
%29 = OpTypeFunction %main_out %v4float
%float_1 = OpConstant %float 1
%main_1 = OpFunction %void None %19
%22 = OpLabel
@@ -69,24 +69,24 @@
OpStore %frag_color %28
OpReturn
OpFunctionEnd
%tint_symbol_4 = OpFunction %void None %29
%tint_symbol_1 = OpFunctionParameter %main_out
%main_inner = OpFunction %main_out None %29
%position_param = OpFunctionParameter %v4float
%33 = OpLabel
%34 = OpCompositeExtract %v4float %tint_symbol_1 0
OpStore %tint_symbol_2 %34
%35 = OpCompositeExtract %v4float %tint_symbol_1 1
OpStore %tint_symbol_3 %35
OpReturn
OpStore %position %position_param
%34 = OpFunctionCall %void %main_1
%35 = OpLoad %v4float %gl_Position
%36 = OpLoad %v4float %frag_color
%37 = OpCompositeConstruct %main_out %35 %36
OpReturnValue %37
OpFunctionEnd
%main = OpFunction %void None %19
%37 = OpLabel
OpStore %tint_pointsize %float_1
%39 = OpLoad %v4float %tint_symbol
OpStore %position %39
%40 = OpFunctionCall %void %main_1
%42 = OpLoad %v4float %gl_Position
%43 = OpLoad %v4float %frag_color
%44 = OpCompositeConstruct %main_out %42 %43
%41 = OpFunctionCall %void %tint_symbol_4 %44
%39 = OpLabel
%41 = OpLoad %v4float %position_param_1
%40 = OpFunctionCall %main_out %main_inner %41
%42 = OpCompositeExtract %v4float %40 0
OpStore %gl_Position_1 %42
%43 = OpCompositeExtract %v4float %40 1
OpStore %frag_color_1_1 %43
OpStore %vertex_point_size %float_1
OpReturn
OpFunctionEnd

52
test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_graphics/1.spvasm.expected.spvasm
View File

@@ -5,55 +5,55 @@
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main" %tint_symbol %tint_symbol_2
OpEntryPoint Fragment %main "main" %frag_color_param_1 %final_color_1_1
OpExecutionMode %main OriginUpperLeft
OpName %frag_color_param_1 "frag_color_param_1"
OpName %final_color_1_1 "final_color_1_1"
OpName %final_color "final_color"
OpName %frag_color "frag_color"
OpName %tint_symbol "tint_symbol"
OpName %tint_symbol_2 "tint_symbol_2"
OpName %main_1 "main_1"
OpName %main_out "main_out"
OpMemberName %main_out 0 "final_color_1"
OpName %tint_symbol_3 "tint_symbol_3"
OpName %tint_symbol_1 "tint_symbol_1"
OpName %main_inner "main_inner"
OpName %frag_color_param "frag_color_param"
OpName %main "main"
OpDecorate %tint_symbol Location 0
OpDecorate %tint_symbol_2 Location 0
OpDecorate %frag_color_param_1 Location 0
OpDecorate %final_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
%final_color = OpVariable %_ptr_Private_v4float Private %5
%frag_color = OpVariable %_ptr_Private_v4float Private %5
%_ptr_Input_v4float = OpTypePointer Input %v4float
%tint_symbol = OpVariable %_ptr_Input_v4float Input
%frag_color_param_1 = OpVariable %_ptr_Input_v4float Input
%_ptr_Output_v4float = OpTypePointer Output %v4float
%tint_symbol_2 = OpVariable %_ptr_Output_v4float Output %5
%7 = OpConstantNull %v4float
%final_color_1_1 = OpVariable %_ptr_Output_v4float Output %7
%_ptr_Private_v4float = OpTypePointer Private %v4float
%final_color = OpVariable %_ptr_Private_v4float Private %7
%frag_color = OpVariable %_ptr_Private_v4float Private %7
%void = OpTypeVoid
%11 = OpTypeFunction %void
%main_out = OpTypeStruct %v4float
%16 = OpTypeFunction %void %main_out
%16 = OpTypeFunction %main_out %v4float
%main_1 = OpFunction %void None %11
%14 = OpLabel
%15 = OpLoad %v4float %frag_color
OpStore %final_color %15
OpReturn
OpFunctionEnd
%tint_symbol_3 = OpFunction %void None %16
%tint_symbol_1 = OpFunctionParameter %main_out
%main_inner = OpFunction %main_out None %16
%frag_color_param = OpFunctionParameter %v4float
%20 = OpLabel
%21 = OpCompositeExtract %v4float %tint_symbol_1 0
OpStore %tint_symbol_2 %21
OpReturn
OpStore %frag_color %frag_color_param
%21 = OpFunctionCall %void %main_1
%22 = OpLoad %v4float %final_color
%23 = OpCompositeConstruct %main_out %22
OpReturnValue %23
OpFunctionEnd
%main = OpFunction %void None %11
%23 = OpLabel
%24 = OpLoad %v4float %tint_symbol
OpStore %frag_color %24
%25 = OpFunctionCall %void %main_1
%27 = OpLoad %v4float %final_color
%28 = OpCompositeConstruct %main_out %27
%26 = OpFunctionCall %void %tint_symbol_3 %28
%25 = OpLabel
%27 = OpLoad %v4float %frag_color_param_1
%26 = OpFunctionCall %main_out %main_inner %27
%28 = OpCompositeExtract %v4float %26 0
OpStore %final_color_1_1 %28
OpReturn
OpFunctionEnd

52
test/vk-gl-cts/binding_model/dynamic_offset/shader_reuse_differing_layout_graphics/1.wgsl.expected.spvasm
View File

@@ -5,55 +5,55 @@
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main" %tint_symbol %tint_symbol_2
OpEntryPoint Fragment %main "main" %frag_color_param_1 %final_color_1_1
OpExecutionMode %main OriginUpperLeft
OpName %frag_color_param_1 "frag_color_param_1"
OpName %final_color_1_1 "final_color_1_1"
OpName %final_color "final_color"
OpName %frag_color "frag_color"
OpName %tint_symbol "tint_symbol"
OpName %tint_symbol_2 "tint_symbol_2"
OpName %main_1 "main_1"
OpName %main_out "main_out"
OpMemberName %main_out 0 "final_color_1"
OpName %tint_symbol_3 "tint_symbol_3"
OpName %tint_symbol_1 "tint_symbol_1"
OpName %main_inner "main_inner"
OpName %frag_color_param "frag_color_param"
OpName %main "main"
OpDecorate %tint_symbol Location 0
OpDecorate %tint_symbol_2 Location 0
OpDecorate %frag_color_param_1 Location 0
OpDecorate %final_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
%final_color = OpVariable %_ptr_Private_v4float Private %5
%frag_color = OpVariable %_ptr_Private_v4float Private %5
%_ptr_Input_v4float = OpTypePointer Input %v4float
%tint_symbol = OpVariable %_ptr_Input_v4float Input
%frag_color_param_1 = OpVariable %_ptr_Input_v4float Input
%_ptr_Output_v4float = OpTypePointer Output %v4float
%tint_symbol_2 = OpVariable %_ptr_Output_v4float Output %5
%7 = OpConstantNull %v4float
%final_color_1_1 = OpVariable %_ptr_Output_v4float Output %7
%_ptr_Private_v4float = OpTypePointer Private %v4float
%final_color = OpVariable %_ptr_Private_v4float Private %7
%frag_color = OpVariable %_ptr_Private_v4float Private %7
%void = OpTypeVoid
%11 = OpTypeFunction %void
%main_out = OpTypeStruct %v4float
%16 = OpTypeFunction %void %main_out
%16 = OpTypeFunction %main_out %v4float
%main_1 = OpFunction %void None %11
%14 = OpLabel
%15 = OpLoad %v4float %frag_color
OpStore %final_color %15
OpReturn
OpFunctionEnd
%tint_symbol_3 = OpFunction %void None %16
%tint_symbol_1 = OpFunctionParameter %main_out
%main_inner = OpFunction %main_out None %16
%frag_color_param = OpFunctionParameter %v4float
%20 = OpLabel
%21 = OpCompositeExtract %v4float %tint_symbol_1 0
OpStore %tint_symbol_2 %21
OpReturn
OpStore %frag_color %frag_color_param
%21 = OpFunctionCall %void %main_1
%22 = OpLoad %v4float %final_color
%23 = OpCompositeConstruct %main_out %22
OpReturnValue %23
OpFunctionEnd
%main = OpFunction %void None %11
%23 = OpLabel
%24 = OpLoad %v4float %tint_symbol
OpStore %frag_color %24
%25 = OpFunctionCall %void %main_1
%27 = OpLoad %v4float %final_color
%28 = OpCompositeConstruct %main_out %27
%26 = OpFunctionCall %void %tint_symbol_3 %28
%25 = OpLabel
%27 = OpLoad %v4float %frag_color_param_1
%26 = OpFunctionCall %main_out %main_inner %27
%28 = OpCompositeExtract %v4float %26 0
OpStore %final_color_1_1 %28
OpReturn
OpFunctionEnd