ShuriZma
/
rpcs3
mirror of https://github.com/RPCS3/rpcs3.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #335 from raven02/patch-21 

Fix line width conversion and comment out point size which already done ...
This commit is contained in:
B1ackDaemon 2014-06-14 00:11:34 +03:00
parent c5a244c669 bf456d5d16
commit 49c9e0f3e2
3 changed files with 4 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);

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

@ -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;

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

@ -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;
@ -428,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;
@ -457,7 +454,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 +519,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;