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

rsx: Fix restart index check for u16 index arrays 

Dont ignore upper bits of the restart index with u16 types
This commit is contained in:
eladash 2018-10-05 17:57:12 +03:00 committed by kd-11
parent 39272eef45
commit e361e0daa6
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/Emu/RSX/Capture/rsx_capture.cpp
View File

@ -237,7 +237,7 @@ namespace rsx
for (u32 i = 0; i < idxCount; ++i) for (u32 i = 0; i < idxCount; ++i)
{ {
u16 index = fifo[i]; u16 index = fifo[i];
if (is_primitive_restart_enabled && index == (u16)primitive_restart_index) if (is_primitive_restart_enabled && (u32)index == primitive_restart_index)
continue; continue;
index = (u16)get_index_from_base(index, method_registers.vertex_data_base_index()); index = (u16)get_index_from_base(index, method_registers.vertex_data_base_index());
min_index = (u16)std::min(index, (u16)min_index); min_index = (u16)std::min(index, (u16)min_index);

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

@ -539,7 +539,7 @@ 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, u32> upload_untouched(gsl::span<to_be_t<const T>> src, gsl::span<T> dst, bool is_primitive_restart_enabled, T primitive_restart_index, u32 base_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, u32 primitive_restart_index, u32 base_index)
{ {
T min_index = -1; T min_index = -1;
T max_index = 0; T max_index = 0;
@ -549,7 +549,7 @@ std::tuple<T, T, u32> upload_untouched(gsl::span<to_be_t<const T>> src, gsl::spa
u32 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 && (u32)index == primitive_restart_index)
{ {
// List types do not need primitive restart. Just skip over this instead // List types do not need primitive restart. Just skip over this instead
if (rsx::method_registers.current_draw_clause.is_disjoint_primitive) if (rsx::method_registers.current_draw_clause.is_disjoint_primitive)
@ -570,7 +570,7 @@ std::tuple<T, T, u32> upload_untouched(gsl::span<to_be_t<const T>> src, gsl::spa
} }
template<typename T> template<typename T>
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, u32 base_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, u32 primitive_restart_index, u32 base_index)
{ {
const T invalid_index = (T)-1; const T invalid_index = (T)-1;
@ -593,7 +593,7 @@ std::tuple<T, T, u32> expand_indexed_triangle_fan(gsl::span<to_be_t<const T>> sr
if (needs_anchor) if (needs_anchor)
{ {
if (is_primitive_restart_enabled && src[src_idx] == primitive_restart_index) if (is_primitive_restart_enabled && (u32)src[src_idx] == primitive_restart_index)
continue; continue;
anchor = index; anchor = index;
@ -601,7 +601,7 @@ std::tuple<T, T, u32> expand_indexed_triangle_fan(gsl::span<to_be_t<const T>> sr
continue; continue;
} }
if (is_primitive_restart_enabled && src[src_idx] == primitive_restart_index) if (is_primitive_restart_enabled && (u32)src[src_idx] == primitive_restart_index)
{ {
needs_anchor = true; needs_anchor = true;
last_index = invalid_index; last_index = invalid_index;
@ -629,7 +629,7 @@ std::tuple<T, T, u32> expand_indexed_triangle_fan(gsl::span<to_be_t<const T>> sr
} }
template<typename T> template<typename T>
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, u32 base_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, u32 primitive_restart_index, u32 base_index)
{ {
T min_index = -1; T min_index = -1;
T max_index = 0; T max_index = 0;
@ -644,7 +644,7 @@ std::tuple<T, T, u32> expand_indexed_quads(gsl::span<to_be_t<const T>> src, gsl:
{ {
T index = src[src_idx]; T index = src[src_idx];
index = rsx::get_index_from_base(index, base_index); index = rsx::get_index_from_base(index, base_index);
if (is_primitive_restart_enabled && src[src_idx] == primitive_restart_index) if (is_primitive_restart_enabled && (u32)src[src_idx] == primitive_restart_index)
{ {
//empty temp buffer //empty temp buffer
set_size = 0; set_size = 0;