ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

general fixes; Force u32 return type for index_count and add RX Vega to primitive restart blacklist

This commit is contained in:
kd-11 2017-10-18 13:42:19 +03:00
parent a8e1754fa4
commit ddcacb8258
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
rpcs3/Emu/RSX/Common/BufferUtils.cpp
View File

@ -456,14 +456,14 @@ void write_vertex_array_data_to_buffer(gsl::span<gsl::byte> raw_dst_span, gsl::s
namespace namespace
{ {
template<typename T> template<typename T>
std::tuple<T, T, T> upload_untouched(gsl::span<to_be_t<const T>> src, gsl::span<T> dst, bool is_primitive_restart_enabled, T primitive_restart_index) std::tuple<T, T, u32> upload_untouched(gsl::span<to_be_t<const T>> src, gsl::span<T> dst, bool is_primitive_restart_enabled, T primitive_restart_index)
{ {
T min_index = -1; T min_index = -1;
T max_index = 0; T max_index = 0;
verify(HERE), (dst.size_bytes() >= src.size_bytes()); verify(HERE), (dst.size_bytes() >= src.size_bytes());
size_t dst_idx = 0; u32 dst_idx = 0;
for (T index : src) for (T index : src)
{ {
if (is_primitive_restart_enabled && index == primitive_restart_index) if (is_primitive_restart_enabled && index == primitive_restart_index)
@ -482,11 +482,11 @@ std::tuple<T, T, T> upload_untouched(gsl::span<to_be_t<const T>> src, gsl::span<
dst[dst_idx++] = index; dst[dst_idx++] = index;
} }
return std::make_tuple(min_index, max_index, ::narrow<T>(dst_idx)); return std::make_tuple(min_index, max_index, dst_idx);
} }
template<typename T> template<typename T>
std::tuple<T, T, T> expand_indexed_triangle_fan(gsl::span<to_be_t<const T>> src, gsl::span<T> dst, bool is_primitive_restart_enabled, T primitive_restart_index) std::tuple<T, T, u32> expand_indexed_triangle_fan(gsl::span<to_be_t<const T>> src, gsl::span<T> dst, bool is_primitive_restart_enabled, T primitive_restart_index)
{ {
const T invalid_index = (T)-1; const T invalid_index = (T)-1;
@ -495,8 +495,8 @@ std::tuple<T, T, T> expand_indexed_triangle_fan(gsl::span<to_be_t<const T>> src,
verify(HERE), (dst.size() >= 3 * (src.size() - 2)); verify(HERE), (dst.size() >= 3 * (src.size() - 2));
size_t dst_idx = 0; u32 dst_idx = 0;
size_t src_idx = 0; u32 src_idx = 0;
bool needs_anchor = true; bool needs_anchor = true;
T anchor = invalid_index; T anchor = invalid_index;
@ -539,19 +539,19 @@ std::tuple<T, T, T> expand_indexed_triangle_fan(gsl::span<to_be_t<const T>> src,
last_index = index; last_index = index;
} }
return std::make_tuple(min_index, max_index, ::narrow<T>(dst_idx)); return std::make_tuple(min_index, max_index, dst_idx);
} }
template<typename T> template<typename T>
std::tuple<T, T, T> expand_indexed_quads(gsl::span<to_be_t<const T>> src, gsl::span<T> dst, bool is_primitive_restart_enabled, T primitive_restart_index) std::tuple<T, T, u32> expand_indexed_quads(gsl::span<to_be_t<const T>> src, gsl::span<T> dst, bool is_primitive_restart_enabled, T primitive_restart_index)
{ {
T min_index = -1; T min_index = -1;
T max_index = 0; T max_index = 0;
verify(HERE), (4 * dst.size_bytes() >= 6 * src.size_bytes()); verify(HERE), (4 * dst.size_bytes() >= 6 * src.size_bytes());
size_t dst_idx = 0; u32 dst_idx = 0;
size_t set_size = 0; u8 set_size = 0;
T tmp_indices[4]; T tmp_indices[4];
for (int src_idx = 0; src_idx < src.size(); ++src_idx) for (int src_idx = 0; src_idx < src.size(); ++src_idx)
@ -583,7 +583,7 @@ std::tuple<T, T, T> expand_indexed_quads(gsl::span<to_be_t<const T>> src, gsl::s
} }
} }
return std::make_tuple(min_index, max_index, ::narrow<T>(dst_idx)); return std::make_tuple(min_index, max_index, dst_idx);
} }
} }
@ -701,7 +701,7 @@ namespace
// TODO: Unify indexed and non indexed primitive expansion ? // TODO: Unify indexed and non indexed primitive expansion ?
template<typename T> template<typename T>
std::tuple<T, T, T> write_index_array_data_to_buffer_impl(gsl::span<T> dst, std::tuple<T, T, u32> write_index_array_data_to_buffer_impl(gsl::span<T> dst,
gsl::span<const be_t<T>> src, gsl::span<const be_t<T>> src,
rsx::primitive_type draw_mode, bool restart_index_enabled, u32 restart_index, const std::vector<std::pair<u32, u32> > &first_count_arguments, rsx::primitive_type draw_mode, bool restart_index_enabled, u32 restart_index, const std::vector<std::pair<u32, u32> > &first_count_arguments,
std::function<bool(rsx::primitive_type)> expands) std::function<bool(rsx::primitive_type)> expands)

1
rpcs3/Emu/RSX/VK/VKHelpers.cpp
View File

@ -269,6 +269,7 @@ namespace vk
"RX 480", "RX 480",
"RX 470", "RX 470",
"RX 460", "RX 460",
"RX Vega",
}; };
const auto gpu_name = g_current_renderer.gpu().name(); const auto gpu_name = g_current_renderer.gpu().name();