From 66007938841471629a408d28c04c4e144c6e8f80 Mon Sep 17 00:00:00 2001 From: Hans-Kristian Arntzen Date: Thu, 4 Jun 2020 12:43:04 +0200 Subject: [PATCH] MSL: Remove obsolete MSLVertexAttr members. These are completely unused. Need to keep the members around for ABI compatbility however ... --- spirv_cross_c.cpp | 8 -------- spirv_cross_c.h | 6 ++++++ spirv_msl.hpp | 4 ---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/spirv_cross_c.cpp b/spirv_cross_c.cpp index 20109888..7212dde1 100644 --- a/spirv_cross_c.cpp +++ b/spirv_cross_c.cpp @@ -1017,12 +1017,8 @@ spvc_result spvc_compiler_msl_add_vertex_attribute(spvc_compiler compiler, const auto &msl = *static_cast(compiler->compiler.get()); MSLVertexAttr attr; attr.location = va->location; - attr.msl_buffer = va->msl_buffer; - attr.msl_offset = va->msl_offset; - attr.msl_stride = va->msl_stride; attr.format = static_cast(va->format); attr.builtin = static_cast(va->builtin); - attr.per_instance = va->per_instance != 0; msl.add_msl_vertex_attribute(attr); return SPVC_SUCCESS; #else @@ -2260,12 +2256,8 @@ void spvc_msl_vertex_attribute_init(spvc_msl_vertex_attribute *attr) // Crude, but works. MSLVertexAttr attr_default; attr->location = attr_default.location; - attr->per_instance = attr_default.per_instance ? SPVC_TRUE : SPVC_FALSE; attr->format = static_cast(attr_default.format); attr->builtin = static_cast(attr_default.builtin); - attr->msl_buffer = attr_default.msl_buffer; - attr->msl_offset = attr_default.msl_offset; - attr->msl_stride = attr_default.msl_stride; #else memset(attr, 0, sizeof(*attr)); #endif diff --git a/spirv_cross_c.h b/spirv_cross_c.h index 0c218396..ddc58f0b 100644 --- a/spirv_cross_c.h +++ b/spirv_cross_c.h @@ -270,10 +270,16 @@ typedef enum spvc_msl_vertex_format typedef struct spvc_msl_vertex_attribute { unsigned location; + + /* Obsolete, do not use. Only lingers on for ABI compatibility. */ unsigned msl_buffer; + /* Obsolete, do not use. Only lingers on for ABI compatibility. */ unsigned msl_offset; + /* Obsolete, do not use. Only lingers on for ABI compatibility. */ unsigned msl_stride; + /* Obsolete, do not use. Only lingers on for ABI compatibility. */ spvc_bool per_instance; + spvc_msl_vertex_format format; SpvBuiltIn builtin; } spvc_msl_vertex_attribute; diff --git a/spirv_msl.hpp b/spirv_msl.hpp index e56d27b9..b786a143 100644 --- a/spirv_msl.hpp +++ b/spirv_msl.hpp @@ -43,10 +43,6 @@ enum MSLVertexFormat struct MSLVertexAttr { uint32_t location = 0; - uint32_t msl_buffer = 0; - uint32_t msl_offset = 0; - uint32_t msl_stride = 0; - bool per_instance = false; MSLVertexFormat format = MSL_VERTEX_FORMAT_OTHER; spv::BuiltIn builtin = spv::BuiltInMax; };