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

GB Video: More SGB fixes

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

1
src/gb/core.c
View File

@ -1048,6 +1048,7 @@ static bool _GBVLPLoadState(struct mCore* core, const void* buffer) {
gb->cpu->pc = GB_BASE_HRAM; gb->cpu->pc = GB_BASE_HRAM;
gb->cpu->memory.setActiveRegion(gb->cpu, gb->cpu->pc); gb->cpu->memory.setActiveRegion(gb->cpu, gb->cpu->pc);
GBVideoReset(&gb->video);
GBVideoDeserialize(&gb->video, state); GBVideoDeserialize(&gb->video, state);
GBIODeserialize(gb, state); GBIODeserialize(gb, state);
GBAudioReset(&gb->audio); GBAudioReset(&gb->audio);

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

@ -30,7 +30,7 @@ static void GBVideoSoftwareRendererDrawObj(struct GBVideoSoftwareRenderer* rende
static void _clearScreen(struct GBVideoSoftwareRenderer* renderer) { static void _clearScreen(struct GBVideoSoftwareRenderer* renderer) {
size_t sgbOffset = 0; size_t sgbOffset = 0;
if (renderer->model == GB_MODEL_SGB) { if (renderer->model & GB_MODEL_SGB) {
return; return;
} }
int y; int y;
@ -193,7 +193,7 @@ static void GBVideoSoftwareRendererInit(struct GBVideoRenderer* renderer, enum G
softwareRenderer->lastY = GB_VIDEO_VERTICAL_PIXELS; softwareRenderer->lastY = GB_VIDEO_VERTICAL_PIXELS;
softwareRenderer->hasWindow = false; softwareRenderer->hasWindow = false;
softwareRenderer->wx = 0; softwareRenderer->wx = 0;
softwareRenderer->model = model & ~GB_MODEL_MGB; softwareRenderer->model = model;
softwareRenderer->sgbTransfer = 0; softwareRenderer->sgbTransfer = 0;
softwareRenderer->sgbCommandHeader = 0; softwareRenderer->sgbCommandHeader = 0;
softwareRenderer->sgbBorders = sgbBorders; softwareRenderer->sgbBorders = sgbBorders;
@ -429,7 +429,7 @@ static void GBVideoSoftwareRendererWriteSGBPacket(struct GBVideoRenderer* render
static void GBVideoSoftwareRendererWritePalette(struct GBVideoRenderer* renderer, int index, uint16_t value) { static void GBVideoSoftwareRendererWritePalette(struct GBVideoRenderer* renderer, int index, uint16_t value) {
struct GBVideoSoftwareRenderer* softwareRenderer = (struct GBVideoSoftwareRenderer*) renderer; struct GBVideoSoftwareRenderer* softwareRenderer = (struct GBVideoSoftwareRenderer*) renderer;
color_t color = mColorFrom555(value); color_t color = mColorFrom555(value);
if (softwareRenderer->model == GB_MODEL_SGB) { if (softwareRenderer->model & GB_MODEL_SGB) {
if (index < 0x10 && index && !(index & 3)) { if (index < 0x10 && index && !(index & 3)) {
color = softwareRenderer->palette[0]; color = softwareRenderer->palette[0];
} else if (index >= 0x40 && !(index & 0xF)) { } else if (index >= 0x40 && !(index & 0xF)) {
@ -460,7 +460,7 @@ static void GBVideoSoftwareRendererWritePalette(struct GBVideoRenderer* renderer
} }
softwareRenderer->palette[index] = color; softwareRenderer->palette[index] = color;
if (softwareRenderer->model == GB_MODEL_SGB && !index && GBRegisterLCDCIsEnable(softwareRenderer->lcdc)) { if (softwareRenderer->model & GB_MODEL_SGB && !index && GBRegisterLCDCIsEnable(softwareRenderer->lcdc)) {
renderer->writePalette(renderer, 0x04, value); renderer->writePalette(renderer, 0x04, value);
renderer->writePalette(renderer, 0x08, value); renderer->writePalette(renderer, 0x08, value);
renderer->writePalette(renderer, 0x0C, value); renderer->writePalette(renderer, 0x0C, value);
@ -525,7 +525,7 @@ static void GBVideoSoftwareRendererDrawRange(struct GBVideoRenderer* renderer, i
} }
size_t sgbOffset = 0; size_t sgbOffset = 0;
if (softwareRenderer->model == GB_MODEL_SGB && softwareRenderer->sgbBorders) { if (softwareRenderer->model & GB_MODEL_SGB && softwareRenderer->sgbBorders) {
sgbOffset = softwareRenderer->outputBufferStride * 40 + 48; sgbOffset = softwareRenderer->outputBufferStride * 40 + 48;
} }
color_t* row = &softwareRenderer->outputBuffer[softwareRenderer->outputBufferStride * y + sgbOffset]; color_t* row = &softwareRenderer->outputBuffer[softwareRenderer->outputBufferStride * y + sgbOffset];
@ -533,7 +533,7 @@ static void GBVideoSoftwareRendererDrawRange(struct GBVideoRenderer* renderer, i
int p = 0; int p = 0;
switch (softwareRenderer->d.sgbRenderMode) { switch (softwareRenderer->d.sgbRenderMode) {
case 0: case 0:
if (softwareRenderer->model == GB_MODEL_SGB) { if (softwareRenderer->model & GB_MODEL_SGB) {
p = softwareRenderer->d.sgbAttributes[(startX >> 5) + 5 * (y >> 3)]; p = softwareRenderer->d.sgbAttributes[(startX >> 5) + 5 * (y >> 3)];
p >>= 6 - ((x / 4) & 0x6); p >>= 6 - ((x / 4) & 0x6);
p &= 3; p &= 3;
@ -543,7 +543,7 @@ static void GBVideoSoftwareRendererDrawRange(struct GBVideoRenderer* renderer, i
row[x] = softwareRenderer->palette[p | softwareRenderer->lookup[softwareRenderer->row[x] & 0x7F]]; row[x] = softwareRenderer->palette[p | softwareRenderer->lookup[softwareRenderer->row[x] & 0x7F]];
} }
for (; x + 7 < (endX & ~7); x += 8) { for (; x + 7 < (endX & ~7); x += 8) {
if (softwareRenderer->model == GB_MODEL_SGB) { if (softwareRenderer->model & GB_MODEL_SGB) {
p = softwareRenderer->d.sgbAttributes[(x >> 5) + 5 * (y >> 3)]; p = softwareRenderer->d.sgbAttributes[(x >> 5) + 5 * (y >> 3)];
p >>= 6 - ((x / 4) & 0x6); p >>= 6 - ((x / 4) & 0x6);
p &= 3; p &= 3;
@ -558,7 +558,7 @@ static void GBVideoSoftwareRendererDrawRange(struct GBVideoRenderer* renderer, i
row[x + 6] = softwareRenderer->palette[p | softwareRenderer->lookup[softwareRenderer->row[x + 6] & 0x7F]]; row[x + 6] = softwareRenderer->palette[p | softwareRenderer->lookup[softwareRenderer->row[x + 6] & 0x7F]];
row[x + 7] = softwareRenderer->palette[p | softwareRenderer->lookup[softwareRenderer->row[x + 7] & 0x7F]]; row[x + 7] = softwareRenderer->palette[p | softwareRenderer->lookup[softwareRenderer->row[x + 7] & 0x7F]];
} }
if (softwareRenderer->model == GB_MODEL_SGB) { if (softwareRenderer->model & GB_MODEL_SGB) {
p = softwareRenderer->d.sgbAttributes[(x >> 5) + 5 * (y >> 3)]; p = softwareRenderer->d.sgbAttributes[(x >> 5) + 5 * (y >> 3)];
p >>= 6 - ((x / 4) & 0x6); p >>= 6 - ((x / 4) & 0x6);
p &= 3; p &= 3;
@ -675,7 +675,7 @@ static void GBVideoSoftwareRendererFinishFrame(struct GBVideoRenderer* renderer)
if (!GBRegisterLCDCIsEnable(softwareRenderer->lcdc)) { if (!GBRegisterLCDCIsEnable(softwareRenderer->lcdc)) {
_clearScreen(softwareRenderer); _clearScreen(softwareRenderer);
} }
if (softwareRenderer->model == GB_MODEL_SGB) { if (softwareRenderer->model & GB_MODEL_SGB) {
switch (softwareRenderer->sgbCommandHeader >> 3) { switch (softwareRenderer->sgbCommandHeader >> 3) {
case SGB_PAL_SET: case SGB_PAL_SET:
case SGB_ATTR_SET: case SGB_ATTR_SET:
@ -708,7 +708,7 @@ 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) { if (enable == softwareRenderer->sgbBorders) {
return; return;
} }