Revert "Add support for top-level uniforms in SPIR-V."
This reverts commit acba30420ce27b3464fd04fac90e822ffd0245d8.
Reason for revert: ASAN breakage on tree for
Perf-Win2019-Clang-GCE-CPU-AVX2-x86_64-(Debug|Release)-All-ASAN
Address 0x009af69fda78 is located in stack of thread T0 at offset 1272 in frame
#0 0x7ff75c069ddf in _asan_wrap_RtlReAllocateHeap+0x44014f (c:\b\s\w\ir\build\nanobench.exe+0x1413a9ddf)
This frame has 35 object(s):
[32, 104) 'body' (line 3363)
[144, 152) 'main' (line 3365)
[176, 184) 'ref.tmp' (line 3366)
[208, 240) '__begin1' (line 3366)
[272, 304) '__end1' (line 3366)
[336, 344) 'ref.tmp27' (line 3370)
[368, 384) 'ref.tmp31' (line 3371)
[400, 416) 'interfaceVars' (line 3382)
[432, 440) 'ref.tmp48' (line 3383)
[464, 496) '__begin151' (line 3383)
[528, 560) '__end154' (line 3383)
[592, 596) 'id' (line 3386)
[608, 624) 'tmp' (line 3393)
[640, 648) 'ref.tmp114' (line 3398)
[672, 704) '__begin1117' (line 3398)
[736, 768) '__end1120' (line 3398)
[800, 1008) 'uniformBuffer' (line 3405)
[1072, 1280) 'ref.tmp159' (line 3407) <== Memory access at offset 1272 is inside this variable
[1344, 1360) 'agg.tmp'
[1376, 1576) 'adapter' (line 3411)
[1648, 1848) 'ref.tmp179' (line 3413)
[1920, 1928) 'ref.tmp191' (line 3415)
[1952, 1960) 'ref.tmp210' (line 3421)
[1984, 2016) '__begin1213' (line 3421)
[2048, 2080) '__end1216' (line 3421)
[2112, 2120) '__begin1242' (line 3427)
[2144, 2152) '__end1247' (line 3427)
[2176, 2192) 'entry256' (line 3427)
[2208, 2224) 'tmp298' (line 3433)
[2240, 2256) 'agg.tmp307'
[2272, 2280) '__begin1365' (line 3457)
[2304, 2312) 'ref.tmp415' (line 3469)
[2336, 2368) '__begin1418' (line 3469)
[2400, 2432) '__end1421' (line 3469)
[2464, 2480) 'agg.tmp436'
Original change's description:
> Add support for top-level uniforms in SPIR-V.
>
> Previously, a uniform not wrapped in an interface block would report a
> SPIR-V error:
>
> "Variables identified with the Uniform storage class are
> used to access transparent buffer backed resources. Such variables must
> be typed as OpTypeStruct, or an array of this type..."
>
> Now, the SPIR-V code generator automatically detects such global
> variables and synthesizes a struct named _UniformBuffer to hold them.
> When these variables are accessed, an OpAccessChain instruction is added
> to grab the variable out of the struct.
>
> Change-Id: I5e852d4de01b866c291506cc8cf6eb547f097d66
> Bug: skia:11225
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/360776
> Commit-Queue: John Stiles <johnstiles@google.com>
> Reviewed-by: Brian Osman <brianosman@google.com>
> Auto-Submit: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Change-Id: Ib72e33dbd662a245c20bc9d45d1397454c9588a3
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:11225
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/362057
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
diff --git a/tests/sksl/shared/ForLoopControlFlow.asm.frag b/tests/sksl/shared/ForLoopControlFlow.asm.frag
index 7a89289..e06c2d6 100644
--- a/tests/sksl/shared/ForLoopControlFlow.asm.frag
+++ b/tests/sksl/shared/ForLoopControlFlow.asm.frag
@@ -1,3 +1,10 @@
+### Compilation failed:
+
+error: SPIR-V validation error: Uniform OpVariable <id> '10[%colorWhite]' has illegal type.
+From Vulkan spec, section 14.5.2:
+Variables identified with the Uniform storage class are used to access transparent buffer backed resources. Such variables must be typed as OpTypeStruct, or an array of this type
+ %colorWhite = OpVariable %_ptr_Uniform_v4float Uniform
+
OpCapability Shader
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
@@ -5,8 +12,7 @@
OpExecutionMode %_entrypoint OriginUpperLeft
OpName %sk_FragColor "sk_FragColor"
OpName %sk_Clockwise "sk_Clockwise"
-OpName %_UniformBuffer "_UniformBuffer"
-OpMemberName %_UniformBuffer 0 "colorWhite"
+OpName %colorWhite "colorWhite"
OpName %_entrypoint "_entrypoint"
OpName %main "main"
OpName %x "x"
@@ -17,23 +23,20 @@
OpDecorate %sk_FragColor Index 0
OpDecorate %sk_Clockwise RelaxedPrecision
OpDecorate %sk_Clockwise BuiltIn FrontFacing
-OpMemberDecorate %_UniformBuffer 0 Offset 0
-OpMemberDecorate %_UniformBuffer 0 RelaxedPrecision
-OpDecorate %_UniformBuffer Block
-OpDecorate %10 Binding 0
-OpDecorate %10 DescriptorSet 0
-OpDecorate %26 RelaxedPrecision
-OpDecorate %35 RelaxedPrecision
-OpDecorate %39 RelaxedPrecision
-OpDecorate %43 RelaxedPrecision
-OpDecorate %48 RelaxedPrecision
-OpDecorate %49 RelaxedPrecision
-OpDecorate %56 RelaxedPrecision
+OpDecorate %colorWhite RelaxedPrecision
+OpDecorate %colorWhite DescriptorSet 0
+OpDecorate %21 RelaxedPrecision
+OpDecorate %30 RelaxedPrecision
+OpDecorate %34 RelaxedPrecision
+OpDecorate %40 RelaxedPrecision
+OpDecorate %45 RelaxedPrecision
+OpDecorate %46 RelaxedPrecision
+OpDecorate %53 RelaxedPrecision
+OpDecorate %55 RelaxedPrecision
OpDecorate %58 RelaxedPrecision
-OpDecorate %61 RelaxedPrecision
-OpDecorate %68 RelaxedPrecision
-OpDecorate %69 RelaxedPrecision
-OpDecorate %70 RelaxedPrecision
+OpDecorate %65 RelaxedPrecision
+OpDecorate %66 RelaxedPrecision
+OpDecorate %67 RelaxedPrecision
%float = OpTypeFloat 32
%v4float = OpTypeVector %float 4
%_ptr_Output_v4float = OpTypePointer Output %v4float
@@ -41,96 +44,95 @@
%bool = OpTypeBool
%_ptr_Input_bool = OpTypePointer Input %bool
%sk_Clockwise = OpVariable %_ptr_Input_bool Input
-%_UniformBuffer = OpTypeStruct %v4float
-%_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
-%10 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
-%void = OpTypeVoid
-%15 = OpTypeFunction %void
-%18 = OpTypeFunction %v4float
-%_ptr_Function_v4float = OpTypePointer Function %v4float
%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
-%int = OpTypeInt 32 1
-%int_0 = OpConstant %int 0
+%colorWhite = OpVariable %_ptr_Uniform_v4float Uniform
+%void = OpTypeVoid
+%14 = OpTypeFunction %void
+%17 = OpTypeFunction %v4float
+%_ptr_Function_v4float = OpTypePointer Function %v4float
%_ptr_Function_float = OpTypePointer Function %float
%float_n5 = OpConstant %float -5
%float_5 = OpConstant %float 5
%float_0 = OpConstant %float 0
%float_1 = OpConstant %float 1
+%int = OpTypeInt 32 1
+%int_0 = OpConstant %int 0
%int_2 = OpConstant %int 2
%int_1 = OpConstant %int 1
-%_entrypoint = OpFunction %void None %15
-%16 = OpLabel
-%17 = OpFunctionCall %v4float %main
-OpStore %sk_FragColor %17
+%_entrypoint = OpFunction %void None %14
+%15 = OpLabel
+%16 = OpFunctionCall %v4float %main
+OpStore %sk_FragColor %16
OpReturn
OpFunctionEnd
-%main = OpFunction %v4float None %18
-%19 = OpLabel
+%main = OpFunction %v4float None %17
+%18 = OpLabel
%x = OpVariable %_ptr_Function_v4float Function
%r = OpVariable %_ptr_Function_float Function
%b = OpVariable %_ptr_Function_float Function
-%22 = OpAccessChain %_ptr_Uniform_v4float %10 %int_0
-%26 = OpLoad %v4float %22
-OpStore %x %26
+%21 = OpLoad %v4float %colorWhite
+OpStore %x %21
OpStore %r %float_n5
-OpBranch %30
-%30 = OpLabel
-OpLoopMerge %34 %33 None
-OpBranch %31
-%31 = OpLabel
-%35 = OpLoad %float %r
-%37 = OpFOrdLessThan %bool %35 %float_5
-OpBranchConditional %37 %32 %34
-%32 = OpLabel
-%39 = OpLoad %float %r
-%38 = OpExtInst %float %1 FClamp %39 %float_0 %float_1
-%42 = OpAccessChain %_ptr_Function_float %x %int_0
-OpStore %42 %38
-%43 = OpLoad %v4float %x
-%44 = OpCompositeExtract %float %43 0
-%45 = OpFOrdEqual %bool %44 %float_0
-OpSelectionMerge %47 None
-OpBranchConditional %45 %46 %47
-%46 = OpLabel
-OpBranch %34
-%47 = OpLabel
-OpBranch %33
-%33 = OpLabel
-%48 = OpLoad %float %r
-%49 = OpFAdd %float %48 %float_1
-OpStore %r %49
-OpBranch %30
-%34 = OpLabel
+OpBranch %25
+%25 = OpLabel
+OpLoopMerge %29 %28 None
+OpBranch %26
+%26 = OpLabel
+%30 = OpLoad %float %r
+%32 = OpFOrdLessThan %bool %30 %float_5
+OpBranchConditional %32 %27 %29
+%27 = OpLabel
+%34 = OpLoad %float %r
+%33 = OpExtInst %float %1 FClamp %34 %float_0 %float_1
+%37 = OpAccessChain %_ptr_Function_float %x %int_0
+OpStore %37 %33
+%40 = OpLoad %v4float %x
+%41 = OpCompositeExtract %float %40 0
+%42 = OpFOrdEqual %bool %41 %float_0
+OpSelectionMerge %44 None
+OpBranchConditional %42 %43 %44
+%43 = OpLabel
+OpBranch %29
+%44 = OpLabel
+OpBranch %28
+%28 = OpLabel
+%45 = OpLoad %float %r
+%46 = OpFAdd %float %45 %float_1
+OpStore %r %46
+OpBranch %25
+%29 = OpLabel
OpStore %b %float_5
+OpBranch %48
+%48 = OpLabel
+OpLoopMerge %52 %51 None
+OpBranch %49
+%49 = OpLabel
+%53 = OpLoad %float %b
+%54 = OpFOrdGreaterThanEqual %bool %53 %float_0
+OpBranchConditional %54 %50 %52
+%50 = OpLabel
+%55 = OpLoad %float %b
+%56 = OpAccessChain %_ptr_Function_float %x %int_2
+OpStore %56 %55
+%58 = OpLoad %v4float %x
+%59 = OpCompositeExtract %float %58 3
+%60 = OpFOrdEqual %bool %59 %float_1
+OpSelectionMerge %62 None
+OpBranchConditional %60 %61 %62
+%61 = OpLabel
+OpBranch %51
+%62 = OpLabel
+%63 = OpAccessChain %_ptr_Function_float %x %int_1
+OpStore %63 %float_0
OpBranch %51
%51 = OpLabel
-OpLoopMerge %55 %54 None
-OpBranch %52
+%65 = OpLoad %float %b
+%66 = OpFSub %float %65 %float_1
+OpStore %b %66
+OpBranch %48
%52 = OpLabel
-%56 = OpLoad %float %b
-%57 = OpFOrdGreaterThanEqual %bool %56 %float_0
-OpBranchConditional %57 %53 %55
-%53 = OpLabel
-%58 = OpLoad %float %b
-%59 = OpAccessChain %_ptr_Function_float %x %int_2
-OpStore %59 %58
-%61 = OpLoad %v4float %x
-%62 = OpCompositeExtract %float %61 3
-%63 = OpFOrdEqual %bool %62 %float_1
-OpSelectionMerge %65 None
-OpBranchConditional %63 %64 %65
-%64 = OpLabel
-OpBranch %54
-%65 = OpLabel
-%66 = OpAccessChain %_ptr_Function_float %x %int_1
-OpStore %66 %float_0
-OpBranch %54
-%54 = OpLabel
-%68 = OpLoad %float %b
-%69 = OpFSub %float %68 %float_1
-OpStore %b %69
-OpBranch %51
-%55 = OpLabel
-%70 = OpLoad %v4float %x
-OpReturnValue %70
+%67 = OpLoad %v4float %x
+OpReturnValue %67
OpFunctionEnd
+
+1 error