AuroraMiddleware/SPIRV-Cross-Vulnerable
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Cross.git synced 2024-11-15 00:11:06 +00:00
Code Issues Projects Releases Wiki Activity

Removed 'argument_buffer_offset' and fixed packed matrix Metal output.

Browse Source
This commit is contained in:
Lukas Hermanns 2019-10-23 16:28:32 -04:00
parent 6673a675ba
commit b0d616aa6d
12 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
reference/opt/shaders-msl/vulkan/comp/struct-packing-scalar.nocompat.invalid.vk.comp
View File

@ -6,9 +6,9 @@
using namespace metal;
typedef float2x2 packed_float2x2;
typedef float2x3 packed_float2x3;
typedef float2x3 packed_rm_float3x2;
typedef packed_float2 packed_float2x2[2];
typedef packed_float3 packed_float2x3[2];
typedef packed_float3 packed_rm_float3x2[2];
template<typename T, size_t Num>
struct spvUnsafeArray

2
reference/shaders-msl-no-opt/asm/packing/load-packed-no-forwarding.asm.comp
View File

@ -3,7 +3,7 @@
using namespace metal;
typedef float3x3 packed_rm_float3x3;
typedef packed_float3 packed_rm_float3x3[3];
struct SSBOScalar
{

2
reference/shaders-msl-no-opt/packing/matrix-2x3-scalar.comp
View File

@ -5,7 +5,7 @@
using namespace metal;
typedef float2x3 packed_float2x3;
typedef packed_float3 packed_float2x3[2];
struct SSBOCol
{

2
reference/shaders-msl-no-opt/packing/matrix-3x2-scalar.comp
View File

@ -5,7 +5,7 @@
using namespace metal;
typedef float2x3 packed_rm_float3x2;
typedef packed_float3 packed_rm_float3x2[2];
struct SSBOCol
{

4
reference/shaders-msl-no-opt/packing/matrix-3x3-scalar.comp
View File

@ -5,8 +5,8 @@
using namespace metal;
typedef float3x3 packed_float3x3;
typedef float3x3 packed_rm_float3x3;
typedef packed_float3 packed_float3x3[3];
typedef packed_float3 packed_rm_float3x3[3];
struct SSBOCol
{

2
reference/shaders-msl-no-opt/packing/matrix-3x4-scalar.comp
View File

@ -5,7 +5,7 @@
using namespace metal;
typedef float4x3 packed_rm_float3x4;
typedef packed_float3 packed_rm_float3x4[4];
struct SSBOCol
{

2
reference/shaders-msl-no-opt/packing/matrix-4x3-scalar.comp
View File

@ -5,7 +5,7 @@
using namespace metal;
typedef float4x3 packed_float4x3;
typedef packed_float3 packed_float4x3[4];
struct SSBOCol
{

2
reference/shaders-msl-no-opt/packing/matrix-multiply-unpacked-col-major-2.comp
View File

@ -3,7 +3,7 @@
using namespace metal;
typedef float3x3 packed_float3x3;
typedef packed_float3 packed_float3x3[3];
struct SSBO
{

2
reference/shaders-msl-no-opt/packing/matrix-multiply-unpacked-row-major-2.comp
View File

@ -3,7 +3,7 @@
using namespace metal;
typedef float3x3 packed_rm_float3x3;
typedef packed_float3 packed_rm_float3x3[3];
struct SSBO
{

6
reference/shaders-msl/vulkan/comp/struct-packing-scalar.nocompat.invalid.vk.comp
View File

@ -6,9 +6,9 @@
using namespace metal;
typedef float2x2 packed_float2x2;
typedef float2x3 packed_float2x3;
typedef float2x3 packed_rm_float3x2;
typedef packed_float2 packed_float2x2[2];
typedef packed_float3 packed_float2x3[2];
typedef packed_float3 packed_rm_float3x2[2];
template<typename T, size_t Num>
struct spvUnsafeArray

17
spirv_msl.cpp
View File

@ -8029,7 +8029,7 @@ string CompilerMSL::to_struct_member(const SPIRType &type, uint32_t member_type_
SPIRType row_major_physical_type;
const SPIRType *declared_type = &physical_type;
if (member_is_packed_physical_type(type, index) && validate_member_packing_rules_msl(type, index))
if (member_is_packed_physical_type(type, index))
{
// If we're packing a matrix, output an appropriate typedef
if (physical_type.basetype == SPIRType::Struct)
@ -8051,11 +8051,11 @@ string CompilerMSL::to_struct_member(const SPIRType &type, uint32_t member_type_
string base_type = physical_type.width == 16 ? "half" : "float";
string td_line = "typedef ";
unpacked_array_type = base_type + to_string(physical_type.columns) + "x" + to_string(physical_type.vecsize);
packed_array_type =
pack_pfx + base_type + to_string(physical_type.columns) + "x" + to_string(physical_type.vecsize);
td_line += base_type + to_string(cols) + "x" + to_string(rows);
packed_array_type = pack_pfx + unpacked_array_type;
td_line += "packed_" + base_type + to_string(rows);
td_line += " ";
td_line += packed_array_type;
td_line += "[" + to_string(cols) + "]";
td_line += ";";
add_typedef_line(td_line);
}
@ -8092,13 +8092,15 @@ string CompilerMSL::to_struct_member(const SPIRType &type, uint32_t member_type_
array_type = type_to_array_glsl(physical_type);
}
if (!use_builtin_array && packed_array_type.length() > 0 && unpacked_array_type.length() > 0)
bool replace_array_type = (!use_builtin_array && !packed_array_type.empty() && !unpacked_array_type.empty());
if (replace_array_type)
pack_pfx = "";
string result = join(pack_pfx, type_to_glsl(*declared_type, orig_id), " ", qualifier, to_member_name(type, index),
member_attribute_qualifier(type, index), array_type, ";");
if (!use_builtin_array && packed_array_type.length() > 0 && unpacked_array_type.length() > 0)
if (replace_array_type)
{
auto it = result.find(unpacked_array_type);
if (it != std::string::npos)
@ -8823,9 +8825,6 @@ string CompilerMSL::entry_point_args_argument_buffer(bool append_comma)
buffer_binding = i;
}
// Allow the caller to specify an offset for argument buffer binding slots
buffer_binding += msl_options.argument_buffer_offset;
claimed_bindings.set(buffer_binding);
ep_args += get_argument_address_space(var) + " " + type_to_glsl(type) + "& " + to_restrict(id) + to_name(id);

1
spirv_msl.hpp
View File

@ -266,7 +266,6 @@ public:
uint32_t dynamic_offsets_buffer_index = 23;
uint32_t shader_input_wg_index = 0;
uint32_t device_index = 0;
uint32_t argument_buffer_offset = 0; // Allow the caller to specify an offset for argument buffer binding slots
bool enable_point_size_builtin = true;
bool disable_rasterization = false;
bool capture_output_to_buffer = false;