Archive/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-28 13:28:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

rsx: de-uglify buffer upload restructure

Browse source
This commit is contained in:
kd-11 2025-04-20 17:58:28 +03:00
parent cecf92e5b8
commit b092b45d24
2 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

38
rpcs3/Emu/RSX/Common/BufferUtils.cpp
View file

@ -432,36 +432,30 @@ namespace
return std::make_tuple(min_index, max_index, written); return std::make_tuple(min_index, max_index, written);
} }
template<typename T> template<typename T, typename U = remove_be_t<T>>
requires std::is_same_v<U, u32> || std::is_same_v<U, u16>
std::tuple<T, T, u32> upload_untouched(std::span<to_be_t<const T>> src, std::span<T> dst, rsx::primitive_type draw_mode, bool is_primitive_restart_enabled, u32 primitive_restart_index) std::tuple<T, T, u32> upload_untouched(std::span<to_be_t<const T>> src, std::span<T> dst, rsx::primitive_type draw_mode, bool is_primitive_restart_enabled, u32 primitive_restart_index)
{ {
if constexpr (std::is_same_v<T, u16>)
{
if (primitive_restart_index > 0xffff)
{
// Will never trip index restart, unpload untouched
is_primitive_restart_enabled = false;
}
}
if (!is_primitive_restart_enabled) if (!is_primitive_restart_enabled)
{ {
return untouched_impl::upload_untouched(src, dst); return untouched_impl::upload_untouched(src, dst);
} }
else if constexpr (std::is_same_v<T, u16>)
if (is_primitive_disjointed(draw_mode))
{ {
if (primitive_restart_index > 0xffff) return upload_untouched_skip_restart(src, dst, static_cast<U>(primitive_restart_index));
{
return untouched_impl::upload_untouched(src, dst);
}
else if (is_primitive_disjointed(draw_mode))
{
return upload_untouched_skip_restart(src, dst, static_cast<u16>(primitive_restart_index));
}
else
{
return primitive_restart_impl::upload_untouched(src, dst, static_cast<u16>(primitive_restart_index));
}
}
else if (is_primitive_disjointed(draw_mode))
{
return upload_untouched_skip_restart(src, dst, primitive_restart_index);
}
else
{
return primitive_restart_impl::upload_untouched(src, dst, primitive_restart_index);
} }
return primitive_restart_impl::upload_untouched(src, dst, static_cast<U>(primitive_restart_index));
} }
void iota16(u16* dst, u32 count) void iota16(u16* dst, u32 count)

8
rpcs3/util/types.hpp
View file

@ -214,6 +214,14 @@ using atomic_be_t = atomic_t<be_t<T>, Align>;
template <typename T, usz Align = alignof(T)> template <typename T, usz Align = alignof(T)>
using atomic_le_t = atomic_t<le_t<T>, Align>; using atomic_le_t = atomic_t<le_t<T>, Align>;
// Primary template (handles non-be_t types)
template<typename T>
struct remove_be { using type = T; };
template<typename T>
struct remove_be<be_t<T>> { using type = T; };
template<typename T>
using remove_be_t = typename remove_be<T>::type;
// Bool type equivalent // Bool type equivalent
class b8 class b8
{ {