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

Merge branch 'master' of git://github.com/kakashidinho/SPIRV-Cross

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2020-05-06 10:03:36 +02:00
commit b8ba89a1ac
9 changed files with 421 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
reference/shaders-msl/asm/vert/packed-bool-to-uint.asm.vert Normal file
View File

@ -0,0 +1,38 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct Struct
{
uint flags[1];
};
struct defaultUniformsVS
{
Struct flags;
float4 uquad[4];
float4x4 umatrix;
};
struct main0_out
{
float4 gl_Position [[position]];
};
struct main0_in
{
float4 a_position [[attribute(0)]];
};
vertex main0_out main0(main0_in in [[stage_in]], constant defaultUniformsVS& _9 [[buffer(0)]], uint gl_VertexIndex [[vertex_id]])
{
main0_out out = {};
out.gl_Position = _9.umatrix * float4(_9.uquad[int(gl_VertexIndex)].x, _9.uquad[int(gl_VertexIndex)].y, in.a_position.z, in.a_position.w);
if (uint(_9.flags.flags[0]) != 0u)
{
out.gl_Position.z = 0.0;
}
return out;
}

38
reference/shaders-msl/asm/vert/packed-bool2-to-packed_uint2.asm.vert Normal file
View File

@ -0,0 +1,38 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct Struct
{
packed_uint2 flags[1];
};
struct defaultUniformsVS
{
Struct flags;
float4 uquad[4];
float4x4 umatrix;
};
struct main0_out
{
float4 gl_Position [[position]];
};
struct main0_in
{
float4 a_position [[attribute(0)]];
};
vertex main0_out main0(main0_in in [[stage_in]], constant defaultUniformsVS& _9 [[buffer(0)]], uint gl_VertexIndex [[vertex_id]])
{
main0_out out = {};
out.gl_Position = _9.umatrix * float4(_9.uquad[int(gl_VertexIndex)].x, _9.uquad[int(gl_VertexIndex)].y, in.a_position.z, in.a_position.w);
if (_9.flags.flags[0][0u] != 0u)
{
out.gl_Position.z = 0.0;
}
return out;
}

38
reference/shaders-msl/vert/packed-bool-to-uint.vert Normal file
View File

@ -0,0 +1,38 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct Struct
{
uint flags[1];
};
struct defaultUniformsVS
{
Struct flags;
float4 uquad[4];
float4x4 umatrix;
};
struct main0_out
{
float4 gl_Position [[position]];
};
struct main0_in
{
float4 a_position [[attribute(0)]];
};
vertex main0_out main0(main0_in in [[stage_in]], constant defaultUniformsVS& _24 [[buffer(0)]], uint gl_VertexIndex [[vertex_id]])
{
main0_out out = {};
out.gl_Position = _24.umatrix * float4(_24.uquad[int(gl_VertexIndex)].x, _24.uquad[int(gl_VertexIndex)].y, in.a_position.z, in.a_position.w);
if (uint(_24.flags.flags[0]) != 0u)
{
out.gl_Position.z = 0.0;
}
return out;
}

38
reference/shaders-msl/vert/packed-bool2-to-packed_uint2.vert Normal file
View File

@ -0,0 +1,38 @@
#include <metal_stdlib>
#include <simd/simd.h>
using namespace metal;
struct Struct
{
packed_uint2 flags[1];
};
struct defaultUniformsVS
{
Struct flags;
float4 uquad[4];
float4x4 umatrix;
};
struct main0_out
{
float4 gl_Position [[position]];
};
struct main0_in
{
float4 a_position [[attribute(0)]];
};
vertex main0_out main0(main0_in in [[stage_in]], constant defaultUniformsVS& _25 [[buffer(0)]], uint gl_VertexIndex [[vertex_id]])
{
main0_out out = {};
out.gl_Position = _25.umatrix * float4(_25.uquad[int(gl_VertexIndex)].x, _25.uquad[int(gl_VertexIndex)].y, in.a_position.z, in.a_position.w);
if (_25.flags.flags[0][0u] != 0u)
{
out.gl_Position.z = 0.0;
}
return out;
}

111
shaders-msl/asm/vert/packed-bool-to-uint.asm.vert Normal file
View File

