mirror of
https://github.com/blawar/GLideN64.git
synced 2024-07-04 10:03:36 +00:00
Remove branchLessZ flag from MicrocodeInfo. Remove F3DEX2MM from specialMicrocodes list.
This commit is contained in:
parent
9e8b32fc89
commit
ae67daca9f
|
@ -55,8 +55,7 @@ SpecialMicrocodeInfo specialMicrocodes[] =
|
||||||
{ F3DJFG, false, 0xbde9d1fb, "Jet Force Gemini" },
|
{ F3DJFG, false, 0xbde9d1fb, "Jet Force Gemini" },
|
||||||
{ F3DPD, true, 0x1c4f7869, "Perfect Dark" },
|
{ F3DPD, true, 0x1c4f7869, "Perfect Dark" },
|
||||||
{ Turbo3D, false, 0x2bdcfc8a, "Turbo3D" },
|
{ Turbo3D, false, 0x2bdcfc8a, "Turbo3D" },
|
||||||
{ F3DEX2CBFD, true, 0x1b4ace88, "Conker's Bad Fur Day" },
|
{ F3DEX2CBFD, true, 0x1b4ace88, "Conker's Bad Fur Day" }
|
||||||
{ F3DEX2MM, true, 0xdf528a85, "Majora's Mask" }
|
|
||||||
};
|
};
|
||||||
|
|
||||||
u32 G_RDPHALF_1, G_RDPHALF_2, G_RDPHALF_CONT;
|
u32 G_RDPHALF_1, G_RDPHALF_2, G_RDPHALF_CONT;
|
||||||
|
@ -246,7 +245,6 @@ void GBIInfo::loadMicrocode(u32 uc_start, u32 uc_dstart, u16 uc_dsize)
|
||||||
current.NoN = false;
|
current.NoN = false;
|
||||||
current.textureGen = true;
|
current.textureGen = true;
|
||||||
current.texturePersp = true;
|
current.texturePersp = true;
|
||||||
current.branchLessZ = true;
|
|
||||||
current.type = NONE;
|
current.type = NONE;
|
||||||
|
|
||||||
// See if we can identify it by CRC
|
// See if we can identify it by CRC
|
||||||
|
@ -292,7 +290,7 @@ void GBIInfo::loadMicrocode(u32 uc_start, u32 uc_dstart, u16 uc_dsize)
|
||||||
if (strncmp(&uc_str[14], "F3DF", 4) == 0)
|
if (strncmp(&uc_str[14], "F3DF", 4) == 0)
|
||||||
current.textureGen = false;
|
current.textureGen = false;
|
||||||
else if (strncmp(&uc_str[14], "F3DZ", 4) == 0)
|
else if (strncmp(&uc_str[14], "F3DZ", 4) == 0)
|
||||||
current.branchLessZ = false;
|
type = F3DEX2MM;
|
||||||
else if (strncmp(&uc_str[14], "F3DLX.Rej", 9) == 0)
|
else if (strncmp(&uc_str[14], "F3DLX.Rej", 9) == 0)
|
||||||
current.NoN = true;
|
current.NoN = true;
|
||||||
else if (strncmp(&uc_str[14], "F3DLP.Rej", 9) == 0) {
|
else if (strncmp(&uc_str[14], "F3DLP.Rej", 9) == 0) {
|
||||||
|
|
|
@ -685,7 +685,6 @@ struct MicrocodeInfo
|
||||||
bool NoN;
|
bool NoN;
|
||||||
bool textureGen;
|
bool textureGen;
|
||||||
bool texturePersp;
|
bool texturePersp;
|
||||||
bool branchLessZ;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
struct GBIInfo
|
struct GBIInfo
|
||||||
|
@ -702,7 +701,6 @@ struct GBIInfo
|
||||||
bool isNoN() const { return m_pCurrent != nullptr ? m_pCurrent->NoN : false; }
|
bool isNoN() const { return m_pCurrent != nullptr ? m_pCurrent->NoN : false; }
|
||||||
bool isTextureGen() const { return m_pCurrent != nullptr ? m_pCurrent->textureGen: true; }
|
bool isTextureGen() const { return m_pCurrent != nullptr ? m_pCurrent->textureGen: true; }
|
||||||
bool isTexturePersp() const { return m_pCurrent != nullptr ? m_pCurrent->texturePersp: true; }
|
bool isTexturePersp() const { return m_pCurrent != nullptr ? m_pCurrent->texturePersp: true; }
|
||||||
bool isBranchLessZ() const { return m_pCurrent != nullptr ? m_pCurrent->branchLessZ : true; }
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void _flushCommands();
|
void _flushCommands();
|
||||||
|
|
|
@ -1284,7 +1284,7 @@ void gSPBranchLessZ( u32 branchdl, u32 vtx, u32 zval )
|
||||||
|
|
||||||
SPVertex & v = video().getRender().getVertex(vtx);
|
SPVertex & v = video().getRender().getVertex(vtx);
|
||||||
const u32 zTest = u32((v.z / v.w) * 1023.0f);
|
const u32 zTest = u32((v.z / v.w) * 1023.0f);
|
||||||
if (zTest > 0x03FF || zTest <= zval || !GBI.isBranchLessZ())
|
if (zTest > 0x03FF || zTest <= zval)
|
||||||
RSP.PC[RSP.PCi] = address;
|
RSP.PC[RSP.PCi] = address;
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
|
|
Loading…
Reference in New Issue
Block a user