MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-02 09:03:37 +00:00
Code Issues Projects Releases Wiki Activity

Revert "Fix implementation of 0xD5 (Special_1) command for F3DEX2 ucode."

Browse Source 
This reverts commit 8985e38bc0.
This commit is contained in:
Sergey Lipskiy 2017-09-16 18:24:06 +07:00
parent 8985e38bc0
commit ef6f470df7
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/F3DEX2.cpp
View File

@ -138,8 +138,11 @@ void F3DEX2_DMAIO( u32 w0, u32 w1 )
void F3DEX2_Special_1( u32 w0, u32 w1 )
{
const u32 mode = _SHIFTR( w0, 0, 8 );
gSPCombineMatrices(mode);
const u32 param = _SHIFTR(w0, 0, 8);
if (GBI.isCombineMatrices())
gSPCombineMatrices(param);
else
gSPDlistCount(param, w1);
}
void F3DEX2_Special_2( u32 w0, u32 w1 )

6
src/GBI.cpp
View File

@ -251,6 +251,7 @@ void GBIInfo::loadMicrocode(u32 uc_start, u32 uc_dstart, u16 uc_dsize)
current.negativeY = true;
current.textureGen = true;
current.texturePersp = true;
current.combineMatrices = false;
current.type = NONE;
// See if we can identify it by CRC
@ -292,8 +293,11 @@ void GBIInfo::loadMicrocode(u32 uc_start, u32 uc_dstart, u16 uc_dsize)
if (strncmp( &uc_str[14], "F3D", 3 ) == 0) {
if (uc_str[28] == '1' || strncmp(&uc_str[28], "0.95", 4) == 0 || strncmp(&uc_str[28], "0.96", 4) == 0)
type = F3DEX;
else if (uc_str[31] == '2')
else if (uc_str[31] == '2') {
type = F3DEX2;
if (uc_str[35] == 'H')
current.combineMatrices = true;
}
if (strncmp(&uc_str[14], "F3DF", 4) == 0)
current.textureGen = false;
else if (strncmp(&uc_str[14], "F3DZEX", 6) == 0) {

2
src/GBI.h
View File

@ -501,6 +501,7 @@ struct MicrocodeInfo
bool negativeY;
bool textureGen;
bool texturePersp;
bool combineMatrices;
};
struct GBIInfo
@ -518,6 +519,7 @@ struct GBIInfo
bool isNegativeY() const { return m_pCurrent != nullptr ? m_pCurrent->negativeY : true; }
bool isTextureGen() const { return m_pCurrent != nullptr ? m_pCurrent->textureGen: true; }
bool isTexturePersp() const { return m_pCurrent != nullptr ? m_pCurrent->texturePersp: true; }
bool isCombineMatrices() const { return m_pCurrent != nullptr ? m_pCurrent->combineMatrices: false; }
private:
void _flushCommands();