From 25338c53e0275c6911a504d4e3e56c172860eb31 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Mon, 3 Jul 2017 20:18:27 +1000 Subject: [PATCH] NativeVertexFormat: Drop unused virtual method SetupVertexPointers --- Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp | 4 ---- Source/Core/VideoBackends/D3D/VertexManager.h | 1 - Source/Core/VideoBackends/Null/VertexManager.cpp | 1 - Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp | 4 ---- Source/Core/VideoBackends/OGL/VertexManager.h | 2 -- Source/Core/VideoBackends/Software/SWVertexLoader.cpp | 1 - Source/Core/VideoBackends/Vulkan/VertexFormat.cpp | 5 ----- Source/Core/VideoBackends/Vulkan/VertexFormat.h | 3 --- Source/Core/VideoCommon/NativeVertexFormat.h | 2 -- 9 files changed, 23 deletions(-) diff --git a/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp b/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp index 2e0df19808..fe17144bc0 100644 --- a/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp +++ b/Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp @@ -119,10 +119,6 @@ D3DVertexFormat::~D3DVertexFormat() SAFE_RELEASE(m_layout); } -void D3DVertexFormat::SetupVertexPointers() -{ -} - void D3DVertexFormat::SetInputLayout(D3DBlob* vs_bytecode) { if (!m_layout) diff --git a/Source/Core/VideoBackends/D3D/VertexManager.h b/Source/Core/VideoBackends/D3D/VertexManager.h index 99d45957ed..7d4d8b66c2 100644 --- a/Source/Core/VideoBackends/D3D/VertexManager.h +++ b/Source/Core/VideoBackends/D3D/VertexManager.h @@ -19,7 +19,6 @@ class D3DVertexFormat : public NativeVertexFormat public: D3DVertexFormat(const PortableVertexDeclaration& vtx_decl); ~D3DVertexFormat(); - void SetupVertexPointers() override; void SetInputLayout(D3DBlob* vs_bytecode); private: diff --git a/Source/Core/VideoBackends/Null/VertexManager.cpp b/Source/Core/VideoBackends/Null/VertexManager.cpp index be2a8f0af5..60eaf83aa3 100644 --- a/Source/Core/VideoBackends/Null/VertexManager.cpp +++ b/Source/Core/VideoBackends/Null/VertexManager.cpp @@ -16,7 +16,6 @@ class NullNativeVertexFormat : public NativeVertexFormat { public: NullNativeVertexFormat() {} - void SetupVertexPointers() override {} }; std::unique_ptr diff --git a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp b/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp index d3b98cd3a7..816cdf3754 100644 --- a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp +++ b/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp @@ -81,8 +81,4 @@ GLVertexFormat::~GLVertexFormat() { glDeleteVertexArrays(1, &VAO); } - -void GLVertexFormat::SetupVertexPointers() -{ -} } diff --git a/Source/Core/VideoBackends/OGL/VertexManager.h b/Source/Core/VideoBackends/OGL/VertexManager.h index 25a1ba7c3b..6a4599d48e 100644 --- a/Source/Core/VideoBackends/OGL/VertexManager.h +++ b/Source/Core/VideoBackends/OGL/VertexManager.h @@ -20,8 +20,6 @@ public: GLVertexFormat(const PortableVertexDeclaration& vtx_decl); ~GLVertexFormat(); - void SetupVertexPointers() override; - GLuint VAO; }; diff --git a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp index d81cb4da4f..3976eb7a2c 100644 --- a/Source/Core/VideoBackends/Software/SWVertexLoader.cpp +++ b/Source/Core/VideoBackends/Software/SWVertexLoader.cpp @@ -30,7 +30,6 @@ class NullNativeVertexFormat : public NativeVertexFormat { public: NullNativeVertexFormat(const PortableVertexDeclaration& _vtx_decl) { vtx_decl = _vtx_decl; } - void SetupVertexPointers() override {} }; std::unique_ptr diff --git a/Source/Core/VideoBackends/Vulkan/VertexFormat.cpp b/Source/Core/VideoBackends/Vulkan/VertexFormat.cpp index 08daba3fe5..c28110c844 100644 --- a/Source/Core/VideoBackends/Vulkan/VertexFormat.cpp +++ b/Source/Core/VideoBackends/Vulkan/VertexFormat.cpp @@ -128,9 +128,4 @@ void VertexFormat::AddAttribute(uint32_t location, uint32_t binding, VkFormat fo m_attribute_descriptions[m_num_attributes].offset = offset; m_num_attributes++; } - -void VertexFormat::SetupVertexPointers() -{ -} - } // namespace Vulkan diff --git a/Source/Core/VideoBackends/Vulkan/VertexFormat.h b/Source/Core/VideoBackends/Vulkan/VertexFormat.h index b2fe21a06e..9b5810ced7 100644 --- a/Source/Core/VideoBackends/Vulkan/VertexFormat.h +++ b/Source/Core/VideoBackends/Vulkan/VertexFormat.h @@ -23,9 +23,6 @@ public: void MapAttributes(); void SetupInputState(); - // Not used in the Vulkan backend. - void SetupVertexPointers() override; - private: void AddAttribute(uint32_t location, uint32_t binding, VkFormat format, uint32_t offset); diff --git a/Source/Core/VideoCommon/NativeVertexFormat.h b/Source/Core/VideoCommon/NativeVertexFormat.h index 55f8a57483..f03de05cc6 100644 --- a/Source/Core/VideoCommon/NativeVertexFormat.h +++ b/Source/Core/VideoCommon/NativeVertexFormat.h @@ -106,8 +106,6 @@ class NativeVertexFormat : NonCopyable { public: virtual ~NativeVertexFormat() {} - virtual void SetupVertexPointers() = 0; - u32 GetVertexStride() const { return vtx_decl.stride; } const PortableVertexDeclaration& GetVertexDeclaration() const { return vtx_decl; } protected: