Merge branch 'master' into vulkan

2020-09-20 20:40:11 +03:00
parent 6a903192c3 fc55b1f81d
commit 7ba2126b2f
9 changed files with 274 additions and 268 deletions
--- a/src/xenia/ui/vulkan/vulkan_immediate_drawer.cc
+++ b/src/xenia/ui/vulkan/vulkan_immediate_drawer.cc
@@ -95,9 +95,6 @@ std::unique_ptr<ImmediateTexture> VulkanImmediateDrawer::CreateTexture(
  return std::unique_ptr<ImmediateTexture>(texture.release());
 }

-void VulkanImmediateDrawer::UpdateTexture(ImmediateTexture* texture,
-                                          const uint8_t* data) {}
-
 void VulkanImmediateDrawer::Begin(int render_target_width,
                                  int render_target_height) {
  assert_true(current_command_buffer_ == VK_NULL_HANDLE);