From 469faf43aabc354fcd1289044a0a16db7dd664f7 Mon Sep 17 00:00:00 2001 From: raven02 Date: Sat, 14 Jun 2014 02:44:18 +0800 Subject: [PATCH 1/2] Fix line width conversion and comment out point size which already done in vertex shader --- rpcs3/Emu/GS/GL/GLGSRender.cpp | 6 ------ rpcs3/Emu/GS/RSXThread.cpp | 28 ++++------------------------ rpcs3/Emu/GS/RSXThread.h | 4 ---- 3 files changed, 4 insertions(+), 34 deletions(-) diff --git a/rpcs3/Emu/GS/GL/GLGSRender.cpp b/rpcs3/Emu/GS/GL/GLGSRender.cpp index 1e8afddd79..3eadb2f1da 100644 --- a/rpcs3/Emu/GS/GL/GLGSRender.cpp +++ b/rpcs3/Emu/GS/GL/GLGSRender.cpp @@ -872,12 +872,6 @@ void GLGSRender::ExecCMD() checkForGlError("glPolygonMode(Back)"); } - if (m_set_point_size) - { - glPointSize(m_point_size); - checkForGlError("glPointSize"); - } - if (m_set_poly_offset_mode) { glPolygonOffset(m_poly_offset_scale_factor, m_poly_offset_bias); diff --git a/rpcs3/Emu/GS/RSXThread.cpp b/rpcs3/Emu/GS/RSXThread.cpp index 8694acde5c..00add356ae 100644 --- a/rpcs3/Emu/GS/RSXThread.cpp +++ b/rpcs3/Emu/GS/RSXThread.cpp @@ -227,7 +227,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3 // Texture case_16(NV4097_SET_TEXTURE_FORMAT, 0x20) : { - // Done in ethodRegisters[NV4097_SET_TEXTURE_FORMAT + (m_index*32)] + // Done in methodRegisters[NV4097_SET_TEXTURE_FORMAT + (m_index*32)] } break; @@ -585,27 +585,9 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3 break; case NV4097_SET_VIEWPORT_SCALE: - { - if (ARGS(0)) - ConLog.Warning("NV4097_SET_VIEWPORT_SCALE: %x", ARGS(0)); - } - break; - case NV4097_SET_VIEWPORT_OFFSET: { - if (ARGS(0)) - ConLog.Warning("NV4097_SET_VIEWPORT_OFFSET: %x", ARGS(0)); - /*const u32 offset0 = ARGS(0); - const u32 offset1 = ARGS(1); - const u32 offset2 = ARGS(2); - const u32 offset3 = ARGS(3); - const u32 scale0 = ARGS(4); - const u32 scale1 = ARGS(5); - const u32 scale2 = ARGS(6); - const u32 scale3 = ARGS(7);*/ - //TODO - //ConLog.Warning("NV4097_SET_VIEWPORT_OFFSET: offset (%d, %d, %d, %d), scale (%d, %d, %d, %d)", - //offset0, offset1, offset2, offset3, scale0, scale1, scale2, scale3); + // Done in Vertex Shader } break; @@ -1167,9 +1149,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3 // Point case NV4097_SET_POINT_SIZE: { - m_set_point_size = true; - const u32 a0 = ARGS(0); - m_point_size = (float&)a0; + // Done in Vertex Shader } break; @@ -1455,7 +1435,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3 { m_set_line_width = true; const u32 a0 = ARGS(0); - m_line_width = (float&)a0; + m_line_width = (float&)a0 / 8.0; } break; diff --git a/rpcs3/Emu/GS/RSXThread.h b/rpcs3/Emu/GS/RSXThread.h index b3d6fb64eb..da5875dd0c 100644 --- a/rpcs3/Emu/GS/RSXThread.h +++ b/rpcs3/Emu/GS/RSXThread.h @@ -181,9 +181,7 @@ public: u32 m_restart_index; // Point - bool m_set_point_size; bool m_set_point_sprite_control; - float m_point_size; u16 m_point_x; u16 m_point_y; @@ -457,7 +455,6 @@ protected: m_point_x = 0; m_point_y = 0; - m_point_size = 0; // Construct Textures for(int i=0; i<16; i++) @@ -523,7 +520,6 @@ protected: m_set_poly_offset_point = false; m_set_poly_offset_mode = false; m_set_restart_index = false; - m_set_point_size = false; m_set_point_sprite_control = false; m_set_specular = false; From bf456d5d168ea49a75a9a65e9dc81e405a3a637a Mon Sep 17 00:00:00 2001 From: raven02 Date: Sat, 14 Jun 2014 04:44:53 +0800 Subject: [PATCH 2/2] Build fix --- rpcs3/Emu/GS/RSXThread.h | 1 - 1 file changed, 1 deletion(-) diff --git a/rpcs3/Emu/GS/RSXThread.h b/rpcs3/Emu/GS/RSXThread.h index da5875dd0c..72cf7b229f 100644 --- a/rpcs3/Emu/GS/RSXThread.h +++ b/rpcs3/Emu/GS/RSXThread.h @@ -426,7 +426,6 @@ protected: m_set_scissor_vertical = false; m_set_line_smooth = false; m_set_poly_smooth = false; - m_set_point_size = false; m_set_two_sided_stencil_test_enable = false; m_set_surface_clip_horizontal = false; m_set_surface_clip_vertical = false;