Merge pull request #354 from magumagu/gx-primitive-mask

Opcode decoding: 0xC0 isn't a valid command.
This commit is contained in:
Tony Wasserka
2014-05-16 15:59:59 +02:00
3 changed files with 6 additions and 6 deletions

View File

@ -201,7 +201,7 @@ void DecodeStandard(u32 bufferSize)
// draw primitives
default:
if (Cmd & 0x80)
if ((Cmd & 0xC0) == 0x80)
{
u8 vatIndex = Cmd & GX_VAT_MASK;
u8 primitiveType = (Cmd & GX_PRIMITIVE_MASK) >> GX_PRIMITIVE_SHIFT;
@ -283,7 +283,7 @@ bool CommandRunnable(u32 iBufferSize)
// draw primitives
default:
if (Cmd & 0x80)
if ((Cmd & 0xC0) == 0x80)
minSize = 3;
break;
}

View File

@ -23,7 +23,7 @@ namespace OpcodeDecoder
#define GX_CMD_CALL_DL 0x40
#define GX_CMD_INVL_VC 0x48
#define GX_PRIMITIVE_MASK 0x78
#define GX_PRIMITIVE_MASK 0x38
#define GX_PRIMITIVE_SHIFT 3
#define GX_VAT_MASK 0x07