Merge branch 'master' into vulkan

This commit is contained in:
Triang3l
2020-10-04 21:54:32 +03:00
10 changed files with 91 additions and 85 deletions

View File

@@ -606,9 +606,9 @@ bool RenderTargetCache::UpdateRenderTargets(const D3D12Shader* pixel_shader) {
const auto& regs = register_file_;
#if FINE_GRAINED_DRAW_SCOPES
#if XE_UI_D3D12_FINE_GRAINED_DRAW_SCOPES
SCOPE_profile_cpu_f("gpu");
#endif // FINE_GRAINED_DRAW_SCOPES
#endif // XE_UI_D3D12_FINE_GRAINED_DRAW_SCOPES
auto rb_surface_info = regs.Get<reg::RB_SURFACE_INFO>();
uint32_t surface_pitch = std::min(rb_surface_info.surface_pitch, 2560u);