@ -0,0 +1,111 @@
; SPIR-V
; Version: 1.0
; Generator: Khronos Glslang Reference Front End; 7
; Bound: 62
; Schema: 0
OpCapability Shader
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint Vertex %main "main" %_ %gl_VertexIndex %a_position
OpSource GLSL 450
OpName %main "main"
OpName %gl_PerVertex "gl_PerVertex"
OpMemberName %gl_PerVertex 0 "gl_Position"
OpMemberName %gl_PerVertex 1 "gl_PointSize"
OpMemberName %gl_PerVertex 2 "gl_ClipDistance"
OpMemberName %gl_PerVertex 3 "gl_CullDistance"
OpName %_ ""
OpName %Struct "Struct"
OpMemberName %Struct 0 "flags"
OpName %defaultUniformsVS "defaultUniformsVS"
OpMemberName %defaultUniformsVS 0 "flags"
OpMemberName %defaultUniformsVS 1 "uquad"
OpMemberName %defaultUniformsVS 2 "umatrix"
OpName %__0 ""
OpName %gl_VertexIndex "gl_VertexIndex"
OpName %a_position "a_position"
OpMemberDecorate %gl_PerVertex 0 BuiltIn Position
OpMemberDecorate %gl_PerVertex 1 BuiltIn PointSize
OpMemberDecorate %gl_PerVertex 2 BuiltIn ClipDistance
OpMemberDecorate %gl_PerVertex 3 BuiltIn CullDistance
OpDecorate %gl_PerVertex Block
OpDecorate %_arr_uint_uint_1 ArrayStride 16
OpMemberDecorate %Struct 0 Offset 0
OpDecorate %_arr_v2float_uint_4 ArrayStride 16
OpMemberDecorate %defaultUniformsVS 0 Offset 0
OpMemberDecorate %defaultUniformsVS 1 Offset 16
OpMemberDecorate %defaultUniformsVS 2 ColMajor
OpMemberDecorate %defaultUniformsVS 2 Offset 80
OpMemberDecorate %defaultUniformsVS 2 MatrixStride 16
OpDecorate %defaultUniformsVS Block
OpDecorate %__0 DescriptorSet 0
OpDecorate %__0 Binding 0
OpDecorate %gl_VertexIndex BuiltIn VertexIndex
OpDecorate %a_position Location 0
%void = OpTypeVoid
%3 = OpTypeFunction %void
%float = OpTypeFloat 32
%v4float = OpTypeVector %float 4
%uint = OpTypeInt 32 0
%uint_1 = OpConstant %uint 1
%_arr_float_uint_1 = OpTypeArray %float %uint_1
%gl_PerVertex = OpTypeStruct %v4float %float %_arr_float_uint_1 %_arr_float_uint_1
%_ptr_Output_gl_PerVertex = OpTypePointer Output %gl_PerVertex
%_ = OpVariable %_ptr_Output_gl_PerVertex Output
%int = OpTypeInt 32 1
%int_0 = OpConstant %int 0
%_arr_uint_uint_1 = OpTypeArray %uint %uint_1
%Struct = OpTypeStruct %_arr_uint_uint_1
%v2float = OpTypeVector %float 2
%uint_4 = OpConstant %uint 4
%_arr_v2float_uint_4 = OpTypeArray %v2float %uint_4
%mat4v4float = OpTypeMatrix %v4float 4
%defaultUniformsVS = OpTypeStruct %Struct %_arr_v2float_uint_4 %mat4v4float
%_ptr_Uniform_defaultUniformsVS = OpTypePointer Uniform %defaultUniformsVS
%__0 = OpVariable %_ptr_Uniform_defaultUniformsVS Uniform
%int_2 = OpConstant %int 2
%_ptr_Uniform_mat4v4float = OpTypePointer Uniform %mat4v4float
%int_1 = OpConstant %int 1
%_ptr_Input_int = OpTypePointer Input %int
%gl_VertexIndex = OpVariable %_ptr_Input_int Input
%_ptr_Uniform_v2float = OpTypePointer Uniform %v2float
%_ptr_Input_v4float = OpTypePointer Input %v4float
%a_position = OpVariable %_ptr_Input_v4float Input
%uint_2 = OpConstant %uint 2
%_ptr_Input_float = OpTypePointer Input %float
%uint_3 = OpConstant %uint 3
%_ptr_Output_v4float = OpTypePointer Output %v4float
%_ptr_Uniform_uint = OpTypePointer Uniform %uint
%bool = OpTypeBool
%uint_0 = OpConstant %uint 0
%float_0 = OpConstant %float 0
%_ptr_Output_float = OpTypePointer Output %float
%main = OpFunction %void None %3
%5 = OpLabel
%27 = OpAccessChain %_ptr_Uniform_mat4v4float %__0 %int_2
%28 = OpLoad %mat4v4float %27
%32 = OpLoad %int %gl_VertexIndex
%34 = OpAccessChain %_ptr_Uniform_v2float %__0 %int_1 %32
%35 = OpLoad %v2float %34
%40 = OpAccessChain %_ptr_Input_float %a_position %uint_2
%41 = OpLoad %float %40
%43 = OpAccessChain %_ptr_Input_float %a_position %uint_3
%44 = OpLoad %float %43
%45 = OpCompositeExtract %float %35 0
%46 = OpCompositeExtract %float %35 1
%47 = OpCompositeConstruct %v4float %45 %46 %41 %44
%48 = OpMatrixTimesVector %v4float %28 %47
%50 = OpAccessChain %_ptr_Output_v4float %_ %int_0
OpStore %50 %48
%52 = OpAccessChain %_ptr_Uniform_uint %__0 %int_0 %int_0 %int_0
%53 = OpLoad %uint %52
%56 = OpINotEqual %bool %53 %uint_0
OpSelectionMerge %58 None
OpBranchConditional %56 %57 %58
%57 = OpLabel
%61 = OpAccessChain %_ptr_Output_float %_ %int_0 %uint_2
OpStore %61 %float_0
OpBranch %58
%58 = OpLabel
OpReturn
OpFunctionEnd

