ShuriZma
/
desmume
mirror of https://github.com/TASEmulators/desmume.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GPU: 

- Account for the fact that extended palette mappings can change independently of the BGnCNT register. Fixes the BG3 layer in Phoenix Wright: Ace Attorney. (Regression from r5286.)
This commit is contained in:
rogerman 2015-10-06 17:13:24 +00:00
parent ec539cba02
commit 61e8cfb063
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
desmume/src/GPU.cpp
View File

@ -396,10 +396,10 @@ void GPUEngineBase::_Reset_Base()
this->_BGLayer[GPULayerID_BG0].extPaletteSlot = GPULayerID_BG0; this->_BGLayer[GPULayerID_BG0].extPaletteSlot = GPULayerID_BG0;
this->_BGLayer[GPULayerID_BG1].extPaletteSlot = GPULayerID_BG1; this->_BGLayer[GPULayerID_BG1].extPaletteSlot = GPULayerID_BG1;
this->_BGLayer[GPULayerID_BG0].extPalette = (u16 *)MMU.ExtPal[this->_engineID][GPULayerID_BG0]; this->_BGLayer[GPULayerID_BG0].extPalette = (u16 **)&MMU.ExtPal[this->_engineID][GPULayerID_BG0];
this->_BGLayer[GPULayerID_BG1].extPalette = (u16 *)MMU.ExtPal[this->_engineID][GPULayerID_BG1]; this->_BGLayer[GPULayerID_BG1].extPalette = (u16 **)&MMU.ExtPal[this->_engineID][GPULayerID_BG1];
this->_BGLayer[GPULayerID_BG2].extPalette = (u16 *)MMU.ExtPal[this->_engineID][GPULayerID_BG2]; this->_BGLayer[GPULayerID_BG2].extPalette = (u16 **)&MMU.ExtPal[this->_engineID][GPULayerID_BG2];
this->_BGLayer[GPULayerID_BG3].extPalette = (u16 *)MMU.ExtPal[this->_engineID][GPULayerID_BG3]; this->_BGLayer[GPULayerID_BG3].extPalette = (u16 **)&MMU.ExtPal[this->_engineID][GPULayerID_BG3];
this->_curr_win[0] = GPUEngineBase::_winEmpty; this->_curr_win[0] = GPUEngineBase::_winEmpty;
this->_curr_win[1] = GPUEngineBase::_winEmpty; this->_curr_win[1] = GPUEngineBase::_winEmpty;
@ -644,7 +644,7 @@ void GPUEngineBase::ParseReg_BGnCNT()
this->_BGLayer[LAYERID].size = GPUEngineBase::_BGLayerSizeLUT[mode][BGnCNT.ScreenSize]; this->_BGLayer[LAYERID].size = GPUEngineBase::_BGLayerSizeLUT[mode][BGnCNT.ScreenSize];
this->_BGLayer[LAYERID].isMosaic = (BGnCNT.Mosaic != 0); this->_BGLayer[LAYERID].isMosaic = (BGnCNT.Mosaic != 0);
this->_BGLayer[LAYERID].priority = BGnCNT.Priority; this->_BGLayer[LAYERID].priority = BGnCNT.Priority;
this->_BGLayer[LAYERID].extPalette = (u16 *)MMU.ExtPal[this->_engineID][this->_BGLayer[LAYERID].extPaletteSlot]; this->_BGLayer[LAYERID].extPalette = (u16 **)&MMU.ExtPal[this->_engineID][this->_BGLayer[LAYERID].extPaletteSlot];
this->_ResortBGLayers(); this->_ResortBGLayers();
} }
@ -1397,7 +1397,7 @@ void GPUEngineBase::_RenderLine_TextBG(u16 *dstColorLine, const u16 lineIndex, u
} }
else //256-color BG else //256-color BG
{ {
const u16 *pal = (DISPCNT.ExBGxPalette_Enable) ? this->_BGLayer[LAYERID].extPalette : this->_paletteBG; const u16 *pal = (DISPCNT.ExBGxPalette_Enable) ? *(this->_BGLayer[LAYERID].extPalette) : this->_paletteBG;
yoff = ((YBG&7)<<3); yoff = ((YBG&7)<<3);
xfin = 8 - (xoff&7); xfin = 8 - (xoff&7);
@ -1457,7 +1457,7 @@ void GPUEngineBase::_ExtRotBG2(u16 *dstColorLine, const u16 lineIndex, const IOR
{ {
if (DISPCNT.ExBGxPalette_Enable) if (DISPCNT.ExBGxPalette_Enable)
{ {
pal = this->_BGLayer[LAYERID].extPalette; pal = *(this->_BGLayer[LAYERID].extPalette);
this->_apply_rot_fun< LAYERID, rot_tiled_16bit_entry<LAYERID, ISDEBUGRENDER, MOSAIC, true, ISCUSTOMRENDERINGNEEDED> >(dstColorLine, lineIndex, param, LG, this->_BGLayer[LAYERID].tileMapAddress, this->_BGLayer[LAYERID].tileEntryAddress, pal); this->_apply_rot_fun< LAYERID, rot_tiled_16bit_entry<LAYERID, ISDEBUGRENDER, MOSAIC, true, ISCUSTOMRENDERINGNEEDED> >(dstColorLine, lineIndex, param, LG, this->_BGLayer[LAYERID].tileMapAddress, this->_BGLayer[LAYERID].tileEntryAddress, pal);
} }
else else

2
desmume/src/GPU.h
View File

@ -1079,7 +1079,7 @@ typedef struct
bool isDisplayWrapped; bool isDisplayWrapped;
u8 extPaletteSlot; u8 extPaletteSlot;
u16 *extPalette; u16 **extPalette;
u32 largeBMPAddress; u32 largeBMPAddress;
u32 BMPAddress; u32 BMPAddress;