diff --git a/src/sksl/SkSLSPIRVCodeGenerator.cpp b/src/sksl/SkSLSPIRVCodeGenerator.cpp index 4bce1718ec..589ddf49e4 100644 --- a/src/sksl/SkSLSPIRVCodeGenerator.cpp +++ b/src/sksl/SkSLSPIRVCodeGenerator.cpp @@ -2691,13 +2691,15 @@ SpvId SPIRVCodeGenerator::writeFunctionStart(const FunctionDeclaration& f, Outpu SpvId functionTypeId = this->getFunctionType(f); this->writeInstruction(SpvOpFunction, returnTypeId, result, SpvFunctionControlMaskNone, functionTypeId, out); - this->writeInstruction(SpvOpName, result, f.name(), fNameBuffer); - const std::vector& parameters = f.parameters(); - for (size_t i = 0; i < parameters.size(); i++) { + String mangledName = f.mangledName(); + this->writeInstruction(SpvOpName, + result, + StringFragment(mangledName.c_str(), mangledName.size()), + fNameBuffer); + for (const Variable* parameter : f.parameters()) { SpvId id = this->nextId(nullptr); - fVariableMap[parameters[i]] = id; - SpvId type; - type = this->getPointerType(parameters[i]->type(), SpvStorageClassFunction); + fVariableMap[parameter] = id; + SpvId type = this->getPointerType(parameter->type(), SpvStorageClassFunction); this->writeInstruction(SpvOpFunctionParameter, type, id, out); } return result; diff --git a/tests/sksl/blend/BlendColor.asm.frag b/tests/sksl/blend/BlendColor.asm.frag index bd76bc5a41..a29fb452dd 100644 --- a/tests/sksl/blend/BlendColor.asm.frag +++ b/tests/sksl/blend/BlendColor.asm.frag @@ -8,7 +8,7 @@ OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "src" OpMemberName %_UniformBuffer 1 "dst" -OpName %_blend_set_color_luminance "_blend_set_color_luminance" +OpName %_blend_set_color_luminance_h3h3hh3 "_blend_set_color_luminance_h3h3hh3" OpName %lum "lum" OpName %result "result" OpName %minComp "minComp" @@ -119,7 +119,7 @@ OpDecorate %171 RelaxedPrecision %int = OpTypeInt 32 1 %int_1 = OpConstant %int 1 %int_0 = OpConstant %int 0 -%_blend_set_color_luminance = OpFunction %v3float None %15 +%_blend_set_color_luminance_h3h3hh3 = OpFunction %v3float None %15 %18 = OpFunctionParameter %_ptr_Function_v3float %19 = OpFunctionParameter %_ptr_Function_float %20 = OpFunctionParameter %_ptr_Function_v3float @@ -263,7 +263,7 @@ OpStore %142 %141 OpStore %144 %143 %145 = OpLoad %v3float %_2_dsa OpStore %146 %145 -%147 = OpFunctionCall %v3float %_blend_set_color_luminance %142 %144 %146 +%147 = OpFunctionCall %v3float %_blend_set_color_luminance_h3h3hh3 %142 %144 %146 %148 = OpAccessChain %_ptr_Uniform_v4float %11 %int_1 %149 = OpLoad %v4float %148 %150 = OpVectorShuffle %v3float %149 %149 0 1 2 diff --git a/tests/sksl/blend/BlendColorBurn.asm.frag b/tests/sksl/blend/BlendColorBurn.asm.frag index 005c0d3348..b7e8986e3f 100644 --- a/tests/sksl/blend/BlendColorBurn.asm.frag +++ b/tests/sksl/blend/BlendColorBurn.asm.frag @@ -8,7 +8,7 @@ OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "src" OpMemberName %_UniformBuffer 1 "dst" -OpName %_color_burn_component "_color_burn_component" +OpName %_color_burn_component_hh2h2 "_color_burn_component_hh2h2" OpName %delta "delta" OpName %main "main" OpDecorate %sk_FragColor RelaxedPrecision @@ -98,7 +98,7 @@ OpDecorate %141 RelaxedPrecision %int = OpTypeInt 32 1 %int_0 = OpConstant %int 0 %int_1 = OpConstant %int 1 -%_color_burn_component = OpFunction %float None %15 +%_color_burn_component_hh2h2 = OpFunction %float None %15 %17 = OpFunctionParameter %_ptr_Function_v2float %18 = OpFunctionParameter %_ptr_Function_v2float %19 = OpLabel @@ -202,7 +202,7 @@ OpStore %105 %104 %108 = OpLoad %v4float %106 %109 = OpVectorShuffle %v2float %108 %108 0 3 OpStore %110 %109 -%111 = OpFunctionCall %float %_color_burn_component %105 %110 +%111 = OpFunctionCall %float %_color_burn_component_hh2h2 %105 %110 %112 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0 %113 = OpLoad %v4float %112 %114 = OpVectorShuffle %v2float %113 %113 1 3 @@ -211,7 +211,7 @@ OpStore %115 %114 %117 = OpLoad %v4float %116 %118 = OpVectorShuffle %v2float %117 %117 1 3 OpStore %119 %118 -%120 = OpFunctionCall %float %_color_burn_component %115 %119 +%120 = OpFunctionCall %float %_color_burn_component_hh2h2 %115 %119 %121 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0 %122 = OpLoad %v4float %121 %123 = OpVectorShuffle %v2float %122 %122 2 3 @@ -220,7 +220,7 @@ OpStore %124 %123 %126 = OpLoad %v4float %125 %127 = OpVectorShuffle %v2float %126 %126 2 3 OpStore %128 %127 -%129 = OpFunctionCall %float %_color_burn_component %124 %128 +%129 = OpFunctionCall %float %_color_burn_component_hh2h2 %124 %128 %130 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0 %131 = OpLoad %v4float %130 %132 = OpCompositeExtract %float %131 3 diff --git a/tests/sksl/blend/BlendColorDodge.asm.frag b/tests/sksl/blend/BlendColorDodge.asm.frag index 0b1f48c733..4b7eabc5a7 100644 --- a/tests/sksl/blend/BlendColorDodge.asm.frag +++ b/tests/sksl/blend/BlendColorDodge.asm.frag @@ -8,7 +8,7 @@ OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "src" OpMemberName %_UniformBuffer 1 "dst" -OpName %_color_dodge_component "_color_dodge_component" +OpName %_color_dodge_component_hh2h2 "_color_dodge_component_hh2h2" OpName %delta "delta" OpName %main "main" OpDecorate %sk_FragColor RelaxedPrecision @@ -97,7 +97,7 @@ OpDecorate %138 RelaxedPrecision %int = OpTypeInt 32 1 %int_0 = OpConstant %int 0 %int_1 = OpConstant %int 1 -%_color_dodge_component = OpFunction %float None %15 +%_color_dodge_component_hh2h2 = OpFunction %float None %15 %17 = OpFunctionParameter %_ptr_Function_v2float %18 = OpFunctionParameter %_ptr_Function_v2float %19 = OpLabel @@ -199,7 +199,7 @@ OpStore %102 %101 %105 = OpLoad %v4float %103 %106 = OpVectorShuffle %v2float %105 %105 0 3 OpStore %107 %106 -%108 = OpFunctionCall %float %_color_dodge_component %102 %107 +%108 = OpFunctionCall %float %_color_dodge_component_hh2h2 %102 %107 %109 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0 %110 = OpLoad %v4float %109 %111 = OpVectorShuffle %v2float %110 %110 1 3 @@ -208,7 +208,7 @@ OpStore %112 %111 %114 = OpLoad %v4float %113 %115 = OpVectorShuffle %v2float %114 %114 1 3 OpStore %116 %115 -%117 = OpFunctionCall %float %_color_dodge_component %112 %116 +%117 = OpFunctionCall %float %_color_dodge_component_hh2h2 %112 %116 %118 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0 %119 = OpLoad %v4float %118 %120 = OpVectorShuffle %v2float %119 %119 2 3 @@ -217,7 +217,7 @@ OpStore %121 %120 %123 = OpLoad %v4float %122 %124 = OpVectorShuffle %v2float %123 %123 2 3 OpStore %125 %124 -%126 = OpFunctionCall %float %_color_dodge_component %121 %125 +%126 = OpFunctionCall %float %_color_dodge_component_hh2h2 %121 %125 %127 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0 %128 = OpLoad %v4float %127 %129 = OpCompositeExtract %float %128 3 diff --git a/tests/sksl/blend/BlendEnum.asm.frag b/tests/sksl/blend/BlendEnum.asm.frag index 8a0fd2b70a..96c1ad238a 100644 --- a/tests/sksl/blend/BlendEnum.asm.frag +++ b/tests/sksl/blend/BlendEnum.asm.frag @@ -8,27 +8,27 @@ OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "src" OpMemberName %_UniformBuffer 1 "dst" -OpName %_blend_overlay_component "_blend_overlay_component" -OpName %blend_overlay "blend_overlay" +OpName %_blend_overlay_component_hh2h2 "_blend_overlay_component_hh2h2" +OpName %blend_overlay_h4h4h4 "blend_overlay_h4h4h4" OpName %result "result" -OpName %_color_dodge_component "_color_dodge_component" +OpName %_color_dodge_component_hh2h2 "_color_dodge_component_hh2h2" OpName %delta "delta" -OpName %_color_burn_component "_color_burn_component" +OpName %_color_burn_component_hh2h2 "_color_burn_component_hh2h2" OpName %delta_0 "delta" -OpName %_soft_light_component "_soft_light_component" +OpName %_soft_light_component_hh2h2 "_soft_light_component_hh2h2" OpName %DSqd "DSqd" OpName %DCub "DCub" OpName %DaSqd "DaSqd" OpName %DaCub "DaCub" -OpName %_blend_set_color_luminance "_blend_set_color_luminance" +OpName %_blend_set_color_luminance_h3h3hh3 "_blend_set_color_luminance_h3h3hh3" OpName %lum "lum" OpName %result_0 "result" OpName %minComp "minComp" OpName %maxComp "maxComp" -OpName %_blend_set_color_saturation_helper "_blend_set_color_saturation_helper" -OpName %_blend_set_color_saturation "_blend_set_color_saturation" +OpName %_blend_set_color_saturation_helper_h3h3h "_blend_set_color_saturation_helper_h3h3h" +OpName %_blend_set_color_saturation_h3h3h3 "_blend_set_color_saturation_h3h3h3" OpName %sat "sat" -OpName %blend "blend" +OpName %blend_h4eh4h4 "blend_h4eh4h4" OpName %_0_result "_0_result" OpName %_1_result "_1_result" OpName %_2_alpha "_2_alpha" @@ -673,7 +673,7 @@ OpDecorate %1226 RelaxedPrecision %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float %int_0 = OpConstant %int 0 %int_1 = OpConstant %int 1 -%_blend_overlay_component = OpFunction %float None %23 +%_blend_overlay_component_hh2h2 = OpFunction %float None %23 %25 = OpFunctionParameter %_ptr_Function_v2float %26 = OpFunctionParameter %_ptr_Function_v2float %27 = OpLabel @@ -720,7 +720,7 @@ OpBranch %39 %64 = OpLoad %float %35 OpReturnValue %64 OpFunctionEnd -%blend_overlay = OpFunction %v4float None %65 +%blend_overlay_h4h4h4 = OpFunction %v4float None %65 %67 = OpFunctionParameter %_ptr_Function_v4float %68 = OpFunctionParameter %_ptr_Function_v4float %69 = OpLabel @@ -737,21 +737,21 @@ OpStore %73 %72 %74 = OpLoad %v4float %68 %75 = OpVectorShuffle %v2float %74 %74 0 3 OpStore %76 %75 -%77 = OpFunctionCall %float %_blend_overlay_component %73 %76 +%77 = OpFunctionCall %float %_blend_overlay_component_hh2h2 %73 %76 %78 = OpLoad %v4float %67 %79 = OpVectorShuffle %v2float %78 %78 1 3 OpStore %80 %79 %81 = OpLoad %v4float %68 %82 = OpVectorShuffle %v2float %81 %81 1 3 OpStore %83 %82 -%84 = OpFunctionCall %float %_blend_overlay_component %80 %83 +%84 = OpFunctionCall %float %_blend_overlay_component_hh2h2 %80 %83 %85 = OpLoad %v4float %67 %86 = OpVectorShuffle %v2float %85 %85 2 3 OpStore %87 %86 %88 = OpLoad %v4float %68 %89 = OpVectorShuffle %v2float %88 %88 2 3 OpStore %90 %89 -%91 = OpFunctionCall %float %_blend_overlay_component %87 %90 +%91 = OpFunctionCall %float %_blend_overlay_component_hh2h2 %87 %90 %92 = OpLoad %v4float %67 %93 = OpCompositeExtract %float %92 3 %95 = OpLoad %v4float %67 @@ -785,7 +785,7 @@ OpStore %result %121 %122 = OpLoad %v4float %result OpReturnValue %122 OpFunctionEnd -%_color_dodge_component = OpFunction %float None %23 +%_color_dodge_component_hh2h2 = OpFunction %float None %23 %123 = OpFunctionParameter %_ptr_Function_v2float %124 = OpFunctionParameter %_ptr_Function_v2float %125 = OpLabel @@ -871,7 +871,7 @@ OpBranch %132 %132 = OpLabel OpUnreachable OpFunctionEnd -%_color_burn_component = OpFunction %float None %23 +%_color_burn_component_hh2h2 = OpFunction %float None %23 %197 = OpFunctionParameter %_ptr_Function_v2float %198 = OpFunctionParameter %_ptr_Function_v2float %199 = OpLabel @@ -959,7 +959,7 @@ OpBranch %207 %207 = OpLabel OpUnreachable OpFunctionEnd -%_soft_light_component = OpFunction %float None %23 +%_soft_light_component_hh2h2 = OpFunction %float None %23 %273 = OpFunctionParameter %_ptr_Function_v2float %274 = OpFunctionParameter %_ptr_Function_v2float %275 = OpLabel @@ -1130,7 +1130,7 @@ OpBranch %284 %284 = OpLabel OpUnreachable OpFunctionEnd -%_blend_set_color_luminance = OpFunction %v3float None %434 +%_blend_set_color_luminance_h3h3hh3 = OpFunction %v3float None %434 %436 = OpFunctionParameter %_ptr_Function_v3float %437 = OpFunctionParameter %_ptr_Function_float %438 = OpFunctionParameter %_ptr_Function_v3float @@ -1236,7 +1236,7 @@ OpReturnValue %525 %508 = OpLabel OpUnreachable OpFunctionEnd -%_blend_set_color_saturation_helper = OpFunction %v3float None %526 +%_blend_set_color_saturation_helper_h3h3h = OpFunction %v3float None %526 %527 = OpFunctionParameter %_ptr_Function_v3float %528 = OpFunctionParameter %_ptr_Function_float %529 = OpLabel @@ -1269,7 +1269,7 @@ OpReturnValue %553 %537 = OpLabel OpUnreachable OpFunctionEnd -%_blend_set_color_saturation = OpFunction %v3float None %554 +%_blend_set_color_saturation_h3h3h3 = OpFunction %v3float None %554 %555 = OpFunctionParameter %_ptr_Function_v3float %556 = OpFunctionParameter %_ptr_Function_v3float %557 = OpLabel @@ -1324,7 +1324,7 @@ OpBranchConditional %588 %589 %590 OpStore %593 %592 %594 = OpLoad %float %sat OpStore %595 %594 -%596 = OpFunctionCall %v3float %_blend_set_color_saturation_helper %593 %595 +%596 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %593 %595 OpReturnValue %596 %590 = OpLabel %597 = OpLoad %v3float %555 @@ -1340,7 +1340,7 @@ OpBranchConditional %601 %602 %603 OpStore %607 %606 %608 = OpLoad %float %sat OpStore %609 %608 -%610 = OpFunctionCall %v3float %_blend_set_color_saturation_helper %607 %609 +%610 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %607 %609 %611 = OpVectorShuffle %v3float %610 %610 0 2 1 OpReturnValue %611 %603 = OpLabel @@ -1349,7 +1349,7 @@ OpReturnValue %611 OpStore %614 %613 %615 = OpLoad %float %sat OpStore %616 %615 -%617 = OpFunctionCall %v3float %_blend_set_color_saturation_helper %614 %616 +%617 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %614 %616 %618 = OpVectorShuffle %v3float %617 %617 1 2 0 OpReturnValue %618 %604 = OpLabel @@ -1370,7 +1370,7 @@ OpBranchConditional %623 %624 %625 OpStore %629 %628 %630 = OpLoad %float %sat OpStore %631 %630 -%632 = OpFunctionCall %v3float %_blend_set_color_saturation_helper %629 %631 +%632 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %629 %631 %633 = OpVectorShuffle %v3float %632 %632 1 0 2 OpReturnValue %633 %625 = OpLabel @@ -1387,7 +1387,7 @@ OpBranchConditional %638 %639 %640 OpStore %644 %643 %645 = OpLoad %float %sat OpStore %646 %645 -%647 = OpFunctionCall %v3float %_blend_set_color_saturation_helper %644 %646 +%647 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %644 %646 %648 = OpVectorShuffle %v3float %647 %647 2 0 1 OpReturnValue %648 %640 = OpLabel @@ -1396,7 +1396,7 @@ OpReturnValue %648 OpStore %651 %650 %652 = OpLoad %float %sat OpStore %653 %652 -%654 = OpFunctionCall %v3float %_blend_set_color_saturation_helper %651 %653 +%654 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %651 %653 %655 = OpVectorShuffle %v3float %654 %654 2 1 0 OpReturnValue %655 %641 = OpLabel @@ -1406,7 +1406,7 @@ OpBranch %583 %583 = OpLabel OpUnreachable OpFunctionEnd -%blend = OpFunction %v4float None %657 +%blend_h4eh4h4 = OpFunction %v4float None %657 %659 = OpFunctionParameter %_ptr_Function_int %660 = OpFunctionParameter %_ptr_Function_v4float %661 = OpFunctionParameter %_ptr_Function_v4float @@ -1582,7 +1582,7 @@ OpReturnValue %775 OpStore %777 %776 %778 = OpLoad %v4float %661 OpStore %779 %778 -%780 = OpFunctionCall %v4float %blend_overlay %777 %779 +%780 = OpFunctionCall %v4float %blend_overlay_h4h4h4 %777 %779 OpReturnValue %780 %681 = OpLabel %782 = OpLoad %v4float %660 @@ -1643,21 +1643,21 @@ OpStore %829 %828 %830 = OpLoad %v4float %661 %831 = OpVectorShuffle %v2float %830 %830 0 3 OpStore %832 %831 -%833 = OpFunctionCall %float %_color_dodge_component %829 %832 +%833 = OpFunctionCall %float %_color_dodge_component_hh2h2 %829 %832 %834 = OpLoad %v4float %660 %835 = OpVectorShuffle %v2float %834 %834 1 3 OpStore %836 %835 %837 = OpLoad %v4float %661 %838 = OpVectorShuffle %v2float %837 %837 1 3 OpStore %839 %838 -%840 = OpFunctionCall %float %_color_dodge_component %836 %839 +%840 = OpFunctionCall %float %_color_dodge_component_hh2h2 %836 %839 %841 = OpLoad %v4float %660 %842 = OpVectorShuffle %v2float %841 %841 2 3 OpStore %843 %842 %844 = OpLoad %v4float %661 %845 = OpVectorShuffle %v2float %844 %844 2 3 OpStore %846 %845 -%847 = OpFunctionCall %float %_color_dodge_component %843 %846 +%847 = OpFunctionCall %float %_color_dodge_component_hh2h2 %843 %846 %848 = OpLoad %v4float %660 %849 = OpCompositeExtract %float %848 3 %850 = OpLoad %v4float %660 @@ -1676,21 +1676,21 @@ OpStore %860 %859 %861 = OpLoad %v4float %661 %862 = OpVectorShuffle %v2float %861 %861 0 3 OpStore %863 %862 -%864 = OpFunctionCall %float %_color_burn_component %860 %863 +%864 = OpFunctionCall %float %_color_burn_component_hh2h2 %860 %863 %865 = OpLoad %v4float %660 %866 = OpVectorShuffle %v2float %865 %865 1 3 OpStore %867 %866 %868 = OpLoad %v4float %661 %869 = OpVectorShuffle %v2float %868 %868 1 3 OpStore %870 %869 -%871 = OpFunctionCall %float %_color_burn_component %867 %870 +%871 = OpFunctionCall %float %_color_burn_component_hh2h2 %867 %870 %872 = OpLoad %v4float %660 %873 = OpVectorShuffle %v2float %872 %872 2 3 OpStore %874 %873 %875 = OpLoad %v4float %661 %876 = OpVectorShuffle %v2float %875 %875 2 3 OpStore %877 %876 -%878 = OpFunctionCall %float %_color_burn_component %874 %877 +%878 = OpFunctionCall %float %_color_burn_component_hh2h2 %874 %877 %879 = OpLoad %v4float %660 %880 = OpCompositeExtract %float %879 3 %881 = OpLoad %v4float %660 @@ -1707,7 +1707,7 @@ OpReturnValue %888 OpStore %890 %889 %891 = OpLoad %v4float %660 OpStore %892 %891 -%893 = OpFunctionCall %v4float %blend_overlay %890 %892 +%893 = OpFunctionCall %v4float %blend_overlay_h4h4h4 %890 %892 OpReturnValue %893 %686 = OpLabel %894 = OpLoad %v4float %661 @@ -1726,21 +1726,21 @@ OpStore %904 %903 %905 = OpLoad %v4float %661 %906 = OpVectorShuffle %v2float %905 %905 0 3 OpStore %907 %906 -%908 = OpFunctionCall %float %_soft_light_component %904 %907 +%908 = OpFunctionCall %float %_soft_light_component_hh2h2 %904 %907 %909 = OpLoad %v4float %660 %910 = OpVectorShuffle %v2float %909 %909 1 3 OpStore %911 %910 %912 = OpLoad %v4float %661 %913 = OpVectorShuffle %v2float %912 %912 1 3 OpStore %914 %913 -%915 = OpFunctionCall %float %_soft_light_component %911 %914 +%915 = OpFunctionCall %float %_soft_light_component_hh2h2 %911 %914 %916 = OpLoad %v4float %660 %917 = OpVectorShuffle %v2float %916 %916 2 3 OpStore %918 %917 %919 = OpLoad %v4float %661 %920 = OpVectorShuffle %v2float %919 %919 2 3 OpStore %921 %920 -%922 = OpFunctionCall %float %_soft_light_component %918 %921 +%922 = OpFunctionCall %float %_soft_light_component_hh2h2 %918 %921 %923 = OpLoad %v4float %660 %924 = OpCompositeExtract %float %923 3 %925 = OpLoad %v4float %660 @@ -1873,13 +1873,13 @@ OpStore %_4_dsa %1039 OpStore %1041 %1040 %1042 = OpLoad %v3float %_4_dsa OpStore %1043 %1042 -%1044 = OpFunctionCall %v3float %_blend_set_color_saturation %1041 %1043 +%1044 = OpFunctionCall %v3float %_blend_set_color_saturation_h3h3h3 %1041 %1043 OpStore %1045 %1044 %1046 = OpLoad %float %_2_alpha OpStore %1047 %1046 %1048 = OpLoad %v3float %_4_dsa OpStore %1049 %1048 -%1050 = OpFunctionCall %v3float %_blend_set_color_luminance %1045 %1047 %1049 +%1050 = OpFunctionCall %v3float %_blend_set_color_luminance_h3h3hh3 %1045 %1047 %1049 %1051 = OpLoad %v4float %661 %1052 = OpVectorShuffle %v3float %1051 %1051 0 1 2 %1053 = OpFAdd %v3float %1050 %1052 @@ -1925,13 +1925,13 @@ OpStore %_7_dsa %1089 OpStore %1091 %1090 %1092 = OpLoad %v3float %_6_sda OpStore %1093 %1092 -%1094 = OpFunctionCall %v3float %_blend_set_color_saturation %1091 %1093 +%1094 = OpFunctionCall %v3float %_blend_set_color_saturation_h3h3h3 %1091 %1093 OpStore %1095 %1094 %1096 = OpLoad %float %_5_alpha OpStore %1097 %1096 %1098 = OpLoad %v3float %_7_dsa OpStore %1099 %1098 -%1100 = OpFunctionCall %v3float %_blend_set_color_luminance %1095 %1097 %1099 +%1100 = OpFunctionCall %v3float %_blend_set_color_luminance_h3h3hh3 %1095 %1097 %1099 %1101 = OpLoad %v4float %661 %1102 = OpVectorShuffle %v3float %1101 %1101 0 1 2 %1103 = OpFAdd %v3float %1100 %1102 @@ -1979,7 +1979,7 @@ OpStore %1141 %1140 OpStore %1143 %1142 %1144 = OpLoad %v3float %_10_dsa OpStore %1145 %1144 -%1146 = OpFunctionCall %v3float %_blend_set_color_luminance %1141 %1143 %1145 +%1146 = OpFunctionCall %v3float %_blend_set_color_luminance_h3h3hh3 %1141 %1143 %1145 %1147 = OpLoad %v4float %661 %1148 = OpVectorShuffle %v3float %1147 %1147 0 1 2 %1149 = OpFAdd %v3float %1146 %1148 @@ -2027,7 +2027,7 @@ OpStore %1187 %1186 OpStore %1189 %1188 %1190 = OpLoad %v3float %_12_sda OpStore %1191 %1190 -%1192 = OpFunctionCall %v3float %_blend_set_color_luminance %1187 %1189 %1191 +%1192 = OpFunctionCall %v3float %_blend_set_color_luminance_h3h3hh3 %1187 %1189 %1191 %1193 = OpLoad %v4float %661 %1194 = OpVectorShuffle %v3float %1193 %1193 0 1 2 %1195 = OpFAdd %v3float %1192 %1194 @@ -2067,7 +2067,7 @@ OpStore %1223 %1222 %1224 = OpAccessChain %_ptr_Uniform_v4float %19 %int_1 %1226 = OpLoad %v4float %1224 OpStore %1227 %1226 -%1228 = OpFunctionCall %v4float %blend %1218 %1223 %1227 +%1228 = OpFunctionCall %v4float %blend_h4eh4h4 %1218 %1223 %1227 OpStore %sk_FragColor %1228 OpReturn OpFunctionEnd diff --git a/tests/sksl/blend/BlendHardLight.asm.frag b/tests/sksl/blend/BlendHardLight.asm.frag index 07ff278ab0..fa3c18f696 100644 --- a/tests/sksl/blend/BlendHardLight.asm.frag +++ b/tests/sksl/blend/BlendHardLight.asm.frag @@ -8,8 +8,8 @@ OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "src" OpMemberName %_UniformBuffer 1 "dst" -OpName %_blend_overlay_component "_blend_overlay_component" -OpName %blend_overlay "blend_overlay" +OpName %_blend_overlay_component_hh2h2 "_blend_overlay_component_hh2h2" +OpName %blend_overlay_h4h4h4 "blend_overlay_h4h4h4" OpName %result "result" OpName %main "main" OpDecorate %sk_FragColor RelaxedPrecision @@ -94,7 +94,7 @@ OpDecorate %127 RelaxedPrecision %int = OpTypeInt 32 1 %int_1 = OpConstant %int 1 %int_0 = OpConstant %int 0 -%_blend_overlay_component = OpFunction %float None %16 +%_blend_overlay_component_hh2h2 = OpFunction %float None %16 %18 = OpFunctionParameter %_ptr_Function_v2float %19 = OpFunctionParameter %_ptr_Function_v2float %20 = OpLabel @@ -141,7 +141,7 @@ OpBranch %32 %57 = OpLoad %float %28 OpReturnValue %57 OpFunctionEnd -%blend_overlay = OpFunction %v4float None %58 +%blend_overlay_h4h4h4 = OpFunction %v4float None %58 %60 = OpFunctionParameter %_ptr_Function_v4float %61 = OpFunctionParameter %_ptr_Function_v4float %62 = OpLabel @@ -158,21 +158,21 @@ OpStore %66 %65 %67 = OpLoad %v4float %61 %68 = OpVectorShuffle %v2float %67 %67 0 3 OpStore %69 %68 -%70 = OpFunctionCall %float %_blend_overlay_component %66 %69 +%70 = OpFunctionCall %float %_blend_overlay_component_hh2h2 %66 %69 %71 = OpLoad %v4float %60 %72 = OpVectorShuffle %v2float %71 %71 1 3 OpStore %73 %72 %74 = OpLoad %v4float %61 %75 = OpVectorShuffle %v2float %74 %74 1 3 OpStore %76 %75 -%77 = OpFunctionCall %float %_blend_overlay_component %73 %76 +%77 = OpFunctionCall %float %_blend_overlay_component_hh2h2 %73 %76 %78 = OpLoad %v4float %60 %79 = OpVectorShuffle %v2float %78 %78 2 3 OpStore %80 %79 %81 = OpLoad %v4float %61 %82 = OpVectorShuffle %v2float %81 %81 2 3 OpStore %83 %82 -%84 = OpFunctionCall %float %_blend_overlay_component %80 %83 +%84 = OpFunctionCall %float %_blend_overlay_component_hh2h2 %80 %83 %85 = OpLoad %v4float %60 %86 = OpCompositeExtract %float %85 3 %88 = OpLoad %v4float %60 @@ -216,7 +216,7 @@ OpStore %124 %123 %125 = OpAccessChain %_ptr_Uniform_v4float %12 %int_0 %127 = OpLoad %v4float %125 OpStore %128 %127 -%129 = OpFunctionCall %v4float %blend_overlay %124 %128 +%129 = OpFunctionCall %v4float %blend_overlay_h4h4h4 %124 %128 OpStore %sk_FragColor %129 OpReturn OpFunctionEnd diff --git a/tests/sksl/blend/BlendHue.asm.frag b/tests/sksl/blend/BlendHue.asm.frag index d61906db0c..ca92bf8d0a 100644 --- a/tests/sksl/blend/BlendHue.asm.frag +++ b/tests/sksl/blend/BlendHue.asm.frag @@ -8,13 +8,13 @@ OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "src" OpMemberName %_UniformBuffer 1 "dst" -OpName %_blend_set_color_luminance "_blend_set_color_luminance" +OpName %_blend_set_color_luminance_h3h3hh3 "_blend_set_color_luminance_h3h3hh3" OpName %lum "lum" OpName %result "result" OpName %minComp "minComp" OpName %maxComp "maxComp" -OpName %_blend_set_color_saturation_helper "_blend_set_color_saturation_helper" -OpName %_blend_set_color_saturation "_blend_set_color_saturation" +OpName %_blend_set_color_saturation_helper_h3h3h "_blend_set_color_saturation_helper_h3h3h" +OpName %_blend_set_color_saturation_h3h3h3 "_blend_set_color_saturation_h3h3h3" OpName %sat "sat" OpName %main "main" OpName %_0_alpha "_0_alpha" @@ -167,7 +167,7 @@ OpDecorate %307 RelaxedPrecision %int = OpTypeInt 32 1 %int_1 = OpConstant %int 1 %int_0 = OpConstant %int 0 -%_blend_set_color_luminance = OpFunction %v3float None %17 +%_blend_set_color_luminance_h3h3hh3 = OpFunction %v3float None %17 %20 = OpFunctionParameter %_ptr_Function_v3float %21 = OpFunctionParameter %_ptr_Function_float %22 = OpFunctionParameter %_ptr_Function_v3float @@ -273,7 +273,7 @@ OpReturnValue %111 %93 = OpLabel OpUnreachable OpFunctionEnd -%_blend_set_color_saturation_helper = OpFunction %v3float None %112 +%_blend_set_color_saturation_helper_h3h3h = OpFunction %v3float None %112 %113 = OpFunctionParameter %_ptr_Function_v3float %114 = OpFunctionParameter %_ptr_Function_float %115 = OpLabel @@ -306,7 +306,7 @@ OpReturnValue %139 %123 = OpLabel OpUnreachable OpFunctionEnd -%_blend_set_color_saturation = OpFunction %v3float None %140 +%_blend_set_color_saturation_h3h3h3 = OpFunction %v3float None %140 %141 = OpFunctionParameter %_ptr_Function_v3float %142 = OpFunctionParameter %_ptr_Function_v3float %143 = OpLabel @@ -361,7 +361,7 @@ OpBranchConditional %174 %175 %176 OpStore %179 %178 %180 = OpLoad %float %sat OpStore %181 %180 -%182 = OpFunctionCall %v3float %_blend_set_color_saturation_helper %179 %181 +%182 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %179 %181 OpReturnValue %182 %176 = OpLabel %183 = OpLoad %v3float %141 @@ -377,7 +377,7 @@ OpBranchConditional %187 %188 %189 OpStore %193 %192 %194 = OpLoad %float %sat OpStore %195 %194 -%196 = OpFunctionCall %v3float %_blend_set_color_saturation_helper %193 %195 +%196 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %193 %195 %197 = OpVectorShuffle %v3float %196 %196 0 2 1 OpReturnValue %197 %189 = OpLabel @@ -386,7 +386,7 @@ OpReturnValue %197 OpStore %200 %199 %201 = OpLoad %float %sat OpStore %202 %201 -%203 = OpFunctionCall %v3float %_blend_set_color_saturation_helper %200 %202 +%203 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %200 %202 %204 = OpVectorShuffle %v3float %203 %203 1 2 0 OpReturnValue %204 %190 = OpLabel @@ -407,7 +407,7 @@ OpBranchConditional %209 %210 %211 OpStore %215 %214 %216 = OpLoad %float %sat OpStore %217 %216 -%218 = OpFunctionCall %v3float %_blend_set_color_saturation_helper %215 %217 +%218 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %215 %217 %219 = OpVectorShuffle %v3float %218 %218 1 0 2 OpReturnValue %219 %211 = OpLabel @@ -424,7 +424,7 @@ OpBranchConditional %224 %225 %226 OpStore %230 %229 %231 = OpLoad %float %sat OpStore %232 %231 -%233 = OpFunctionCall %v3float %_blend_set_color_saturation_helper %230 %232 +%233 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %230 %232 %234 = OpVectorShuffle %v3float %233 %233 2 0 1 OpReturnValue %234 %226 = OpLabel @@ -433,7 +433,7 @@ OpReturnValue %234 OpStore %237 %236 %238 = OpLoad %float %sat OpStore %239 %238 -%240 = OpFunctionCall %v3float %_blend_set_color_saturation_helper %237 %239 +%240 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %237 %239 %241 = OpVectorShuffle %v3float %240 %240 2 1 0 OpReturnValue %241 %227 = OpLabel @@ -481,13 +481,13 @@ OpStore %_2_dsa %272 OpStore %274 %273 %275 = OpLoad %v3float %_2_dsa OpStore %276 %275 -%277 = OpFunctionCall %v3float %_blend_set_color_saturation %274 %276 +%277 = OpFunctionCall %v3float %_blend_set_color_saturation_h3h3h3 %274 %276 OpStore %278 %277 %279 = OpLoad %float %_0_alpha OpStore %280 %279 %281 = OpLoad %v3float %_2_dsa OpStore %282 %281 -%283 = OpFunctionCall %v3float %_blend_set_color_luminance %278 %280 %282 +%283 = OpFunctionCall %v3float %_blend_set_color_luminance_h3h3hh3 %278 %280 %282 %284 = OpAccessChain %_ptr_Uniform_v4float %13 %int_1 %285 = OpLoad %v4float %284 %286 = OpVectorShuffle %v3float %285 %285 0 1 2 diff --git a/tests/sksl/blend/BlendLuminosity.asm.frag b/tests/sksl/blend/BlendLuminosity.asm.frag index 41f66202f7..1de7e0384a 100644 --- a/tests/sksl/blend/BlendLuminosity.asm.frag +++ b/tests/sksl/blend/BlendLuminosity.asm.frag @@ -8,7 +8,7 @@ OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "src" OpMemberName %_UniformBuffer 1 "dst" -OpName %_blend_set_color_luminance "_blend_set_color_luminance" +OpName %_blend_set_color_luminance_h3h3hh3 "_blend_set_color_luminance_h3h3hh3" OpName %lum "lum" OpName %result "result" OpName %minComp "minComp" @@ -119,7 +119,7 @@ OpDecorate %171 RelaxedPrecision %int = OpTypeInt 32 1 %int_1 = OpConstant %int 1 %int_0 = OpConstant %int 0 -%_blend_set_color_luminance = OpFunction %v3float None %15 +%_blend_set_color_luminance_h3h3hh3 = OpFunction %v3float None %15 %18 = OpFunctionParameter %_ptr_Function_v3float %19 = OpFunctionParameter %_ptr_Function_float %20 = OpFunctionParameter %_ptr_Function_v3float @@ -263,7 +263,7 @@ OpStore %142 %141 OpStore %144 %143 %145 = OpLoad %v3float %_1_sda OpStore %146 %145 -%147 = OpFunctionCall %v3float %_blend_set_color_luminance %142 %144 %146 +%147 = OpFunctionCall %v3float %_blend_set_color_luminance_h3h3hh3 %142 %144 %146 %148 = OpAccessChain %_ptr_Uniform_v4float %11 %int_1 %149 = OpLoad %v4float %148 %150 = OpVectorShuffle %v3float %149 %149 0 1 2 diff --git a/tests/sksl/blend/BlendOverlay.asm.frag b/tests/sksl/blend/BlendOverlay.asm.frag index 1016123baa..0cab8b7864 100644 --- a/tests/sksl/blend/BlendOverlay.asm.frag +++ b/tests/sksl/blend/BlendOverlay.asm.frag @@ -8,7 +8,7 @@ OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "src" OpMemberName %_UniformBuffer 1 "dst" -OpName %_blend_overlay_component "_blend_overlay_component" +OpName %_blend_overlay_component_hh2h2 "_blend_overlay_component_hh2h2" OpName %main "main" OpName %_0_result "_0_result" OpDecorate %sk_FragColor RelaxedPrecision @@ -90,7 +90,7 @@ OpDecorate %130 RelaxedPrecision %int_1 = OpConstant %int 1 %float_1 = OpConstant %float 1 %v3float = OpTypeVector %float 3 -%_blend_overlay_component = OpFunction %float None %15 +%_blend_overlay_component_hh2h2 = OpFunction %float None %15 %17 = OpFunctionParameter %_ptr_Function_v2float %18 = OpFunctionParameter %_ptr_Function_v2float %19 = OpLabel @@ -154,7 +154,7 @@ OpStore %68 %67 %71 = OpLoad %v4float %69 %72 = OpVectorShuffle %v2float %71 %71 0 3 OpStore %73 %72 -%74 = OpFunctionCall %float %_blend_overlay_component %68 %73 +%74 = OpFunctionCall %float %_blend_overlay_component_hh2h2 %68 %73 %75 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0 %76 = OpLoad %v4float %75 %77 = OpVectorShuffle %v2float %76 %76 1 3 @@ -163,7 +163,7 @@ OpStore %78 %77 %80 = OpLoad %v4float %79 %81 = OpVectorShuffle %v2float %80 %80 1 3 OpStore %82 %81 -%83 = OpFunctionCall %float %_blend_overlay_component %78 %82 +%83 = OpFunctionCall %float %_blend_overlay_component_hh2h2 %78 %82 %84 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0 %85 = OpLoad %v4float %84 %86 = OpVectorShuffle %v2float %85 %85 2 3 @@ -172,7 +172,7 @@ OpStore %87 %86 %89 = OpLoad %v4float %88 %90 = OpVectorShuffle %v2float %89 %89 2 3 OpStore %91 %90 -%92 = OpFunctionCall %float %_blend_overlay_component %87 %91 +%92 = OpFunctionCall %float %_blend_overlay_component_hh2h2 %87 %91 %93 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0 %94 = OpLoad %v4float %93 %95 = OpCompositeExtract %float %94 3 diff --git a/tests/sksl/blend/BlendSaturation.asm.frag b/tests/sksl/blend/BlendSaturation.asm.frag index 495cd24ca4..40d23574ad 100644 --- a/tests/sksl/blend/BlendSaturation.asm.frag +++ b/tests/sksl/blend/BlendSaturation.asm.frag @@ -8,13 +8,13 @@ OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "src" OpMemberName %_UniformBuffer 1 "dst" -OpName %_blend_set_color_luminance "_blend_set_color_luminance" +OpName %_blend_set_color_luminance_h3h3hh3 "_blend_set_color_luminance_h3h3hh3" OpName %lum "lum" OpName %result "result" OpName %minComp "minComp" OpName %maxComp "maxComp" -OpName %_blend_set_color_saturation_helper "_blend_set_color_saturation_helper" -OpName %_blend_set_color_saturation "_blend_set_color_saturation" +OpName %_blend_set_color_saturation_helper_h3h3h "_blend_set_color_saturation_helper_h3h3h" +OpName %_blend_set_color_saturation_h3h3h3 "_blend_set_color_saturation_h3h3h3" OpName %sat "sat" OpName %main "main" OpName %_0_alpha "_0_alpha" @@ -167,7 +167,7 @@ OpDecorate %307 RelaxedPrecision %int = OpTypeInt 32 1 %int_1 = OpConstant %int 1 %int_0 = OpConstant %int 0 -%_blend_set_color_luminance = OpFunction %v3float None %17 +%_blend_set_color_luminance_h3h3hh3 = OpFunction %v3float None %17 %20 = OpFunctionParameter %_ptr_Function_v3float %21 = OpFunctionParameter %_ptr_Function_float %22 = OpFunctionParameter %_ptr_Function_v3float @@ -273,7 +273,7 @@ OpReturnValue %111 %93 = OpLabel OpUnreachable OpFunctionEnd -%_blend_set_color_saturation_helper = OpFunction %v3float None %112 +%_blend_set_color_saturation_helper_h3h3h = OpFunction %v3float None %112 %113 = OpFunctionParameter %_ptr_Function_v3float %114 = OpFunctionParameter %_ptr_Function_float %115 = OpLabel @@ -306,7 +306,7 @@ OpReturnValue %139 %123 = OpLabel OpUnreachable OpFunctionEnd -%_blend_set_color_saturation = OpFunction %v3float None %140 +%_blend_set_color_saturation_h3h3h3 = OpFunction %v3float None %140 %141 = OpFunctionParameter %_ptr_Function_v3float %142 = OpFunctionParameter %_ptr_Function_v3float %143 = OpLabel @@ -361,7 +361,7 @@ OpBranchConditional %174 %175 %176 OpStore %179 %178 %180 = OpLoad %float %sat OpStore %181 %180 -%182 = OpFunctionCall %v3float %_blend_set_color_saturation_helper %179 %181 +%182 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %179 %181 OpReturnValue %182 %176 = OpLabel %183 = OpLoad %v3float %141 @@ -377,7 +377,7 @@ OpBranchConditional %187 %188 %189 OpStore %193 %192 %194 = OpLoad %float %sat OpStore %195 %194 -%196 = OpFunctionCall %v3float %_blend_set_color_saturation_helper %193 %195 +%196 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %193 %195 %197 = OpVectorShuffle %v3float %196 %196 0 2 1 OpReturnValue %197 %189 = OpLabel @@ -386,7 +386,7 @@ OpReturnValue %197 OpStore %200 %199 %201 = OpLoad %float %sat OpStore %202 %201 -%203 = OpFunctionCall %v3float %_blend_set_color_saturation_helper %200 %202 +%203 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %200 %202 %204 = OpVectorShuffle %v3float %203 %203 1 2 0 OpReturnValue %204 %190 = OpLabel @@ -407,7 +407,7 @@ OpBranchConditional %209 %210 %211 OpStore %215 %214 %216 = OpLoad %float %sat OpStore %217 %216 -%218 = OpFunctionCall %v3float %_blend_set_color_saturation_helper %215 %217 +%218 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %215 %217 %219 = OpVectorShuffle %v3float %218 %218 1 0 2 OpReturnValue %219 %211 = OpLabel @@ -424,7 +424,7 @@ OpBranchConditional %224 %225 %226 OpStore %230 %229 %231 = OpLoad %float %sat OpStore %232 %231 -%233 = OpFunctionCall %v3float %_blend_set_color_saturation_helper %230 %232 +%233 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %230 %232 %234 = OpVectorShuffle %v3float %233 %233 2 0 1 OpReturnValue %234 %226 = OpLabel @@ -433,7 +433,7 @@ OpReturnValue %234 OpStore %237 %236 %238 = OpLoad %float %sat OpStore %239 %238 -%240 = OpFunctionCall %v3float %_blend_set_color_saturation_helper %237 %239 +%240 = OpFunctionCall %v3float %_blend_set_color_saturation_helper_h3h3h %237 %239 %241 = OpVectorShuffle %v3float %240 %240 2 1 0 OpReturnValue %241 %227 = OpLabel @@ -481,13 +481,13 @@ OpStore %_2_dsa %272 OpStore %274 %273 %275 = OpLoad %v3float %_1_sda OpStore %276 %275 -%277 = OpFunctionCall %v3float %_blend_set_color_saturation %274 %276 +%277 = OpFunctionCall %v3float %_blend_set_color_saturation_h3h3h3 %274 %276 OpStore %278 %277 %279 = OpLoad %float %_0_alpha OpStore %280 %279 %281 = OpLoad %v3float %_2_dsa OpStore %282 %281 -%283 = OpFunctionCall %v3float %_blend_set_color_luminance %278 %280 %282 +%283 = OpFunctionCall %v3float %_blend_set_color_luminance_h3h3hh3 %278 %280 %282 %284 = OpAccessChain %_ptr_Uniform_v4float %13 %int_1 %285 = OpLoad %v4float %284 %286 = OpVectorShuffle %v3float %285 %285 0 1 2 diff --git a/tests/sksl/blend/BlendSoftLight.asm.frag b/tests/sksl/blend/BlendSoftLight.asm.frag index 2ec924666f..04e36f1f93 100644 --- a/tests/sksl/blend/BlendSoftLight.asm.frag +++ b/tests/sksl/blend/BlendSoftLight.asm.frag @@ -8,7 +8,7 @@ OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "src" OpMemberName %_UniformBuffer 1 "dst" -OpName %_soft_light_component "_soft_light_component" +OpName %_soft_light_component_hh2h2 "_soft_light_component_hh2h2" OpName %DSqd "DSqd" OpName %DCub "DCub" OpName %DaSqd "DaSqd" @@ -169,7 +169,7 @@ OpDecorate %240 RelaxedPrecision %float_0 = OpConstant %float 0 %_ptr_Function_v4float = OpTypePointer Function %v4float %int_0 = OpConstant %int 0 -%_soft_light_component = OpFunction %float None %15 +%_soft_light_component_hh2h2 = OpFunction %float None %15 %17 = OpFunctionParameter %_ptr_Function_v2float %18 = OpFunctionParameter %_ptr_Function_v2float %19 = OpLabel @@ -369,7 +369,7 @@ OpStore %203 %202 %205 = OpLoad %v4float %204 %206 = OpVectorShuffle %v2float %205 %205 0 3 OpStore %207 %206 -%208 = OpFunctionCall %float %_soft_light_component %203 %207 +%208 = OpFunctionCall %float %_soft_light_component_hh2h2 %203 %207 %209 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0 %210 = OpLoad %v4float %209 %211 = OpVectorShuffle %v2float %210 %210 1 3 @@ -378,7 +378,7 @@ OpStore %212 %211 %214 = OpLoad %v4float %213 %215 = OpVectorShuffle %v2float %214 %214 1 3 OpStore %216 %215 -%217 = OpFunctionCall %float %_soft_light_component %212 %216 +%217 = OpFunctionCall %float %_soft_light_component_hh2h2 %212 %216 %218 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0 %219 = OpLoad %v4float %218 %220 = OpVectorShuffle %v2float %219 %219 2 3 @@ -387,7 +387,7 @@ OpStore %221 %220 %223 = OpLoad %v4float %222 %224 = OpVectorShuffle %v2float %223 %223 2 3 OpStore %225 %224 -%226 = OpFunctionCall %float %_soft_light_component %221 %225 +%226 = OpFunctionCall %float %_soft_light_component_hh2h2 %221 %225 %227 = OpAccessChain %_ptr_Uniform_v4float %11 %int_0 %228 = OpLoad %v4float %227 %229 = OpCompositeExtract %float %228 3 diff --git a/tests/sksl/intrinsics/AbsFloat.asm.frag b/tests/sksl/intrinsics/AbsFloat.asm.frag index e5634766b9..dc1511c99a 100644 --- a/tests/sksl/intrinsics/AbsFloat.asm.frag +++ b/tests/sksl/intrinsics/AbsFloat.asm.frag @@ -1,15 +1,15 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "testInputs" OpMemberName %_UniformBuffer 1 "colorGreen" OpMemberName %_UniformBuffer 2 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %expected "expected" OpDecorate %sk_FragColor RelaxedPrecision @@ -66,7 +66,7 @@ OpDecorate %84 RelaxedPrecision %v4bool = OpTypeVector %bool 4 %int_1 = OpConstant %int 1 %int_2 = OpConstant %int 2 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/intrinsics/AbsInt.asm.frag b/tests/sksl/intrinsics/AbsInt.asm.frag index 852f1d081a..b2230dbe35 100644 --- a/tests/sksl/intrinsics/AbsInt.asm.frag +++ b/tests/sksl/intrinsics/AbsInt.asm.frag @@ -1,15 +1,15 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "testInputs" OpMemberName %_UniformBuffer 1 "colorGreen" OpMemberName %_UniformBuffer 2 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %expected "expected" OpDecorate %sk_FragColor RelaxedPrecision @@ -62,7 +62,7 @@ OpDecorate %106 RelaxedPrecision %v3bool = OpTypeVector %bool 3 %v4bool = OpTypeVector %bool 4 %_ptr_Function_v4float = OpTypePointer Function %v4float -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/intrinsics/Ceil.asm.frag b/tests/sksl/intrinsics/Ceil.asm.frag index d4c07babc4..8a46a52f49 100644 --- a/tests/sksl/intrinsics/Ceil.asm.frag +++ b/tests/sksl/intrinsics/Ceil.asm.frag @@ -1,15 +1,15 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "testInputs" OpMemberName %_UniformBuffer 1 "colorGreen" OpMemberName %_UniformBuffer 2 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %expected "expected" OpDecorate %sk_FragColor RelaxedPrecision @@ -66,7 +66,7 @@ OpDecorate %84 RelaxedPrecision %v4bool = OpTypeVector %bool 4 %int_1 = OpConstant %int 1 %int_2 = OpConstant %int 2 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/intrinsics/ClampFloat.asm.frag b/tests/sksl/intrinsics/ClampFloat.asm.frag index 2a25778bff..da7da5085c 100644 --- a/tests/sksl/intrinsics/ClampFloat.asm.frag +++ b/tests/sksl/intrinsics/ClampFloat.asm.frag @@ -1,15 +1,15 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "testInputs" OpMemberName %_UniformBuffer 1 "colorGreen" OpMemberName %_UniformBuffer 2 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %expectedA "expectedA" OpName %clampLow "clampLow" @@ -99,7 +99,7 @@ OpDecorate %156 RelaxedPrecision %v4bool = OpTypeVector %bool 4 %int_1 = OpConstant %int 1 %int_2 = OpConstant %int 2 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/intrinsics/ClampInt.asm.frag b/tests/sksl/intrinsics/ClampInt.asm.frag index 020cd1c388..f6a8a6ec09 100644 --- a/tests/sksl/intrinsics/ClampInt.asm.frag +++ b/tests/sksl/intrinsics/ClampInt.asm.frag @@ -1,15 +1,15 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "testInputs" OpMemberName %_UniformBuffer 1 "colorGreen" OpMemberName %_UniformBuffer 2 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %expectedA "expectedA" OpName %intValues "intValues" @@ -73,7 +73,7 @@ OpDecorate %163 RelaxedPrecision %_ptr_Function_v4float = OpTypePointer Function %v4float %int_1 = OpConstant %int 1 %int_2 = OpConstant %int 2 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/intrinsics/CrossNoInline.asm.frag b/tests/sksl/intrinsics/CrossNoInline.asm.frag index a074c7533a..2af3be600f 100644 --- a/tests/sksl/intrinsics/CrossNoInline.asm.frag +++ b/tests/sksl/intrinsics/CrossNoInline.asm.frag @@ -10,8 +10,8 @@ OpMemberName %_UniformBuffer 0 "ah" OpMemberName %_UniformBuffer 1 "bh" OpMemberName %_UniformBuffer 2 "af" OpMemberName %_UniformBuffer 3 "bf" -OpName %cross "cross" -OpName %cross_0 "cross" +OpName %cross_hh2h2 "cross_hh2h2" +OpName %cross_ff2f2 "cross_ff2f2" OpName %main "main" OpDecorate %sk_FragColor RelaxedPrecision OpDecorate %sk_FragColor Location 0 @@ -57,7 +57,7 @@ OpDecorate %57 RelaxedPrecision %_ptr_Output_float = OpTypePointer Output %float %int_2 = OpConstant %int 2 %int_3 = OpConstant %int 3 -%cross = OpFunction %float None %16 +%cross_hh2h2 = OpFunction %float None %16 %18 = OpFunctionParameter %_ptr_Function_v2float %19 = OpFunctionParameter %_ptr_Function_v2float %20 = OpLabel @@ -74,7 +74,7 @@ OpDecorate %57 RelaxedPrecision %31 = OpFSub %float %25 %30 OpReturnValue %31 OpFunctionEnd -%cross_0 = OpFunction %float None %16 +%cross_ff2f2 = OpFunction %float None %16 %32 = OpFunctionParameter %_ptr_Function_v2float %33 = OpFunctionParameter %_ptr_Function_v2float %34 = OpLabel @@ -103,7 +103,7 @@ OpStore %54 %53 %55 = OpAccessChain %_ptr_Uniform_v2float %12 %int_1 %57 = OpLoad %v2float %55 OpStore %58 %57 -%59 = OpFunctionCall %float %cross %54 %58 +%59 = OpFunctionCall %float %cross_hh2h2 %54 %58 %60 = OpAccessChain %_ptr_Output_float %sk_FragColor %int_0 OpStore %60 %59 %62 = OpAccessChain %_ptr_Uniform_v2float %12 %int_2 @@ -112,7 +112,7 @@ OpStore %65 %64 %66 = OpAccessChain %_ptr_Uniform_v2float %12 %int_3 %68 = OpLoad %v2float %66 OpStore %69 %68 -%70 = OpFunctionCall %float %cross_0 %65 %69 +%70 = OpFunctionCall %float %cross_ff2f2 %65 %69 %71 = OpAccessChain %_ptr_Output_float %sk_FragColor %int_1 OpStore %71 %70 OpReturn diff --git a/tests/sksl/intrinsics/Floor.asm.frag b/tests/sksl/intrinsics/Floor.asm.frag index 1033d93061..a97d780480 100644 --- a/tests/sksl/intrinsics/Floor.asm.frag +++ b/tests/sksl/intrinsics/Floor.asm.frag @@ -1,15 +1,15 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "testInputs" OpMemberName %_UniformBuffer 1 "colorGreen" OpMemberName %_UniformBuffer 2 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %expected "expected" OpDecorate %sk_FragColor RelaxedPrecision @@ -65,7 +65,7 @@ OpDecorate %83 RelaxedPrecision %v4bool = OpTypeVector %bool 4 %int_1 = OpConstant %int 1 %int_2 = OpConstant %int 2 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/intrinsics/Frexp.asm.frag b/tests/sksl/intrinsics/Frexp.asm.frag index 2d3c004db6..9e8824f64f 100644 --- a/tests/sksl/intrinsics/Frexp.asm.frag +++ b/tests/sksl/intrinsics/Frexp.asm.frag @@ -6,14 +6,14 @@ error: SPIR-V validation error: ID 4294967295[%4294967295] has not been defined OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %value "value" OpName %exp "exp" @@ -67,7 +67,7 @@ OpDecorate %114 RelaxedPrecision %int_1 = OpConstant %int 1 %v3float = OpTypeVector %float 3 %int_2 = OpConstant %int 2 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/intrinsics/MaxFloat.asm.frag b/tests/sksl/intrinsics/MaxFloat.asm.frag index e9c05a89dc..9f7734ba0e 100644 --- a/tests/sksl/intrinsics/MaxFloat.asm.frag +++ b/tests/sksl/intrinsics/MaxFloat.asm.frag @@ -1,15 +1,15 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "testInputs" OpMemberName %_UniformBuffer 1 "colorGreen" OpMemberName %_UniformBuffer 2 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %expectedA "expectedA" OpName %expectedB "expectedB" @@ -84,7 +84,7 @@ OpDecorate %142 RelaxedPrecision %v4bool = OpTypeVector %bool 4 %int_1 = OpConstant %int 1 %int_2 = OpConstant %int 2 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/intrinsics/MaxInt.asm.frag b/tests/sksl/intrinsics/MaxInt.asm.frag index c7888039c3..8ee7b2a2d0 100644 --- a/tests/sksl/intrinsics/MaxInt.asm.frag +++ b/tests/sksl/intrinsics/MaxInt.asm.frag @@ -1,15 +1,15 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "testInputs" OpMemberName %_UniformBuffer 1 "colorGreen" OpMemberName %_UniformBuffer 2 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %intValues "intValues" OpName %intGreen "intGreen" @@ -67,7 +67,7 @@ OpDecorate %158 RelaxedPrecision %v4bool = OpTypeVector %bool 4 %_ptr_Function_v4float = OpTypePointer Function %v4float %int_2 = OpConstant %int 2 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/intrinsics/MinFloat.asm.frag b/tests/sksl/intrinsics/MinFloat.asm.frag index fb4e40f40c..b8bae87309 100644 --- a/tests/sksl/intrinsics/MinFloat.asm.frag +++ b/tests/sksl/intrinsics/MinFloat.asm.frag @@ -1,15 +1,15 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "testInputs" OpMemberName %_UniformBuffer 1 "colorGreen" OpMemberName %_UniformBuffer 2 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %expectedA "expectedA" OpName %expectedB "expectedB" @@ -83,7 +83,7 @@ OpDecorate %141 RelaxedPrecision %v4bool = OpTypeVector %bool 4 %int_1 = OpConstant %int 1 %int_2 = OpConstant %int 2 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/intrinsics/MinInt.asm.frag b/tests/sksl/intrinsics/MinInt.asm.frag index b6d5f7a2cc..26bca04579 100644 --- a/tests/sksl/intrinsics/MinInt.asm.frag +++ b/tests/sksl/intrinsics/MinInt.asm.frag @@ -1,15 +1,15 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "testInputs" OpMemberName %_UniformBuffer 1 "colorGreen" OpMemberName %_UniformBuffer 2 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %intValues "intValues" OpName %intGreen "intGreen" @@ -66,7 +66,7 @@ OpDecorate %157 RelaxedPrecision %v4bool = OpTypeVector %bool 4 %_ptr_Function_v4float = OpTypePointer Function %v4float %int_2 = OpConstant %int 2 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/intrinsics/MixBool.asm.frag b/tests/sksl/intrinsics/MixBool.asm.frag index be6a5c2910..90e46357e1 100644 --- a/tests/sksl/intrinsics/MixBool.asm.frag +++ b/tests/sksl/intrinsics/MixBool.asm.frag @@ -1,6 +1,6 @@ ### Compilation failed: -error: SPIR-V validation error: Invalid instruction OpExtInst starting at word 574: expected no more operands after 6 words, but stated word count is 8. -SPIR-V validation error: Invalid instruction OpExtInst starting at word 574: expected no more operands after 6 words, but stated word count is 8. +error: SPIR-V validation error: Invalid instruction OpExtInst starting at word 575: expected no more operands after 6 words, but stated word count is 8. +SPIR-V validation error: Invalid instruction OpExtInst starting at word 575: expected no more operands after 6 words, but stated word count is 8. 1 error diff --git a/tests/sksl/intrinsics/MixFloat.asm.frag b/tests/sksl/intrinsics/MixFloat.asm.frag index b70894ddbf..5900f19966 100644 --- a/tests/sksl/intrinsics/MixFloat.asm.frag +++ b/tests/sksl/intrinsics/MixFloat.asm.frag @@ -1,8 +1,8 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" @@ -11,7 +11,7 @@ OpMemberName %_UniformBuffer 1 "colorRed" OpMemberName %_UniformBuffer 2 "colorBlack" OpMemberName %_UniformBuffer 3 "colorWhite" OpMemberName %_UniformBuffer 4 "testInputs" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %expectedBW "expectedBW" OpName %expectedWT "expectedWT" @@ -116,7 +116,7 @@ OpDecorate %207 RelaxedPrecision %166 = OpConstantComposite %v2float %float_0 %float_0_5 %181 = OpConstantComposite %v3float %float_0 %float_0_5 %float_0 %194 = OpConstantComposite %v4float %float_0 %float_0_5 %float_0 %float_1 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/intrinsics/Modf.asm.frag b/tests/sksl/intrinsics/Modf.asm.frag index 9ba7c0f42c..0427cc7b08 100644 --- a/tests/sksl/intrinsics/Modf.asm.frag +++ b/tests/sksl/intrinsics/Modf.asm.frag @@ -6,14 +6,14 @@ error: SPIR-V validation error: ID 4294967295[%4294967295] has not been defined OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %value "value" OpName %whole "whole" @@ -65,7 +65,7 @@ OpDecorate %112 RelaxedPrecision %v3float = OpTypeVector %float 3 %int_2 = OpConstant %int 2 %int_3 = OpConstant %int 3 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/intrinsics/SignFloat.asm.frag b/tests/sksl/intrinsics/SignFloat.asm.frag index cf3e7f9ce0..4ef8b38313 100644 --- a/tests/sksl/intrinsics/SignFloat.asm.frag +++ b/tests/sksl/intrinsics/SignFloat.asm.frag @@ -1,15 +1,15 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "testInputs" OpMemberName %_UniformBuffer 1 "colorGreen" OpMemberName %_UniformBuffer 2 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %expected "expected" OpDecorate %sk_FragColor RelaxedPrecision @@ -65,7 +65,7 @@ OpDecorate %83 RelaxedPrecision %v4bool = OpTypeVector %bool 4 %int_1 = OpConstant %int 1 %int_2 = OpConstant %int 2 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/ArrayConstructors.asm.frag b/tests/sksl/shared/ArrayConstructors.asm.frag index 91bfb49c6b..26b4004bf6 100644 --- a/tests/sksl/shared/ArrayConstructors.asm.frag +++ b/tests/sksl/shared/ArrayConstructors.asm.frag @@ -1,14 +1,14 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %test1 "test1" OpName %test2 "test2" @@ -70,7 +70,7 @@ OpDecorate %77 RelaxedPrecision %_ptr_Function_v4float = OpTypePointer Function %v4float %float_24 = OpConstant %float 24 %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/ArrayTypes.asm.frag b/tests/sksl/shared/ArrayTypes.asm.frag index 453921a0b6..90bda37a12 100644 --- a/tests/sksl/shared/ArrayTypes.asm.frag +++ b/tests/sksl/shared/ArrayTypes.asm.frag @@ -1,11 +1,11 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %x "x" OpName %y "y" @@ -40,7 +40,7 @@ OpDecorate %_arr_v2float_int_2 ArrayStride 16 %float_n1 = OpConstant %float -1 %float_2 = OpConstant %float 2 %37 = OpConstantComposite %v2float %float_n1 %float_2 -%_entrypoint = OpFunction %void None %12 +%_entrypoint_v = OpFunction %void None %12 %13 = OpLabel %14 = OpFunctionCall %v4float %main OpStore %sk_FragColor %14 diff --git a/tests/sksl/shared/Assignment.asm.frag b/tests/sksl/shared/Assignment.asm.frag index 785546111b..80d37531b8 100644 --- a/tests/sksl/shared/Assignment.asm.frag +++ b/tests/sksl/shared/Assignment.asm.frag @@ -1,8 +1,8 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %globalVar "globalVar" @@ -14,7 +14,7 @@ OpMemberName %S 3 "ah4" OpName %globalStruct "globalStruct" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %i "i" OpName %i4 "i4" @@ -126,7 +126,7 @@ OpDecorate %139 RelaxedPrecision %116 = OpConstantComposite %v4float %float_2 %float_2 %float_2 %float_2 %_ptr_Function_v3float = OpTypePointer Function %v3float %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float -%_entrypoint = OpFunction %void None %24 +%_entrypoint_v = OpFunction %void None %24 %25 = OpLabel %26 = OpFunctionCall %v4float %main OpStore %sk_FragColor %26 diff --git a/tests/sksl/shared/CastsRoundTowardZero.asm.frag b/tests/sksl/shared/CastsRoundTowardZero.asm.frag index 8c8ea416bc..2175141f91 100644 --- a/tests/sksl/shared/CastsRoundTowardZero.asm.frag +++ b/tests/sksl/shared/CastsRoundTowardZero.asm.frag @@ -1,14 +1,14 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %ok "ok" OpDecorate %sk_FragColor RelaxedPrecision @@ -46,7 +46,7 @@ OpDecorate %37 RelaxedPrecision %int = OpTypeInt 32 1 %int_0 = OpConstant %int 0 %int_1 = OpConstant %int 1 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/CommaMixedTypes.asm.frag b/tests/sksl/shared/CommaMixedTypes.asm.frag index 440b955110..2ab5ad7ec8 100644 --- a/tests/sksl/shared/CommaMixedTypes.asm.frag +++ b/tests/sksl/shared/CommaMixedTypes.asm.frag @@ -1,13 +1,13 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %result "result" OpDecorate %sk_FragColor RelaxedPrecision @@ -45,7 +45,7 @@ OpDecorate %45 RelaxedPrecision %int_1 = OpConstant %int 1 %int_2 = OpConstant %int 2 %int_3 = OpConstant %int 3 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/CommaSideEffects.asm.frag b/tests/sksl/shared/CommaSideEffects.asm.frag index c5f8ee7fd5..b7966f4e73 100644 --- a/tests/sksl/shared/CommaSideEffects.asm.frag +++ b/tests/sksl/shared/CommaSideEffects.asm.frag @@ -1,8 +1,8 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" @@ -10,8 +10,8 @@ OpMemberName %_UniformBuffer 0 "colorRed" OpMemberName %_UniformBuffer 1 "colorGreen" OpMemberName %_UniformBuffer 2 "colorWhite" OpMemberName %_UniformBuffer 3 "colorBlack" -OpName %_entrypoint "_entrypoint" -OpName %setToColorBlack "setToColorBlack" +OpName %_entrypoint_v "_entrypoint_v" +OpName %setToColorBlack_vh4 "setToColorBlack_vh4" OpName %main "main" OpName %a "a" OpName %b "b" @@ -82,13 +82,13 @@ OpDecorate %95 RelaxedPrecision %int_2 = OpConstant %int 2 %false = OpConstantFalse %bool %v4bool = OpTypeVector %bool 4 -%_entrypoint = OpFunction %void None %16 +%_entrypoint_v = OpFunction %void None %16 %17 = OpLabel %18 = OpFunctionCall %v4float %main OpStore %sk_FragColor %18 OpReturn OpFunctionEnd -%setToColorBlack = OpFunction %void None %19 +%setToColorBlack_vh4 = OpFunction %void None %19 %21 = OpFunctionParameter %_ptr_Function_v4float %22 = OpLabel %23 = OpAccessChain %_ptr_Uniform_v4float %11 %int_3 @@ -109,7 +109,7 @@ OpStore %b %36 %37 = OpAccessChain %_ptr_Uniform_v4float %11 %int_1 %39 = OpLoad %v4float %37 OpStore %c %39 -%40 = OpFunctionCall %void %setToColorBlack %d +%40 = OpFunctionCall %void %setToColorBlack_vh4 %d %41 = OpAccessChain %_ptr_Uniform_v4float %11 %int_2 %43 = OpLoad %v4float %41 OpStore %a %43 diff --git a/tests/sksl/shared/ConstVariableComparison.asm.frag b/tests/sksl/shared/ConstVariableComparison.asm.frag index 3d2218fdeb..836362c84b 100644 --- a/tests/sksl/shared/ConstVariableComparison.asm.frag +++ b/tests/sksl/shared/ConstVariableComparison.asm.frag @@ -1,14 +1,14 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %b "b" OpName %c "c" @@ -46,7 +46,7 @@ OpDecorate %42 RelaxedPrecision %int = OpTypeInt 32 1 %int_1 = OpConstant %int 1 %int_0 = OpConstant %int 0 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/ConstantIf.asm.frag b/tests/sksl/shared/ConstantIf.asm.frag index 72e0f4b145..e93462080b 100644 --- a/tests/sksl/shared/ConstantIf.asm.frag +++ b/tests/sksl/shared/ConstantIf.asm.frag @@ -1,14 +1,14 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %a "a" OpName %b "b" @@ -50,7 +50,7 @@ OpDecorate %58 RelaxedPrecision %false = OpConstantFalse %bool %_ptr_Function_v4float = OpTypePointer Function %v4float %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/DeadIfStatement.asm.frag b/tests/sksl/shared/DeadIfStatement.asm.frag index edd133004c..34ab69aa52 100644 --- a/tests/sksl/shared/DeadIfStatement.asm.frag +++ b/tests/sksl/shared/DeadIfStatement.asm.frag @@ -1,14 +1,14 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpDecorate %sk_FragColor RelaxedPrecision OpDecorate %sk_FragColor Location 0 @@ -38,7 +38,7 @@ OpDecorate %24 RelaxedPrecision %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float %int = OpTypeInt 32 1 %int_0 = OpConstant %int 0 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/DeadLoopVariable.asm.frag b/tests/sksl/shared/DeadLoopVariable.asm.frag index a851f475ac..cd51e5a053 100644 --- a/tests/sksl/shared/DeadLoopVariable.asm.frag +++ b/tests/sksl/shared/DeadLoopVariable.asm.frag @@ -1,13 +1,13 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %x "x" OpDecorate %sk_FragColor RelaxedPrecision @@ -38,7 +38,7 @@ OpDecorate %34 RelaxedPrecision %int_0 = OpConstant %int 0 %int_4 = OpConstant %int 4 %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/DeadStripFunctions.asm.frag b/tests/sksl/shared/DeadStripFunctions.asm.frag index 02a30c5a35..34e2d1456c 100644 --- a/tests/sksl/shared/DeadStripFunctions.asm.frag +++ b/tests/sksl/shared/DeadStripFunctions.asm.frag @@ -1,16 +1,16 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" -OpName %unpremul "unpremul" -OpName %live_fn "live_fn" +OpName %_entrypoint_v "_entrypoint_v" +OpName %unpremul_h4h4 "unpremul_h4h4" +OpName %live_fn_h4h4h4 "live_fn_h4h4h4" OpName %main "main" OpName %a "a" OpName %b "b" @@ -68,13 +68,13 @@ OpDecorate %86 RelaxedPrecision %int = OpTypeInt 32 1 %int_0 = OpConstant %int 0 %int_1 = OpConstant %int 1 -%_entrypoint = OpFunction %void None %17 +%_entrypoint_v = OpFunction %void None %17 %18 = OpLabel %19 = OpFunctionCall %v4float %main OpStore %sk_FragColor %19 OpReturn OpFunctionEnd -%unpremul = OpFunction %v4float None %20 +%unpremul_h4h4 = OpFunction %v4float None %20 %22 = OpFunctionParameter %_ptr_Function_v4float %23 = OpLabel %24 = OpLoad %v4float %22 @@ -92,7 +92,7 @@ OpFunctionEnd %39 = OpCompositeConstruct %v4float %34 %35 %36 %38 OpReturnValue %39 OpFunctionEnd -%live_fn = OpFunction %v4float None %40 +%live_fn_h4h4h4 = OpFunction %v4float None %40 %41 = OpFunctionParameter %_ptr_Function_v4float %42 = OpFunctionParameter %_ptr_Function_v4float %43 = OpLabel @@ -111,10 +111,10 @@ OpFunctionEnd %74 = OpVariable %_ptr_Function_v4float Function OpStore %53 %52 OpStore %56 %55 -%57 = OpFunctionCall %v4float %live_fn %53 %56 +%57 = OpFunctionCall %v4float %live_fn_h4h4h4 %53 %56 OpStore %a %57 OpStore %59 %58 -%60 = OpFunctionCall %v4float %unpremul %59 +%60 = OpFunctionCall %v4float %unpremul_h4h4 %59 OpStore %b %60 %62 = OpLoad %v4float %a %65 = OpFOrdNotEqual %v4bool %62 %64 diff --git a/tests/sksl/shared/DependentInitializers.asm.frag b/tests/sksl/shared/DependentInitializers.asm.frag index daf95616d0..7536a9e2a2 100644 --- a/tests/sksl/shared/DependentInitializers.asm.frag +++ b/tests/sksl/shared/DependentInitializers.asm.frag @@ -1,14 +1,14 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %x "x" OpName %y "y" @@ -48,7 +48,7 @@ OpDecorate %43 RelaxedPrecision %int = OpTypeInt 32 1 %int_0 = OpConstant %int 0 %int_1 = OpConstant %int 1 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/DoWhileControlFlow.asm.frag b/tests/sksl/shared/DoWhileControlFlow.asm.frag index 16ed7909df..c3e5e9af79 100644 --- a/tests/sksl/shared/DoWhileControlFlow.asm.frag +++ b/tests/sksl/shared/DoWhileControlFlow.asm.frag @@ -1,11 +1,11 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %x "x" OpDecorate %sk_FragColor RelaxedPrecision @@ -41,7 +41,7 @@ OpDecorate %61 RelaxedPrecision %float_0 = OpConstant %float 0 %int_2 = OpConstant %int 2 %int_1 = OpConstant %int 1 -%_entrypoint = OpFunction %void None %12 +%_entrypoint_v = OpFunction %void None %12 %13 = OpLabel %14 = OpFunctionCall %v4float %main OpStore %sk_FragColor %14 diff --git a/tests/sksl/shared/EmptyBlocksES2.asm.frag b/tests/sksl/shared/EmptyBlocksES2.asm.frag index e6f8c12dab..3ab7b26ba3 100644 --- a/tests/sksl/shared/EmptyBlocksES2.asm.frag +++ b/tests/sksl/shared/EmptyBlocksES2.asm.frag @@ -1,11 +1,11 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %color "color" OpName %counter "counter" @@ -38,7 +38,7 @@ OpDecorate %71 RelaxedPrecision %_ptr_Function_float = OpTypePointer Function %float %float_2 = OpConstant %float 2 %int_3 = OpConstant %int 3 -%_entrypoint = OpFunction %void None %12 +%_entrypoint_v = OpFunction %void None %12 %13 = OpLabel %14 = OpFunctionCall %v4float %main OpStore %sk_FragColor %14 diff --git a/tests/sksl/shared/EmptyBlocksES3.asm.frag b/tests/sksl/shared/EmptyBlocksES3.asm.frag index 7ea582eb1c..270f763b71 100644 --- a/tests/sksl/shared/EmptyBlocksES3.asm.frag +++ b/tests/sksl/shared/EmptyBlocksES3.asm.frag @@ -1,11 +1,11 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %color "color" OpName %counter "counter" @@ -38,7 +38,7 @@ OpDecorate %85 RelaxedPrecision %_ptr_Function_float = OpTypePointer Function %float %float_2 = OpConstant %float 2 %int_3 = OpConstant %int 3 -%_entrypoint = OpFunction %void None %12 +%_entrypoint_v = OpFunction %void None %12 %13 = OpLabel %14 = OpFunctionCall %v4float %main OpStore %sk_FragColor %14 diff --git a/tests/sksl/shared/ForLoopControlFlow.asm.frag b/tests/sksl/shared/ForLoopControlFlow.asm.frag index e9df124579..276c288ffb 100644 --- a/tests/sksl/shared/ForLoopControlFlow.asm.frag +++ b/tests/sksl/shared/ForLoopControlFlow.asm.frag @@ -1,13 +1,13 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorWhite" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %x "x" OpName %r "r" @@ -57,7 +57,7 @@ OpDecorate %70 RelaxedPrecision %float_1 = OpConstant %float 1 %int_2 = OpConstant %int 2 %int_1 = OpConstant %int 1 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/FunctionArgTypeMatch.asm.frag b/tests/sksl/shared/FunctionArgTypeMatch.asm.frag index 63b608c3ad..baa929d8b0 100644 --- a/tests/sksl/shared/FunctionArgTypeMatch.asm.frag +++ b/tests/sksl/shared/FunctionArgTypeMatch.asm.frag @@ -1,35 +1,35 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" -OpName %takes_float2 "takes_float2" -OpName %takes_float3 "takes_float3" -OpName %takes_float4 "takes_float4" -OpName %takes_float2x2 "takes_float2x2" -OpName %takes_float3x3 "takes_float3x3" -OpName %takes_float4x4 "takes_float4x4" -OpName %takes_half "takes_half" -OpName %takes_half2 "takes_half2" -OpName %takes_half3 "takes_half3" -OpName %takes_half4 "takes_half4" -OpName %takes_half2x2 "takes_half2x2" -OpName %takes_half3x3 "takes_half3x3" -OpName %takes_half4x4 "takes_half4x4" -OpName %takes_bool "takes_bool" -OpName %takes_bool2 "takes_bool2" -OpName %takes_bool3 "takes_bool3" -OpName %takes_bool4 "takes_bool4" -OpName %takes_int "takes_int" -OpName %takes_int2 "takes_int2" -OpName %takes_int3 "takes_int3" -OpName %takes_int4 "takes_int4" +OpName %_entrypoint_v "_entrypoint_v" +OpName %takes_float2_bf2 "takes_float2_bf2" +OpName %takes_float3_bf3 "takes_float3_bf3" +OpName %takes_float4_bf4 "takes_float4_bf4" +OpName %takes_float2x2_bf22 "takes_float2x2_bf22" +OpName %takes_float3x3_bf33 "takes_float3x3_bf33" +OpName %takes_float4x4_bf44 "takes_float4x4_bf44" +OpName %takes_half_bh "takes_half_bh" +OpName %takes_half2_bh2 "takes_half2_bh2" +OpName %takes_half3_bh3 "takes_half3_bh3" +OpName %takes_half4_bh4 "takes_half4_bh4" +OpName %takes_half2x2_bh22 "takes_half2x2_bh22" +OpName %takes_half3x3_bh33 "takes_half3x3_bh33" +OpName %takes_half4x4_bh44 "takes_half4x4_bh44" +OpName %takes_bool_bb "takes_bool_bb" +OpName %takes_bool2_bb2 "takes_bool2_bb2" +OpName %takes_bool3_bb3 "takes_bool3_bb3" +OpName %takes_bool4_bb4 "takes_bool4_bb4" +OpName %takes_int_bi "takes_int_bi" +OpName %takes_int2_bi2 "takes_int2_bi2" +OpName %takes_int3_bi3 "takes_int3_bi3" +OpName %takes_int4_bi4 "takes_int4_bi4" OpName %main "main" OpDecorate %sk_FragColor RelaxedPrecision OpDecorate %sk_FragColor Location 0 @@ -134,113 +134,113 @@ OpDecorate %284 RelaxedPrecision %270 = OpConstantComposite %v4int %int_4 %int_4 %int_4 %int_4 %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float %int_0 = OpConstant %int 0 -%_entrypoint = OpFunction %void None %36 +%_entrypoint_v = OpFunction %void None %36 %37 = OpLabel %38 = OpFunctionCall %v4float %main OpStore %sk_FragColor %38 OpReturn OpFunctionEnd -%takes_float2 = OpFunction %bool None %40 +%takes_float2_bf2 = OpFunction %bool None %40 %42 = OpFunctionParameter %_ptr_Function_v2float %43 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_float3 = OpFunction %bool None %46 +%takes_float3_bf3 = OpFunction %bool None %46 %48 = OpFunctionParameter %_ptr_Function_v3float %49 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_float4 = OpFunction %bool None %50 +%takes_float4_bf4 = OpFunction %bool None %50 %52 = OpFunctionParameter %_ptr_Function_v4float %53 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_float2x2 = OpFunction %bool None %55 +%takes_float2x2_bf22 = OpFunction %bool None %55 %57 = OpFunctionParameter %_ptr_Function_mat2v2float %58 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_float3x3 = OpFunction %bool None %60 +%takes_float3x3_bf33 = OpFunction %bool None %60 %62 = OpFunctionParameter %_ptr_Function_mat3v3float %63 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_float4x4 = OpFunction %bool None %65 +%takes_float4x4_bf44 = OpFunction %bool None %65 %67 = OpFunctionParameter %_ptr_Function_mat4v4float %68 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_half = OpFunction %bool None %69 +%takes_half_bh = OpFunction %bool None %69 %71 = OpFunctionParameter %_ptr_Function_float %72 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_half2 = OpFunction %bool None %40 +%takes_half2_bh2 = OpFunction %bool None %40 %73 = OpFunctionParameter %_ptr_Function_v2float %74 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_half3 = OpFunction %bool None %46 +%takes_half3_bh3 = OpFunction %bool None %46 %75 = OpFunctionParameter %_ptr_Function_v3float %76 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_half4 = OpFunction %bool None %50 +%takes_half4_bh4 = OpFunction %bool None %50 %77 = OpFunctionParameter %_ptr_Function_v4float %78 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_half2x2 = OpFunction %bool None %55 +%takes_half2x2_bh22 = OpFunction %bool None %55 %79 = OpFunctionParameter %_ptr_Function_mat2v2float %80 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_half3x3 = OpFunction %bool None %60 +%takes_half3x3_bh33 = OpFunction %bool None %60 %81 = OpFunctionParameter %_ptr_Function_mat3v3float %82 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_half4x4 = OpFunction %bool None %65 +%takes_half4x4_bh44 = OpFunction %bool None %65 %83 = OpFunctionParameter %_ptr_Function_mat4v4float %84 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_bool = OpFunction %bool None %85 +%takes_bool_bb = OpFunction %bool None %85 %87 = OpFunctionParameter %_ptr_Function_bool %88 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_bool2 = OpFunction %bool None %90 +%takes_bool2_bb2 = OpFunction %bool None %90 %92 = OpFunctionParameter %_ptr_Function_v2bool %93 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_bool3 = OpFunction %bool None %95 +%takes_bool3_bb3 = OpFunction %bool None %95 %97 = OpFunctionParameter %_ptr_Function_v3bool %98 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_bool4 = OpFunction %bool None %100 +%takes_bool4_bb4 = OpFunction %bool None %100 %102 = OpFunctionParameter %_ptr_Function_v4bool %103 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_int = OpFunction %bool None %105 +%takes_int_bi = OpFunction %bool None %105 %107 = OpFunctionParameter %_ptr_Function_int %108 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_int2 = OpFunction %bool None %110 +%takes_int2_bi2 = OpFunction %bool None %110 %112 = OpFunctionParameter %_ptr_Function_v2int %113 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_int3 = OpFunction %bool None %115 +%takes_int3_bi3 = OpFunction %bool None %115 %117 = OpFunctionParameter %_ptr_Function_v3int %118 = OpLabel OpReturnValue %true OpFunctionEnd -%takes_int4 = OpFunction %bool None %120 +%takes_int4_bi4 = OpFunction %bool None %120 %122 = OpFunctionParameter %_ptr_Function_v4int %123 = OpLabel OpReturnValue %true @@ -273,7 +273,7 @@ OpSelectionMerge %128 None OpBranchConditional %true %127 %128 %127 = OpLabel OpStore %131 %130 -%132 = OpFunctionCall %bool %takes_float2 %131 +%132 = OpFunctionCall %bool %takes_float2_bf2 %131 OpBranch %128 %128 = OpLabel %133 = OpPhi %bool %false %125 %132 %127 @@ -281,7 +281,7 @@ OpSelectionMerge %135 None OpBranchConditional %133 %134 %135 %134 = OpLabel OpStore %138 %137 -%139 = OpFunctionCall %bool %takes_float3 %138 +%139 = OpFunctionCall %bool %takes_float3_bf3 %138 OpBranch %135 %135 = OpLabel %140 = OpPhi %bool %false %128 %139 %134 @@ -289,7 +289,7 @@ OpSelectionMerge %142 None OpBranchConditional %140 %141 %142 %141 = OpLabel OpStore %145 %144 -%146 = OpFunctionCall %bool %takes_float4 %145 +%146 = OpFunctionCall %bool %takes_float4_bf4 %145 OpBranch %142 %142 = OpLabel %147 = OpPhi %bool %false %135 %146 %141 @@ -300,7 +300,7 @@ OpBranchConditional %147 %148 %149 %153 = OpCompositeConstruct %v2float %float_0 %float_2 %150 = OpCompositeConstruct %mat2v2float %152 %153 OpStore %154 %150 -%155 = OpFunctionCall %bool %takes_float2x2 %154 +%155 = OpFunctionCall %bool %takes_float2x2_bf22 %154 OpBranch %149 %149 = OpLabel %156 = OpPhi %bool %false %142 %155 %148 @@ -312,7 +312,7 @@ OpBranchConditional %156 %157 %158 %162 = OpCompositeConstruct %v3float %float_0 %float_0 %float_3 %159 = OpCompositeConstruct %mat3v3float %160 %161 %162 OpStore %163 %159 -%164 = OpFunctionCall %bool %takes_float3x3 %163 +%164 = OpFunctionCall %bool %takes_float3x3_bf33 %163 OpBranch %158 %158 = OpLabel %165 = OpPhi %bool %false %149 %164 %157 @@ -325,7 +325,7 @@ OpBranchConditional %165 %166 %167 %172 = OpCompositeConstruct %v4float %float_0 %float_0 %float_0 %float_4 %168 = OpCompositeConstruct %mat4v4float %169 %170 %171 %172 OpStore %173 %168 -%174 = OpFunctionCall %bool %takes_float4x4 %173 +%174 = OpFunctionCall %bool %takes_float4x4_bf44 %173 OpBranch %167 %167 = OpLabel %175 = OpPhi %bool %false %158 %174 %166 @@ -333,7 +333,7 @@ OpSelectionMerge %177 None OpBranchConditional %175 %176 %177 %176 = OpLabel OpStore %179 %float_1 -%180 = OpFunctionCall %bool %takes_half %179 +%180 = OpFunctionCall %bool %takes_half_bh %179 OpBranch %177 %177 = OpLabel %181 = OpPhi %bool %false %167 %180 %176 @@ -341,7 +341,7 @@ OpSelectionMerge %183 None OpBranchConditional %181 %182 %183 %182 = OpLabel OpStore %184 %130 -%185 = OpFunctionCall %bool %takes_half2 %184 +%185 = OpFunctionCall %bool %takes_half2_bh2 %184 OpBranch %183 %183 = OpLabel %186 = OpPhi %bool %false %177 %185 %182 @@ -349,7 +349,7 @@ OpSelectionMerge %188 None OpBranchConditional %186 %187 %188 %187 = OpLabel OpStore %189 %137 -%190 = OpFunctionCall %bool %takes_half3 %189 +%190 = OpFunctionCall %bool %takes_half3_bh3 %189 OpBranch %188 %188 = OpLabel %191 = OpPhi %bool %false %183 %190 %187 @@ -357,7 +357,7 @@ OpSelectionMerge %193 None OpBranchConditional %191 %192 %193 %192 = OpLabel OpStore %194 %144 -%195 = OpFunctionCall %bool %takes_half4 %194 +%195 = OpFunctionCall %bool %takes_half4_bh4 %194 OpBranch %193 %193 = OpLabel %196 = OpPhi %bool %false %188 %195 %192 @@ -368,7 +368,7 @@ OpBranchConditional %196 %197 %198 %201 = OpCompositeConstruct %v2float %float_0 %float_2 %199 = OpCompositeConstruct %mat2v2float %200 %201 OpStore %202 %199 -%203 = OpFunctionCall %bool %takes_half2x2 %202 +%203 = OpFunctionCall %bool %takes_half2x2_bh22 %202 OpBranch %198 %198 = OpLabel %204 = OpPhi %bool %false %193 %203 %197 @@ -380,7 +380,7 @@ OpBranchConditional %204 %205 %206 %210 = OpCompositeConstruct %v3float %float_0 %float_0 %float_3 %207 = OpCompositeConstruct %mat3v3float %208 %209 %210 OpStore %211 %207 -%212 = OpFunctionCall %bool %takes_half3x3 %211 +%212 = OpFunctionCall %bool %takes_half3x3_bh33 %211 OpBranch %206 %206 = OpLabel %213 = OpPhi %bool %false %198 %212 %205 @@ -393,7 +393,7 @@ OpBranchConditional %213 %214 %215 %220 = OpCompositeConstruct %v4float %float_0 %float_0 %float_0 %float_4 %216 = OpCompositeConstruct %mat4v4float %217 %218 %219 %220 OpStore %221 %216 -%222 = OpFunctionCall %bool %takes_half4x4 %221 +%222 = OpFunctionCall %bool %takes_half4x4_bh44 %221 OpBranch %215 %215 = OpLabel %223 = OpPhi %bool %false %206 %222 %214 @@ -401,7 +401,7 @@ OpSelectionMerge %225 None OpBranchConditional %223 %224 %225 %224 = OpLabel OpStore %226 %true -%227 = OpFunctionCall %bool %takes_bool %226 +%227 = OpFunctionCall %bool %takes_bool_bb %226 OpBranch %225 %225 = OpLabel %228 = OpPhi %bool %false %215 %227 %224 @@ -409,7 +409,7 @@ OpSelectionMerge %230 None OpBranchConditional %228 %229 %230 %229 = OpLabel OpStore %232 %231 -%233 = OpFunctionCall %bool %takes_bool2 %232 +%233 = OpFunctionCall %bool %takes_bool2_bb2 %232 OpBranch %230 %230 = OpLabel %234 = OpPhi %bool %false %225 %233 %229 @@ -417,7 +417,7 @@ OpSelectionMerge %236 None OpBranchConditional %234 %235 %236 %235 = OpLabel OpStore %238 %237 -%239 = OpFunctionCall %bool %takes_bool3 %238 +%239 = OpFunctionCall %bool %takes_bool3_bb3 %238 OpBranch %236 %236 = OpLabel %240 = OpPhi %bool %false %230 %239 %235 @@ -425,7 +425,7 @@ OpSelectionMerge %242 None OpBranchConditional %240 %241 %242 %241 = OpLabel OpStore %244 %243 -%245 = OpFunctionCall %bool %takes_bool4 %244 +%245 = OpFunctionCall %bool %takes_bool4_bb4 %244 OpBranch %242 %242 = OpLabel %246 = OpPhi %bool %false %236 %245 %241 @@ -433,7 +433,7 @@ OpSelectionMerge %248 None OpBranchConditional %246 %247 %248 %247 = OpLabel OpStore %250 %int_1 -%251 = OpFunctionCall %bool %takes_int %250 +%251 = OpFunctionCall %bool %takes_int_bi %250 OpBranch %248 %248 = OpLabel %252 = OpPhi %bool %false %242 %251 %247 @@ -441,7 +441,7 @@ OpSelectionMerge %254 None OpBranchConditional %252 %253 %254 %253 = OpLabel OpStore %257 %256 -%258 = OpFunctionCall %bool %takes_int2 %257 +%258 = OpFunctionCall %bool %takes_int2_bi2 %257 OpBranch %254 %254 = OpLabel %259 = OpPhi %bool %false %248 %258 %253 @@ -449,7 +449,7 @@ OpSelectionMerge %261 None OpBranchConditional %259 %260 %261 %260 = OpLabel OpStore %264 %263 -%265 = OpFunctionCall %bool %takes_int3 %264 +%265 = OpFunctionCall %bool %takes_int3_bi3 %264 OpBranch %261 %261 = OpLabel %266 = OpPhi %bool %false %254 %265 %260 @@ -457,7 +457,7 @@ OpSelectionMerge %268 None OpBranchConditional %266 %267 %268 %267 = OpLabel OpStore %271 %270 -%272 = OpFunctionCall %bool %takes_int4 %271 +%272 = OpFunctionCall %bool %takes_int4_bi4 %271 OpBranch %268 %268 = OpLabel %273 = OpPhi %bool %false %261 %272 %267 diff --git a/tests/sksl/shared/FunctionPrototype.asm.frag b/tests/sksl/shared/FunctionPrototype.asm.frag index f10ae21e0c..519b55298d 100644 --- a/tests/sksl/shared/FunctionPrototype.asm.frag +++ b/tests/sksl/shared/FunctionPrototype.asm.frag @@ -1,13 +1,13 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpDecorate %sk_FragColor RelaxedPrecision OpDecorate %sk_FragColor Location 0 @@ -35,7 +35,7 @@ OpDecorate %24 RelaxedPrecision %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float %int = OpTypeInt 32 1 %int_0 = OpConstant %int 0 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/FunctionReturnTypeMatch.asm.frag b/tests/sksl/shared/FunctionReturnTypeMatch.asm.frag index df2d62f7bf..a982a8769a 100644 --- a/tests/sksl/shared/FunctionReturnTypeMatch.asm.frag +++ b/tests/sksl/shared/FunctionReturnTypeMatch.asm.frag @@ -1,35 +1,35 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" -OpName %returns_float2 "returns_float2" -OpName %returns_float3 "returns_float3" -OpName %returns_float4 "returns_float4" -OpName %returns_float2x2 "returns_float2x2" -OpName %returns_float3x3 "returns_float3x3" -OpName %returns_float4x4 "returns_float4x4" -OpName %returns_half "returns_half" -OpName %returns_half2 "returns_half2" -OpName %returns_half3 "returns_half3" -OpName %returns_half4 "returns_half4" -OpName %returns_half2x2 "returns_half2x2" -OpName %returns_half3x3 "returns_half3x3" -OpName %returns_half4x4 "returns_half4x4" -OpName %returns_bool "returns_bool" -OpName %returns_bool2 "returns_bool2" -OpName %returns_bool3 "returns_bool3" -OpName %returns_bool4 "returns_bool4" -OpName %returns_int "returns_int" -OpName %returns_int2 "returns_int2" -OpName %returns_int3 "returns_int3" -OpName %returns_int4 "returns_int4" +OpName %_entrypoint_v "_entrypoint_v" +OpName %returns_float2_f2 "returns_float2_f2" +OpName %returns_float3_f3 "returns_float3_f3" +OpName %returns_float4_f4 "returns_float4_f4" +OpName %returns_float2x2_f22 "returns_float2x2_f22" +OpName %returns_float3x3_f33 "returns_float3x3_f33" +OpName %returns_float4x4_f44 "returns_float4x4_f44" +OpName %returns_half_h "returns_half_h" +OpName %returns_half2_h2 "returns_half2_h2" +OpName %returns_half3_h3 "returns_half3_h3" +OpName %returns_half4_h4 "returns_half4_h4" +OpName %returns_half2x2_h22 "returns_half2x2_h22" +OpName %returns_half3x3_h33 "returns_half3x3_h33" +OpName %returns_half4x4_h44 "returns_half4x4_h44" +OpName %returns_bool_b "returns_bool_b" +OpName %returns_bool2_b2 "returns_bool2_b2" +OpName %returns_bool3_b3 "returns_bool3_b3" +OpName %returns_bool4_b4 "returns_bool4_b4" +OpName %returns_int_i "returns_int_i" +OpName %returns_int2_i2 "returns_int2_i2" +OpName %returns_int3_i3 "returns_int3_i3" +OpName %returns_int4_i4 "returns_int4_i4" OpName %main "main" OpName %x1 "x1" OpName %x2 "x2" @@ -178,32 +178,32 @@ OpDecorate %421 RelaxedPrecision %false = OpConstantFalse %bool %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float %int_0 = OpConstant %int 0 -%_entrypoint = OpFunction %void None %36 +%_entrypoint_v = OpFunction %void None %36 %37 = OpLabel %38 = OpFunctionCall %v4float %main OpStore %sk_FragColor %38 OpReturn OpFunctionEnd -%returns_float2 = OpFunction %v2float None %40 +%returns_float2_f2 = OpFunction %v2float None %40 %41 = OpLabel OpReturnValue %43 OpFunctionEnd -%returns_float3 = OpFunction %v3float None %45 +%returns_float3_f3 = OpFunction %v3float None %45 %46 = OpLabel OpReturnValue %48 OpFunctionEnd -%returns_float4 = OpFunction %v4float None %49 +%returns_float4_f4 = OpFunction %v4float None %49 %50 = OpLabel OpReturnValue %52 OpFunctionEnd -%returns_float2x2 = OpFunction %mat2v2float None %54 +%returns_float2x2_f22 = OpFunction %mat2v2float None %54 %55 = OpLabel %58 = OpCompositeConstruct %v2float %float_2 %float_0 %59 = OpCompositeConstruct %v2float %float_0 %float_2 %56 = OpCompositeConstruct %mat2v2float %58 %59 OpReturnValue %56 OpFunctionEnd -%returns_float3x3 = OpFunction %mat3v3float None %61 +%returns_float3x3_f33 = OpFunction %mat3v3float None %61 %62 = OpLabel %64 = OpCompositeConstruct %v3float %float_3 %float_0 %float_0 %65 = OpCompositeConstruct %v3float %float_0 %float_3 %float_0 @@ -211,7 +211,7 @@ OpFunctionEnd %63 = OpCompositeConstruct %mat3v3float %64 %65 %66 OpReturnValue %63 OpFunctionEnd -%returns_float4x4 = OpFunction %mat4v4float None %68 +%returns_float4x4_f44 = OpFunction %mat4v4float None %68 %69 = OpLabel %71 = OpCompositeConstruct %v4float %float_4 %float_0 %float_0 %float_0 %72 = OpCompositeConstruct %v4float %float_0 %float_4 %float_0 %float_0 @@ -220,30 +220,30 @@ OpFunctionEnd %70 = OpCompositeConstruct %mat4v4float %71 %72 %73 %74 OpReturnValue %70 OpFunctionEnd -%returns_half = OpFunction %float None %75 +%returns_half_h = OpFunction %float None %75 %76 = OpLabel OpReturnValue %float_1 OpFunctionEnd -%returns_half2 = OpFunction %v2float None %40 +%returns_half2_h2 = OpFunction %v2float None %40 %78 = OpLabel OpReturnValue %43 OpFunctionEnd -%returns_half3 = OpFunction %v3float None %45 +%returns_half3_h3 = OpFunction %v3float None %45 %79 = OpLabel OpReturnValue %48 OpFunctionEnd -%returns_half4 = OpFunction %v4float None %49 +%returns_half4_h4 = OpFunction %v4float None %49 %80 = OpLabel OpReturnValue %52 OpFunctionEnd -%returns_half2x2 = OpFunction %mat2v2float None %54 +%returns_half2x2_h22 = OpFunction %mat2v2float None %54 %81 = OpLabel %83 = OpCompositeConstruct %v2float %float_2 %float_0 %84 = OpCompositeConstruct %v2float %float_0 %float_2 %82 = OpCompositeConstruct %mat2v2float %83 %84 OpReturnValue %82 OpFunctionEnd -%returns_half3x3 = OpFunction %mat3v3float None %61 +%returns_half3x3_h33 = OpFunction %mat3v3float None %61 %85 = OpLabel %87 = OpCompositeConstruct %v3float %float_3 %float_0 %float_0 %88 = OpCompositeConstruct %v3float %float_0 %float_3 %float_0 @@ -251,7 +251,7 @@ OpFunctionEnd %86 = OpCompositeConstruct %mat3v3float %87 %88 %89 OpReturnValue %86 OpFunctionEnd -%returns_half4x4 = OpFunction %mat4v4float None %68 +%returns_half4x4_h44 = OpFunction %mat4v4float None %68 %90 = OpLabel %92 = OpCompositeConstruct %v4float %float_4 %float_0 %float_0 %float_0 %93 = OpCompositeConstruct %v4float %float_0 %float_4 %float_0 %float_0 @@ -260,35 +260,35 @@ OpFunctionEnd %91 = OpCompositeConstruct %mat4v4float %92 %93 %94 %95 OpReturnValue %91 OpFunctionEnd -%returns_bool = OpFunction %bool None %96 +%returns_bool_b = OpFunction %bool None %96 %97 = OpLabel OpReturnValue %true OpFunctionEnd -%returns_bool2 = OpFunction %v2bool None %100 +%returns_bool2_b2 = OpFunction %v2bool None %100 %101 = OpLabel OpReturnValue %102 OpFunctionEnd -%returns_bool3 = OpFunction %v3bool None %104 +%returns_bool3_b3 = OpFunction %v3bool None %104 %105 = OpLabel OpReturnValue %106 OpFunctionEnd -%returns_bool4 = OpFunction %v4bool None %108 +%returns_bool4_b4 = OpFunction %v4bool None %108 %109 = OpLabel OpReturnValue %110 OpFunctionEnd -%returns_int = OpFunction %int None %112 +%returns_int_i = OpFunction %int None %112 %113 = OpLabel OpReturnValue %int_1 OpFunctionEnd -%returns_int2 = OpFunction %v2int None %116 +%returns_int2_i2 = OpFunction %v2int None %116 %117 = OpLabel OpReturnValue %119 OpFunctionEnd -%returns_int3 = OpFunction %v3int None %121 +%returns_int3_i3 = OpFunction %v3int None %121 %122 = OpLabel OpReturnValue %124 OpFunctionEnd -%returns_int4 = OpFunction %v4int None %126 +%returns_int4_i4 = OpFunction %v4int None %126 %127 = OpLabel OpReturnValue %129 OpFunctionEnd @@ -369,7 +369,7 @@ OpSelectionMerge %196 None OpBranchConditional %194 %195 %196 %195 = OpLabel %197 = OpLoad %v2float %x2 -%198 = OpFunctionCall %v2float %returns_float2 +%198 = OpFunctionCall %v2float %returns_float2_f2 %199 = OpFOrdEqual %v2bool %197 %198 %200 = OpAll %bool %199 OpBranch %196 @@ -379,7 +379,7 @@ OpSelectionMerge %203 None OpBranchConditional %201 %202 %203 %202 = OpLabel %204 = OpLoad %v3float %x3 -%205 = OpFunctionCall %v3float %returns_float3 +%205 = OpFunctionCall %v3float %returns_float3_f3 %206 = OpFOrdEqual %v3bool %204 %205 %207 = OpAll %bool %206 OpBranch %203 @@ -389,7 +389,7 @@ OpSelectionMerge %210 None OpBranchConditional %208 %209 %210 %209 = OpLabel %211 = OpLoad %v4float %x4 -%212 = OpFunctionCall %v4float %returns_float4 +%212 = OpFunctionCall %v4float %returns_float4_f4 %213 = OpFOrdEqual %v4bool %211 %212 %214 = OpAll %bool %213 OpBranch %210 @@ -399,7 +399,7 @@ OpSelectionMerge %217 None OpBranchConditional %215 %216 %217 %216 = OpLabel %218 = OpLoad %mat2v2float %x5 -%219 = OpFunctionCall %mat2v2float %returns_float2x2 +%219 = OpFunctionCall %mat2v2float %returns_float2x2_f22 %220 = OpCompositeExtract %v2float %218 0 %221 = OpCompositeExtract %v2float %219 0 %222 = OpFOrdEqual %v2bool %220 %221 @@ -416,7 +416,7 @@ OpSelectionMerge %231 None OpBranchConditional %229 %230 %231 %230 = OpLabel %232 = OpLoad %mat3v3float %x6 -%233 = OpFunctionCall %mat3v3float %returns_float3x3 +%233 = OpFunctionCall %mat3v3float %returns_float3x3_f33 %234 = OpCompositeExtract %v3float %232 0 %235 = OpCompositeExtract %v3float %233 0 %236 = OpFOrdEqual %v3bool %234 %235 @@ -438,7 +438,7 @@ OpSelectionMerge %250 None OpBranchConditional %248 %249 %250 %249 = OpLabel %251 = OpLoad %mat4v4float %x7 -%252 = OpFunctionCall %mat4v4float %returns_float4x4 +%252 = OpFunctionCall %mat4v4float %returns_float4x4_f44 %253 = OpCompositeExtract %v4float %251 0 %254 = OpCompositeExtract %v4float %252 0 %255 = OpFOrdEqual %v4bool %253 %254 @@ -465,7 +465,7 @@ OpSelectionMerge %274 None OpBranchConditional %272 %273 %274 %273 = OpLabel %275 = OpLoad %float %x8 -%276 = OpFunctionCall %float %returns_half +%276 = OpFunctionCall %float %returns_half_h %277 = OpFOrdEqual %bool %275 %276 OpBranch %274 %274 = OpLabel @@ -474,7 +474,7 @@ OpSelectionMerge %280 None OpBranchConditional %278 %279 %280 %279 = OpLabel %281 = OpLoad %v2float %x9 -%282 = OpFunctionCall %v2float %returns_half2 +%282 = OpFunctionCall %v2float %returns_half2_h2 %283 = OpFOrdEqual %v2bool %281 %282 %284 = OpAll %bool %283 OpBranch %280 @@ -484,7 +484,7 @@ OpSelectionMerge %287 None OpBranchConditional %285 %286 %287 %286 = OpLabel %288 = OpLoad %v3float %x10 -%289 = OpFunctionCall %v3float %returns_half3 +%289 = OpFunctionCall %v3float %returns_half3_h3 %290 = OpFOrdEqual %v3bool %288 %289 %291 = OpAll %bool %290 OpBranch %287 @@ -494,7 +494,7 @@ OpSelectionMerge %294 None OpBranchConditional %292 %293 %294 %293 = OpLabel %295 = OpLoad %v4float %x11 -%296 = OpFunctionCall %v4float %returns_half4 +%296 = OpFunctionCall %v4float %returns_half4_h4 %297 = OpFOrdEqual %v4bool %295 %296 %298 = OpAll %bool %297 OpBranch %294 @@ -504,7 +504,7 @@ OpSelectionMerge %301 None OpBranchConditional %299 %300 %301 %300 = OpLabel %302 = OpLoad %mat2v2float %x12 -%303 = OpFunctionCall %mat2v2float %returns_half2x2 +%303 = OpFunctionCall %mat2v2float %returns_half2x2_h22 %304 = OpCompositeExtract %v2float %302 0 %305 = OpCompositeExtract %v2float %303 0 %306 = OpFOrdEqual %v2bool %304 %305 @@ -521,7 +521,7 @@ OpSelectionMerge %315 None OpBranchConditional %313 %314 %315 %314 = OpLabel %316 = OpLoad %mat3v3float %x13 -%317 = OpFunctionCall %mat3v3float %returns_half3x3 +%317 = OpFunctionCall %mat3v3float %returns_half3x3_h33 %318 = OpCompositeExtract %v3float %316 0 %319 = OpCompositeExtract %v3float %317 0 %320 = OpFOrdEqual %v3bool %318 %319 @@ -543,7 +543,7 @@ OpSelectionMerge %334 None OpBranchConditional %332 %333 %334 %333 = OpLabel %335 = OpLoad %mat4v4float %x14 -%336 = OpFunctionCall %mat4v4float %returns_half4x4 +%336 = OpFunctionCall %mat4v4float %returns_half4x4_h44 %337 = OpCompositeExtract %v4float %335 0 %338 = OpCompositeExtract %v4float %336 0 %339 = OpFOrdEqual %v4bool %337 %338 @@ -570,7 +570,7 @@ OpSelectionMerge %358 None OpBranchConditional %356 %357 %358 %357 = OpLabel %359 = OpLoad %bool %x15 -%360 = OpFunctionCall %bool %returns_bool +%360 = OpFunctionCall %bool %returns_bool_b %361 = OpLogicalEqual %bool %359 %360 OpBranch %358 %358 = OpLabel @@ -579,7 +579,7 @@ OpSelectionMerge %364 None OpBranchConditional %362 %363 %364 %363 = OpLabel %365 = OpLoad %v2bool %x16 -%366 = OpFunctionCall %v2bool %returns_bool2 +%366 = OpFunctionCall %v2bool %returns_bool2_b2 %367 = OpLogicalEqual %v2bool %365 %366 %368 = OpAll %bool %367 OpBranch %364 @@ -589,7 +589,7 @@ OpSelectionMerge %371 None OpBranchConditional %369 %370 %371 %370 = OpLabel %372 = OpLoad %v3bool %x17 -%373 = OpFunctionCall %v3bool %returns_bool3 +%373 = OpFunctionCall %v3bool %returns_bool3_b3 %374 = OpLogicalEqual %v3bool %372 %373 %375 = OpAll %bool %374 OpBranch %371 @@ -599,7 +599,7 @@ OpSelectionMerge %378 None OpBranchConditional %376 %377 %378 %377 = OpLabel %379 = OpLoad %v4bool %x18 -%380 = OpFunctionCall %v4bool %returns_bool4 +%380 = OpFunctionCall %v4bool %returns_bool4_b4 %381 = OpLogicalEqual %v4bool %379 %380 %382 = OpAll %bool %381 OpBranch %378 @@ -609,7 +609,7 @@ OpSelectionMerge %385 None OpBranchConditional %383 %384 %385 %384 = OpLabel %386 = OpLoad %int %x19 -%387 = OpFunctionCall %int %returns_int +%387 = OpFunctionCall %int %returns_int_i %388 = OpIEqual %bool %386 %387 OpBranch %385 %385 = OpLabel @@ -618,7 +618,7 @@ OpSelectionMerge %391 None OpBranchConditional %389 %390 %391 %390 = OpLabel %392 = OpLoad %v2int %x20 -%393 = OpFunctionCall %v2int %returns_int2 +%393 = OpFunctionCall %v2int %returns_int2_i2 %394 = OpIEqual %v2bool %392 %393 %395 = OpAll %bool %394 OpBranch %391 @@ -628,7 +628,7 @@ OpSelectionMerge %398 None OpBranchConditional %396 %397 %398 %397 = OpLabel %399 = OpLoad %v3int %x21 -%400 = OpFunctionCall %v3int %returns_int3 +%400 = OpFunctionCall %v3int %returns_int3_i3 %401 = OpIEqual %v3bool %399 %400 %402 = OpAll %bool %401 OpBranch %398 @@ -638,7 +638,7 @@ OpSelectionMerge %405 None OpBranchConditional %403 %404 %405 %404 = OpLabel %406 = OpLoad %v4int %x22 -%407 = OpFunctionCall %v4int %returns_int4 +%407 = OpFunctionCall %v4int %returns_int4_i4 %408 = OpIEqual %v4bool %406 %407 %409 = OpAll %bool %408 OpBranch %405 diff --git a/tests/sksl/shared/Functions.asm.frag b/tests/sksl/shared/Functions.asm.frag index 063a3ec03e..d59b0ebf2f 100644 --- a/tests/sksl/shared/Functions.asm.frag +++ b/tests/sksl/shared/Functions.asm.frag @@ -1,16 +1,16 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" -OpName %foo "foo" -OpName %bar "bar" +OpName %_entrypoint_v "_entrypoint_v" +OpName %foo_ff2 "foo_ff2" +OpName %bar_vf "bar_vf" OpName %y "y" OpName %main "main" OpName %x "x" @@ -58,13 +58,13 @@ OpDecorate %72 RelaxedPrecision %float_200 = OpConstant %float 200 %_ptr_Function_v4float = OpTypePointer Function %v4float %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float -%_entrypoint = OpFunction %void None %17 +%_entrypoint_v = OpFunction %void None %17 %18 = OpLabel %19 = OpFunctionCall %v4float %main OpStore %sk_FragColor %19 OpReturn OpFunctionEnd -%foo = OpFunction %float None %21 +%foo_ff2 = OpFunction %float None %21 %23 = OpFunctionParameter %_ptr_Function_v2float %24 = OpLabel %25 = OpLoad %v2float %23 @@ -74,7 +74,7 @@ OpFunctionEnd %29 = OpFMul %float %26 %28 OpReturnValue %29 OpFunctionEnd -%bar = OpFunction %void None %30 +%bar_vf = OpFunction %void None %30 %32 = OpFunctionParameter %_ptr_Function_float %33 = OpLabel %y = OpVariable %_ptr_Function__arr_float_int_2 Function @@ -92,7 +92,7 @@ OpStore %46 %44 %50 = OpLoad %float %49 %51 = OpCompositeConstruct %v2float %48 %50 OpStore %52 %51 -%53 = OpFunctionCall %float %foo %52 +%53 = OpFunctionCall %float %foo_ff2 %52 OpStore %32 %53 OpReturn OpFunctionEnd @@ -101,7 +101,7 @@ OpFunctionEnd %x = OpVariable %_ptr_Function_float Function %62 = OpVariable %_ptr_Function_v4float Function OpStore %x %float_10 -%58 = OpFunctionCall %void %bar %x +%58 = OpFunctionCall %void %bar_vf %x %59 = OpLoad %float %x %61 = OpFOrdEqual %bool %59 %float_200 OpSelectionMerge %66 None diff --git a/tests/sksl/shared/GaussianBlur.asm.frag b/tests/sksl/shared/GaussianBlur.asm.frag index 4732b36b9c..f8feaab483 100644 --- a/tests/sksl/shared/GaussianBlur.asm.frag +++ b/tests/sksl/shared/GaussianBlur.asm.frag @@ -15,7 +15,7 @@ OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %uTextureSampler_0_Stage1 "uTextureSampler_0_Stage1" OpName %vLocalCoord_Stage0 "vLocalCoord_Stage0" -OpName %MatrixEffect_Stage1_c0_c0 "MatrixEffect_Stage1_c0_c0" +OpName %MatrixEffect_Stage1_c0_c0_h4h4f2 "MatrixEffect_Stage1_c0_c0_h4h4f2" OpName %_1_inCoord "_1_inCoord" OpName %_2_subsetCoord "_2_subsetCoord" OpName %_3_clampedCoord "_3_clampedCoord" @@ -235,7 +235,7 @@ OpDecorate %527 RelaxedPrecision %_ptr_Uniform_v2float = OpTypePointer Uniform %v2float %119 = OpConstantComposite %v2float %float_0 %float_0 %int_2 = OpConstant %int 2 -%MatrixEffect_Stage1_c0_c0 = OpFunction %v4float None %26 +%MatrixEffect_Stage1_c0_c0_h4h4f2 = OpFunction %v4float None %26 %29 = OpFunctionParameter %_ptr_Function_v4float %30 = OpFunctionParameter %_ptr_Function_v2float %31 = OpLabel @@ -385,7 +385,7 @@ OpStore %_8_coordSampled %120 OpStore %123 %122 %124 = OpLoad %v2float %_8_coordSampled OpStore %125 %124 -%126 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %123 %125 +%126 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %123 %125 %128 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_0 %129 = OpLoad %v4float %128 %130 = OpCompositeExtract %float %129 0 @@ -404,7 +404,7 @@ OpStore %_8_coordSampled %137 OpStore %140 %139 %141 = OpLoad %v2float %_8_coordSampled OpStore %142 %141 -%143 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %140 %142 +%143 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %140 %142 %144 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_0 %145 = OpLoad %v4float %144 %146 = OpCompositeExtract %float %145 1 @@ -423,7 +423,7 @@ OpStore %_8_coordSampled %153 OpStore %156 %155 %157 = OpLoad %v2float %_8_coordSampled OpStore %158 %157 -%159 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %156 %158 +%159 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %156 %158 %160 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_0 %161 = OpLoad %v4float %160 %162 = OpCompositeExtract %float %161 2 @@ -442,7 +442,7 @@ OpStore %_8_coordSampled %169 OpStore %172 %171 %173 = OpLoad %v2float %_8_coordSampled OpStore %174 %173 -%175 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %172 %174 +%175 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %172 %174 %176 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_0 %177 = OpLoad %v4float %176 %178 = OpCompositeExtract %float %177 3 @@ -461,7 +461,7 @@ OpStore %_8_coordSampled %185 OpStore %188 %187 %189 = OpLoad %v2float %_8_coordSampled OpStore %190 %189 -%191 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %188 %190 +%191 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %188 %190 %192 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_1 %193 = OpLoad %v4float %192 %194 = OpCompositeExtract %float %193 0 @@ -480,7 +480,7 @@ OpStore %_8_coordSampled %201 OpStore %204 %203 %205 = OpLoad %v2float %_8_coordSampled OpStore %206 %205 -%207 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %204 %206 +%207 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %204 %206 %208 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_1 %209 = OpLoad %v4float %208 %210 = OpCompositeExtract %float %209 1 @@ -499,7 +499,7 @@ OpStore %_8_coordSampled %217 OpStore %220 %219 %221 = OpLoad %v2float %_8_coordSampled OpStore %222 %221 -%223 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %220 %222 +%223 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %220 %222 %224 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_1 %225 = OpLoad %v4float %224 %226 = OpCompositeExtract %float %225 2 @@ -518,7 +518,7 @@ OpStore %_8_coordSampled %233 OpStore %236 %235 %237 = OpLoad %v2float %_8_coordSampled OpStore %238 %237 -%239 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %236 %238 +%239 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %236 %238 %240 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_1 %241 = OpLoad %v4float %240 %242 = OpCompositeExtract %float %241 3 @@ -537,7 +537,7 @@ OpStore %_8_coordSampled %249 OpStore %252 %251 %253 = OpLoad %v2float %_8_coordSampled OpStore %254 %253 -%255 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %252 %254 +%255 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %252 %254 %256 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_2 %257 = OpLoad %v4float %256 %258 = OpCompositeExtract %float %257 0 @@ -556,7 +556,7 @@ OpStore %_8_coordSampled %265 OpStore %268 %267 %269 = OpLoad %v2float %_8_coordSampled OpStore %270 %269 -%271 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %268 %270 +%271 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %268 %270 %272 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_2 %273 = OpLoad %v4float %272 %274 = OpCompositeExtract %float %273 1 @@ -575,7 +575,7 @@ OpStore %_8_coordSampled %281 OpStore %284 %283 %285 = OpLoad %v2float %_8_coordSampled OpStore %286 %285 -%287 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %284 %286 +%287 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %284 %286 %288 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_2 %289 = OpLoad %v4float %288 %290 = OpCompositeExtract %float %289 2 @@ -594,7 +594,7 @@ OpStore %_8_coordSampled %297 OpStore %300 %299 %301 = OpLoad %v2float %_8_coordSampled OpStore %302 %301 -%303 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %300 %302 +%303 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %300 %302 %304 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_2 %305 = OpLoad %v4float %304 %306 = OpCompositeExtract %float %305 3 @@ -613,7 +613,7 @@ OpStore %_8_coordSampled %313 OpStore %316 %315 %317 = OpLoad %v2float %_8_coordSampled OpStore %318 %317 -%319 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %316 %318 +%319 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %316 %318 %320 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_3 %321 = OpLoad %v4float %320 %322 = OpCompositeExtract %float %321 0 @@ -632,7 +632,7 @@ OpStore %_8_coordSampled %329 OpStore %332 %331 %333 = OpLoad %v2float %_8_coordSampled OpStore %334 %333 -%335 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %332 %334 +%335 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %332 %334 %336 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_3 %337 = OpLoad %v4float %336 %338 = OpCompositeExtract %float %337 1 @@ -651,7 +651,7 @@ OpStore %_8_coordSampled %345 OpStore %348 %347 %349 = OpLoad %v2float %_8_coordSampled OpStore %350 %349 -%351 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %348 %350 +%351 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %348 %350 %352 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_3 %353 = OpLoad %v4float %352 %354 = OpCompositeExtract %float %353 2 @@ -670,7 +670,7 @@ OpStore %_8_coordSampled %361 OpStore %364 %363 %365 = OpLoad %v2float %_8_coordSampled OpStore %366 %365 -%367 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %364 %366 +%367 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %364 %366 %368 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_3 %369 = OpLoad %v4float %368 %370 = OpCompositeExtract %float %369 3 @@ -689,7 +689,7 @@ OpStore %_8_coordSampled %377 OpStore %380 %379 %381 = OpLoad %v2float %_8_coordSampled OpStore %382 %381 -%383 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %380 %382 +%383 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %380 %382 %384 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_4 %385 = OpLoad %v4float %384 %386 = OpCompositeExtract %float %385 0 @@ -708,7 +708,7 @@ OpStore %_8_coordSampled %393 OpStore %396 %395 %397 = OpLoad %v2float %_8_coordSampled OpStore %398 %397 -%399 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %396 %398 +%399 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %396 %398 %400 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_4 %401 = OpLoad %v4float %400 %402 = OpCompositeExtract %float %401 1 @@ -727,7 +727,7 @@ OpStore %_8_coordSampled %409 OpStore %412 %411 %413 = OpLoad %v2float %_8_coordSampled OpStore %414 %413 -%415 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %412 %414 +%415 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %412 %414 %416 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_4 %417 = OpLoad %v4float %416 %418 = OpCompositeExtract %float %417 2 @@ -746,7 +746,7 @@ OpStore %_8_coordSampled %425 OpStore %428 %427 %429 = OpLoad %v2float %_8_coordSampled OpStore %430 %429 -%431 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %428 %430 +%431 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %428 %430 %432 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_4 %433 = OpLoad %v4float %432 %434 = OpCompositeExtract %float %433 3 @@ -765,7 +765,7 @@ OpStore %_8_coordSampled %441 OpStore %444 %443 %445 = OpLoad %v2float %_8_coordSampled OpStore %446 %445 -%447 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %444 %446 +%447 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %444 %446 %448 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_5 %449 = OpLoad %v4float %448 %450 = OpCompositeExtract %float %449 0 @@ -784,7 +784,7 @@ OpStore %_8_coordSampled %457 OpStore %460 %459 %461 = OpLoad %v2float %_8_coordSampled OpStore %462 %461 -%463 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %460 %462 +%463 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %460 %462 %464 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_5 %465 = OpLoad %v4float %464 %466 = OpCompositeExtract %float %465 1 @@ -803,7 +803,7 @@ OpStore %_8_coordSampled %473 OpStore %476 %475 %477 = OpLoad %v2float %_8_coordSampled OpStore %478 %477 -%479 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %476 %478 +%479 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %476 %478 %480 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_5 %481 = OpLoad %v4float %480 %482 = OpCompositeExtract %float %481 2 @@ -822,7 +822,7 @@ OpStore %_8_coordSampled %489 OpStore %492 %491 %493 = OpLoad %v2float %_8_coordSampled OpStore %494 %493 -%495 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %492 %494 +%495 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %492 %494 %496 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_5 %497 = OpLoad %v4float %496 %498 = OpCompositeExtract %float %497 3 @@ -841,7 +841,7 @@ OpStore %_8_coordSampled %505 OpStore %508 %507 %509 = OpLoad %v2float %_8_coordSampled OpStore %510 %509 -%511 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0 %508 %510 +%511 = OpFunctionCall %v4float %MatrixEffect_Stage1_c0_c0_h4h4f2 %508 %510 %512 = OpAccessChain %_ptr_Uniform_v4float %4 %int_2 %int_6 %513 = OpLoad %v4float %512 %514 = OpCompositeExtract %float %513 0 diff --git a/tests/sksl/shared/GeometricIntrinsics.asm.frag b/tests/sksl/shared/GeometricIntrinsics.asm.frag index 7deb17ca56..15067f806c 100644 --- a/tests/sksl/shared/GeometricIntrinsics.asm.frag +++ b/tests/sksl/shared/GeometricIntrinsics.asm.frag @@ -1,13 +1,13 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %_0_x "_0_x" OpName %_1_x "_1_x" @@ -46,7 +46,7 @@ OpDecorate %54 RelaxedPrecision %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float %int = OpTypeInt 32 1 %int_0 = OpConstant %int 0 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/HelloWorld.asm.frag b/tests/sksl/shared/HelloWorld.asm.frag index 2701564c6e..2f9f7d73f7 100644 --- a/tests/sksl/shared/HelloWorld.asm.frag +++ b/tests/sksl/shared/HelloWorld.asm.frag @@ -1,11 +1,11 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpDecorate %sk_FragColor RelaxedPrecision OpDecorate %sk_FragColor Location 0 @@ -24,7 +24,7 @@ OpDecorate %sk_Clockwise BuiltIn FrontFacing %float_0 = OpConstant %float 0 %float_1 = OpConstant %float 1 %19 = OpConstantComposite %v4float %float_0 %float_1 %float_0 %float_1 -%_entrypoint = OpFunction %void None %12 +%_entrypoint_v = OpFunction %void None %12 %13 = OpLabel %14 = OpFunctionCall %v4float %main OpStore %sk_FragColor %14 diff --git a/tests/sksl/shared/Hex.asm.frag b/tests/sksl/shared/Hex.asm.frag index 84aa88770d..9f568c7ab0 100644 --- a/tests/sksl/shared/Hex.asm.frag +++ b/tests/sksl/shared/Hex.asm.frag @@ -1,13 +1,13 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %i1 "i1" OpName %i2 "i2" @@ -46,7 +46,7 @@ OpDecorate %45 RelaxedPrecision %int_n32766 = OpConstant %int -32766 %int_19132 = OpConstant %int 19132 %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/HexUnsigned.asm.frag b/tests/sksl/shared/HexUnsigned.asm.frag index 281531ceb3..6589c0044b 100644 --- a/tests/sksl/shared/HexUnsigned.asm.frag +++ b/tests/sksl/shared/HexUnsigned.asm.frag @@ -1,13 +1,13 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %u1 "u1" OpName %u2 "u2" @@ -50,7 +50,7 @@ OpDecorate %47 RelaxedPrecision %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float %int = OpTypeInt 32 1 %int_0 = OpConstant %int 0 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/Matrices.asm.frag b/tests/sksl/shared/Matrices.asm.frag index adc690070b..423e293a75 100644 --- a/tests/sksl/shared/Matrices.asm.frag +++ b/tests/sksl/shared/Matrices.asm.frag @@ -1,15 +1,15 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" -OpName %test_half "test_half" +OpName %_entrypoint_v "_entrypoint_v" +OpName %test_half_b "test_half_b" OpName %m1 "m1" OpName %m3 "m3" OpName %m4 "m4" @@ -101,13 +101,13 @@ OpDecorate %173 RelaxedPrecision %_ptr_Function_v4float = OpTypePointer Function %v4float %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float %int_1 = OpConstant %int 1 -%_entrypoint = OpFunction %void None %16 +%_entrypoint_v = OpFunction %void None %16 %17 = OpLabel %18 = OpFunctionCall %v4float %main OpStore %sk_FragColor %18 OpReturn OpFunctionEnd -%test_half = OpFunction %bool None %19 +%test_half_b = OpFunction %bool None %19 %20 = OpLabel %m1 = OpVariable %_ptr_Function_mat2v2float Function %m3 = OpVariable %_ptr_Function_mat2v2float Function @@ -257,7 +257,7 @@ OpStore %_11_m11 %156 OpSelectionMerge %159 None OpBranchConditional %true %158 %159 %158 = OpLabel -%160 = OpFunctionCall %bool %test_half +%160 = OpFunctionCall %bool %test_half_b OpBranch %159 %159 = OpLabel %161 = OpPhi %bool %false %96 %160 %158 diff --git a/tests/sksl/shared/MatrixEquality.asm.frag b/tests/sksl/shared/MatrixEquality.asm.frag index 343d9817ea..0c14bc742b 100644 --- a/tests/sksl/shared/MatrixEquality.asm.frag +++ b/tests/sksl/shared/MatrixEquality.asm.frag @@ -1,8 +1,8 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" @@ -10,7 +10,7 @@ OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" OpMemberName %_UniformBuffer 2 "testMatrix2x2" OpMemberName %_UniformBuffer 3 "testMatrix3x3" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %_0_ok "_0_ok" OpDecorate %sk_FragColor RelaxedPrecision @@ -100,7 +100,7 @@ OpDecorate %143 RelaxedPrecision %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float %int_0 = OpConstant %int 0 %int_1 = OpConstant %int 1 -%_entrypoint = OpFunction %void None %19 +%_entrypoint_v = OpFunction %void None %19 %20 = OpLabel %21 = OpFunctionCall %v4float %main OpStore %sk_FragColor %21 diff --git a/tests/sksl/shared/MultipleAssignments.asm.frag b/tests/sksl/shared/MultipleAssignments.asm.frag index d6cb7b6277..7c88f3af22 100644 --- a/tests/sksl/shared/MultipleAssignments.asm.frag +++ b/tests/sksl/shared/MultipleAssignments.asm.frag @@ -1,11 +1,11 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %x "x" OpName %y "y" @@ -33,7 +33,7 @@ OpDecorate %29 RelaxedPrecision %_ptr_Function_float = OpTypePointer Function %float %float_1 = OpConstant %float 1 %float_0 = OpConstant %float 0 -%_entrypoint = OpFunction %void None %12 +%_entrypoint_v = OpFunction %void None %12 %13 = OpLabel %14 = OpFunctionCall %v4float %main OpStore %sk_FragColor %14 diff --git a/tests/sksl/shared/NegatedVectorLiteral.asm.frag b/tests/sksl/shared/NegatedVectorLiteral.asm.frag index 86a9588c0b..9704c168c9 100644 --- a/tests/sksl/shared/NegatedVectorLiteral.asm.frag +++ b/tests/sksl/shared/NegatedVectorLiteral.asm.frag @@ -1,15 +1,15 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" -OpName %test_int "test_int" +OpName %_entrypoint_v "_entrypoint_v" +OpName %test_int_b "test_int_b" OpName %one "one" OpName %two "two" OpName %result "result" @@ -71,13 +71,13 @@ OpDecorate %145 RelaxedPrecision %false = OpConstantFalse %bool %float_0 = OpConstant %float 0 %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float -%_entrypoint = OpFunction %void None %16 +%_entrypoint_v = OpFunction %void None %16 %17 = OpLabel %18 = OpFunctionCall %v4float %main OpStore %sk_FragColor %18 OpReturn OpFunctionEnd -%test_int = OpFunction %bool None %19 +%test_int_b = OpFunction %bool None %19 %20 = OpLabel %one = OpVariable %_ptr_Function_int Function %two = OpVariable %_ptr_Function_int Function @@ -185,7 +185,7 @@ OpStore %117 %116 OpSelectionMerge %133 None OpBranchConditional %130 %132 %133 %132 = OpLabel -%134 = OpFunctionCall %bool %test_int +%134 = OpFunctionCall %bool %test_int_b OpBranch %133 %133 = OpLabel %135 = OpPhi %bool %false %76 %134 %132 diff --git a/tests/sksl/shared/NumberCasts.asm.frag b/tests/sksl/shared/NumberCasts.asm.frag index 8526a23729..45d7dfbea1 100644 --- a/tests/sksl/shared/NumberCasts.asm.frag +++ b/tests/sksl/shared/NumberCasts.asm.frag @@ -1,11 +1,11 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %B "B" OpName %F "F" @@ -45,7 +45,7 @@ OpDecorate %64 RelaxedPrecision %_ptr_Function_v3int = OpTypePointer Function %v3int %_ptr_Function_int = OpTypePointer Function %int %false = OpConstantFalse %bool -%_entrypoint = OpFunction %void None %12 +%_entrypoint_v = OpFunction %void None %12 %13 = OpLabel %14 = OpFunctionCall %v4float %main OpStore %sk_FragColor %14 diff --git a/tests/sksl/shared/OperatorsES2.asm.frag b/tests/sksl/shared/OperatorsES2.asm.frag index 422f6f8d01..1422b90a04 100644 --- a/tests/sksl/shared/OperatorsES2.asm.frag +++ b/tests/sksl/shared/OperatorsES2.asm.frag @@ -1,14 +1,14 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %x "x" OpName %y "y" @@ -77,7 +77,7 @@ OpDecorate %147 RelaxedPrecision %_ptr_Function_v4float = OpTypePointer Function %v4float %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float %int_0 = OpConstant %int 0 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/OperatorsES3.asm.frag b/tests/sksl/shared/OperatorsES3.asm.frag index 6d4061c863..8c220e5e11 100644 --- a/tests/sksl/shared/OperatorsES3.asm.frag +++ b/tests/sksl/shared/OperatorsES3.asm.frag @@ -1,14 +1,14 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %x "x" OpName %y "y" @@ -59,7 +59,7 @@ OpDecorate %106 RelaxedPrecision %false = OpConstantFalse %bool %_ptr_Function_v4float = OpTypePointer Function %v4float %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/OutParams.asm.frag b/tests/sksl/shared/OutParams.asm.frag index c6cf6a3810..8d7f56e7bc 100644 --- a/tests/sksl/shared/OutParams.asm.frag +++ b/tests/sksl/shared/OutParams.asm.frag @@ -1,37 +1,37 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" OpMemberName %_UniformBuffer 2 "colorWhite" -OpName %_entrypoint "_entrypoint" -OpName %out_half "out_half" -OpName %out_half2 "out_half2" -OpName %out_half3 "out_half3" -OpName %out_half4 "out_half4" -OpName %out_half2x2 "out_half2x2" -OpName %out_half3x3 "out_half3x3" -OpName %out_half4x4 "out_half4x4" -OpName %out_int "out_int" -OpName %out_int2 "out_int2" -OpName %out_int3 "out_int3" -OpName %out_int4 "out_int4" -OpName %out_float "out_float" -OpName %out_float2 "out_float2" -OpName %out_float3 "out_float3" -OpName %out_float4 "out_float4" -OpName %out_float2x2 "out_float2x2" -OpName %out_float3x3 "out_float3x3" -OpName %out_float4x4 "out_float4x4" -OpName %out_bool "out_bool" -OpName %out_bool2 "out_bool2" -OpName %out_bool3 "out_bool3" -OpName %out_bool4 "out_bool4" +OpName %_entrypoint_v "_entrypoint_v" +OpName %out_half_vh "out_half_vh" +OpName %out_half2_vh2 "out_half2_vh2" +OpName %out_half3_vh3 "out_half3_vh3" +OpName %out_half4_vh4 "out_half4_vh4" +OpName %out_half2x2_vh22 "out_half2x2_vh22" +OpName %out_half3x3_vh33 "out_half3x3_vh33" +OpName %out_half4x4_vh44 "out_half4x4_vh44" +OpName %out_int_vi "out_int_vi" +OpName %out_int2_vi2 "out_int2_vi2" +OpName %out_int3_vi3 "out_int3_vi3" +OpName %out_int4_vi4 "out_int4_vi4" +OpName %out_float_vf "out_float_vf" +OpName %out_float2_vf2 "out_float2_vf2" +OpName %out_float3_vf3 "out_float3_vf3" +OpName %out_float4_vf4 "out_float4_vf4" +OpName %out_float2x2_vf22 "out_float2x2_vf22" +OpName %out_float3x3_vf33 "out_float3x3_vf33" +OpName %out_float4x4_vf44 "out_float4x4_vf44" +OpName %out_bool_vb "out_bool_vb" +OpName %out_bool2_vb2 "out_bool2_vb2" +OpName %out_bool3_vb3 "out_bool3_vb3" +OpName %out_bool4_vb4 "out_bool4_vb4" OpName %main "main" OpName %h "h" OpName %h2 "h2" @@ -209,13 +209,13 @@ OpDecorate %468 RelaxedPrecision %true = OpConstantTrue %bool %false = OpConstantFalse %bool %float_1 = OpConstant %float 1 -%_entrypoint = OpFunction %void None %37 +%_entrypoint_v = OpFunction %void None %37 %38 = OpLabel %39 = OpFunctionCall %v4float %main OpStore %sk_FragColor %39 OpReturn OpFunctionEnd -%out_half = OpFunction %void None %40 +%out_half_vh = OpFunction %void None %40 %42 = OpFunctionParameter %_ptr_Function_float %43 = OpLabel %44 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -224,7 +224,7 @@ OpFunctionEnd OpStore %42 %49 OpReturn OpFunctionEnd -%out_half2 = OpFunction %void None %51 +%out_half2_vh2 = OpFunction %void None %51 %53 = OpFunctionParameter %_ptr_Function_v2float %54 = OpLabel %55 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -234,7 +234,7 @@ OpFunctionEnd OpStore %53 %58 OpReturn OpFunctionEnd -%out_half3 = OpFunction %void None %60 +%out_half3_vh3 = OpFunction %void None %60 %62 = OpFunctionParameter %_ptr_Function_v3float %63 = OpLabel %64 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -244,7 +244,7 @@ OpFunctionEnd OpStore %62 %67 OpReturn OpFunctionEnd -%out_half4 = OpFunction %void None %68 +%out_half4_vh4 = OpFunction %void None %68 %70 = OpFunctionParameter %_ptr_Function_v4float %71 = OpLabel %72 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -254,7 +254,7 @@ OpFunctionEnd OpStore %70 %75 OpReturn OpFunctionEnd -%out_half2x2 = OpFunction %void None %77 +%out_half2x2_vh22 = OpFunction %void None %77 %79 = OpFunctionParameter %_ptr_Function_mat2v2float %80 = OpLabel %81 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -266,7 +266,7 @@ OpFunctionEnd OpStore %79 %84 OpReturn OpFunctionEnd -%out_half3x3 = OpFunction %void None %89 +%out_half3x3_vh33 = OpFunction %void None %89 %91 = OpFunctionParameter %_ptr_Function_mat3v3float %92 = OpLabel %93 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -279,7 +279,7 @@ OpFunctionEnd OpStore %91 %96 OpReturn OpFunctionEnd -%out_half4x4 = OpFunction %void None %101 +%out_half4x4_vh44 = OpFunction %void None %101 %103 = OpFunctionParameter %_ptr_Function_mat4v4float %104 = OpLabel %105 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -293,7 +293,7 @@ OpFunctionEnd OpStore %103 %108 OpReturn OpFunctionEnd -%out_int = OpFunction %void None %113 +%out_int_vi = OpFunction %void None %113 %115 = OpFunctionParameter %_ptr_Function_int %116 = OpLabel %117 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -303,7 +303,7 @@ OpFunctionEnd OpStore %115 %120 OpReturn OpFunctionEnd -%out_int2 = OpFunction %void None %122 +%out_int2_vi2 = OpFunction %void None %122 %124 = OpFunctionParameter %_ptr_Function_v2int %125 = OpLabel %126 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -314,7 +314,7 @@ OpFunctionEnd OpStore %124 %130 OpReturn OpFunctionEnd -%out_int3 = OpFunction %void None %132 +%out_int3_vi3 = OpFunction %void None %132 %134 = OpFunctionParameter %_ptr_Function_v3int %135 = OpLabel %136 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -325,7 +325,7 @@ OpFunctionEnd OpStore %134 %140 OpReturn OpFunctionEnd -%out_int4 = OpFunction %void None %142 +%out_int4_vi4 = OpFunction %void None %142 %144 = OpFunctionParameter %_ptr_Function_v4int %145 = OpLabel %146 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -336,7 +336,7 @@ OpFunctionEnd OpStore %144 %150 OpReturn OpFunctionEnd -%out_float = OpFunction %void None %40 +%out_float_vf = OpFunction %void None %40 %151 = OpFunctionParameter %_ptr_Function_float %152 = OpLabel %153 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -345,7 +345,7 @@ OpFunctionEnd OpStore %151 %155 OpReturn OpFunctionEnd -%out_float2 = OpFunction %void None %51 +%out_float2_vf2 = OpFunction %void None %51 %156 = OpFunctionParameter %_ptr_Function_v2float %157 = OpLabel %158 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -355,7 +355,7 @@ OpFunctionEnd OpStore %156 %161 OpReturn OpFunctionEnd -%out_float3 = OpFunction %void None %60 +%out_float3_vf3 = OpFunction %void None %60 %162 = OpFunctionParameter %_ptr_Function_v3float %163 = OpLabel %164 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -365,7 +365,7 @@ OpFunctionEnd OpStore %162 %167 OpReturn OpFunctionEnd -%out_float4 = OpFunction %void None %68 +%out_float4_vf4 = OpFunction %void None %68 %168 = OpFunctionParameter %_ptr_Function_v4float %169 = OpLabel %170 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -375,7 +375,7 @@ OpFunctionEnd OpStore %168 %173 OpReturn OpFunctionEnd -%out_float2x2 = OpFunction %void None %77 +%out_float2x2_vf22 = OpFunction %void None %77 %174 = OpFunctionParameter %_ptr_Function_mat2v2float %175 = OpLabel %176 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -387,7 +387,7 @@ OpFunctionEnd OpStore %174 %179 OpReturn OpFunctionEnd -%out_float3x3 = OpFunction %void None %89 +%out_float3x3_vf33 = OpFunction %void None %89 %182 = OpFunctionParameter %_ptr_Function_mat3v3float %183 = OpLabel %184 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -400,7 +400,7 @@ OpFunctionEnd OpStore %182 %187 OpReturn OpFunctionEnd -%out_float4x4 = OpFunction %void None %101 +%out_float4x4_vf44 = OpFunction %void None %101 %191 = OpFunctionParameter %_ptr_Function_mat4v4float %192 = OpLabel %193 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -414,7 +414,7 @@ OpFunctionEnd OpStore %191 %196 OpReturn OpFunctionEnd -%out_bool = OpFunction %void None %201 +%out_bool_vb = OpFunction %void None %201 %203 = OpFunctionParameter %_ptr_Function_bool %204 = OpLabel %205 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -424,7 +424,7 @@ OpFunctionEnd OpStore %203 %208 OpReturn OpFunctionEnd -%out_bool2 = OpFunction %void None %210 +%out_bool2_vb2 = OpFunction %void None %210 %212 = OpFunctionParameter %_ptr_Function_v2bool %213 = OpLabel %214 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -435,7 +435,7 @@ OpFunctionEnd OpStore %212 %218 OpReturn OpFunctionEnd -%out_bool3 = OpFunction %void None %220 +%out_bool3_vb3 = OpFunction %void None %220 %222 = OpFunctionParameter %_ptr_Function_v3bool %223 = OpLabel %224 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -446,7 +446,7 @@ OpFunctionEnd OpStore %222 %228 OpReturn OpFunctionEnd -%out_bool4 = OpFunction %void None %230 +%out_bool4_vb4 = OpFunction %void None %230 %232 = OpFunctionParameter %_ptr_Function_v4bool %233 = OpLabel %234 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -496,20 +496,20 @@ OpFunctionEnd %363 = OpVariable %_ptr_Function_bool Function %ok = OpVariable %_ptr_Function_bool Function %460 = OpVariable %_ptr_Function_v4float Function -%242 = OpFunctionCall %void %out_half %h -%244 = OpFunctionCall %void %out_half2 %h2 -%246 = OpFunctionCall %void %out_half3 %h3 -%248 = OpFunctionCall %void %out_half4 %h4 +%242 = OpFunctionCall %void %out_half_vh %h +%244 = OpFunctionCall %void %out_half2_vh2 %h2 +%246 = OpFunctionCall %void %out_half3_vh3 %h3 +%248 = OpFunctionCall %void %out_half4_vh4 %h4 %249 = OpAccessChain %_ptr_Function_float %h3 %int_1 %251 = OpLoad %float %249 OpStore %252 %251 -%253 = OpFunctionCall %void %out_half %252 +%253 = OpFunctionCall %void %out_half_vh %252 %254 = OpLoad %float %252 OpStore %249 %254 %255 = OpLoad %v3float %h3 %256 = OpVectorShuffle %v2float %255 %255 0 2 OpStore %257 %256 -%258 = OpFunctionCall %void %out_half2 %257 +%258 = OpFunctionCall %void %out_half2_vh2 %257 %259 = OpLoad %v2float %257 %260 = OpLoad %v3float %h3 %261 = OpVectorShuffle %v3float %260 %259 3 1 4 @@ -517,42 +517,42 @@ OpStore %h3 %261 %262 = OpLoad %v4float %h4 %263 = OpVectorShuffle %v4float %262 %262 2 3 0 1 OpStore %264 %263 -%265 = OpFunctionCall %void %out_half4 %264 +%265 = OpFunctionCall %void %out_half4_vh4 %264 %266 = OpLoad %v4float %264 %267 = OpLoad %v4float %h4 %268 = OpVectorShuffle %v4float %267 %266 6 7 4 5 OpStore %h4 %268 -%270 = OpFunctionCall %void %out_half2x2 %h2x2 -%272 = OpFunctionCall %void %out_half3x3 %h3x3 -%274 = OpFunctionCall %void %out_half4x4 %h4x4 +%270 = OpFunctionCall %void %out_half2x2_vh22 %h2x2 +%272 = OpFunctionCall %void %out_half3x3_vh33 %h3x3 +%274 = OpFunctionCall %void %out_half4x4_vh44 %h4x4 %275 = OpAccessChain %_ptr_Function_v3float %h3x3 %int_1 %276 = OpLoad %v3float %275 OpStore %277 %276 -%278 = OpFunctionCall %void %out_half3 %277 +%278 = OpFunctionCall %void %out_half3_vh3 %277 %279 = OpLoad %v3float %277 OpStore %275 %279 %281 = OpAccessChain %_ptr_Function_v4float %h4x4 %int_3 %282 = OpAccessChain %_ptr_Function_float %281 %int_3 %283 = OpLoad %float %282 OpStore %284 %283 -%285 = OpFunctionCall %void %out_half %284 +%285 = OpFunctionCall %void %out_half_vh %284 %286 = OpLoad %float %284 OpStore %282 %286 %288 = OpAccessChain %_ptr_Function_v2float %h2x2 %int_0 %289 = OpAccessChain %_ptr_Function_float %288 %int_0 %290 = OpLoad %float %289 OpStore %291 %290 -%292 = OpFunctionCall %void %out_half %291 +%292 = OpFunctionCall %void %out_half_vh %291 %293 = OpLoad %float %291 OpStore %289 %293 -%295 = OpFunctionCall %void %out_int %i -%297 = OpFunctionCall %void %out_int2 %i2 -%299 = OpFunctionCall %void %out_int3 %i3 -%301 = OpFunctionCall %void %out_int4 %i4 +%295 = OpFunctionCall %void %out_int_vi %i +%297 = OpFunctionCall %void %out_int2_vi2 %i2 +%299 = OpFunctionCall %void %out_int3_vi3 %i3 +%301 = OpFunctionCall %void %out_int4_vi4 %i4 %302 = OpLoad %v4int %i4 %303 = OpVectorShuffle %v3int %302 %302 0 1 2 OpStore %304 %303 -%305 = OpFunctionCall %void %out_int3 %304 +%305 = OpFunctionCall %void %out_int3_vi3 %304 %306 = OpLoad %v3int %304 %307 = OpLoad %v4int %i4 %308 = OpVectorShuffle %v4int %307 %306 4 5 6 3 @@ -560,17 +560,17 @@ OpStore %i4 %308 %309 = OpAccessChain %_ptr_Function_int %i2 %int_1 %310 = OpLoad %int %309 OpStore %311 %310 -%312 = OpFunctionCall %void %out_int %311 +%312 = OpFunctionCall %void %out_int_vi %311 %313 = OpLoad %int %311 OpStore %309 %313 -%315 = OpFunctionCall %void %out_float %f -%317 = OpFunctionCall %void %out_float2 %f2 -%319 = OpFunctionCall %void %out_float3 %f3 -%321 = OpFunctionCall %void %out_float4 %f4 +%315 = OpFunctionCall %void %out_float_vf %f +%317 = OpFunctionCall %void %out_float2_vf2 %f2 +%319 = OpFunctionCall %void %out_float3_vf3 %f3 +%321 = OpFunctionCall %void %out_float4_vf4 %f4 %322 = OpLoad %v3float %f3 %323 = OpVectorShuffle %v2float %322 %322 0 1 OpStore %324 %323 -%325 = OpFunctionCall %void %out_float2 %324 +%325 = OpFunctionCall %void %out_float2_vf2 %324 %326 = OpLoad %v2float %324 %327 = OpLoad %v3float %f3 %328 = OpVectorShuffle %v3float %327 %326 3 4 2 @@ -578,27 +578,27 @@ OpStore %f3 %328 %329 = OpAccessChain %_ptr_Function_float %f2 %int_0 %330 = OpLoad %float %329 OpStore %331 %330 -%332 = OpFunctionCall %void %out_float %331 +%332 = OpFunctionCall %void %out_float_vf %331 %333 = OpLoad %float %331 OpStore %329 %333 -%335 = OpFunctionCall %void %out_float2x2 %f2x2 -%337 = OpFunctionCall %void %out_float3x3 %f3x3 -%339 = OpFunctionCall %void %out_float4x4 %f4x4 +%335 = OpFunctionCall %void %out_float2x2_vf22 %f2x2 +%337 = OpFunctionCall %void %out_float3x3_vf33 %f3x3 +%339 = OpFunctionCall %void %out_float4x4_vf44 %f4x4 %340 = OpAccessChain %_ptr_Function_v2float %f2x2 %int_0 %341 = OpAccessChain %_ptr_Function_float %340 %int_0 %342 = OpLoad %float %341 OpStore %343 %342 -%344 = OpFunctionCall %void %out_float %343 +%344 = OpFunctionCall %void %out_float_vf %343 %345 = OpLoad %float %343 OpStore %341 %345 -%347 = OpFunctionCall %void %out_bool %b -%349 = OpFunctionCall %void %out_bool2 %b2 -%351 = OpFunctionCall %void %out_bool3 %b3 -%353 = OpFunctionCall %void %out_bool4 %b4 +%347 = OpFunctionCall %void %out_bool_vb %b +%349 = OpFunctionCall %void %out_bool2_vb2 %b2 +%351 = OpFunctionCall %void %out_bool3_vb3 %b3 +%353 = OpFunctionCall %void %out_bool4_vb4 %b4 %354 = OpLoad %v4bool %b4 %355 = OpVectorShuffle %v2bool %354 %354 0 3 OpStore %356 %355 -%357 = OpFunctionCall %void %out_bool2 %356 +%357 = OpFunctionCall %void %out_bool2_vb2 %356 %358 = OpLoad %v2bool %356 %359 = OpLoad %v4bool %b4 %360 = OpVectorShuffle %v4bool %359 %358 4 1 2 5 @@ -606,7 +606,7 @@ OpStore %b4 %360 %361 = OpAccessChain %_ptr_Function_bool %b3 %int_2 %362 = OpLoad %bool %361 OpStore %363 %362 -%364 = OpFunctionCall %void %out_bool %363 +%364 = OpFunctionCall %void %out_bool_vb %363 %365 = OpLoad %bool %363 OpStore %361 %365 OpStore %ok %true diff --git a/tests/sksl/shared/OutParamsNoInline.asm.frag b/tests/sksl/shared/OutParamsNoInline.asm.frag index c6cf6a3810..8d7f56e7bc 100644 --- a/tests/sksl/shared/OutParamsNoInline.asm.frag +++ b/tests/sksl/shared/OutParamsNoInline.asm.frag @@ -1,37 +1,37 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" OpMemberName %_UniformBuffer 2 "colorWhite" -OpName %_entrypoint "_entrypoint" -OpName %out_half "out_half" -OpName %out_half2 "out_half2" -OpName %out_half3 "out_half3" -OpName %out_half4 "out_half4" -OpName %out_half2x2 "out_half2x2" -OpName %out_half3x3 "out_half3x3" -OpName %out_half4x4 "out_half4x4" -OpName %out_int "out_int" -OpName %out_int2 "out_int2" -OpName %out_int3 "out_int3" -OpName %out_int4 "out_int4" -OpName %out_float "out_float" -OpName %out_float2 "out_float2" -OpName %out_float3 "out_float3" -OpName %out_float4 "out_float4" -OpName %out_float2x2 "out_float2x2" -OpName %out_float3x3 "out_float3x3" -OpName %out_float4x4 "out_float4x4" -OpName %out_bool "out_bool" -OpName %out_bool2 "out_bool2" -OpName %out_bool3 "out_bool3" -OpName %out_bool4 "out_bool4" +OpName %_entrypoint_v "_entrypoint_v" +OpName %out_half_vh "out_half_vh" +OpName %out_half2_vh2 "out_half2_vh2" +OpName %out_half3_vh3 "out_half3_vh3" +OpName %out_half4_vh4 "out_half4_vh4" +OpName %out_half2x2_vh22 "out_half2x2_vh22" +OpName %out_half3x3_vh33 "out_half3x3_vh33" +OpName %out_half4x4_vh44 "out_half4x4_vh44" +OpName %out_int_vi "out_int_vi" +OpName %out_int2_vi2 "out_int2_vi2" +OpName %out_int3_vi3 "out_int3_vi3" +OpName %out_int4_vi4 "out_int4_vi4" +OpName %out_float_vf "out_float_vf" +OpName %out_float2_vf2 "out_float2_vf2" +OpName %out_float3_vf3 "out_float3_vf3" +OpName %out_float4_vf4 "out_float4_vf4" +OpName %out_float2x2_vf22 "out_float2x2_vf22" +OpName %out_float3x3_vf33 "out_float3x3_vf33" +OpName %out_float4x4_vf44 "out_float4x4_vf44" +OpName %out_bool_vb "out_bool_vb" +OpName %out_bool2_vb2 "out_bool2_vb2" +OpName %out_bool3_vb3 "out_bool3_vb3" +OpName %out_bool4_vb4 "out_bool4_vb4" OpName %main "main" OpName %h "h" OpName %h2 "h2" @@ -209,13 +209,13 @@ OpDecorate %468 RelaxedPrecision %true = OpConstantTrue %bool %false = OpConstantFalse %bool %float_1 = OpConstant %float 1 -%_entrypoint = OpFunction %void None %37 +%_entrypoint_v = OpFunction %void None %37 %38 = OpLabel %39 = OpFunctionCall %v4float %main OpStore %sk_FragColor %39 OpReturn OpFunctionEnd -%out_half = OpFunction %void None %40 +%out_half_vh = OpFunction %void None %40 %42 = OpFunctionParameter %_ptr_Function_float %43 = OpLabel %44 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -224,7 +224,7 @@ OpFunctionEnd OpStore %42 %49 OpReturn OpFunctionEnd -%out_half2 = OpFunction %void None %51 +%out_half2_vh2 = OpFunction %void None %51 %53 = OpFunctionParameter %_ptr_Function_v2float %54 = OpLabel %55 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -234,7 +234,7 @@ OpFunctionEnd OpStore %53 %58 OpReturn OpFunctionEnd -%out_half3 = OpFunction %void None %60 +%out_half3_vh3 = OpFunction %void None %60 %62 = OpFunctionParameter %_ptr_Function_v3float %63 = OpLabel %64 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -244,7 +244,7 @@ OpFunctionEnd OpStore %62 %67 OpReturn OpFunctionEnd -%out_half4 = OpFunction %void None %68 +%out_half4_vh4 = OpFunction %void None %68 %70 = OpFunctionParameter %_ptr_Function_v4float %71 = OpLabel %72 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -254,7 +254,7 @@ OpFunctionEnd OpStore %70 %75 OpReturn OpFunctionEnd -%out_half2x2 = OpFunction %void None %77 +%out_half2x2_vh22 = OpFunction %void None %77 %79 = OpFunctionParameter %_ptr_Function_mat2v2float %80 = OpLabel %81 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -266,7 +266,7 @@ OpFunctionEnd OpStore %79 %84 OpReturn OpFunctionEnd -%out_half3x3 = OpFunction %void None %89 +%out_half3x3_vh33 = OpFunction %void None %89 %91 = OpFunctionParameter %_ptr_Function_mat3v3float %92 = OpLabel %93 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -279,7 +279,7 @@ OpFunctionEnd OpStore %91 %96 OpReturn OpFunctionEnd -%out_half4x4 = OpFunction %void None %101 +%out_half4x4_vh44 = OpFunction %void None %101 %103 = OpFunctionParameter %_ptr_Function_mat4v4float %104 = OpLabel %105 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -293,7 +293,7 @@ OpFunctionEnd OpStore %103 %108 OpReturn OpFunctionEnd -%out_int = OpFunction %void None %113 +%out_int_vi = OpFunction %void None %113 %115 = OpFunctionParameter %_ptr_Function_int %116 = OpLabel %117 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -303,7 +303,7 @@ OpFunctionEnd OpStore %115 %120 OpReturn OpFunctionEnd -%out_int2 = OpFunction %void None %122 +%out_int2_vi2 = OpFunction %void None %122 %124 = OpFunctionParameter %_ptr_Function_v2int %125 = OpLabel %126 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -314,7 +314,7 @@ OpFunctionEnd OpStore %124 %130 OpReturn OpFunctionEnd -%out_int3 = OpFunction %void None %132 +%out_int3_vi3 = OpFunction %void None %132 %134 = OpFunctionParameter %_ptr_Function_v3int %135 = OpLabel %136 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -325,7 +325,7 @@ OpFunctionEnd OpStore %134 %140 OpReturn OpFunctionEnd -%out_int4 = OpFunction %void None %142 +%out_int4_vi4 = OpFunction %void None %142 %144 = OpFunctionParameter %_ptr_Function_v4int %145 = OpLabel %146 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -336,7 +336,7 @@ OpFunctionEnd OpStore %144 %150 OpReturn OpFunctionEnd -%out_float = OpFunction %void None %40 +%out_float_vf = OpFunction %void None %40 %151 = OpFunctionParameter %_ptr_Function_float %152 = OpLabel %153 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -345,7 +345,7 @@ OpFunctionEnd OpStore %151 %155 OpReturn OpFunctionEnd -%out_float2 = OpFunction %void None %51 +%out_float2_vf2 = OpFunction %void None %51 %156 = OpFunctionParameter %_ptr_Function_v2float %157 = OpLabel %158 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -355,7 +355,7 @@ OpFunctionEnd OpStore %156 %161 OpReturn OpFunctionEnd -%out_float3 = OpFunction %void None %60 +%out_float3_vf3 = OpFunction %void None %60 %162 = OpFunctionParameter %_ptr_Function_v3float %163 = OpLabel %164 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -365,7 +365,7 @@ OpFunctionEnd OpStore %162 %167 OpReturn OpFunctionEnd -%out_float4 = OpFunction %void None %68 +%out_float4_vf4 = OpFunction %void None %68 %168 = OpFunctionParameter %_ptr_Function_v4float %169 = OpLabel %170 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -375,7 +375,7 @@ OpFunctionEnd OpStore %168 %173 OpReturn OpFunctionEnd -%out_float2x2 = OpFunction %void None %77 +%out_float2x2_vf22 = OpFunction %void None %77 %174 = OpFunctionParameter %_ptr_Function_mat2v2float %175 = OpLabel %176 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -387,7 +387,7 @@ OpFunctionEnd OpStore %174 %179 OpReturn OpFunctionEnd -%out_float3x3 = OpFunction %void None %89 +%out_float3x3_vf33 = OpFunction %void None %89 %182 = OpFunctionParameter %_ptr_Function_mat3v3float %183 = OpLabel %184 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -400,7 +400,7 @@ OpFunctionEnd OpStore %182 %187 OpReturn OpFunctionEnd -%out_float4x4 = OpFunction %void None %101 +%out_float4x4_vf44 = OpFunction %void None %101 %191 = OpFunctionParameter %_ptr_Function_mat4v4float %192 = OpLabel %193 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -414,7 +414,7 @@ OpFunctionEnd OpStore %191 %196 OpReturn OpFunctionEnd -%out_bool = OpFunction %void None %201 +%out_bool_vb = OpFunction %void None %201 %203 = OpFunctionParameter %_ptr_Function_bool %204 = OpLabel %205 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -424,7 +424,7 @@ OpFunctionEnd OpStore %203 %208 OpReturn OpFunctionEnd -%out_bool2 = OpFunction %void None %210 +%out_bool2_vb2 = OpFunction %void None %210 %212 = OpFunctionParameter %_ptr_Function_v2bool %213 = OpLabel %214 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -435,7 +435,7 @@ OpFunctionEnd OpStore %212 %218 OpReturn OpFunctionEnd -%out_bool3 = OpFunction %void None %220 +%out_bool3_vb3 = OpFunction %void None %220 %222 = OpFunctionParameter %_ptr_Function_v3bool %223 = OpLabel %224 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -446,7 +446,7 @@ OpFunctionEnd OpStore %222 %228 OpReturn OpFunctionEnd -%out_bool4 = OpFunction %void None %230 +%out_bool4_vb4 = OpFunction %void None %230 %232 = OpFunctionParameter %_ptr_Function_v4bool %233 = OpLabel %234 = OpAccessChain %_ptr_Uniform_v4float %32 %int_2 @@ -496,20 +496,20 @@ OpFunctionEnd %363 = OpVariable %_ptr_Function_bool Function %ok = OpVariable %_ptr_Function_bool Function %460 = OpVariable %_ptr_Function_v4float Function -%242 = OpFunctionCall %void %out_half %h -%244 = OpFunctionCall %void %out_half2 %h2 -%246 = OpFunctionCall %void %out_half3 %h3 -%248 = OpFunctionCall %void %out_half4 %h4 +%242 = OpFunctionCall %void %out_half_vh %h +%244 = OpFunctionCall %void %out_half2_vh2 %h2 +%246 = OpFunctionCall %void %out_half3_vh3 %h3 +%248 = OpFunctionCall %void %out_half4_vh4 %h4 %249 = OpAccessChain %_ptr_Function_float %h3 %int_1 %251 = OpLoad %float %249 OpStore %252 %251 -%253 = OpFunctionCall %void %out_half %252 +%253 = OpFunctionCall %void %out_half_vh %252 %254 = OpLoad %float %252 OpStore %249 %254 %255 = OpLoad %v3float %h3 %256 = OpVectorShuffle %v2float %255 %255 0 2 OpStore %257 %256 -%258 = OpFunctionCall %void %out_half2 %257 +%258 = OpFunctionCall %void %out_half2_vh2 %257 %259 = OpLoad %v2float %257 %260 = OpLoad %v3float %h3 %261 = OpVectorShuffle %v3float %260 %259 3 1 4 @@ -517,42 +517,42 @@ OpStore %h3 %261 %262 = OpLoad %v4float %h4 %263 = OpVectorShuffle %v4float %262 %262 2 3 0 1 OpStore %264 %263 -%265 = OpFunctionCall %void %out_half4 %264 +%265 = OpFunctionCall %void %out_half4_vh4 %264 %266 = OpLoad %v4float %264 %267 = OpLoad %v4float %h4 %268 = OpVectorShuffle %v4float %267 %266 6 7 4 5 OpStore %h4 %268 -%270 = OpFunctionCall %void %out_half2x2 %h2x2 -%272 = OpFunctionCall %void %out_half3x3 %h3x3 -%274 = OpFunctionCall %void %out_half4x4 %h4x4 +%270 = OpFunctionCall %void %out_half2x2_vh22 %h2x2 +%272 = OpFunctionCall %void %out_half3x3_vh33 %h3x3 +%274 = OpFunctionCall %void %out_half4x4_vh44 %h4x4 %275 = OpAccessChain %_ptr_Function_v3float %h3x3 %int_1 %276 = OpLoad %v3float %275 OpStore %277 %276 -%278 = OpFunctionCall %void %out_half3 %277 +%278 = OpFunctionCall %void %out_half3_vh3 %277 %279 = OpLoad %v3float %277 OpStore %275 %279 %281 = OpAccessChain %_ptr_Function_v4float %h4x4 %int_3 %282 = OpAccessChain %_ptr_Function_float %281 %int_3 %283 = OpLoad %float %282 OpStore %284 %283 -%285 = OpFunctionCall %void %out_half %284 +%285 = OpFunctionCall %void %out_half_vh %284 %286 = OpLoad %float %284 OpStore %282 %286 %288 = OpAccessChain %_ptr_Function_v2float %h2x2 %int_0 %289 = OpAccessChain %_ptr_Function_float %288 %int_0 %290 = OpLoad %float %289 OpStore %291 %290 -%292 = OpFunctionCall %void %out_half %291 +%292 = OpFunctionCall %void %out_half_vh %291 %293 = OpLoad %float %291 OpStore %289 %293 -%295 = OpFunctionCall %void %out_int %i -%297 = OpFunctionCall %void %out_int2 %i2 -%299 = OpFunctionCall %void %out_int3 %i3 -%301 = OpFunctionCall %void %out_int4 %i4 +%295 = OpFunctionCall %void %out_int_vi %i +%297 = OpFunctionCall %void %out_int2_vi2 %i2 +%299 = OpFunctionCall %void %out_int3_vi3 %i3 +%301 = OpFunctionCall %void %out_int4_vi4 %i4 %302 = OpLoad %v4int %i4 %303 = OpVectorShuffle %v3int %302 %302 0 1 2 OpStore %304 %303 -%305 = OpFunctionCall %void %out_int3 %304 +%305 = OpFunctionCall %void %out_int3_vi3 %304 %306 = OpLoad %v3int %304 %307 = OpLoad %v4int %i4 %308 = OpVectorShuffle %v4int %307 %306 4 5 6 3 @@ -560,17 +560,17 @@ OpStore %i4 %308 %309 = OpAccessChain %_ptr_Function_int %i2 %int_1 %310 = OpLoad %int %309 OpStore %311 %310 -%312 = OpFunctionCall %void %out_int %311 +%312 = OpFunctionCall %void %out_int_vi %311 %313 = OpLoad %int %311 OpStore %309 %313 -%315 = OpFunctionCall %void %out_float %f -%317 = OpFunctionCall %void %out_float2 %f2 -%319 = OpFunctionCall %void %out_float3 %f3 -%321 = OpFunctionCall %void %out_float4 %f4 +%315 = OpFunctionCall %void %out_float_vf %f +%317 = OpFunctionCall %void %out_float2_vf2 %f2 +%319 = OpFunctionCall %void %out_float3_vf3 %f3 +%321 = OpFunctionCall %void %out_float4_vf4 %f4 %322 = OpLoad %v3float %f3 %323 = OpVectorShuffle %v2float %322 %322 0 1 OpStore %324 %323 -%325 = OpFunctionCall %void %out_float2 %324 +%325 = OpFunctionCall %void %out_float2_vf2 %324 %326 = OpLoad %v2float %324 %327 = OpLoad %v3float %f3 %328 = OpVectorShuffle %v3float %327 %326 3 4 2 @@ -578,27 +578,27 @@ OpStore %f3 %328 %329 = OpAccessChain %_ptr_Function_float %f2 %int_0 %330 = OpLoad %float %329 OpStore %331 %330 -%332 = OpFunctionCall %void %out_float %331 +%332 = OpFunctionCall %void %out_float_vf %331 %333 = OpLoad %float %331 OpStore %329 %333 -%335 = OpFunctionCall %void %out_float2x2 %f2x2 -%337 = OpFunctionCall %void %out_float3x3 %f3x3 -%339 = OpFunctionCall %void %out_float4x4 %f4x4 +%335 = OpFunctionCall %void %out_float2x2_vf22 %f2x2 +%337 = OpFunctionCall %void %out_float3x3_vf33 %f3x3 +%339 = OpFunctionCall %void %out_float4x4_vf44 %f4x4 %340 = OpAccessChain %_ptr_Function_v2float %f2x2 %int_0 %341 = OpAccessChain %_ptr_Function_float %340 %int_0 %342 = OpLoad %float %341 OpStore %343 %342 -%344 = OpFunctionCall %void %out_float %343 +%344 = OpFunctionCall %void %out_float_vf %343 %345 = OpLoad %float %343 OpStore %341 %345 -%347 = OpFunctionCall %void %out_bool %b -%349 = OpFunctionCall %void %out_bool2 %b2 -%351 = OpFunctionCall %void %out_bool3 %b3 -%353 = OpFunctionCall %void %out_bool4 %b4 +%347 = OpFunctionCall %void %out_bool_vb %b +%349 = OpFunctionCall %void %out_bool2_vb2 %b2 +%351 = OpFunctionCall %void %out_bool3_vb3 %b3 +%353 = OpFunctionCall %void %out_bool4_vb4 %b4 %354 = OpLoad %v4bool %b4 %355 = OpVectorShuffle %v2bool %354 %354 0 3 OpStore %356 %355 -%357 = OpFunctionCall %void %out_bool2 %356 +%357 = OpFunctionCall %void %out_bool2_vb2 %356 %358 = OpLoad %v2bool %356 %359 = OpLoad %v4bool %b4 %360 = OpVectorShuffle %v4bool %359 %358 4 1 2 5 @@ -606,7 +606,7 @@ OpStore %b4 %360 %361 = OpAccessChain %_ptr_Function_bool %b3 %int_2 %362 = OpLoad %bool %361 OpStore %363 %362 -%364 = OpFunctionCall %void %out_bool %363 +%364 = OpFunctionCall %void %out_bool_vb %363 %365 = OpLoad %bool %363 OpStore %361 %365 OpStore %ok %true diff --git a/tests/sksl/shared/OutParamsTricky.asm.frag b/tests/sksl/shared/OutParamsTricky.asm.frag index cf16ea8db9..f6defe60d2 100644 --- a/tests/sksl/shared/OutParamsTricky.asm.frag +++ b/tests/sksl/shared/OutParamsTricky.asm.frag @@ -1,16 +1,16 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" -OpName %tricky "tricky" -OpName %func "func" +OpName %_entrypoint_v "_entrypoint_v" +OpName %tricky_h2hhh2h "tricky_h2hhh2h" +OpName %func_vh4 "func_vh4" OpName %t "t" OpName %main "main" OpName %result "result" @@ -71,13 +71,13 @@ OpDecorate %81 RelaxedPrecision %int = OpTypeInt 32 1 %int_0 = OpConstant %int 0 %int_1 = OpConstant %int 1 -%_entrypoint = OpFunction %void None %17 +%_entrypoint_v = OpFunction %void None %17 %18 = OpLabel %19 = OpFunctionCall %v4float %main OpStore %sk_FragColor %19 OpReturn OpFunctionEnd -%tricky = OpFunction %v2float None %21 +%tricky_h2hhh2h = OpFunction %v2float None %21 %24 = OpFunctionParameter %_ptr_Function_float %25 = OpFunctionParameter %_ptr_Function_float %26 = OpFunctionParameter %_ptr_Function_v2float @@ -93,7 +93,7 @@ OpStore %26 %30 %35 = OpCompositeConstruct %v2float %33 %34 OpReturnValue %35 OpFunctionEnd -%func = OpFunction %void None %36 +%func_vh4 = OpFunction %void None %36 %38 = OpFunctionParameter %_ptr_Function_v4float %39 = OpLabel %t = OpVariable %_ptr_Function_v2float Function @@ -107,7 +107,7 @@ OpStore %44 %float_2 %46 = OpVectorShuffle %v2float %45 %45 0 2 OpStore %47 %46 OpStore %49 %float_5 -%50 = OpFunctionCall %v2float %tricky %42 %44 %47 %49 +%50 = OpFunctionCall %v2float %tricky_h2hhh2h %42 %44 %47 %49 %51 = OpLoad %v2float %47 %52 = OpLoad %v4float %38 %53 = OpVectorShuffle %v4float %52 %51 4 1 5 3 @@ -124,7 +124,7 @@ OpFunctionEnd %result = OpVariable %_ptr_Function_v4float Function %69 = OpVariable %_ptr_Function_v4float Function OpStore %result %62 -%63 = OpFunctionCall %void %func %result +%63 = OpFunctionCall %void %func_vh4 %result %64 = OpLoad %v4float %result %66 = OpFOrdEqual %v4bool %64 %65 %68 = OpAll %bool %66 diff --git a/tests/sksl/shared/ResizeMatrix.asm.frag b/tests/sksl/shared/ResizeMatrix.asm.frag index 1954e83be4..89079e0dc3 100644 --- a/tests/sksl/shared/ResizeMatrix.asm.frag +++ b/tests/sksl/shared/ResizeMatrix.asm.frag @@ -1,14 +1,14 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %result "result" OpName %a "a" @@ -63,7 +63,7 @@ OpDecorate %160 RelaxedPrecision %float_6 = OpConstant %float 6 %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float %int_1 = OpConstant %int 1 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/ReturnColorFromMain.asm.frag b/tests/sksl/shared/ReturnColorFromMain.asm.frag index fc9c20ec57..eb7543ff2f 100644 --- a/tests/sksl/shared/ReturnColorFromMain.asm.frag +++ b/tests/sksl/shared/ReturnColorFromMain.asm.frag @@ -1,11 +1,11 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpDecorate %sk_FragColor RelaxedPrecision OpDecorate %sk_FragColor Location 0 @@ -26,7 +26,7 @@ OpDecorate %sk_Clockwise BuiltIn FrontFacing %float_3 = OpConstant %float 3 %float_4 = OpConstant %float 4 %21 = OpConstantComposite %v4float %float_1 %float_2 %float_3 %float_4 -%_entrypoint = OpFunction %void None %12 +%_entrypoint_v = OpFunction %void None %12 %13 = OpLabel %14 = OpFunctionCall %v4float %main OpStore %sk_FragColor %14 diff --git a/tests/sksl/shared/ReturnsValueOnEveryPathES2.asm.frag b/tests/sksl/shared/ReturnsValueOnEveryPathES2.asm.frag index 6002251f06..848099bd19 100644 --- a/tests/sksl/shared/ReturnsValueOnEveryPathES2.asm.frag +++ b/tests/sksl/shared/ReturnsValueOnEveryPathES2.asm.frag @@ -1,23 +1,23 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" OpMemberName %_UniformBuffer 2 "unknownInput" -OpName %_entrypoint "_entrypoint" -OpName %return_on_both_sides "return_on_both_sides" -OpName %for_inside_body "for_inside_body" +OpName %_entrypoint_v "_entrypoint_v" +OpName %return_on_both_sides_b "return_on_both_sides_b" +OpName %for_inside_body_b "for_inside_body_b" OpName %x "x" -OpName %after_for_body "after_for_body" +OpName %after_for_body_b "after_for_body_b" OpName %x_0 "x" -OpName %for_with_double_sided_conditional_return "for_with_double_sided_conditional_return" +OpName %for_with_double_sided_conditional_return_b "for_with_double_sided_conditional_return_b" OpName %x_1 "x" -OpName %if_else_chain "if_else_chain" +OpName %if_else_chain_b "if_else_chain_b" OpName %main "main" OpDecorate %sk_FragColor RelaxedPrecision OpDecorate %sk_FragColor Location 0 @@ -70,13 +70,13 @@ OpDecorate %140 RelaxedPrecision %108 = OpTypeFunction %v4float %_ptr_Function_v4float = OpTypePointer Function %v4float %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float -%_entrypoint = OpFunction %void None %20 +%_entrypoint_v = OpFunction %void None %20 %21 = OpLabel %22 = OpFunctionCall %v4float %main OpStore %sk_FragColor %22 OpReturn OpFunctionEnd -%return_on_both_sides = OpFunction %bool None %23 +%return_on_both_sides_b = OpFunction %bool None %23 %24 = OpLabel %25 = OpAccessChain %_ptr_Uniform_float %15 %int_2 %29 = OpLoad %float %25 @@ -90,7 +90,7 @@ OpReturnValue %true %34 = OpLabel OpUnreachable OpFunctionEnd -%for_inside_body = OpFunction %bool None %23 +%for_inside_body_b = OpFunction %bool None %23 %36 = OpLabel %x = OpVariable %_ptr_Function_int Function OpStore %x %int_0 @@ -112,7 +112,7 @@ OpBranch %40 %44 = OpLabel OpUnreachable OpFunctionEnd -%after_for_body = OpFunction %bool None %23 +%after_for_body_b = OpFunction %bool None %23 %51 = OpLabel %x_0 = OpVariable %_ptr_Function_int Function OpStore %x_0 %int_0 @@ -134,7 +134,7 @@ OpBranch %53 %57 = OpLabel OpReturnValue %true OpFunctionEnd -%for_with_double_sided_conditional_return = OpFunction %bool None %23 +%for_with_double_sided_conditional_return_b = OpFunction %bool None %23 %62 = OpLabel %x_1 = OpVariable %_ptr_Function_int Function OpStore %x_1 %int_0 @@ -166,7 +166,7 @@ OpBranch %64 %68 = OpLabel OpUnreachable OpFunctionEnd -%if_else_chain = OpFunction %bool None %23 +%if_else_chain_b = OpFunction %bool None %23 %79 = OpLabel %80 = OpAccessChain %_ptr_Uniform_float %15 %int_2 %81 = OpLoad %float %80 @@ -216,35 +216,35 @@ OpFunctionEnd OpSelectionMerge %111 None OpBranchConditional %true %110 %111 %110 = OpLabel -%112 = OpFunctionCall %bool %return_on_both_sides +%112 = OpFunctionCall %bool %return_on_both_sides_b OpBranch %111 %111 = OpLabel %113 = OpPhi %bool %false %109 %112 %110 OpSelectionMerge %115 None OpBranchConditional %113 %114 %115 %114 = OpLabel -%116 = OpFunctionCall %bool %for_inside_body +%116 = OpFunctionCall %bool %for_inside_body_b OpBranch %115 %115 = OpLabel %117 = OpPhi %bool %false %111 %116 %114 OpSelectionMerge %119 None OpBranchConditional %117 %118 %119 %118 = OpLabel -%120 = OpFunctionCall %bool %after_for_body +%120 = OpFunctionCall %bool %after_for_body_b OpBranch %119 %119 = OpLabel %121 = OpPhi %bool %false %115 %120 %118 OpSelectionMerge %123 None OpBranchConditional %121 %122 %123 %122 = OpLabel -%124 = OpFunctionCall %bool %for_with_double_sided_conditional_return +%124 = OpFunctionCall %bool %for_with_double_sided_conditional_return_b OpBranch %123 %123 = OpLabel %125 = OpPhi %bool %false %119 %124 %122 OpSelectionMerge %127 None OpBranchConditional %125 %126 %127 %126 = OpLabel -%128 = OpFunctionCall %bool %if_else_chain +%128 = OpFunctionCall %bool %if_else_chain_b OpBranch %127 %127 = OpLabel %129 = OpPhi %bool %false %123 %128 %126 diff --git a/tests/sksl/shared/ReturnsValueOnEveryPathES3.asm.frag b/tests/sksl/shared/ReturnsValueOnEveryPathES3.asm.frag index 019dcbfb75..39e063cec5 100644 --- a/tests/sksl/shared/ReturnsValueOnEveryPathES3.asm.frag +++ b/tests/sksl/shared/ReturnsValueOnEveryPathES3.asm.frag @@ -1,38 +1,38 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" OpMemberName %_UniformBuffer 2 "unknownInput" -OpName %_entrypoint "_entrypoint" -OpName %return_on_both_sides "return_on_both_sides" -OpName %for_inside_body "for_inside_body" +OpName %_entrypoint_v "_entrypoint_v" +OpName %return_on_both_sides_b "return_on_both_sides_b" +OpName %for_inside_body_b "for_inside_body_b" OpName %x "x" -OpName %after_for_body "after_for_body" +OpName %after_for_body_b "after_for_body_b" OpName %x_0 "x" -OpName %for_with_double_sided_conditional_return "for_with_double_sided_conditional_return" +OpName %for_with_double_sided_conditional_return_b "for_with_double_sided_conditional_return_b" OpName %x_1 "x" -OpName %if_else_chain "if_else_chain" -OpName %conditional_inside_while_loop "conditional_inside_while_loop" -OpName %inside_do_loop "inside_do_loop" -OpName %inside_while_loop "inside_while_loop" -OpName %after_do_loop "after_do_loop" -OpName %after_while_loop "after_while_loop" -OpName %switch_with_all_returns "switch_with_all_returns" -OpName %switch_only_default "switch_only_default" -OpName %switch_fallthrough "switch_fallthrough" -OpName %switch_fallthrough_twice "switch_fallthrough_twice" -OpName %switch_with_break_in_loop "switch_with_break_in_loop" +OpName %if_else_chain_b "if_else_chain_b" +OpName %conditional_inside_while_loop_b "conditional_inside_while_loop_b" +OpName %inside_do_loop_b "inside_do_loop_b" +OpName %inside_while_loop_b "inside_while_loop_b" +OpName %after_do_loop_b "after_do_loop_b" +OpName %after_while_loop_b "after_while_loop_b" +OpName %switch_with_all_returns_b "switch_with_all_returns_b" +OpName %switch_only_default_b "switch_only_default_b" +OpName %switch_fallthrough_b "switch_fallthrough_b" +OpName %switch_fallthrough_twice_b "switch_fallthrough_twice_b" +OpName %switch_with_break_in_loop_b "switch_with_break_in_loop_b" OpName %x_2 "x" -OpName %switch_with_continue_in_loop "switch_with_continue_in_loop" +OpName %switch_with_continue_in_loop_b "switch_with_continue_in_loop_b" OpName %x_3 "x" -OpName %switch_with_if_that_returns "switch_with_if_that_returns" -OpName %switch_with_one_sided_if_then_fallthrough "switch_with_one_sided_if_then_fallthrough" +OpName %switch_with_if_that_returns_b "switch_with_if_that_returns_b" +OpName %switch_with_one_sided_if_then_fallthrough_b "switch_with_one_sided_if_then_fallthrough_b" OpName %main "main" OpDecorate %sk_FragColor RelaxedPrecision OpDecorate %sk_FragColor Location 0 @@ -97,13 +97,13 @@ OpDecorate %328 RelaxedPrecision %244 = OpTypeFunction %v4float %_ptr_Function_v4float = OpTypePointer Function %v4float %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float -%_entrypoint = OpFunction %void None %33 +%_entrypoint_v = OpFunction %void None %33 %34 = OpLabel %35 = OpFunctionCall %v4float %main OpStore %sk_FragColor %35 OpReturn OpFunctionEnd -%return_on_both_sides = OpFunction %bool None %36 +%return_on_both_sides_b = OpFunction %bool None %36 %37 = OpLabel %38 = OpAccessChain %_ptr_Uniform_float %28 %int_2 %42 = OpLoad %float %38 @@ -117,7 +117,7 @@ OpReturnValue %true %47 = OpLabel OpUnreachable OpFunctionEnd -%for_inside_body = OpFunction %bool None %36 +%for_inside_body_b = OpFunction %bool None %36 %49 = OpLabel %x = OpVariable %_ptr_Function_int Function OpStore %x %int_0 @@ -139,7 +139,7 @@ OpBranch %53 %57 = OpLabel OpUnreachable OpFunctionEnd -%after_for_body = OpFunction %bool None %36 +%after_for_body_b = OpFunction %bool None %36 %64 = OpLabel %x_0 = OpVariable %_ptr_Function_int Function OpStore %x_0 %int_0 @@ -161,7 +161,7 @@ OpBranch %66 %70 = OpLabel OpReturnValue %true OpFunctionEnd -%for_with_double_sided_conditional_return = OpFunction %bool None %36 +%for_with_double_sided_conditional_return_b = OpFunction %bool None %36 %75 = OpLabel %x_1 = OpVariable %_ptr_Function_int Function OpStore %x_1 %int_0 @@ -193,7 +193,7 @@ OpBranch %77 %81 = OpLabel OpUnreachable OpFunctionEnd -%if_else_chain = OpFunction %bool None %36 +%if_else_chain_b = OpFunction %bool None %36 %92 = OpLabel %93 = OpAccessChain %_ptr_Uniform_float %28 %int_2 %94 = OpLoad %float %93 @@ -237,7 +237,7 @@ OpBranch %98 %98 = OpLabel OpUnreachable OpFunctionEnd -%conditional_inside_while_loop = OpFunction %bool None %36 +%conditional_inside_while_loop_b = OpFunction %bool None %36 %121 = OpLabel OpBranch %122 %122 = OpLabel @@ -255,7 +255,7 @@ OpBranch %122 %126 = OpLabel OpUnreachable OpFunctionEnd -%inside_do_loop = OpFunction %bool None %36 +%inside_do_loop_b = OpFunction %bool None %36 %131 = OpLabel OpBranch %132 %132 = OpLabel @@ -270,7 +270,7 @@ OpBranch %132 %136 = OpLabel OpUnreachable OpFunctionEnd -%inside_while_loop = OpFunction %bool None %36 +%inside_while_loop_b = OpFunction %bool None %36 %137 = OpLabel OpBranch %138 %138 = OpLabel @@ -285,7 +285,7 @@ OpBranch %138 %142 = OpLabel OpUnreachable OpFunctionEnd -%after_do_loop = OpFunction %bool None %36 +%after_do_loop_b = OpFunction %bool None %36 %143 = OpLabel OpBranch %144 %144 = OpLabel @@ -300,7 +300,7 @@ OpBranch %144 %148 = OpLabel OpReturnValue %true OpFunctionEnd -%after_while_loop = OpFunction %bool None %36 +%after_while_loop_b = OpFunction %bool None %36 %149 = OpLabel OpBranch %150 %150 = OpLabel @@ -315,7 +315,7 @@ OpBranch %150 %154 = OpLabel OpReturnValue %true OpFunctionEnd -%switch_with_all_returns = OpFunction %bool None %36 +%switch_with_all_returns_b = OpFunction %bool None %36 %155 = OpLabel %156 = OpAccessChain %_ptr_Uniform_float %28 %int_2 %157 = OpLoad %float %156 @@ -331,7 +331,7 @@ OpReturnValue %true %159 = OpLabel OpUnreachable OpFunctionEnd -%switch_only_default = OpFunction %bool None %36 +%switch_only_default_b = OpFunction %bool None %36 %163 = OpLabel %164 = OpAccessChain %_ptr_Uniform_float %28 %int_2 %165 = OpLoad %float %164 @@ -343,7 +343,7 @@ OpReturnValue %true %167 = OpLabel OpUnreachable OpFunctionEnd -%switch_fallthrough = OpFunction %bool None %36 +%switch_fallthrough_b = OpFunction %bool None %36 %169 = OpLabel %170 = OpAccessChain %_ptr_Uniform_float %28 %int_2 %171 = OpLoad %float %170 @@ -359,7 +359,7 @@ OpReturnValue %true %173 = OpLabel OpUnreachable OpFunctionEnd -%switch_fallthrough_twice = OpFunction %bool None %36 +%switch_fallthrough_twice_b = OpFunction %bool None %36 %177 = OpLabel %178 = OpAccessChain %_ptr_Uniform_float %28 %int_2 %179 = OpLoad %float %178 @@ -375,7 +375,7 @@ OpReturnValue %true %181 = OpLabel OpUnreachable OpFunctionEnd -%switch_with_break_in_loop = OpFunction %bool None %36 +%switch_with_break_in_loop_b = OpFunction %bool None %36 %185 = OpLabel %x_2 = OpVariable %_ptr_Function_int Function %186 = OpAccessChain %_ptr_Uniform_float %28 %int_2 @@ -407,7 +407,7 @@ OpReturnValue %true %189 = OpLabel OpUnreachable OpFunctionEnd -%switch_with_continue_in_loop = OpFunction %bool None %36 +%switch_with_continue_in_loop_b = OpFunction %bool None %36 %202 = OpLabel %x_3 = OpVariable %_ptr_Function_int Function %203 = OpAccessChain %_ptr_Uniform_float %28 %int_2 @@ -439,7 +439,7 @@ OpReturnValue %true %206 = OpLabel OpUnreachable OpFunctionEnd -%switch_with_if_that_returns = OpFunction %bool None %36 +%switch_with_if_that_returns_b = OpFunction %bool None %36 %219 = OpLabel %220 = OpAccessChain %_ptr_Uniform_float %28 %int_2 %221 = OpLoad %float %220 @@ -463,7 +463,7 @@ OpReturnValue %true %223 = OpLabel OpUnreachable OpFunctionEnd -%switch_with_one_sided_if_then_fallthrough = OpFunction %bool None %36 +%switch_with_one_sided_if_then_fallthrough_b = OpFunction %bool None %36 %232 = OpLabel %233 = OpAccessChain %_ptr_Uniform_float %28 %int_2 %234 = OpLoad %float %233 @@ -491,126 +491,126 @@ OpFunctionEnd OpSelectionMerge %247 None OpBranchConditional %true %246 %247 %246 = OpLabel -%248 = OpFunctionCall %bool %return_on_both_sides +%248 = OpFunctionCall %bool %return_on_both_sides_b OpBranch %247 %247 = OpLabel %249 = OpPhi %bool %false %245 %248 %246 OpSelectionMerge %251 None OpBranchConditional %249 %250 %251 %250 = OpLabel -%252 = OpFunctionCall %bool %for_inside_body +%252 = OpFunctionCall %bool %for_inside_body_b OpBranch %251 %251 = OpLabel %253 = OpPhi %bool %false %247 %252 %250 OpSelectionMerge %255 None OpBranchConditional %253 %254 %255 %254 = OpLabel -%256 = OpFunctionCall %bool %after_for_body +%256 = OpFunctionCall %bool %after_for_body_b OpBranch %255 %255 = OpLabel %257 = OpPhi %bool %false %251 %256 %254 OpSelectionMerge %259 None OpBranchConditional %257 %258 %259 %258 = OpLabel -%260 = OpFunctionCall %bool %for_with_double_sided_conditional_return +%260 = OpFunctionCall %bool %for_with_double_sided_conditional_return_b OpBranch %259 %259 = OpLabel %261 = OpPhi %bool %false %255 %260 %258 OpSelectionMerge %263 None OpBranchConditional %261 %262 %263 %262 = OpLabel -%264 = OpFunctionCall %bool %if_else_chain +%264 = OpFunctionCall %bool %if_else_chain_b OpBranch %263 %263 = OpLabel %265 = OpPhi %bool %false %259 %264 %262 OpSelectionMerge %267 None OpBranchConditional %265 %266 %267 %266 = OpLabel -%268 = OpFunctionCall %bool %conditional_inside_while_loop +%268 = OpFunctionCall %bool %conditional_inside_while_loop_b OpBranch %267 %267 = OpLabel %269 = OpPhi %bool %false %263 %268 %266 OpSelectionMerge %271 None OpBranchConditional %269 %270 %271 %270 = OpLabel -%272 = OpFunctionCall %bool %inside_do_loop +%272 = OpFunctionCall %bool %inside_do_loop_b OpBranch %271 %271 = OpLabel %273 = OpPhi %bool %false %267 %272 %270 OpSelectionMerge %275 None OpBranchConditional %273 %274 %275 %274 = OpLabel -%276 = OpFunctionCall %bool %inside_while_loop +%276 = OpFunctionCall %bool %inside_while_loop_b OpBranch %275 %275 = OpLabel %277 = OpPhi %bool %false %271 %276 %274 OpSelectionMerge %279 None OpBranchConditional %277 %278 %279 %278 = OpLabel -%280 = OpFunctionCall %bool %after_do_loop +%280 = OpFunctionCall %bool %after_do_loop_b OpBranch %279 %279 = OpLabel %281 = OpPhi %bool %false %275 %280 %278 OpSelectionMerge %283 None OpBranchConditional %281 %282 %283 %282 = OpLabel -%284 = OpFunctionCall %bool %after_while_loop +%284 = OpFunctionCall %bool %after_while_loop_b OpBranch %283 %283 = OpLabel %285 = OpPhi %bool %false %279 %284 %282 OpSelectionMerge %287 None OpBranchConditional %285 %286 %287 %286 = OpLabel -%288 = OpFunctionCall %bool %switch_with_all_returns +%288 = OpFunctionCall %bool %switch_with_all_returns_b OpBranch %287 %287 = OpLabel %289 = OpPhi %bool %false %283 %288 %286 OpSelectionMerge %291 None OpBranchConditional %289 %290 %291 %290 = OpLabel -%292 = OpFunctionCall %bool %switch_only_default +%292 = OpFunctionCall %bool %switch_only_default_b OpBranch %291 %291 = OpLabel %293 = OpPhi %bool %false %287 %292 %290 OpSelectionMerge %295 None OpBranchConditional %293 %294 %295 %294 = OpLabel -%296 = OpFunctionCall %bool %switch_fallthrough +%296 = OpFunctionCall %bool %switch_fallthrough_b OpBranch %295 %295 = OpLabel %297 = OpPhi %bool %false %291 %296 %294 OpSelectionMerge %299 None OpBranchConditional %297 %298 %299 %298 = OpLabel -%300 = OpFunctionCall %bool %switch_fallthrough_twice +%300 = OpFunctionCall %bool %switch_fallthrough_twice_b OpBranch %299 %299 = OpLabel %301 = OpPhi %bool %false %295 %300 %298 OpSelectionMerge %303 None OpBranchConditional %301 %302 %303 %302 = OpLabel -%304 = OpFunctionCall %bool %switch_with_break_in_loop +%304 = OpFunctionCall %bool %switch_with_break_in_loop_b OpBranch %303 %303 = OpLabel %305 = OpPhi %bool %false %299 %304 %302 OpSelectionMerge %307 None OpBranchConditional %305 %306 %307 %306 = OpLabel -%308 = OpFunctionCall %bool %switch_with_continue_in_loop +%308 = OpFunctionCall %bool %switch_with_continue_in_loop_b OpBranch %307 %307 = OpLabel %309 = OpPhi %bool %false %303 %308 %306 OpSelectionMerge %311 None OpBranchConditional %309 %310 %311 %310 = OpLabel -%312 = OpFunctionCall %bool %switch_with_if_that_returns +%312 = OpFunctionCall %bool %switch_with_if_that_returns_b OpBranch %311 %311 = OpLabel %313 = OpPhi %bool %false %307 %312 %310 OpSelectionMerge %315 None OpBranchConditional %313 %314 %315 %314 = OpLabel -%316 = OpFunctionCall %bool %switch_with_one_sided_if_then_fallthrough +%316 = OpFunctionCall %bool %switch_with_one_sided_if_then_fallthrough_b OpBranch %315 %315 = OpLabel %317 = OpPhi %bool %false %311 %316 %314 diff --git a/tests/sksl/shared/ScalarConversionConstructorsES2.asm.frag b/tests/sksl/shared/ScalarConversionConstructorsES2.asm.frag index b3124a8d47..3283dd7195 100644 --- a/tests/sksl/shared/ScalarConversionConstructorsES2.asm.frag +++ b/tests/sksl/shared/ScalarConversionConstructorsES2.asm.frag @@ -1,14 +1,14 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %f "f" OpName %i "i" @@ -77,7 +77,7 @@ OpDecorate %101 RelaxedPrecision %int_1 = OpConstant %int 1 %float_9 = OpConstant %float 9 %_ptr_Function_v4float = OpTypePointer Function %v4float -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/ScalarConversionConstructorsES3.asm.frag b/tests/sksl/shared/ScalarConversionConstructorsES3.asm.frag index 80a180aef6..f141d810de 100644 --- a/tests/sksl/shared/ScalarConversionConstructorsES3.asm.frag +++ b/tests/sksl/shared/ScalarConversionConstructorsES3.asm.frag @@ -1,14 +1,14 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %f "f" OpName %i "i" @@ -99,7 +99,7 @@ OpDecorate %150 RelaxedPrecision %uint_0 = OpConstant %uint 0 %float_16 = OpConstant %float 16 %_ptr_Function_v4float = OpTypePointer Function %v4float -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/StackingVectorCasts.asm.frag b/tests/sksl/shared/StackingVectorCasts.asm.frag index edd133004c..34ab69aa52 100644 --- a/tests/sksl/shared/StackingVectorCasts.asm.frag +++ b/tests/sksl/shared/StackingVectorCasts.asm.frag @@ -1,14 +1,14 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpDecorate %sk_FragColor RelaxedPrecision OpDecorate %sk_FragColor Location 0 @@ -38,7 +38,7 @@ OpDecorate %24 RelaxedPrecision %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float %int = OpTypeInt 32 1 %int_0 = OpConstant %int 0 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/StaticIf.asm.frag b/tests/sksl/shared/StaticIf.asm.frag index 8f2fc41767..e001fd897a 100644 --- a/tests/sksl/shared/StaticIf.asm.frag +++ b/tests/sksl/shared/StaticIf.asm.frag @@ -1,14 +1,14 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorRed" OpMemberName %_UniformBuffer 1 "colorGreen" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %result "result" OpDecorate %sk_FragColor RelaxedPrecision @@ -43,7 +43,7 @@ OpDecorate %30 RelaxedPrecision %int = OpTypeInt 32 1 %int_0 = OpConstant %int 0 %int_1 = OpConstant %int 1 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/StaticSwitchWithContinue.asm.frag b/tests/sksl/shared/StaticSwitchWithContinue.asm.frag index bc335cf815..b0918bf8f9 100644 --- a/tests/sksl/shared/StaticSwitchWithContinue.asm.frag +++ b/tests/sksl/shared/StaticSwitchWithContinue.asm.frag @@ -1,14 +1,14 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %result "result" OpName %x "x" @@ -48,7 +48,7 @@ OpDecorate %51 RelaxedPrecision %float_2 = OpConstant %float 2 %_ptr_Function_v4float = OpTypePointer Function %v4float %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/StructsInFunctions.asm.frag b/tests/sksl/shared/StructsInFunctions.asm.frag index b21a399672..c47265cfaf 100644 --- a/tests/sksl/shared/StructsInFunctions.asm.frag +++ b/tests/sksl/shared/StructsInFunctions.asm.frag @@ -1,21 +1,21 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorRed" OpMemberName %_UniformBuffer 1 "colorGreen" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %S "S" OpMemberName %S 0 "x" OpMemberName %S 1 "y" -OpName %returns_a_struct "returns_a_struct" +OpName %returns_a_struct_S "returns_a_struct_S" OpName %s "s" -OpName %accepts_a_struct "accepts_a_struct" -OpName %modifies_a_struct "modifies_a_struct" +OpName %accepts_a_struct_fS "accepts_a_struct_fS" +OpName %modifies_a_struct_vS "modifies_a_struct_vS" OpName %main "main" OpName %s_0 "s" OpName %x "x" @@ -71,13 +71,13 @@ OpDecorate %94 RelaxedPrecision %int_3 = OpConstant %int 3 %_ptr_Function_v4float = OpTypePointer Function %v4float %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float -%_entrypoint = OpFunction %void None %18 +%_entrypoint_v = OpFunction %void None %18 %19 = OpLabel %20 = OpFunctionCall %v4float %main OpStore %sk_FragColor %20 OpReturn OpFunctionEnd -%returns_a_struct = OpFunction %S None %23 +%returns_a_struct_S = OpFunction %S None %23 %24 = OpLabel %s = OpVariable %_ptr_Function_S Function %29 = OpAccessChain %_ptr_Function_float %s %int_0 @@ -87,7 +87,7 @@ OpStore %33 %int_2 %35 = OpLoad %S %s OpReturnValue %35 OpFunctionEnd -%accepts_a_struct = OpFunction %float None %36 +%accepts_a_struct_fS = OpFunction %float None %36 %37 = OpFunctionParameter %_ptr_Function_S %38 = OpLabel %39 = OpAccessChain %_ptr_Function_float %37 %int_0 @@ -98,7 +98,7 @@ OpFunctionEnd %44 = OpFAdd %float %40 %43 OpReturnValue %44 OpFunctionEnd -%modifies_a_struct = OpFunction %void None %45 +%modifies_a_struct_vS = OpFunction %void None %45 %46 = OpFunctionParameter %_ptr_Function_S %47 = OpLabel %48 = OpAccessChain %_ptr_Function_float %46 %int_0 @@ -118,13 +118,13 @@ OpFunctionEnd %60 = OpVariable %_ptr_Function_S Function %valid = OpVariable %_ptr_Function_bool Function %84 = OpVariable %_ptr_Function_v4float Function -%57 = OpFunctionCall %S %returns_a_struct +%57 = OpFunctionCall %S %returns_a_struct_S OpStore %s_0 %57 %59 = OpLoad %S %s_0 OpStore %60 %59 -%61 = OpFunctionCall %float %accepts_a_struct %60 +%61 = OpFunctionCall %float %accepts_a_struct_fS %60 OpStore %x %61 -%62 = OpFunctionCall %void %modifies_a_struct %s_0 +%62 = OpFunctionCall %void %modifies_a_struct_vS %s_0 %66 = OpLoad %float %x %68 = OpFOrdEqual %bool %66 %float_3 OpSelectionMerge %70 None diff --git a/tests/sksl/shared/SwizzleBoolConstants.asm.frag b/tests/sksl/shared/SwizzleBoolConstants.asm.frag index 38ec670143..c635b00aba 100644 --- a/tests/sksl/shared/SwizzleBoolConstants.asm.frag +++ b/tests/sksl/shared/SwizzleBoolConstants.asm.frag @@ -1,14 +1,14 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %v "v" OpName %result "result" @@ -85,7 +85,7 @@ OpDecorate %162 RelaxedPrecision %v3bool = OpTypeVector %bool 3 %_ptr_Function_v4float = OpTypePointer Function %v4float %int_1 = OpConstant %int 1 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/SwizzleByConstantIndex.asm.frag b/tests/sksl/shared/SwizzleByConstantIndex.asm.frag index 960997b523..d9e50477d2 100644 --- a/tests/sksl/shared/SwizzleByConstantIndex.asm.frag +++ b/tests/sksl/shared/SwizzleByConstantIndex.asm.frag @@ -1,15 +1,15 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "testInputs" OpMemberName %_UniformBuffer 1 "colorGreen" OpMemberName %_UniformBuffer 2 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %_0_v "_0_v" OpName %_1_x "_1_x" @@ -103,7 +103,7 @@ OpDecorate %123 RelaxedPrecision %v4bool = OpTypeVector %bool 4 %int_1 = OpConstant %int 1 %int_2 = OpConstant %int 2 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/SwizzleByIndex.asm.frag b/tests/sksl/shared/SwizzleByIndex.asm.frag index ae6affbdde..f09f2aaf33 100644 --- a/tests/sksl/shared/SwizzleByIndex.asm.frag +++ b/tests/sksl/shared/SwizzleByIndex.asm.frag @@ -1,8 +1,8 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" @@ -10,7 +10,7 @@ OpMemberName %_UniformBuffer 0 "testInputs" OpMemberName %_UniformBuffer 1 "colorBlack" OpMemberName %_UniformBuffer 2 "colorGreen" OpMemberName %_UniformBuffer 3 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %_0_v "_0_v" OpName %_1_i "_1_i" @@ -73,7 +73,7 @@ OpDecorate %84 RelaxedPrecision %v4bool = OpTypeVector %bool 4 %int_2 = OpConstant %int 2 %int_3 = OpConstant %int 3 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/SwizzleConstants.asm.frag b/tests/sksl/shared/SwizzleConstants.asm.frag index 9c4fe2ed4c..3924974f82 100644 --- a/tests/sksl/shared/SwizzleConstants.asm.frag +++ b/tests/sksl/shared/SwizzleConstants.asm.frag @@ -1,15 +1,15 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "testInputs" OpMemberName %_UniformBuffer 1 "colorGreen" OpMemberName %_UniformBuffer 2 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %v "v" OpDecorate %sk_FragColor RelaxedPrecision @@ -86,7 +86,7 @@ OpDecorate %158 RelaxedPrecision %v4bool = OpTypeVector %bool 4 %int_1 = OpConstant %int 1 %int_2 = OpConstant %int 2 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/SwizzleLTRB.asm.frag b/tests/sksl/shared/SwizzleLTRB.asm.frag index df9a621e39..50b412ce95 100644 --- a/tests/sksl/shared/SwizzleLTRB.asm.frag +++ b/tests/sksl/shared/SwizzleLTRB.asm.frag @@ -1,13 +1,13 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpDecorate %sk_FragColor RelaxedPrecision OpDecorate %sk_FragColor Location 0 @@ -35,7 +35,7 @@ OpDecorate %24 RelaxedPrecision %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float %int = OpTypeInt 32 1 %int_0 = OpConstant %int 0 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/SwizzleOpt.asm.frag b/tests/sksl/shared/SwizzleOpt.asm.frag index 242b863bb2..0afe0cc833 100644 --- a/tests/sksl/shared/SwizzleOpt.asm.frag +++ b/tests/sksl/shared/SwizzleOpt.asm.frag @@ -1,16 +1,16 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorRed" OpMemberName %_UniformBuffer 1 "colorGreen" OpMemberName %_UniformBuffer 2 "testInputs" -OpName %_entrypoint "_entrypoint" -OpName %fn "fn" +OpName %_entrypoint_v "_entrypoint_v" +OpName %fn_hh4 "fn_hh4" OpName %x "x" OpName %main "main" OpName %v "v" @@ -86,13 +86,13 @@ OpDecorate %154 RelaxedPrecision %int_0 = OpConstant %int 0 %142 = OpConstantComposite %v4float %float_1 %float_1 %float_1 %float_1 %v4bool = OpTypeVector %bool 4 -%_entrypoint = OpFunction %void None %16 +%_entrypoint_v = OpFunction %void None %16 %17 = OpLabel %18 = OpFunctionCall %v4float %main OpStore %sk_FragColor %18 OpReturn OpFunctionEnd -%fn = OpFunction %float None %19 +%fn_hh4 = OpFunction %float None %19 %21 = OpFunctionParameter %_ptr_Function_v4float %22 = OpLabel %x = OpVariable %_ptr_Function_int Function @@ -166,35 +166,35 @@ OpStore %v %74 OpStore %v %76 %77 = OpLoad %v4float %v OpStore %78 %77 -%79 = OpFunctionCall %float %fn %78 +%79 = OpFunctionCall %float %fn_hh4 %78 %82 = OpCompositeConstruct %v3float %79 %float_123 %float_456 %83 = OpVectorShuffle %v4float %82 %82 1 1 2 2 OpStore %v %83 %84 = OpLoad %v4float %v OpStore %85 %84 -%86 = OpFunctionCall %float %fn %85 +%86 = OpFunctionCall %float %fn_hh4 %85 %87 = OpCompositeConstruct %v3float %86 %float_123 %float_456 %88 = OpVectorShuffle %v4float %87 %87 1 1 2 2 OpStore %v %88 %89 = OpLoad %v4float %v OpStore %90 %89 -%91 = OpFunctionCall %float %fn %90 +%91 = OpFunctionCall %float %fn_hh4 %90 %92 = OpCompositeConstruct %v4float %float_123 %float_456 %float_456 %91 OpStore %v %92 %93 = OpLoad %v4float %v OpStore %94 %93 -%95 = OpFunctionCall %float %fn %94 +%95 = OpFunctionCall %float %fn_hh4 %94 %96 = OpCompositeConstruct %v4float %float_123 %float_456 %float_456 %95 OpStore %v %96 %97 = OpLoad %v4float %v OpStore %98 %97 -%99 = OpFunctionCall %float %fn %98 +%99 = OpFunctionCall %float %fn_hh4 %98 %100 = OpCompositeConstruct %v3float %99 %float_123 %float_456 %101 = OpVectorShuffle %v4float %100 %100 1 0 0 2 OpStore %v %101 %102 = OpLoad %v4float %v OpStore %103 %102 -%104 = OpFunctionCall %float %fn %103 +%104 = OpFunctionCall %float %fn_hh4 %103 %105 = OpCompositeConstruct %v3float %104 %float_123 %float_456 %106 = OpVectorShuffle %v4float %105 %105 1 0 0 2 OpStore %v %106 diff --git a/tests/sksl/shared/SwizzleScalar.asm.frag b/tests/sksl/shared/SwizzleScalar.asm.frag index 5e4a6c6124..d744631310 100644 --- a/tests/sksl/shared/SwizzleScalar.asm.frag +++ b/tests/sksl/shared/SwizzleScalar.asm.frag @@ -1,13 +1,13 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "unknownInput" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %x "x" OpName %v "v" @@ -48,7 +48,7 @@ OpDecorate %51 RelaxedPrecision %v2float = OpTypeVector %float 2 %float_0 = OpConstant %float 0 %float_1 = OpConstant %float 1 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/TernaryAsLValueEntirelyFoldable.asm.frag b/tests/sksl/shared/TernaryAsLValueEntirelyFoldable.asm.frag index 6b9c2a29f6..400c57bd69 100644 --- a/tests/sksl/shared/TernaryAsLValueEntirelyFoldable.asm.frag +++ b/tests/sksl/shared/TernaryAsLValueEntirelyFoldable.asm.frag @@ -1,11 +1,11 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %r "r" OpName %g "g" @@ -28,7 +28,7 @@ OpDecorate %23 RelaxedPrecision %_ptr_Function_float = OpTypePointer Function %float %float_0 = OpConstant %float 0 %float_1 = OpConstant %float 1 -%_entrypoint = OpFunction %void None %12 +%_entrypoint_v = OpFunction %void None %12 %13 = OpLabel %14 = OpFunctionCall %v4float %main OpStore %sk_FragColor %14 diff --git a/tests/sksl/shared/TernaryAsLValueFoldableTest.asm.frag b/tests/sksl/shared/TernaryAsLValueFoldableTest.asm.frag index bd9fbb7092..4c90c93acc 100644 --- a/tests/sksl/shared/TernaryAsLValueFoldableTest.asm.frag +++ b/tests/sksl/shared/TernaryAsLValueFoldableTest.asm.frag @@ -1,13 +1,13 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "unknownInput" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %r "r" OpName %g "g" @@ -44,7 +44,7 @@ OpDecorate %33 RelaxedPrecision %int = OpTypeInt 32 1 %int_0 = OpConstant %int 0 %float_0 = OpConstant %float 0 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/TernaryExpression.asm.frag b/tests/sksl/shared/TernaryExpression.asm.frag index 368463281d..111b2efe2d 100644 --- a/tests/sksl/shared/TernaryExpression.asm.frag +++ b/tests/sksl/shared/TernaryExpression.asm.frag @@ -1,14 +1,14 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %ok "ok" OpDecorate %sk_FragColor RelaxedPrecision @@ -52,7 +52,7 @@ OpDecorate %57 RelaxedPrecision %float_1 = OpConstant %float 1 %_ptr_Function_v4float = OpTypePointer Function %v4float %int_1 = OpConstant %int 1 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/UnaryPositiveNegative.asm.frag b/tests/sksl/shared/UnaryPositiveNegative.asm.frag index 6403e0532c..96d14239e3 100644 --- a/tests/sksl/shared/UnaryPositiveNegative.asm.frag +++ b/tests/sksl/shared/UnaryPositiveNegative.asm.frag @@ -1,15 +1,15 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorWhite" OpMemberName %_UniformBuffer 1 "colorGreen" OpMemberName %_UniformBuffer 2 "colorRed" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %x "x" OpDecorate %sk_FragColor RelaxedPrecision @@ -56,7 +56,7 @@ OpDecorate %48 RelaxedPrecision %_ptr_Function_v4float = OpTypePointer Function %v4float %int_1 = OpConstant %int 1 %int_2 = OpConstant %int 2 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/Uniforms.asm.frag b/tests/sksl/shared/Uniforms.asm.frag index 77bbe8c20b..a2e5cc8381 100644 --- a/tests/sksl/shared/Uniforms.asm.frag +++ b/tests/sksl/shared/Uniforms.asm.frag @@ -1,14 +1,14 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "myHalf" OpMemberName %_UniformBuffer 1 "myHalf4" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpDecorate %sk_FragColor RelaxedPrecision OpDecorate %sk_FragColor Location 0 @@ -41,7 +41,7 @@ OpDecorate %28 RelaxedPrecision %int_1 = OpConstant %int 1 %_ptr_Uniform_float = OpTypePointer Uniform %float %int_0 = OpConstant %int 0 -%_entrypoint = OpFunction %void None %15 +%_entrypoint_v = OpFunction %void None %15 %16 = OpLabel %17 = OpFunctionCall %v4float %main OpStore %sk_FragColor %17 diff --git a/tests/sksl/shared/UnusedVariables.asm.frag b/tests/sksl/shared/UnusedVariables.asm.frag index 7fa81f484a..71a153261c 100644 --- a/tests/sksl/shared/UnusedVariables.asm.frag +++ b/tests/sksl/shared/UnusedVariables.asm.frag @@ -1,11 +1,11 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %b "b" OpName %c "c" @@ -31,7 +31,7 @@ OpDecorate %sk_Clockwise BuiltIn FrontFacing %float_0 = OpConstant %float 0 %float_5 = OpConstant %float 5 %float_4 = OpConstant %float 4 -%_entrypoint = OpFunction %void None %12 +%_entrypoint_v = OpFunction %void None %12 %13 = OpLabel %14 = OpFunctionCall %v4float %main OpStore %sk_FragColor %14 diff --git a/tests/sksl/shared/VectorConstructors.asm.frag b/tests/sksl/shared/VectorConstructors.asm.frag index 05092951a2..5419d68a36 100644 --- a/tests/sksl/shared/VectorConstructors.asm.frag +++ b/tests/sksl/shared/VectorConstructors.asm.frag @@ -1,15 +1,15 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" OpName %_UniformBuffer "_UniformBuffer" OpMemberName %_UniformBuffer 0 "colorGreen" OpMemberName %_UniformBuffer 1 "colorRed" -OpName %_entrypoint "_entrypoint" -OpName %check "check" +OpName %_entrypoint_v "_entrypoint_v" +OpName %check_bf2f2f2f3i2i2f2f2f4i2b4f2f2f2b2b2b3 "check_bf2f2f2f3i2i2f2f2f4i2b4f2f2f2b2b2b3" OpName %main "main" OpName %v1 "v1" OpName %v2 "v2" @@ -118,13 +118,13 @@ OpDecorate %238 RelaxedPrecision %192 = OpConstantComposite %v3bool %true %true %true %_ptr_Uniform_v4float = OpTypePointer Uniform %v4float %int_0 = OpConstant %int 0 -%_entrypoint = OpFunction %void None %16 +%_entrypoint_v = OpFunction %void None %16 %17 = OpLabel %18 = OpFunctionCall %v4float %main OpStore %sk_FragColor %18 OpReturn OpFunctionEnd -%check = OpFunction %bool None %26 +%check_bf2f2f2f3i2i2f2f2f4i2b4f2f2f2b2b2b3 = OpFunction %bool None %26 %34 = OpFunctionParameter %_ptr_Function_v2float %35 = OpFunctionParameter %_ptr_Function_v2float %36 = OpFunctionParameter %_ptr_Function_v2float @@ -333,7 +333,7 @@ OpStore %222 %221 OpStore %224 %223 %225 = OpLoad %v3bool %v17 OpStore %226 %225 -%227 = OpFunctionCall %bool %check %194 %196 %198 %200 %202 %204 %206 %208 %210 %212 %214 %216 %218 %220 %222 %224 %226 +%227 = OpFunctionCall %bool %check_bf2f2f2f3i2i2f2f2f4i2b4f2f2f2b2b2b3 %194 %196 %198 %200 %202 %204 %206 %208 %210 %212 %214 %216 %218 %220 %222 %224 %226 OpSelectionMerge %231 None OpBranchConditional %227 %229 %230 %229 = OpLabel diff --git a/tests/sksl/shared/WhileLoopControlFlow.asm.frag b/tests/sksl/shared/WhileLoopControlFlow.asm.frag index f8cf048837..72b260ea74 100644 --- a/tests/sksl/shared/WhileLoopControlFlow.asm.frag +++ b/tests/sksl/shared/WhileLoopControlFlow.asm.frag @@ -1,11 +1,11 @@ OpCapability Shader %1 = OpExtInstImport "GLSL.std.450" OpMemoryModel Logical GLSL450 -OpEntryPoint Fragment %_entrypoint "_entrypoint" %sk_FragColor %sk_Clockwise -OpExecutionMode %_entrypoint OriginUpperLeft +OpEntryPoint Fragment %_entrypoint_v "_entrypoint" %sk_FragColor %sk_Clockwise +OpExecutionMode %_entrypoint_v OriginUpperLeft OpName %sk_FragColor "sk_FragColor" OpName %sk_Clockwise "sk_Clockwise" -OpName %_entrypoint "_entrypoint" +OpName %_entrypoint_v "_entrypoint_v" OpName %main "main" OpName %x "x" OpDecorate %sk_FragColor RelaxedPrecision @@ -41,7 +41,7 @@ OpDecorate %61 RelaxedPrecision %float_0 = OpConstant %float 0 %int_2 = OpConstant %int 2 %int_1 = OpConstant %int 1 -%_entrypoint = OpFunction %void None %12 +%_entrypoint_v = OpFunction %void None %12 %13 = OpLabel %14 = OpFunctionCall %v4float %main OpStore %sk_FragColor %14