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.h
+++ b/src/xenia/ui/vulkan/vulkan_immediate_drawer.h
@@ -34,7 +34,6 @@ class VulkanImmediateDrawer : public ImmediateDrawer {
                                                  ImmediateTextureFilter filter,
                                                  bool repeat,
                                                  const uint8_t* data) override;
-  void UpdateTexture(ImmediateTexture* texture, const uint8_t* data) override;

  void Begin(int render_target_width, int render_target_height) override;
  void BeginDrawBatch(const ImmediateDrawBatch& batch) override;