113
shaders-msl/asm/vert/packed-bool2-to-packed_uint2.asm.vert Normal file
View File

@ -0,0 +1,113 @@
; SPIR-V
; Version: 1.0
; Generator: Khronos Glslang Reference Front End; 7
; Bound: 64
; Schema: 0
OpCapability Shader
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint Vertex %main "main" %_ %gl_VertexIndex %a_position
OpSource GLSL 450
OpName %main "main"
OpName %gl_PerVertex "gl_PerVertex"
OpMemberName %gl_PerVertex 0 "gl_Position"
OpMemberName %gl_PerVertex 1 "gl_PointSize"
OpMemberName %gl_PerVertex 2 "gl_ClipDistance"
OpMemberName %gl_PerVertex 3 "gl_CullDistance"
OpName %_ ""
OpName %Struct "Struct"
OpMemberName %Struct 0 "flags"
OpName %defaultUniformsVS "defaultUniformsVS"
OpMemberName %defaultUniformsVS 0 "flags"
OpMemberName %defaultUniformsVS 1 "uquad"
OpMemberName %defaultUniformsVS 2 "umatrix"
OpName %__0 ""
OpName %gl_VertexIndex "gl_VertexIndex"
OpName %a_position "a_position"
OpMemberDecorate %gl_PerVertex 0 BuiltIn Position
OpMemberDecorate %gl_PerVertex 1 BuiltIn PointSize
OpMemberDecorate %gl_PerVertex 2 BuiltIn ClipDistance
OpMemberDecorate %gl_PerVertex 3 BuiltIn CullDistance
OpDecorate %gl_PerVertex Block
OpDecorate %_arr_v2uint_uint_1 ArrayStride 16
OpMemberDecorate %Struct 0 Offset 0
OpDecorate %_arr_v2float_uint_4 ArrayStride 16
OpMemberDecorate %defaultUniformsVS 0 Offset 0
OpMemberDecorate %defaultUniformsVS 1 Offset 16
OpMemberDecorate %defaultUniformsVS 2 ColMajor
OpMemberDecorate %defaultUniformsVS 2 Offset 80
OpMemberDecorate %defaultUniformsVS 2 MatrixStride 16
OpDecorate %defaultUniformsVS Block
OpDecorate %__0 DescriptorSet 0
OpDecorate %__0 Binding 0
OpDecorate %gl_VertexIndex BuiltIn VertexIndex
OpDecorate %a_position Location 0
%void = OpTypeVoid
%3 = OpTypeFunction %void
%float = OpTypeFloat 32
%v4float = OpTypeVector %float 4
%uint = OpTypeInt 32 0
%uint_1 = OpConstant %uint 1
%_arr_float_uint_1 = OpTypeArray %float %uint_1
%gl_PerVertex = OpTypeStruct %v4float %float %_arr_float_uint_1 %_arr_float_uint_1
%_ptr_Output_gl_PerVertex = OpTypePointer Output %gl_PerVertex
%_ = OpVariable %_ptr_Output_gl_PerVertex Output
%int = OpTypeInt 32 1
%int_0 = OpConstant %int 0
%v2uint = OpTypeVector %uint 2
%_arr_v2uint_uint_1 = OpTypeArray %v2uint %uint_1
%Struct = OpTypeStruct %_arr_v2uint_uint_1
%v2float = OpTypeVector %float 2
%uint_4 = OpConstant %uint 4
%_arr_v2float_uint_4 = OpTypeArray %v2float %uint_4
%mat4v4float = OpTypeMatrix %v4float 4
%defaultUniformsVS = OpTypeStruct %Struct %_arr_v2float_uint_4 %mat4v4float
%_ptr_Uniform_defaultUniformsVS = OpTypePointer Uniform %defaultUniformsVS
%__0 = OpVariable %_ptr_Uniform_defaultUniformsVS Uniform
%int_2 = OpConstant %int 2
%_ptr_Uniform_mat4v4float = OpTypePointer Uniform %mat4v4float
%int_1 = OpConstant %int 1
%_ptr_Input_int = OpTypePointer Input %int
%gl_VertexIndex = OpVariable %_ptr_Input_int Input
%_ptr_Uniform_v2float = OpTypePointer Uniform %v2float
%_ptr_Input_v4float = OpTypePointer Input %v4float
%a_position = OpVariable %_ptr_Input_v4float Input
%uint_2 = OpConstant %uint 2
%_ptr_Input_float = OpTypePointer Input %float
%uint_3 = OpConstant %uint 3
%_ptr_Output_v4float = OpTypePointer Output %v4float
%bool = OpTypeBool
%v2bool = OpTypeVector %bool 2
%uint_0 = OpConstant %uint 0
%_ptr_Uniform_uint = OpTypePointer Uniform %uint
%float_0 = OpConstant %float 0
%_ptr_Output_float = OpTypePointer Output %float
%main = OpFunction %void None %3
%5 = OpLabel
%28 = OpAccessChain %_ptr_Uniform_mat4v4float %__0 %int_2
%29 = OpLoad %mat4v4float %28
%33 = OpLoad %int %gl_VertexIndex
%35 = OpAccessChain %_ptr_Uniform_v2float %__0 %int_1 %33
%36 = OpLoad %v2float %35
%41 = OpAccessChain %_ptr_Input_float %a_position %uint_2
%42 = OpLoad %float %41
%44 = OpAccessChain %_ptr_Input_float %a_position %uint_3
%45 = OpLoad %float %44
%46 = OpCompositeExtract %float %36 0
%47 = OpCompositeExtract %float %36 1
%48 = OpCompositeConstruct %v4float %46 %47 %42 %45
%49 = OpMatrixTimesVector %v4float %29 %48
%51 = OpAccessChain %_ptr_Output_v4float %_ %int_0
OpStore %51 %49
%56 = OpAccessChain %_ptr_Uniform_uint %__0 %int_0 %int_0 %int_0 %uint_0
%57 = OpLoad %uint %56
%58 = OpINotEqual %bool %57 %uint_0
OpSelectionMerge %60 None
OpBranchConditional %58 %59 %60
%59 = OpLabel
%63 = OpAccessChain %_ptr_Output_float %_ %int_0 %uint_2
OpStore %63 %float_0
OpBranch %60
%60 = OpLabel
OpReturn
OpFunctionEnd

