Merge branch 'master' into vulkan

2021-12-12 21:32:43 +03:00
parent 6630442588 e25167d2bc
commit 95c2101ca9
273 changed files with 82285 additions and 339957 deletions
--- a/src/xenia/gpu/vulkan/vulkan_render_target_cache.h
+++ b/src/xenia/gpu/vulkan/vulkan_render_target_cache.h
@@ -82,7 +82,8 @@ class VulkanRenderTargetCache final : public RenderTargetCache {
  Path GetPath() const override { return Path::kHostRenderTargets; }

  // TODO(Triang3l): Resolution scaling.
-  uint32_t GetResolutionScale() const override { return 1; }
+  uint32_t GetResolutionScaleX() const override { return 1; }
+  uint32_t GetResolutionScaleY() const override { return 1; }

  bool Update(bool is_rasterization_done,
              uint32_t shader_writes_color_targets) override;