Merge pull request #695 from raven02/patch-10

RSX : add missing NV4097 method names
This commit is contained in:
Alexandro Sánchez Bach 2014-07-25 11:10:44 +02:00
commit 665aaa0ef5
2 changed files with 12 additions and 3 deletions

View File

@ -555,7 +555,6 @@ enum
NV4097_SET_VERTEX_ATTRIB_INPUT_MASK = 0x00001ff0,
NV4097_SET_VERTEX_ATTRIB_OUTPUT_MASK = 0x00001ff4,
NV4097_SET_TRANSFORM_BRANCH_BITS = 0x00001ff8,
NV4097_SET_FLIP = 0x0003fead,
// NV03_MEMORY_TO_MEMORY_FORMAT (NV0039)
NV0039_SET_OBJECT = 0x00002000,
@ -1326,7 +1325,17 @@ static const std::string GetMethodName(const u32 id)
{ NV4097_SET_TRANSFORM_TIMEOUT , "NV4097_SET_TRANSFORM_TIMEOUT" },
{ NV4097_SET_TRANSFORM_CONSTANT_LOAD , "NV4097_SET_TRANSFORM_CONSTANT_LOAD" },
{ NV4097_SET_FREQUENCY_DIVIDER_OPERATION , "NV4097_SET_FREQUENCY_DIVIDER_OPERATION" },
{ NV4097_INVALIDATE_L2 , "NV4097_INVALIDATE_L2" },
{ NV4097_SET_ATTRIB_COLOR, "NV4097_SET_ATTRIB_COLOR" },
{ NV4097_SET_ATTRIB_TEX_COORD, "NV4097_SET_ATTRIB_TEX_COORD" },
{ NV4097_SET_ATTRIB_TEX_COORD_EX, "NV4097_SET_ATTRIB_TEX_COORD_EX" },
{ NV4097_SET_ATTRIB_UCLIP0, "NV4097_SET_ATTRIB_UCLIP0" },
{ NV4097_SET_ATTRIB_UCLIP1, "NV4097_SET_ATTRIB_UCLIP1" },
{ NV4097_INVALIDATE_L2, "NV4097_INVALIDATE_L2" },
{ NV4097_SET_REDUCE_DST_COLOR, "NV4097_SET_REDUCE_DST_COLOR" },
{ NV4097_SET_NO_PARANOID_TEXTURE_FETCHES, "NV4097_SET_NO_PARANOID_TEXTURE_FETCHES" },
{ NV4097_SET_SHADER_PACKER, "NV4097_SET_SHADER_PACKER" },
{ NV4097_SET_VERTEX_ATTRIB_INPUT_MASK, "NV4097_SET_VERTEX_ATTRIB_INPUT_MASK" },
{ NV4097_SET_VERTEX_ATTRIB_OUTPUT_MASK, "NV4097_SET_VERTEX_ATTRIB_OUTPUT_MASK" },
{ NV4097_SET_TRANSFORM_BRANCH_BITS, "NV4097_SET_TRANSFORM_BRANCH_BITS" }
};

View File

@ -275,7 +275,7 @@ void RSXThread::DoCmd(const u32 fcmd, const u32 cmd, mem32_ptr_t args, const u32
break;
// NV4097
case NV4097_SET_FLIP:
case 0x0003fead:
//if(cmd == 0xfeadffff)
{
Flip();