22
shaders-msl/vert/packed-bool-to-uint.vert Normal file
View File

@ -0,0 +1,22 @@
#version 450 core
struct Struct
{
bool flags[1];
};
layout(set=0, binding=0, std140) uniform defaultUniformsVS
{
Struct flags;
vec2 uquad[4];
mat4 umatrix;
};
layout (location = 0) in vec4 a_position;
void main()
{
gl_Position = umatrix * vec4(uquad[gl_VertexIndex], a_position.z, a_position.w);
if (flags.flags[0])
gl_Position.z = 0.0;
}

22
shaders-msl/vert/packed-bool2-to-packed_uint2.vert Normal file
View File

@ -0,0 +1,22 @@
#version 450 core
struct Struct
{
bvec2 flags[1];
};
layout(set=0, binding=0, std140) uniform defaultUniformsVS
{
Struct flags;
vec2 uquad[4];
mat4 umatrix;
};
layout (location = 0) in vec4 a_position;
void main()
{
gl_Position = umatrix * vec4(uquad[gl_VertexIndex], a_position.z, a_position.w);
if (flags.flags[0].x)
gl_Position.z = 0.0;
}

2
spirv_msl.cpp
View File

@ -8666,7 +8666,7 @@ string CompilerMSL::to_struct_member(const SPIRType &type, uint32_t member_type_
td_line += ";";
add_typedef_line(td_line);
}
else
else if (!is_scalar(physical_type)) // scalar type is already packed.
pack_pfx = "packed_";
}
else if (row_major)