From 81b4ed2a81d7bada71a115efc7fb2347378fb975 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Thu, 20 Jul 2017 15:25:35 +1000 Subject: Vulkan: Uber shader support --- Source/Core/VideoBackends/Vulkan/VertexFormat.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'Source/Core/VideoBackends/Vulkan/VertexFormat.cpp') diff --git a/Source/Core/VideoBackends/Vulkan/VertexFormat.cpp b/Source/Core/VideoBackends/Vulkan/VertexFormat.cpp index 1d35177252..08daba3fe5 100644 --- a/Source/Core/VideoBackends/Vulkan/VertexFormat.cpp +++ b/Source/Core/VideoBackends/Vulkan/VertexFormat.cpp @@ -53,17 +53,9 @@ VertexFormat::VertexFormat(const PortableVertexDeclaration& in_vtx_decl) SetupInputState(); } -VertexFormat* VertexFormat::GetOrCreateMatchingFormat(const PortableVertexDeclaration& decl) +const VkPipelineVertexInputStateCreateInfo& VertexFormat::GetVertexInputStateInfo() const { - auto vertex_format_map = VertexLoaderManager::GetNativeVertexFormatMap(); - auto iter = vertex_format_map->find(decl); - if (iter == vertex_format_map->end()) - { - auto ipair = vertex_format_map->emplace(decl, std::make_unique(decl)); - iter = ipair.first; - } - - return static_cast(iter->second.get()); + return m_input_state_info; } void VertexFormat::MapAttributes() -- cgit v1.2.3 From 25338c53e0275c6911a504d4e3e56c172860eb31 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Mon, 3 Jul 2017 20:18:27 +1000 Subject: NativeVertexFormat: Drop unused virtual method SetupVertexPointers --- Source/Core/VideoBackends/Vulkan/VertexFormat.cpp | 5 ----- 1 file changed, 5 deletions(-) (limited to 'Source/Core/VideoBackends/Vulkan/VertexFormat.cpp') 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 -- cgit v1.2.3