From 5fbc190c80103537fb6b433f0fa719f9c0fbc89d Mon Sep 17 00:00:00 2001 From: elisha464 Date: Wed, 26 Feb 2014 23:24:57 +0200 Subject: [PATCH 1/3] fixed flipped colors on some homebrews --- rpcs3/Emu/GS/GL/GLGSRender.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/rpcs3/Emu/GS/GL/GLGSRender.cpp b/rpcs3/Emu/GS/GL/GLGSRender.cpp index 442942f881..880b8a5eb5 100644 --- a/rpcs3/Emu/GS/GL/GLGSRender.cpp +++ b/rpcs3/Emu/GS/GL/GLGSRender.cpp @@ -1115,9 +1115,11 @@ void GLGSRender::Flip() static u8* src_buffer = nullptr; static u32 width = 0; static u32 height = 0; + GLenum format = GL_RGBA; if(m_read_buffer) { + format = GL_BGRA; gcmBuffer* buffers = (gcmBuffer*)Memory.GetMemFromAddr(m_gcm_buffers_addr); u32 addr = GetAddress(re(buffers[m_gcm_current_buffer].offset), CELL_GCM_LOCATION_LOCAL); @@ -1134,6 +1136,7 @@ void GLGSRender::Flip() } else if(m_fbo.IsCreated()) { + format = GL_RGBA; static Array pixels; pixels.SetCount(RSXThread::m_width * RSXThread::m_height * 4); m_fbo.Bind(GL_READ_FRAMEBUFFER); @@ -1150,7 +1153,7 @@ void GLGSRender::Flip() { glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, g_flip_tex); - glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, GL_RGBA, GL_UNSIGNED_INT_8_8_8_8, src_buffer); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, format, GL_UNSIGNED_INT_8_8_8_8, src_buffer); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); From d0300e5f43c183bbdb446ed893581fbb850b306c Mon Sep 17 00:00:00 2001 From: elisha464 Date: Thu, 27 Feb 2014 19:47:08 +0200 Subject: [PATCH 2/3] fix alpha test --- rpcs3/Emu/GS/GL/GLGSRender.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Emu/GS/GL/GLGSRender.cpp b/rpcs3/Emu/GS/GL/GLGSRender.cpp index 880b8a5eb5..f940a4edf3 100644 --- a/rpcs3/Emu/GS/GL/GLGSRender.cpp +++ b/rpcs3/Emu/GS/GL/GLGSRender.cpp @@ -1013,7 +1013,7 @@ void GLGSRender::ExecCMD() if(m_set_alpha_func && m_set_alpha_ref) { - glAlphaFunc(m_alpha_func, m_alpha_ref); + glAlphaFunc(m_alpha_func, m_alpha_ref/255.0f); checkForGlError("glAlphaFunc"); } From 1ab5bc40a0989720c6c045d525e064c85ea4d887 Mon Sep 17 00:00:00 2001 From: elisha464 Date: Fri, 28 Feb 2014 11:19:56 +0200 Subject: [PATCH 3/3] fixed colors on scogger --- rpcs3/Emu/GS/GL/GLGSRender.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/rpcs3/Emu/GS/GL/GLGSRender.cpp b/rpcs3/Emu/GS/GL/GLGSRender.cpp index f940a4edf3..9e1b4a6fd0 100644 --- a/rpcs3/Emu/GS/GL/GLGSRender.cpp +++ b/rpcs3/Emu/GS/GL/GLGSRender.cpp @@ -1154,6 +1154,7 @@ void GLGSRender::Flip() glActiveTexture(GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, g_flip_tex); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0, format, GL_UNSIGNED_INT_8_8_8_8, src_buffer); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_SWIZZLE_A, GL_ONE); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);