Merge pull request #5702 from stenzek/ubershaders

Ubershaders 2.0

1 files changed, 2 insertions, 15 deletions

diff --git a/Source/Core/VideoBackends/Vulkan/VertexFormat.cpp b/Source/Core/VideoBackends/Vulkan/VertexFormat.cpp
index 1d35177252..c28110c844 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<VertexFormat>(decl));
-    iter = ipair.first;
-  }
-
-  return static_cast<VertexFormat*>(iter->second.get());
+  return m_input_state_info;
 }
 
 void VertexFormat::MapAttributes()
@@ -136,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