Merge branch 'master' into vulkan

2020-10-03 16:16:05 +03:00
parent 2acf2ce041 e0916be5cd
commit c02534e5cf
11 changed files with 1227 additions and 1102 deletions
--- a/src/xenia/gpu/d3d12/render_target_cache.cc
+++ b/src/xenia/gpu/d3d12/render_target_cache.cc
@@ -1085,7 +1085,7 @@ bool RenderTargetCache::UpdateRenderTargets(const D3D12Shader* pixel_shader) {
 }

 bool RenderTargetCache::Resolve(const Memory& memory,
-                                SharedMemory& shared_memory,
+                                D3D12SharedMemory& shared_memory,
                                TextureCache& texture_cache,
                                uint32_t& written_address_out,
                                uint32_t& written_length_out) {