From bee95d9e638dd96bb6627917a477f318a0ac0e0f Mon Sep 17 00:00:00 2001
From: Triang3l <triang3l@yandex.ru>
Date: Wed, 9 Jun 2021 21:10:27 +0300
Subject: [PATCH] [Vulkan] Remove remaining IndexBufferInfo references

---
 src/xenia/gpu/vulkan/vulkan_command_processor.cc | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/xenia/gpu/vulkan/vulkan_command_processor.cc b/src/xenia/gpu/vulkan/vulkan_command_processor.cc
index 9936f182f..14edfe4ab 100644
--- a/src/xenia/gpu/vulkan/vulkan_command_processor.cc
+++ b/src/xenia/gpu/vulkan/vulkan_command_processor.cc
@@ -770,12 +770,9 @@ bool VulkanCommandProcessor::IssueDraw(xenos::PrimitiveType prim_type,
   // Update fixed-function dynamic state.
   UpdateFixedFunctionState(viewport_info);
 
-  bool indexed = index_buffer_info != nullptr && index_buffer_info->guest_base;
-
   // Update system constants before uploading them.
-  UpdateSystemConstantValues(
-      indexed ? index_buffer_info->endianness : xenos::Endian::kNone,
-      viewport_info);
+  UpdateSystemConstantValues(primitive_processing_result.host_index_endian,
+                             viewport_info);
 
   // Update uniform buffers and descriptor sets after binding the pipeline with
   // the new layout.
@@ -882,10 +879,12 @@ bool VulkanCommandProcessor::IssueDraw(xenos::PrimitiveType prim_type,
     }
     deferred_command_buffer_.CmdVkBindIndexBuffer(
         index_buffer.first, index_buffer.second,
-        index_buffer_info->format == xenos::IndexFormat::kInt16
+        primitive_processing_result.host_index_format ==
+                xenos::IndexFormat::kInt16
             ? VK_INDEX_TYPE_UINT16
             : VK_INDEX_TYPE_UINT32);
-    deferred_command_buffer_.CmdVkDrawIndexed(index_count, 1, 0, 0, 0);
+    deferred_command_buffer_.CmdVkDrawIndexed(
+        primitive_processing_result.host_draw_vertex_count, 1, 0, 0, 0);
   }
 
   return true;