archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-14 10:48:36 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Conflicts fixed

Browse source
This commit is contained in:
Nekotekina 2014-12-28 16:29:01 +03:00
commit 6cd2665e12
13 changed files with 101 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -419,13 +419,13 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
break;
// Vertex Texture
case_4(NV4097_SET_VERTEX_TEXTURE_FORMAT, 0x20) :
case_4(NV4097_SET_VERTEX_TEXTURE_OFFSET, 0x20) :
case_4(NV4097_SET_VERTEX_TEXTURE_FILTER, 0x20) :
case_4(NV4097_SET_VERTEX_TEXTURE_ADDRESS, 0x20) :
case_4(NV4097_SET_VERTEX_TEXTURE_IMAGE_RECT, 0x20) :
case_4(NV4097_SET_VERTEX_TEXTURE_BORDER_COLOR, 0x20) :
case_4(NV4097_SET_VERTEX_TEXTURE_CONTROL0, 0x20) :
case_4(NV4097_SET_VERTEX_TEXTURE_FORMAT, 0x20):
case_4(NV4097_SET_VERTEX_TEXTURE_OFFSET, 0x20):
case_4(NV4097_SET_VERTEX_TEXTURE_FILTER, 0x20):
case_4(NV4097_SET_VERTEX_TEXTURE_ADDRESS, 0x20):
case_4(NV4097_SET_VERTEX_TEXTURE_IMAGE_RECT, 0x20):
case_4(NV4097_SET_VERTEX_TEXTURE_BORDER_COLOR, 0x20):
case_4(NV4097_SET_VERTEX_TEXTURE_CONTROL0, 0x20):
{
// Done using methodRegisters in RSXTexture.cpp
}
@ -1586,7 +1586,9 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, const u32 args_addr, const
case NV4097_SET_CONTEXT_DMA_COLOR_D:
{
if (ARGS(0))
{
LOG_WARNING(RSX, "NV4097_SET_CONTEXT_DMA_COLOR_D: 0x%x", ARGS(0));
}
}
break;
@ -2356,10 +2358,6 @@ void RSXThread::Task()
//LOG_WARNING(RSX, "non increment cmd! 0x%x", cmd);
inc = 0;
}
else
{
//LOG_WARNING(RSX, "increment cmd! 0x%x", cmd);
}
if(cmd == 0) //nop
{