Merge branch 'master' of https://github.com/xenia-project/xenia into canary_experimental

This commit is contained in:
Gliniak
2022-06-20 21:07:32 +02:00
122 changed files with 114240 additions and 61766 deletions

View File

@@ -1329,10 +1329,11 @@ bool D3D12RenderTargetCache::Resolve(const Memory& memory,
bool draw_resolution_scaled = IsDrawResolutionScaled();
draw_util::ResolveInfo resolve_info;
bool fixed_16_truncated_to_minus_1_to_1 = IsFixed16TruncatedToMinus1To1();
if (!draw_util::GetResolveInfo(
register_file(), memory, trace_writer_, draw_resolution_scale_x(),
draw_resolution_scale_y(), IsFixed16TruncatedToMinus1To1(),
resolve_info)) {
draw_resolution_scale_y(), fixed_16_truncated_to_minus_1_to_1,
fixed_16_truncated_to_minus_1_to_1, resolve_info)) {
return false;
}