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

Merge pull request #105 from kacek/master 

implemented  cellGcmsetTexture_BorderColor function
This commit is contained in:
Alexandro Sánchez Bach 2014-03-18 13:00:35 +01:00
parent cf4501fe41 39dc6f0838
commit fb38897b8f
3 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1150,6 +1150,10 @@ void GLGSRender::Flip()
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);
if(m_set_texture_border_color)
{
glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_BORDER_COLOR,(GLint)m_border_color);
}
glMatrixMode(GL_PROJECTION);
glLoadIdentity();

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

@ -322,6 +322,14 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t& args, const u3
}
break;
case NV4097_SET_TEXTURE_BORDER_COLOR:
{
m_set_texture_border_color = true;
u32 tmp = ARGS(0);
m_border_color=((tmp & 0x00FFFFFF)<<8)|((tmp & 0xFF000000)>>24);
break;
}
case NV4097_SET_SURFACE_FORMAT:
{
u32 a0 = ARGS(0);

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

@ -272,6 +272,9 @@ public:
u8 m_blend_color_b;
u8 m_blend_color_a;
bool m_set_texture_border_color;
u32 m_border_color;
u8 m_clear_color_r;
u8 m_clear_color_g;
u8 m_clear_color_b;
@ -400,6 +403,7 @@ protected:
{
m_set_alpha_test = false;
m_set_blend = false;
m_set_texture_border_color = false;
m_set_depth_bounds_test = false;
m_depth_test_enable = false;
m_set_logic_op = false;
@ -419,6 +423,8 @@ protected:
m_clear_z = 0xffffff;
m_clear_s = 0;
m_border_color = 0;
m_depth_bounds_min = 0.0;
m_depth_bounds_max = 1.0;
m_restart_index = 0xffffffff;
@ -442,6 +448,7 @@ protected:
void Reset()
{
m_set_color_mask = false;
m_set_texture_border_color = false;
m_set_clip = false;
m_set_depth_func = false;
m_set_depth_bounds = false;