AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1456 from KhronosGroup/fix-1455

Browse Source 
MSL: Fix OpCompositeInsert and OpVectorInsertDynamic.
This commit is contained in:
Hans-Kristian Arntzen 2020-09-02 12:36:51 +02:00 committed by GitHub
commit c7507e39d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 107 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
reference/shaders-msl-no-opt/asm/frag/component-insert-packed-expression.asm.frag Normal file
View File

@ -0,0 +1,34 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct type_Globals
{
float4 _BorderWidths[4];
};
struct main0_out
{
float4 out_var_SV_Target [[color(0)]];
};
fragment main0_out main0(constant type_Globals& _Globals [[buffer(0)]], float4 gl_FragCoord [[position]])
{
main0_out out = {};
float2 _31 = float2(_Globals._BorderWidths[0].x, _Globals._BorderWidths[1].x);
float2 _39;
if (gl_FragCoord.x > 0.0)
{
float2 _38 = _31;
_38.x = _Globals._BorderWidths[2].x;
_39 = _38;
}
else
{
_39 = _31;
}
out.out_var_SV_Target = float4(_39, 0.0, 1.0);
return out;
}

70
shaders-msl-no-opt/asm/frag/component-insert-packed-expression.asm.frag Normal file
View File

@ -0,0 +1,70 @@
; SPIR-V
; Version: 1.0
; Generator: Google spiregg; 0
; Bound: 43
; Schema: 0
OpCapability Shader
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %frag "main" %gl_FragCoord %out_var_SV_Target
OpExecutionMode %frag OriginUpperLeft
OpSource HLSL 600
OpName %type__Globals "type.$Globals"
OpMemberName %type__Globals 0 "_BorderWidths"
OpName %_Globals "$Globals"
OpName %out_var_SV_Target "out.var.SV_Target"
OpName %frag "frag"
OpDecorate %gl_FragCoord BuiltIn FragCoord
OpDecorate %out_var_SV_Target Location 0
OpDecorate %_Globals DescriptorSet 0
OpDecorate %_Globals Binding 0
OpDecorate %_arr_float_uint_4 ArrayStride 16
OpMemberDecorate %type__Globals 0 Offset 0
OpDecorate %type__Globals Block
%int = OpTypeInt 32 1
%int_0 = OpConstant %int 0
%int_1 = OpConstant %int 1
%float = OpTypeFloat 32
%float_0 = OpConstant %float 0
%int_2 = OpConstant %int 2
%uint = OpTypeInt 32 0
%float_1 = OpConstant %float 1
%uint_4 = OpConstant %uint 4
%_arr_float_uint_4 = OpTypeArray %float %uint_4
%type__Globals = OpTypeStruct %_arr_float_uint_4
%_ptr_Uniform_type__Globals = OpTypePointer Uniform %type__Globals
%v4float = OpTypeVector %float 4
%_ptr_Input_v4float = OpTypePointer Input %v4float
%_ptr_Output_v4float = OpTypePointer Output %v4float
%void = OpTypeVoid
%21 = OpTypeFunction %void
%v2float = OpTypeVector %float 2
%_ptr_Uniform_float = OpTypePointer Uniform %float
%bool = OpTypeBool
%_Globals = OpVariable %_ptr_Uniform_type__Globals Uniform
%gl_FragCoord = OpVariable %_ptr_Input_v4float Input
%out_var_SV_Target = OpVariable %_ptr_Output_v4float Output
%frag = OpFunction %void None %21
%25 = OpLabel
%26 = OpLoad %v4float %gl_FragCoord
%27 = OpAccessChain %_ptr_Uniform_float %_Globals %int_0 %int_0
%28 = OpLoad %float %27
%29 = OpAccessChain %_ptr_Uniform_float %_Globals %int_0 %int_1
%30 = OpLoad %float %29
%31 = OpCompositeConstruct %v2float %28 %30
%32 = OpCompositeExtract %float %26 0
%33 = OpFOrdGreaterThan %bool %32 %float_0
OpSelectionMerge %34 None
OpBranchConditional %33 %35 %34
%35 = OpLabel
%36 = OpAccessChain %_ptr_Uniform_float %_Globals %int_0 %int_2
%37 = OpLoad %float %36
%38 = OpCompositeInsert %v2float %37 %31 0
OpBranch %34
%34 = OpLabel
%39 = OpPhi %v2float %31 %25 %38 %35
%40 = OpCompositeExtract %float %39 0
%41 = OpCompositeExtract %float %39 1
%42 = OpCompositeConstruct %v4float %40 %41 %float_0 %float_1
OpStore %out_var_SV_Target %42
OpReturn
OpFunctionEnd

6
spirv_glsl.cpp
View File

@ -9280,7 +9280,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
statement(declare_temporary(result_type, id), to_expression(vec), ";");
set<SPIRExpression>(id, to_name(id), result_type, true);
auto chain = access_chain_internal(id, &index, 1, 0, nullptr);
statement(chain, " = ", to_expression(comp), ";");
statement(chain, " = ", to_unpacked_expression(comp), ";");
break;
}
@ -9382,7 +9382,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
statement(declare_temporary(result_type, id), to_expression(composite), ";");
set<SPIRExpression>(id, to_name(id), result_type, true);
auto chain = access_chain_internal(id, elems, length, ACCESS_CHAIN_INDEX_IS_LITERAL_BIT, nullptr);
statement(chain, " = ", to_expression(obj), ";");
statement(chain, " = ", to_unpacked_expression(obj), ";");
break;
}
@ -9395,7 +9395,7 @@ void CompilerGLSL::emit_instruction(const Instruction &instruction)
{
flush_variable_declaration(lhs);
flush_variable_declaration(rhs);
statement(to_expression(lhs), " = ", to_expression(rhs), ";");
statement(to_expression(lhs), " = ", to_unpacked_expression(rhs), ";");
register_write(lhs);
}
break;