From a120414d322c4e25144d4030a7671caafe8990f7 Mon Sep 17 00:00:00 2001 From: kd-11 Date: Wed, 23 Mar 2016 23:31:49 +0300 Subject: [PATCH 1/2] Set render target textures to clamp to border by default --- rpcs3/Emu/RSX/GL/gl_render_targets.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rpcs3/Emu/RSX/GL/gl_render_targets.h b/rpcs3/Emu/RSX/GL/gl_render_targets.h index e2d24c15be..6de4e4ae85 100644 --- a/rpcs3/Emu/RSX/GL/gl_render_targets.h +++ b/rpcs3/Emu/RSX/GL/gl_render_targets.h @@ -94,6 +94,7 @@ struct gl_render_target_traits .type(format.type) .format(format.format) .swizzle(format.swizzle.r, format.swizzle.g, format.swizzle.b, format.swizzle.a) + .wrap(gl::texture::wrap::clamp_to_border, gl::texture::wrap::clamp_to_border, gl::texture::wrap::clamp_to_border) .apply(); __glcheck result->pixel_pack_settings().swap_bytes(format.swap_bytes).aligment(1); @@ -120,6 +121,7 @@ struct gl_render_target_traits .type(format.type) .format(format.format) .internal_format(format.internal_format) + .wrap(gl::texture::wrap::clamp_to_border, gl::texture::wrap::clamp_to_border, gl::texture::wrap::clamp_to_border) .apply(); __glcheck result->pixel_pack_settings().aligment(1); From 0327e7632079dfbdf897a5ce394beb07de94db7b Mon Sep 17 00:00:00 2001 From: kd-11 Date: Thu, 24 Mar 2016 00:35:52 +0300 Subject: [PATCH 2/2] Fix quad strip triangle winding --- rpcs3/Emu/RSX/Common/BufferUtils.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rpcs3/Emu/RSX/Common/BufferUtils.cpp b/rpcs3/Emu/RSX/Common/BufferUtils.cpp index c166aad4ac..56d6461d9b 100644 --- a/rpcs3/Emu/RSX/Common/BufferUtils.cpp +++ b/rpcs3/Emu/RSX/Common/BufferUtils.cpp @@ -333,8 +333,8 @@ void write_index_array_for_non_indexed_non_native_primitive_to_buffer(char* dst, typedDst[6 * i + 2] = 2 * i + 2 + first; // Second triangle typedDst[6 * i + 3] = 2 * i + 2 + first; - typedDst[6 * i + 4] = 2 * i + 3 + first; - typedDst[6 * i + 5] = 2 * i + 1 + first; + typedDst[6 * i + 4] = 2 * i + 1 + first; + typedDst[6 * i + 5] = 2 * i + 3 + first; } return; case rsx::primitive_type::points: