From 44dd770cecbced22da22ca6ca0702cd07878a193 Mon Sep 17 00:00:00 2001 From: raven02 Date: Sun, 15 Jun 2014 02:20:11 +0800 Subject: [PATCH] RSX: fix line width --- rpcs3/Emu/GS/RSXThread.cpp | 2 +- rpcs3/Emu/GS/RSXThread.h | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/rpcs3/Emu/GS/RSXThread.cpp b/rpcs3/Emu/GS/RSXThread.cpp index d1334e904a..ff7b473c54 100644 --- a/rpcs3/Emu/GS/RSXThread.cpp +++ b/rpcs3/Emu/GS/RSXThread.cpp @@ -1437,7 +1437,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 / 8.0; + m_line_width = (float)a0 / 8.0f; } break; diff --git a/rpcs3/Emu/GS/RSXThread.h b/rpcs3/Emu/GS/RSXThread.h index 887581712e..347c2b5fe5 100644 --- a/rpcs3/Emu/GS/RSXThread.h +++ b/rpcs3/Emu/GS/RSXThread.h @@ -183,7 +183,7 @@ public: // Point bool m_set_point_size; bool m_set_point_sprite_control; - u32 m_point_size; + float m_point_size; u16 m_point_x; u16 m_point_y; @@ -428,7 +428,8 @@ protected: m_set_scissor_vertical = false; m_set_line_smooth = false; m_set_poly_smooth = false; - m_set_point_size = false; + m_set_point_sprite_control = false; + m_set_specular = false; m_set_two_sided_stencil_test_enable = false; m_set_surface_clip_horizontal = false; m_set_surface_clip_vertical = false; @@ -444,8 +445,8 @@ protected: m_clear_z = 0xffffff; m_clear_s = 0; - m_poly_offset_scale_factor = 0; - m_poly_offset_bias = 0; + m_poly_offset_scale_factor = 0.0; + m_poly_offset_bias = 0.0; m_depth_bounds_min = 0.0; m_depth_bounds_max = 1.0; @@ -457,7 +458,8 @@ protected: m_point_x = 0; m_point_y = 0; - m_point_size = 0; + m_point_size = 1.0; + m_line_width = 1.0; // Construct Textures for(int i=0; i<16; i++) @@ -501,6 +503,7 @@ protected: m_set_back_stencil_zpass = false; m_set_blend_equation = false; m_set_depth_mask = false; + m_set_point_size = false; m_set_line_width = false; m_set_shade_mode = false; m_set_blend_color = false;