2020-11-20 21:28:50 +00:00
|
|
|
OpCapability Shader
|
|
|
|
%1 = OpExtInstImport "GLSL.std.450"
|
|
|
|
OpMemoryModel Logical GLSL450
|
2021-03-22 16:05:31 +00:00
|
|
|
OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise
|
|
|
|
OpExecutionMode %_entrypoint_v OriginUpperLeft
|
2020-11-20 21:28:50 +00:00
|
|
|
OpName %sk_FragColor "sk_FragColor"
|
|
|
|
OpName %sk_Clockwise "sk_Clockwise"
|
2021-03-16 14:57:55 +00:00
|
|
|
OpName %globalVar "globalVar"
|
|
|
|
OpName %S "S"
|
|
|
|
OpMemberName %S 0 "f"
|
|
|
|
OpMemberName %S 1 "af"
|
|
|
|
OpMemberName %S 2 "h4"
|
|
|
|
OpMemberName %S 3 "ah4"
|
|
|
|
OpName %globalStruct "globalStruct"
|
Reland "Improve support for arrays in Metal."
This reverts commit 38df4c8470ab3db7455005ab0c3599a95c791d2b.
Reason for revert: updated ArrayTypes test for ES2 compatibility
Original change's description:
> Revert "Improve support for arrays in Metal."
>
> This reverts commit dd904af5666b4746d4b9af5c1f03b47ac3ec73b2.
>
> Reason for revert: breaks ANGLE
>
> Original change's description:
> > Improve support for arrays in Metal.
> >
> > Arrays in Metal now use the `array<T, N>` type instead of the C-style
> > `T[N]` type. This gives them semantics much more in line with GLSL,
> > so they can be initialized and assigned like GLSL arrays.
> >
> > This allows the ArrayTypes and Assignment tests to pass, so they have
> > been added to our dm SkSL tests. (ArrayConstructors also passes, but
> > is not ES2-compliant so it is not enabled.)
> >
> > Change-Id: Id1028311963084befd0e044e11e223af6a064dda
> > Bug: skia:10761, skia:10760, skia:11022, skia:10939
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365699
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
>
> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
>
> Change-Id: If6a18dea7d6a45fa7836e9129bf81c2e536f07e3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:10761
> Bug: skia:10760
> Bug: skia:11022
> Bug: skia:10939
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365976
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Bug: skia:10761
Bug: skia:10760
Bug: skia:11022
Bug: skia:10939
Change-Id: Ia1c4917f5d3c41162d282b3093814d861707ad30
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366144
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-04 15:57:08 +00:00
|
|
|
OpName %_UniformBuffer "_UniformBuffer"
|
|
|
|
OpMemberName %_UniformBuffer 0 "colorGreen"
|
2021-03-22 16:05:31 +00:00
|
|
|
OpName %_entrypoint_v "_entrypoint_v"
|
2020-11-20 21:28:50 +00:00
|
|
|
OpName %main "main"
|
2021-03-08 18:29:15 +00:00
|
|
|
OpName %i "i"
|
Reland "Improve support for arrays in Metal."
This reverts commit 38df4c8470ab3db7455005ab0c3599a95c791d2b.
Reason for revert: updated ArrayTypes test for ES2 compatibility
Original change's description:
> Revert "Improve support for arrays in Metal."
>
> This reverts commit dd904af5666b4746d4b9af5c1f03b47ac3ec73b2.
>
> Reason for revert: breaks ANGLE
>
> Original change's description:
> > Improve support for arrays in Metal.
> >
> > Arrays in Metal now use the `array<T, N>` type instead of the C-style
> > `T[N]` type. This gives them semantics much more in line with GLSL,
> > so they can be initialized and assigned like GLSL arrays.
> >
> > This allows the ArrayTypes and Assignment tests to pass, so they have
> > been added to our dm SkSL tests. (ArrayConstructors also passes, but
> > is not ES2-compliant so it is not enabled.)
> >
> > Change-Id: Id1028311963084befd0e044e11e223af6a064dda
> > Bug: skia:10761, skia:10760, skia:11022, skia:10939
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365699
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
>
> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
>
> Change-Id: If6a18dea7d6a45fa7836e9129bf81c2e536f07e3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:10761
> Bug: skia:10760
> Bug: skia:11022
> Bug: skia:10939
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365976
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Bug: skia:10761
Bug: skia:10760
Bug: skia:11022
Bug: skia:10939
Change-Id: Ia1c4917f5d3c41162d282b3093814d861707ad30
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366144
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-04 15:57:08 +00:00
|
|
|
OpName %i4 "i4"
|
2021-03-08 18:29:15 +00:00
|
|
|
OpName %f3x3 "f3x3"
|
2020-11-20 21:28:50 +00:00
|
|
|
OpName %x "x"
|
|
|
|
OpName %ai "ai"
|
|
|
|
OpName %ai4 "ai4"
|
|
|
|
OpName %ah2x4 "ah2x4"
|
|
|
|
OpName %af4 "af4"
|
2021-02-10 15:19:27 +00:00
|
|
|
OpName %s "s"
|
2021-03-08 18:29:15 +00:00
|
|
|
OpName %l "l"
|
2020-11-20 21:28:50 +00:00
|
|
|
OpDecorate %sk_FragColor RelaxedPrecision
|
|
|
|
OpDecorate %sk_FragColor Location 0
|
|
|
|
OpDecorate %sk_FragColor Index 0
|
|
|
|
OpDecorate %sk_Clockwise BuiltIn FrontFacing
|
2021-03-16 14:57:55 +00:00
|
|
|
OpDecorate %globalVar RelaxedPrecision
|
2021-02-10 15:19:27 +00:00
|
|
|
OpDecorate %_arr_float_int_5 ArrayStride 16
|
|
|
|
OpDecorate %_arr_v4float_int_5 ArrayStride 16
|
|
|
|
OpMemberDecorate %S 0 Offset 0
|
|
|
|
OpMemberDecorate %S 1 Offset 16
|
|
|
|
OpMemberDecorate %S 2 Offset 96
|
|
|
|
OpMemberDecorate %S 2 RelaxedPrecision
|
|
|
|
OpMemberDecorate %S 3 Offset 112
|
|
|
|
OpMemberDecorate %S 3 RelaxedPrecision
|
2021-03-16 14:57:55 +00:00
|
|
|
OpMemberDecorate %_UniformBuffer 0 Offset 0
|
|
|
|
OpMemberDecorate %_UniformBuffer 0 RelaxedPrecision
|
|
|
|
OpDecorate %_UniformBuffer Block
|
|
|
|
OpDecorate %19 Binding 0
|
|
|
|
OpDecorate %19 DescriptorSet 0
|
2021-03-23 18:16:52 +00:00
|
|
|
OpDecorate %x RelaxedPrecision
|
2021-04-21 18:27:08 +00:00
|
|
|
OpDecorate %67 RelaxedPrecision
|
|
|
|
OpDecorate %68 RelaxedPrecision
|
2021-03-16 14:57:55 +00:00
|
|
|
OpDecorate %_arr_int_int_1 ArrayStride 16
|
|
|
|
OpDecorate %_arr_v4int_int_1 ArrayStride 16
|
|
|
|
OpDecorate %_arr_mat3v3float_int_1 ArrayStride 48
|
|
|
|
OpDecorate %_arr_v4float_int_1 ArrayStride 16
|
2022-04-12 21:07:38 +00:00
|
|
|
OpDecorate %96 RelaxedPrecision
|
2022-04-08 02:05:30 +00:00
|
|
|
OpDecorate %97 RelaxedPrecision
|
2022-04-12 21:07:38 +00:00
|
|
|
OpDecorate %100 RelaxedPrecision
|
2021-03-23 18:16:52 +00:00
|
|
|
OpDecorate %101 RelaxedPrecision
|
|
|
|
OpDecorate %l RelaxedPrecision
|
2022-04-12 21:07:38 +00:00
|
|
|
OpDecorate %121 RelaxedPrecision
|
2022-04-08 02:05:30 +00:00
|
|
|
OpDecorate %122 RelaxedPrecision
|
2022-04-12 21:07:38 +00:00
|
|
|
OpDecorate %129 RelaxedPrecision
|
2022-04-08 02:05:30 +00:00
|
|
|
OpDecorate %130 RelaxedPrecision
|
|
|
|
OpDecorate %131 RelaxedPrecision
|
2022-04-12 21:07:38 +00:00
|
|
|
OpDecorate %134 RelaxedPrecision
|
|
|
|
OpDecorate %138 RelaxedPrecision
|
2020-11-20 21:28:50 +00:00
|
|
|
%float = OpTypeFloat 32
|
|
|
|
%v4float = OpTypeVector %float 4
|
|
|
|
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
|
|
|
%sk_FragColor = OpVariable %_ptr_Output_v4float Output
|
|
|
|
%bool = OpTypeBool
|
|
|
|
%_ptr_Input_bool = OpTypePointer Input %bool
|
|
|
|
%sk_Clockwise = OpVariable %_ptr_Input_bool Input
|
2021-03-16 14:57:55 +00:00
|
|
|
%_ptr_Private_v4float = OpTypePointer Private %v4float
|
|
|
|
%globalVar = OpVariable %_ptr_Private_v4float Private
|
|
|
|
%int = OpTypeInt 32 1
|
|
|
|
%int_5 = OpConstant %int 5
|
|
|
|
%_arr_float_int_5 = OpTypeArray %float %int_5
|
|
|
|
%_arr_v4float_int_5 = OpTypeArray %v4float %int_5
|
|
|
|
%S = OpTypeStruct %float %_arr_float_int_5 %v4float %_arr_v4float_int_5
|
|
|
|
%_ptr_Private_S = OpTypePointer Private %S
|
|
|
|
%globalStruct = OpVariable %_ptr_Private_S Private
|
Reland "Improve support for arrays in Metal."
This reverts commit 38df4c8470ab3db7455005ab0c3599a95c791d2b.
Reason for revert: updated ArrayTypes test for ES2 compatibility
Original change's description:
> Revert "Improve support for arrays in Metal."
>
> This reverts commit dd904af5666b4746d4b9af5c1f03b47ac3ec73b2.
>
> Reason for revert: breaks ANGLE
>
> Original change's description:
> > Improve support for arrays in Metal.
> >
> > Arrays in Metal now use the `array<T, N>` type instead of the C-style
> > `T[N]` type. This gives them semantics much more in line with GLSL,
> > so they can be initialized and assigned like GLSL arrays.
> >
> > This allows the ArrayTypes and Assignment tests to pass, so they have
> > been added to our dm SkSL tests. (ArrayConstructors also passes, but
> > is not ES2-compliant so it is not enabled.)
> >
> > Change-Id: Id1028311963084befd0e044e11e223af6a064dda
> > Bug: skia:10761, skia:10760, skia:11022, skia:10939
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365699
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
>
> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
>
> Change-Id: If6a18dea7d6a45fa7836e9129bf81c2e536f07e3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:10761
> Bug: skia:10760
> Bug: skia:11022
> Bug: skia:10939
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365976
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Bug: skia:10761
Bug: skia:10760
Bug: skia:11022
Bug: skia:10939
Change-Id: Ia1c4917f5d3c41162d282b3093814d861707ad30
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366144
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-04 15:57:08 +00:00
|
|
|
%_UniformBuffer = OpTypeStruct %v4float
|
|
|
|
%_ptr_Uniform__UniformBuffer = OpTypePointer Uniform %_UniformBuffer
|
2021-03-16 14:57:55 +00:00
|
|
|
%19 = OpVariable %_ptr_Uniform__UniformBuffer Uniform
|
2020-11-20 21:28:50 +00:00
|
|
|
%void = OpTypeVoid
|
2021-03-16 14:57:55 +00:00
|
|
|
%24 = OpTypeFunction %void
|
2021-04-21 18:27:08 +00:00
|
|
|
%float_0 = OpConstant %float 0
|
2022-04-12 21:02:43 +00:00
|
|
|
%v2float = OpTypeVector %float 2
|
2021-04-21 18:27:08 +00:00
|
|
|
%28 = OpConstantComposite %v2float %float_0 %float_0
|
|
|
|
%_ptr_Function_v2float = OpTypePointer Function %v2float
|
|
|
|
%32 = OpTypeFunction %v4float %_ptr_Function_v2float
|
2021-03-08 18:29:15 +00:00
|
|
|
%_ptr_Function_int = OpTypePointer Function %int
|
|
|
|
%int_0 = OpConstant %int 0
|
Reland "Improve support for arrays in Metal."
This reverts commit 38df4c8470ab3db7455005ab0c3599a95c791d2b.
Reason for revert: updated ArrayTypes test for ES2 compatibility
Original change's description:
> Revert "Improve support for arrays in Metal."
>
> This reverts commit dd904af5666b4746d4b9af5c1f03b47ac3ec73b2.
>
> Reason for revert: breaks ANGLE
>
> Original change's description:
> > Improve support for arrays in Metal.
> >
> > Arrays in Metal now use the `array<T, N>` type instead of the C-style
> > `T[N]` type. This gives them semantics much more in line with GLSL,
> > so they can be initialized and assigned like GLSL arrays.
> >
> > This allows the ArrayTypes and Assignment tests to pass, so they have
> > been added to our dm SkSL tests. (ArrayConstructors also passes, but
> > is not ES2-compliant so it is not enabled.)
> >
> > Change-Id: Id1028311963084befd0e044e11e223af6a064dda
> > Bug: skia:10761, skia:10760, skia:11022, skia:10939
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365699
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
>
> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
>
> Change-Id: If6a18dea7d6a45fa7836e9129bf81c2e536f07e3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:10761
> Bug: skia:10760
> Bug: skia:11022
> Bug: skia:10939
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365976
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Bug: skia:10761
Bug: skia:10760
Bug: skia:11022
Bug: skia:10939
Change-Id: Ia1c4917f5d3c41162d282b3093814d861707ad30
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366144
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-04 15:57:08 +00:00
|
|
|
%v4int = OpTypeVector %int 4
|
|
|
|
%_ptr_Function_v4int = OpTypePointer Function %v4int
|
|
|
|
%int_1 = OpConstant %int 1
|
|
|
|
%int_2 = OpConstant %int 2
|
|
|
|
%int_3 = OpConstant %int 3
|
|
|
|
%int_4 = OpConstant %int 4
|
2021-04-21 18:27:08 +00:00
|
|
|
%45 = OpConstantComposite %v4int %int_1 %int_2 %int_3 %int_4
|
Reland "Improve support for arrays in Metal."
This reverts commit 38df4c8470ab3db7455005ab0c3599a95c791d2b.
Reason for revert: updated ArrayTypes test for ES2 compatibility
Original change's description:
> Revert "Improve support for arrays in Metal."
>
> This reverts commit dd904af5666b4746d4b9af5c1f03b47ac3ec73b2.
>
> Reason for revert: breaks ANGLE
>
> Original change's description:
> > Improve support for arrays in Metal.
> >
> > Arrays in Metal now use the `array<T, N>` type instead of the C-style
> > `T[N]` type. This gives them semantics much more in line with GLSL,
> > so they can be initialized and assigned like GLSL arrays.
> >
> > This allows the ArrayTypes and Assignment tests to pass, so they have
> > been added to our dm SkSL tests. (ArrayConstructors also passes, but
> > is not ES2-compliant so it is not enabled.)
> >
> > Change-Id: Id1028311963084befd0e044e11e223af6a064dda
> > Bug: skia:10761, skia:10760, skia:11022, skia:10939
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365699
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
>
> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
>
> Change-Id: If6a18dea7d6a45fa7836e9129bf81c2e536f07e3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:10761
> Bug: skia:10760
> Bug: skia:11022
> Bug: skia:10939
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365976
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Bug: skia:10761
Bug: skia:10760
Bug: skia:11022
Bug: skia:10939
Change-Id: Ia1c4917f5d3c41162d282b3093814d861707ad30
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366144
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-04 15:57:08 +00:00
|
|
|
%v3float = OpTypeVector %float 3
|
|
|
|
%mat3v3float = OpTypeMatrix %v3float 3
|
2021-03-08 18:29:15 +00:00
|
|
|
%_ptr_Function_mat3v3float = OpTypePointer Function %mat3v3float
|
2020-11-20 21:28:50 +00:00
|
|
|
%float_1 = OpConstant %float 1
|
|
|
|
%float_2 = OpConstant %float 2
|
|
|
|
%float_3 = OpConstant %float 3
|
|
|
|
%float_4 = OpConstant %float 4
|
|
|
|
%float_5 = OpConstant %float 5
|
|
|
|
%float_6 = OpConstant %float 6
|
|
|
|
%float_7 = OpConstant %float 7
|
|
|
|
%float_8 = OpConstant %float 8
|
2021-02-04 00:49:45 +00:00
|
|
|
%float_9 = OpConstant %float 9
|
2022-04-08 02:05:30 +00:00
|
|
|
%59 = OpConstantComposite %v3float %float_1 %float_2 %float_3
|
|
|
|
%60 = OpConstantComposite %v3float %float_4 %float_5 %float_6
|
|
|
|
%61 = OpConstantComposite %v3float %float_7 %float_8 %float_9
|
2022-04-12 21:07:38 +00:00
|
|
|
%62 = OpConstantComposite %mat3v3float %59 %60 %61
|
2021-03-08 18:29:15 +00:00
|
|
|
%_ptr_Function_v4float = OpTypePointer Function %v4float
|
|
|
|
%_ptr_Function_float = OpTypePointer Function %float
|
|
|
|
%_arr_int_int_1 = OpTypeArray %int %int_1
|
|
|
|
%_ptr_Function__arr_int_int_1 = OpTypePointer Function %_arr_int_int_1
|
|
|
|
%_arr_v4int_int_1 = OpTypeArray %v4int %int_1
|
|
|
|
%_ptr_Function__arr_v4int_int_1 = OpTypePointer Function %_arr_v4int_int_1
|
|
|
|
%_arr_mat3v3float_int_1 = OpTypeArray %mat3v3float %int_1
|
|
|
|
%_ptr_Function__arr_mat3v3float_int_1 = OpTypePointer Function %_arr_mat3v3float_int_1
|
Reland "Improve support for arrays in Metal."
This reverts commit 38df4c8470ab3db7455005ab0c3599a95c791d2b.
Reason for revert: updated ArrayTypes test for ES2 compatibility
Original change's description:
> Revert "Improve support for arrays in Metal."
>
> This reverts commit dd904af5666b4746d4b9af5c1f03b47ac3ec73b2.
>
> Reason for revert: breaks ANGLE
>
> Original change's description:
> > Improve support for arrays in Metal.
> >
> > Arrays in Metal now use the `array<T, N>` type instead of the C-style
> > `T[N]` type. This gives them semantics much more in line with GLSL,
> > so they can be initialized and assigned like GLSL arrays.
> >
> > This allows the ArrayTypes and Assignment tests to pass, so they have
> > been added to our dm SkSL tests. (ArrayConstructors also passes, but
> > is not ES2-compliant so it is not enabled.)
> >
> > Change-Id: Id1028311963084befd0e044e11e223af6a064dda
> > Bug: skia:10761, skia:10760, skia:11022, skia:10939
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365699
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
>
> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
>
> Change-Id: If6a18dea7d6a45fa7836e9129bf81c2e536f07e3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:10761
> Bug: skia:10760
> Bug: skia:11022
> Bug: skia:10939
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365976
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Bug: skia:10761
Bug: skia:10760
Bug: skia:11022
Bug: skia:10939
Change-Id: Ia1c4917f5d3c41162d282b3093814d861707ad30
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366144
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-04 15:57:08 +00:00
|
|
|
%_arr_v4float_int_1 = OpTypeArray %v4float %int_1
|
|
|
|
%_ptr_Function__arr_v4float_int_1 = OpTypePointer Function %_arr_v4float_int_1
|
2022-04-12 21:07:38 +00:00
|
|
|
%86 = OpConstantComposite %v4float %float_1 %float_1 %float_1 %float_1
|
2021-02-10 15:19:27 +00:00
|
|
|
%_ptr_Function_S = OpTypePointer Function %S
|
2022-04-12 21:07:38 +00:00
|
|
|
%94 = OpConstantComposite %v3float %float_9 %float_9 %float_9
|
|
|
|
%98 = OpConstantComposite %v2float %float_5 %float_5
|
|
|
|
%102 = OpConstantComposite %v4float %float_0 %float_0 %float_0 %float_0
|
2021-03-16 14:57:55 +00:00
|
|
|
%_ptr_Private_float = OpTypePointer Private %float
|
2022-04-12 21:07:38 +00:00
|
|
|
%115 = OpConstantComposite %v4float %float_2 %float_2 %float_2 %float_2
|
2021-02-05 15:07:19 +00:00
|
|
|
%_ptr_Function_v3float = OpTypePointer Function %v3float
|
Reland "Improve support for arrays in Metal."
This reverts commit 38df4c8470ab3db7455005ab0c3599a95c791d2b.
Reason for revert: updated ArrayTypes test for ES2 compatibility
Original change's description:
> Revert "Improve support for arrays in Metal."
>
> This reverts commit dd904af5666b4746d4b9af5c1f03b47ac3ec73b2.
>
> Reason for revert: breaks ANGLE
>
> Original change's description:
> > Improve support for arrays in Metal.
> >
> > Arrays in Metal now use the `array<T, N>` type instead of the C-style
> > `T[N]` type. This gives them semantics much more in line with GLSL,
> > so they can be initialized and assigned like GLSL arrays.
> >
> > This allows the ArrayTypes and Assignment tests to pass, so they have
> > been added to our dm SkSL tests. (ArrayConstructors also passes, but
> > is not ES2-compliant so it is not enabled.)
> >
> > Change-Id: Id1028311963084befd0e044e11e223af6a064dda
> > Bug: skia:10761, skia:10760, skia:11022, skia:10939
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365699
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
>
> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
>
> Change-Id: If6a18dea7d6a45fa7836e9129bf81c2e536f07e3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:10761
> Bug: skia:10760
> Bug: skia:11022
> Bug: skia:10939
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365976
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Bug: skia:10761
Bug: skia:10760
Bug: skia:11022
Bug: skia:10939
Change-Id: Ia1c4917f5d3c41162d282b3093814d861707ad30
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366144
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-04 15:57:08 +00:00
|
|
|
%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
|
2021-03-22 16:05:31 +00:00
|
|
|
%_entrypoint_v = OpFunction %void None %24
|
2021-03-16 14:57:55 +00:00
|
|
|
%25 = OpLabel
|
2021-04-21 18:27:08 +00:00
|
|
|
%29 = OpVariable %_ptr_Function_v2float Function
|
|
|
|
OpStore %29 %28
|
|
|
|
%31 = OpFunctionCall %v4float %main %29
|
|
|
|
OpStore %sk_FragColor %31
|
Reland "Improve support for arrays in Metal."
This reverts commit 38df4c8470ab3db7455005ab0c3599a95c791d2b.
Reason for revert: updated ArrayTypes test for ES2 compatibility
Original change's description:
> Revert "Improve support for arrays in Metal."
>
> This reverts commit dd904af5666b4746d4b9af5c1f03b47ac3ec73b2.
>
> Reason for revert: breaks ANGLE
>
> Original change's description:
> > Improve support for arrays in Metal.
> >
> > Arrays in Metal now use the `array<T, N>` type instead of the C-style
> > `T[N]` type. This gives them semantics much more in line with GLSL,
> > so they can be initialized and assigned like GLSL arrays.
> >
> > This allows the ArrayTypes and Assignment tests to pass, so they have
> > been added to our dm SkSL tests. (ArrayConstructors also passes, but
> > is not ES2-compliant so it is not enabled.)
> >
> > Change-Id: Id1028311963084befd0e044e11e223af6a064dda
> > Bug: skia:10761, skia:10760, skia:11022, skia:10939
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365699
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
>
> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
>
> Change-Id: If6a18dea7d6a45fa7836e9129bf81c2e536f07e3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:10761
> Bug: skia:10760
> Bug: skia:11022
> Bug: skia:10939
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365976
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Bug: skia:10761
Bug: skia:10760
Bug: skia:11022
Bug: skia:10939
Change-Id: Ia1c4917f5d3c41162d282b3093814d861707ad30
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366144
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-04 15:57:08 +00:00
|
|
|
OpReturn
|
|
|
|
OpFunctionEnd
|
2021-04-21 18:27:08 +00:00
|
|
|
%main = OpFunction %v4float None %32
|
|
|
|
%33 = OpFunctionParameter %_ptr_Function_v2float
|
|
|
|
%34 = OpLabel
|
2021-03-08 18:29:15 +00:00
|
|
|
%i = OpVariable %_ptr_Function_int Function
|
Reland "Improve support for arrays in Metal."
This reverts commit 38df4c8470ab3db7455005ab0c3599a95c791d2b.
Reason for revert: updated ArrayTypes test for ES2 compatibility
Original change's description:
> Revert "Improve support for arrays in Metal."
>
> This reverts commit dd904af5666b4746d4b9af5c1f03b47ac3ec73b2.
>
> Reason for revert: breaks ANGLE
>
> Original change's description:
> > Improve support for arrays in Metal.
> >
> > Arrays in Metal now use the `array<T, N>` type instead of the C-style
> > `T[N]` type. This gives them semantics much more in line with GLSL,
> > so they can be initialized and assigned like GLSL arrays.
> >
> > This allows the ArrayTypes and Assignment tests to pass, so they have
> > been added to our dm SkSL tests. (ArrayConstructors also passes, but
> > is not ES2-compliant so it is not enabled.)
> >
> > Change-Id: Id1028311963084befd0e044e11e223af6a064dda
> > Bug: skia:10761, skia:10760, skia:11022, skia:10939
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365699
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
>
> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
>
> Change-Id: If6a18dea7d6a45fa7836e9129bf81c2e536f07e3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:10761
> Bug: skia:10760
> Bug: skia:11022
> Bug: skia:10939
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365976
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Bug: skia:10761
Bug: skia:10760
Bug: skia:11022
Bug: skia:10939
Change-Id: Ia1c4917f5d3c41162d282b3093814d861707ad30
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366144
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-04 15:57:08 +00:00
|
|
|
%i4 = OpVariable %_ptr_Function_v4int Function
|
2021-03-08 18:29:15 +00:00
|
|
|
%f3x3 = OpVariable %_ptr_Function_mat3v3float Function
|
2020-11-20 21:28:50 +00:00
|
|
|
%x = OpVariable %_ptr_Function_v4float Function
|
|
|
|
%ai = OpVariable %_ptr_Function__arr_int_int_1 Function
|
|
|
|
%ai4 = OpVariable %_ptr_Function__arr_v4int_int_1 Function
|
Reland "Improve support for arrays in Metal."
This reverts commit 38df4c8470ab3db7455005ab0c3599a95c791d2b.
Reason for revert: updated ArrayTypes test for ES2 compatibility
Original change's description:
> Revert "Improve support for arrays in Metal."
>
> This reverts commit dd904af5666b4746d4b9af5c1f03b47ac3ec73b2.
>
> Reason for revert: breaks ANGLE
>
> Original change's description:
> > Improve support for arrays in Metal.
> >
> > Arrays in Metal now use the `array<T, N>` type instead of the C-style
> > `T[N]` type. This gives them semantics much more in line with GLSL,
> > so they can be initialized and assigned like GLSL arrays.
> >
> > This allows the ArrayTypes and Assignment tests to pass, so they have
> > been added to our dm SkSL tests. (ArrayConstructors also passes, but
> > is not ES2-compliant so it is not enabled.)
> >
> > Change-Id: Id1028311963084befd0e044e11e223af6a064dda
> > Bug: skia:10761, skia:10760, skia:11022, skia:10939
> > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365699
> > Commit-Queue: John Stiles <johnstiles@google.com>
> > Auto-Submit: John Stiles <johnstiles@google.com>
> > Reviewed-by: Brian Osman <brianosman@google.com>
>
> TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
>
> Change-Id: If6a18dea7d6a45fa7836e9129bf81c2e536f07e3
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:10761
> Bug: skia:10760
> Bug: skia:11022
> Bug: skia:10939
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/365976
> Reviewed-by: John Stiles <johnstiles@google.com>
> Commit-Queue: John Stiles <johnstiles@google.com>
TBR=brianosman@google.com,ethannicholas@google.com,johnstiles@google.com
Bug: skia:10761
Bug: skia:10760
Bug: skia:11022
Bug: skia:10939
Change-Id: Ia1c4917f5d3c41162d282b3093814d861707ad30
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/366144
Reviewed-by: John Stiles <johnstiles@google.com>
Commit-Queue: John Stiles <johnstiles@google.com>
2021-02-04 15:57:08 +00:00
|
|
|
%ah2x4 = OpVariable %_ptr_Function__arr_mat3v3float_int_1 Function
|
2020-11-20 21:28:50 +00:00
|
|
|
%af4 = OpVariable %_ptr_Function__arr_v4float_int_1 Function
|
2021-02-10 15:19:27 +00:00
|
|
|
%s = OpVariable %_ptr_Function_S Function
|
2021-03-08 18:29:15 +00:00
|
|
|
%l = OpVariable %_ptr_Function_float Function
|
|
|
|
OpStore %i %int_0
|
2021-04-21 18:27:08 +00:00
|
|
|
OpStore %i4 %45
|
2021-07-08 22:54:39 +00:00
|
|
|
OpStore %f3x3 %62
|
2021-04-21 18:27:08 +00:00
|
|
|
%65 = OpAccessChain %_ptr_Function_float %x %int_3
|
|
|
|
OpStore %65 %float_0
|
|
|
|
%67 = OpLoad %v4float %x
|
|
|
|
%68 = OpVectorShuffle %v4float %67 %28 5 4 2 3
|
|
|
|
OpStore %x %68
|
|
|
|
%72 = OpAccessChain %_ptr_Function_int %ai %int_0
|
|
|
|
OpStore %72 %int_0
|
|
|
|
%76 = OpAccessChain %_ptr_Function_v4int %ai4 %int_0
|
|
|
|
OpStore %76 %45
|
2022-04-12 21:07:38 +00:00
|
|
|
%80 = OpAccessChain %_ptr_Function_mat3v3float %ah2x4 %int_0
|
|
|
|
OpStore %80 %62
|
|
|
|
%84 = OpAccessChain %_ptr_Function_v4float %af4 %int_0
|
|
|
|
%85 = OpAccessChain %_ptr_Function_float %84 %int_0
|
|
|
|
OpStore %85 %float_0
|
|
|
|
%87 = OpAccessChain %_ptr_Function_v4float %af4 %int_0
|
|
|
|
%88 = OpLoad %v4float %87
|
|
|
|
%89 = OpVectorShuffle %v4float %88 %86 6 4 7 5
|
|
|
|
OpStore %87 %89
|
|
|
|
%92 = OpAccessChain %_ptr_Function_float %s %int_0
|
|
|
|
OpStore %92 %float_0
|
|
|
|
%93 = OpAccessChain %_ptr_Function_float %s %int_1 %int_1
|
2022-04-08 02:05:30 +00:00
|
|
|
OpStore %93 %float_0
|
2022-04-12 21:07:38 +00:00
|
|
|
%95 = OpAccessChain %_ptr_Function_v4float %s %int_2
|
|
|
|
%96 = OpLoad %v4float %95
|
|
|
|
%97 = OpVectorShuffle %v4float %96 %94 5 6 4 3
|
|
|
|
OpStore %95 %97
|
|
|
|
%99 = OpAccessChain %_ptr_Function_v4float %s %int_3 %int_2
|
|
|
|
%100 = OpLoad %v4float %99
|
|
|
|
%101 = OpVectorShuffle %v4float %100 %98 0 4 2 5
|
|
|
|
OpStore %99 %101
|
|
|
|
OpStore %globalVar %102
|
|
|
|
%103 = OpAccessChain %_ptr_Private_float %globalStruct %int_0
|
|
|
|
OpStore %103 %float_0
|
2021-03-08 18:29:15 +00:00
|
|
|
OpStore %l %float_0
|
2022-04-12 21:07:38 +00:00
|
|
|
%106 = OpAccessChain %_ptr_Function_int %ai %int_0
|
|
|
|
%107 = OpLoad %int %106
|
|
|
|
%108 = OpAccessChain %_ptr_Function_v4int %ai4 %int_0
|
|
|
|
%109 = OpLoad %v4int %108
|
|
|
|
%110 = OpCompositeExtract %int %109 0
|
|
|
|
%111 = OpIAdd %int %107 %110
|
|
|
|
OpStore %106 %111
|
|
|
|
%112 = OpAccessChain %_ptr_Function_float %s %int_0
|
|
|
|
OpStore %112 %float_1
|
|
|
|
%113 = OpAccessChain %_ptr_Function_float %s %int_1 %int_0
|
|
|
|
OpStore %113 %float_2
|
|
|
|
%114 = OpAccessChain %_ptr_Function_v4float %s %int_2
|
|
|
|
OpStore %114 %86
|
|
|
|
%116 = OpAccessChain %_ptr_Function_v4float %s %int_3 %int_0
|
|
|
|
OpStore %116 %115
|
|
|
|
%117 = OpAccessChain %_ptr_Function_v4float %af4 %int_0
|
|
|
|
%118 = OpLoad %v4float %117
|
|
|
|
%119 = OpAccessChain %_ptr_Function_v3float %ah2x4 %int_0 %int_0
|
|
|
|
%121 = OpLoad %v3float %119
|
|
|
|
%122 = OpCompositeExtract %float %121 0
|
|
|
|
%123 = OpVectorTimesScalar %v4float %118 %122
|
|
|
|
OpStore %117 %123
|
|
|
|
%124 = OpAccessChain %_ptr_Function_int %i4 %int_1
|
|
|
|
%125 = OpLoad %int %124
|
|
|
|
%126 = OpLoad %int %i
|
|
|
|
%127 = OpIMul %int %125 %126
|
|
|
|
OpStore %124 %127
|
|
|
|
%128 = OpAccessChain %_ptr_Function_float %x %int_1
|
|
|
|
%129 = OpLoad %float %128
|
|
|
|
%130 = OpLoad %float %l
|
|
|
|
%131 = OpFMul %float %129 %130
|
|
|
|
OpStore %128 %131
|
|
|
|
%132 = OpAccessChain %_ptr_Function_float %s %int_0
|
|
|
|
%133 = OpLoad %float %132
|
|
|
|
%134 = OpLoad %float %l
|
|
|
|
%135 = OpFMul %float %133 %134
|
|
|
|
OpStore %132 %135
|
|
|
|
%136 = OpAccessChain %_ptr_Uniform_v4float %19 %int_0
|
|
|
|
%138 = OpLoad %v4float %136
|
|
|
|
OpReturnValue %138
|
2020-11-20 21:28:50 +00:00
|
|
|
OpFunctionEnd
|