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

GB Video: SGB border drawing improvements

This commit is contained in:
Vicki Pfau 2018-10-04 09:45:38 -07:00
parent 23e60e081e
commit d7f2f5ba06
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -117,6 +117,7 @@ Bugfixes:
- Qt: Fix FPS counter on Windows - Qt: Fix FPS counter on Windows
- GB, GBA Savedata: Fix leaks when loading masked save (fixes mgba.io/i/1197) - GB, GBA Savedata: Fix leaks when loading masked save (fixes mgba.io/i/1197)
- Qt: Fix focus issues with load/save state overlay - Qt: Fix focus issues with load/save state overlay
- GB Video: Fix SGB border hole size
Misc: Misc:
- mGUI: Add SGB border configuration option - mGUI: Add SGB border configuration option
- mGUI: Add support for different settings types - mGUI: Add support for different settings types

20
src/gb/renderers/software.c
View File

@ -56,7 +56,7 @@ static void _regenerateSGBBorder(struct GBVideoSoftwareRenderer* renderer) {
int x, y; int x, y;
for (y = 0; y < 224; ++y) { for (y = 0; y < 224; ++y) {
for (x = 0; x < 256; x += 8) { for (x = 0; x < 256; x += 8) {
if (x >= 48 && x < 208 && y >= 40 && y < 104) { if (x >= 48 && x < 208 && y >= 40 && y < 184) {
continue; continue;
} }
uint16_t mapData; uint16_t mapData;
@ -79,16 +79,13 @@ static void _regenerateSGBBorder(struct GBVideoSoftwareRenderer* renderer) {
int paletteBase = SGBBgAttributesGetPalette(mapData) * 0x10; int paletteBase = SGBBgAttributesGetPalette(mapData) * 0x10;
int colorSelector; int colorSelector;
int flip = 0;
if (SGBBgAttributesIsXFlip(mapData)) { if (SGBBgAttributesIsXFlip(mapData)) {
for (i = 0; i < 8; ++i) { flip = 7;
colorSelector = (tileData[0] >> i & 0x1) << 0 | (tileData[1] >> i & 0x1) << 1 | (tileData[2] >> i & 0x1) << 2 | (tileData[3] >> i & 0x1) << 3; }
renderer->outputBuffer[base + i] = renderer->palette[paletteBase | colorSelector]; for (i = 7; i >= 0; --i) {
} colorSelector = (tileData[0] >> i & 0x1) << 0 | (tileData[1] >> i & 0x1) << 1 | (tileData[2] >> i & 0x1) << 2 | (tileData[3] >> i & 0x1) << 3;
} else { renderer->outputBuffer[(base + 7 - i) ^ flip] = renderer->palette[paletteBase | colorSelector];
for (i = 7; i >= 0; --i) {
colorSelector = (tileData[0] >> i & 0x1) << 0 | (tileData[1] >> i & 0x1) << 1 | (tileData[2] >> i & 0x1) << 2 | (tileData[3] >> i & 0x1) << 3;
renderer->outputBuffer[base + 7 - i] = renderer->palette[paletteBase | colorSelector];
}
} }
} }
} }
@ -712,6 +709,9 @@ static void GBVideoSoftwareRendererFinishFrame(struct GBVideoRenderer* renderer)
static void GBVideoSoftwareRendererEnableSGBBorder(struct GBVideoRenderer* renderer, bool enable) { static void GBVideoSoftwareRendererEnableSGBBorder(struct GBVideoRenderer* renderer, bool enable) {
struct GBVideoSoftwareRenderer* softwareRenderer = (struct GBVideoSoftwareRenderer*) renderer; struct GBVideoSoftwareRenderer* softwareRenderer = (struct GBVideoSoftwareRenderer*) renderer;
if (softwareRenderer->model == GB_MODEL_SGB) { if (softwareRenderer->model == GB_MODEL_SGB) {
if (enable == softwareRenderer->sgbBorders) {
return;
}
softwareRenderer->sgbBorders = enable; softwareRenderer->sgbBorders = enable;
if (softwareRenderer->sgbBorders && !renderer->sgbRenderMode) { if (softwareRenderer->sgbBorders && !renderer->sgbRenderMode) {
_regenerateSGBBorder(softwareRenderer); _regenerateSGBBorder(softwareRenderer);