dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-06-01 12:15:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Regresion fix : restore point size functionality

Browse Source
This commit is contained in:
raven02 2014-06-15 00:54:09 +08:00
parent f7c0c6fd34
commit 5007d62e27
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rpcs3/Emu/GS/GL/GLGSRender.cpp
View File

@ -843,7 +843,7 @@ void GLGSRender::ExecCMD()
Enable(m_set_poly_offset_fill, GL_POLYGON_OFFSET_FILL); Enable(m_set_poly_offset_fill, GL_POLYGON_OFFSET_FILL);
Enable(m_set_poly_offset_line, GL_POLYGON_OFFSET_LINE); Enable(m_set_poly_offset_line, GL_POLYGON_OFFSET_LINE);
Enable(m_set_poly_offset_point, GL_POLYGON_OFFSET_POINT); Enable(m_set_poly_offset_point, GL_POLYGON_OFFSET_POINT);
Enable(m_set_restart_index, GL_PRIMITIVE_RESTART); // Requires OpenGL 3.1+ Enable(m_set_restart_index, GL_PRIMITIVE_RESTART);
if(m_set_clip_plane) if(m_set_clip_plane)
{ {
@ -872,6 +872,12 @@ void GLGSRender::ExecCMD()
checkForGlError("glPolygonMode(Back)"); checkForGlError("glPolygonMode(Back)");
} }
if (m_set_point_size)
{
glPointSize(m_point_size);
checkForGlError("glPointSize");
}
if (m_set_poly_offset_mode) if (m_set_poly_offset_mode)
{ {
glPolygonOffset(m_poly_offset_scale_factor, m_poly_offset_bias); glPolygonOffset(m_poly_offset_scale_factor, m_poly_offset_bias);

4
rpcs3/Emu/GS/RSXThread.cpp
View File

@ -1149,7 +1149,9 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3
// Point // Point
case NV4097_SET_POINT_SIZE: case NV4097_SET_POINT_SIZE:
{ {
// Done in Vertex Shader m_set_point_size = true;
const u32 a0 = ARGS(0);
m_point_size = (float&)a0;
} }
break; break;

4
rpcs3/Emu/GS/RSXThread.h
View File

@ -181,7 +181,9 @@ public:
u32 m_restart_index; u32 m_restart_index;
// Point // Point
bool m_set_point_size;
bool m_set_point_sprite_control; bool m_set_point_sprite_control;
u32 m_point_size;
u16 m_point_x; u16 m_point_x;
u16 m_point_y; u16 m_point_y;
@ -426,6 +428,7 @@ protected:
m_set_scissor_vertical = false; m_set_scissor_vertical = false;
m_set_line_smooth = false; m_set_line_smooth = false;
m_set_poly_smooth = false; m_set_poly_smooth = false;
m_set_point_size = false;
m_set_two_sided_stencil_test_enable = false; m_set_two_sided_stencil_test_enable = false;
m_set_surface_clip_horizontal = false; m_set_surface_clip_horizontal = false;
m_set_surface_clip_vertical = false; m_set_surface_clip_vertical = false;
@ -454,6 +457,7 @@ protected:
m_point_x = 0; m_point_x = 0;
m_point_y = 0; m_point_y = 0;
m_point_size = 0;
// Construct Textures // Construct Textures
for(int i=0; i<16; i++) for(int i=0; i<16; i++)