empathicqubit/Mesen-SX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PPU: Fixed obj/color window mask logic not being applied correctly

Browse source
This commit is contained in:
Sour 2019-02-24 19:02:21 -05:00
parent b9aedafd32
commit 76d1aa82e5
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Core/Ppu.cpp
View file

@ -849,7 +849,6 @@ void Ppu::ApplyColorMath()
} }
uint8_t activeWindowCount = (uint8_t)_window[0].ActiveLayers[Ppu::ColorWindowIndex] + (uint8_t)_window[1].ActiveLayers[Ppu::ColorWindowIndex]; uint8_t activeWindowCount = (uint8_t)_window[0].ActiveLayers[Ppu::ColorWindowIndex] + (uint8_t)_window[1].ActiveLayers[Ppu::ColorWindowIndex];
uint16_t outBaseAddress = (_scanline << 8);
for(int x = 0; x < 256; x++) { for(int x = 0; x < 256; x++) {
if(_rowPixelFlags[x] & PixelFlags::AllowColorMath) { if(_rowPixelFlags[x] & PixelFlags::AllowColorMath) {
@ -1396,8 +1395,8 @@ void Ppu::Write(uint32_t addr, uint8_t value)
case 0x212B: case 0x212B:
//WOBJLOG - Window mask logic for OBJs and Color Window //WOBJLOG - Window mask logic for OBJs and Color Window
_maskLogic[5] = (WindowMaskLogic)((value >> 0) & 0x03); _maskLogic[4] = (WindowMaskLogic)((value >> 0) & 0x03);
_maskLogic[6] = (WindowMaskLogic)((value >> 2) & 0x03); _maskLogic[5] = (WindowMaskLogic)((value >> 2) & 0x03);
break; break;
case 0x212C: case 0x212C: