archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-05 14:31:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

rsx: Fix clang build

Browse source
This commit is contained in:
kd-11 2022-03-06 15:32:38 +03:00 • committed by kd-11
parent 454a724f4e
commit 3e4faf602a
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
rpcs3/Emu/RSX/Common/surface_store.h
View file

@ -190,7 +190,7 @@ namespace rsx
copy.dst_x = 0; copy.dst_x = 0;
copy.dst_y = 0; copy.dst_y = 0;
copy.width = std::max<u16>((old.width - _new.width) / bytes_to_texels_x, 1); copy.width = std::max<u16>((old.width - _new.width) / bytes_to_texels_x, 1);
copy.height = prev_surface->get_surface_height(); copy.height = prev_surface->template get_surface_height();
copy.transfer_scale_x = 1.f; copy.transfer_scale_x = 1.f;
copy.transfer_scale_y = 1.f; copy.transfer_scale_y = 1.f;
copy.target = nullptr; copy.target = nullptr;
@ -612,7 +612,7 @@ namespace rsx
} }
if (it->surface->get_rsx_pitch() != it->surface->get_native_pitch() && if (it->surface->get_rsx_pitch() != it->surface->get_native_pitch() &&
it->surface->get_surface_height() != 1) it->surface->template get_surface_height() != 1)
{ {
// Memory gap in descriptor // Memory gap in descriptor
continue; continue;
@ -721,9 +721,9 @@ namespace rsx
auto this_range = it->surface->get_memory_range(); auto this_range = it->surface->get_memory_range();
ensure(this_range.overlaps(range)); ensure(this_range.overlaps(range));
const auto native_pitch = it->surface->get_surface_width<rsx::surface_metrics::bytes>(); const auto native_pitch = it->surface->template get_surface_width<rsx::surface_metrics::bytes>();
const auto rsx_pitch = it->surface->get_rsx_pitch(); const auto rsx_pitch = it->surface->get_rsx_pitch();
auto num_rows = it->surface->get_surface_height<rsx::surface_metrics::samples>(); auto num_rows = it->surface->template get_surface_height<rsx::surface_metrics::samples>();
bool valid = false; bool valid = false;
if (this_range.start < range.start) if (this_range.start < range.start)
@ -1002,8 +1002,8 @@ namespace rsx
info.base_address = range.start; info.base_address = range.start;
info.is_depth = is_depth; info.is_depth = is_depth;
const u32 normalized_surface_width = surface->get_surface_width<rsx::surface_metrics::bytes>() / required_bpp; const u32 normalized_surface_width = surface->template get_surface_width<rsx::surface_metrics::bytes>() / required_bpp;
const u32 normalized_surface_height = surface->get_surface_height<rsx::surface_metrics::samples>(); const u32 normalized_surface_height = surface->template get_surface_height<rsx::surface_metrics::samples>();
if (range.start >= texaddr) [[likely]] if (range.start >= texaddr) [[likely]]
{ {

8
rpcs3/Emu/RSX/Common/surface_utils.h
View file

@ -197,7 +197,7 @@ namespace rsx
} }
else else
{ {
static_assert(false); fmt::throw_exception("Unreachable");
} }
} }
@ -218,7 +218,7 @@ namespace rsx
} }
else else
{ {
static_assert(false); fmt::throw_exception("Unreachable");
} }
} }
@ -543,8 +543,8 @@ namespace rsx
const auto child_w = get_surface_width<rsx::surface_metrics::bytes>(); const auto child_w = get_surface_width<rsx::surface_metrics::bytes>();
const auto child_h = get_surface_height<rsx::surface_metrics::bytes>(); const auto child_h = get_surface_height<rsx::surface_metrics::bytes>();
const auto parent_w = surface->get_surface_width<rsx::surface_metrics::bytes>(); const auto parent_w = surface->template get_surface_width<rsx::surface_metrics::bytes>();
const auto parent_h = surface->get_surface_height<rsx::surface_metrics::bytes>(); const auto parent_h = surface->template get_surface_height<rsx::surface_metrics::bytes>();
const auto rect = rsx::intersect_region(surface->base_addr, parent_w, parent_h, 1, base_addr, child_w, child_h, 1, get_rsx_pitch()); const auto rect = rsx::intersect_region(surface->base_addr, parent_w, parent_h, 1, base_addr, child_w, child_h, 1, get_rsx_pitch());
const auto src_offset = std::get<0>(rect); const auto src_offset = std::get<0>(rect);