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

DS Software: Extend master bright to VRAM mode

This commit is contained in:
Vicki Pfau 2017-03-04 22:28:03 -08:00
parent faf99ac304
commit 5fd2f0c43a
3 changed files with 41 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mgba/internal/ds/renderers/software.h
View File

@ -26,8 +26,6 @@ struct DSVideoSoftwareRenderer {
color_t* outputBuffer; color_t* outputBuffer;
int outputBufferStride; int outputBufferStride;
uint32_t row[DS_VIDEO_HORIZONTAL_PIXELS];
color_t extPaletteA[16384]; color_t extPaletteA[16384];
color_t extPaletteB[16384]; color_t extPaletteB[16384];
color_t variantPaletteA[16384]; color_t variantPaletteA[16384];

82
src/ds/renderers/software.c
View File

@ -452,33 +452,6 @@ static void DSVideoSoftwareRendererDrawGBAScanline(struct GBAVideoRenderer* rend
softwareRenderer->bg[3].sy += softwareRenderer->bg[3].dmy; softwareRenderer->bg[3].sy += softwareRenderer->bg[3].dmy;
GBAVideoSoftwareRendererPostprocessBuffer(softwareRenderer); GBAVideoSoftwareRendererPostprocessBuffer(softwareRenderer);
#ifdef COLOR_16_BIT
#if defined(__ARM_NEON) && !defined(__APPLE__)
_to16Bit(row, softwareRenderer->row, softwareRenderer->masterEnd);
#else
for (x = 0; x < softwareRenderer->masterEnd; ++x) {
row[x] = softwareRenderer->row[x];
}
#endif
#else
switch (softwareRenderer->masterBright) {
case 0:
default:
memcpy(row, softwareRenderer->row, softwareRenderer->masterEnd * sizeof(*row));
break;
case 1:
for (x = 0; x < softwareRenderer->masterEnd; ++x) {
row[x] = _brighten(softwareRenderer->row[x], softwareRenderer->masterBrightY);
}
break;
case 2:
for (x = 0; x < softwareRenderer->masterEnd; ++x) {
row[x] = _darken(softwareRenderer->row[x], softwareRenderer->masterBrightY);
}
break;
}
#endif
} }
static void _drawScanlineA(struct DSVideoSoftwareRenderer* softwareRenderer, int y) { static void _drawScanlineA(struct DSVideoSoftwareRenderer* softwareRenderer, int y) {
@ -495,7 +468,7 @@ static void _drawScanlineA(struct DSVideoSoftwareRenderer* softwareRenderer, int
return; return;
case 1: case 1:
DSVideoSoftwareRendererDrawGBAScanline(&softwareRenderer->engA.d, softwareRenderer->d.gx, y); DSVideoSoftwareRendererDrawGBAScanline(&softwareRenderer->engA.d, softwareRenderer->d.gx, y);
return; break;
case 2: { case 2: {
uint16_t* vram = &softwareRenderer->d.vram[0x10000 * DSRegisterDISPCNTGetVRAMBlock(softwareRenderer->dispcntA)]; uint16_t* vram = &softwareRenderer->d.vram[0x10000 * DSRegisterDISPCNTGetVRAMBlock(softwareRenderer->dispcntA)];
for (x = 0; x < DS_VIDEO_HORIZONTAL_PIXELS; ++x) { for (x = 0; x < DS_VIDEO_HORIZONTAL_PIXELS; ++x) {
@ -515,7 +488,7 @@ static void _drawScanlineA(struct DSVideoSoftwareRenderer* softwareRenderer, int
color16 |= (color & 0x7C00) >> 10; color16 |= (color & 0x7C00) >> 10;
color = color16; color = color16;
#endif #endif
softwareRenderer->row[x] = color; softwareRenderer->engA.row[x] = color;
} }
break; break;
} }
@ -525,14 +498,29 @@ static void _drawScanlineA(struct DSVideoSoftwareRenderer* softwareRenderer, int
#ifdef COLOR_16_BIT #ifdef COLOR_16_BIT
#if defined(__ARM_NEON) && !defined(__APPLE__) #if defined(__ARM_NEON) && !defined(__APPLE__)
_to16Bit(row, softwareRenderer->row, DS_VIDEO_HORIZONTAL_PIXELS); _to16Bit(row, softwareRenderer->engA.row, DS_VIDEO_HORIZONTAL_PIXELS);
#else #else
for (x = 0; x < DS_VIDEO_HORIZONTAL_PIXELS; ++x) { for (x = 0; x < DS_VIDEO_HORIZONTAL_PIXELS; ++x) {
row[x] = softwareRenderer->row[x]; row[x] = softwareRenderer->engA.row[x];
} }
#endif #endif
#else #else
memcpy(row, softwareRenderer->row, DS_VIDEO_HORIZONTAL_PIXELS * sizeof(*row)); switch (softwareRenderer->engA.masterBright) {
case 0:
default:
memcpy(row, softwareRenderer->engA.row, softwareRenderer->engA.masterEnd * sizeof(*row));
break;
case 1:
for (x = 0; x < DS_VIDEO_HORIZONTAL_PIXELS; ++x) {
row[x] = _brighten(softwareRenderer->engA.row[x], softwareRenderer->engA.masterBrightY);
}
break;
case 2:
for (x = 0; x < DS_VIDEO_HORIZONTAL_PIXELS; ++x) {
row[x] = _darken(softwareRenderer->engA.row[x], softwareRenderer->engA.masterBrightY);
}
break;
}
#endif #endif
} }
@ -550,19 +538,34 @@ static void _drawScanlineB(struct DSVideoSoftwareRenderer* softwareRenderer, int
return; return;
case 1: case 1:
DSVideoSoftwareRendererDrawGBAScanline(&softwareRenderer->engB.d, NULL, y); DSVideoSoftwareRendererDrawGBAScanline(&softwareRenderer->engB.d, NULL, y);
return; break;
} }
#ifdef COLOR_16_BIT #ifdef COLOR_16_BIT
#if defined(__ARM_NEON) && !defined(__APPLE__) #if defined(__ARM_NEON) && !defined(__APPLE__)
_to16Bit(row, softwareRenderer->row, DS_VIDEO_HORIZONTAL_PIXELS); _to16Bit(row, softwareRenderer->engB.row, DS_VIDEO_HORIZONTAL_PIXELS);
#else #else
for (x = 0; x < DS_VIDEO_HORIZONTAL_PIXELS; ++x) { for (x = 0; x < DS_VIDEO_HORIZONTAL_PIXELS; ++x) {
row[x] = softwareRenderer->row[x]; row[x] = softwareRenderer->engB.row[x];
} }
#endif #endif
#else #else
memcpy(row, softwareRenderer->row, DS_VIDEO_HORIZONTAL_PIXELS * sizeof(*row)); switch (softwareRenderer->engB.masterBright) {
case 0:
default:
memcpy(row, softwareRenderer->engB.row, softwareRenderer->engB.masterEnd * sizeof(*row));
break;
case 1:
for (x = 0; x < DS_VIDEO_HORIZONTAL_PIXELS; ++x) {
row[x] = _brighten(softwareRenderer->engB.row[x], softwareRenderer->engB.masterBrightY);
}
break;
case 2:
for (x = 0; x < DS_VIDEO_HORIZONTAL_PIXELS; ++x) {
row[x] = _darken(softwareRenderer->engB.row[x], softwareRenderer->engB.masterBrightY);
}
break;
}
#endif #endif
} }
@ -582,13 +585,8 @@ static void DSVideoSoftwareRendererDrawScanline(struct DSVideoRenderer* renderer
static void DSVideoSoftwareRendererDrawScanlineDirectly(struct DSVideoRenderer* renderer, int y, color_t* scanline) { static void DSVideoSoftwareRendererDrawScanlineDirectly(struct DSVideoRenderer* renderer, int y, color_t* scanline) {
struct DSVideoSoftwareRenderer* softwareRenderer = (struct DSVideoSoftwareRenderer*) renderer; struct DSVideoSoftwareRenderer* softwareRenderer = (struct DSVideoSoftwareRenderer*) renderer;
if (!DSRegisterPOWCNT1IsSwap(softwareRenderer->powcnt)) {
softwareRenderer->engA.outputBuffer = &softwareRenderer->outputBuffer[softwareRenderer->outputBufferStride * DS_VIDEO_VERTICAL_PIXELS];
} else {
softwareRenderer->engA.outputBuffer = softwareRenderer->outputBuffer;
}
DSVideoSoftwareRendererDrawGBAScanline(&softwareRenderer->engA.d, softwareRenderer->d.gx, y); DSVideoSoftwareRendererDrawGBAScanline(&softwareRenderer->engA.d, softwareRenderer->d.gx, y);
memcpy(scanline, softwareRenderer->engA.row, softwareRenderer->engA.masterEnd * sizeof(*scanline));
} }
static void DSVideoSoftwareRendererFinishFrame(struct DSVideoRenderer* renderer) { static void DSVideoSoftwareRendererFinishFrame(struct DSVideoRenderer* renderer) {

2
src/ds/video.c
View File

@ -223,7 +223,7 @@ static void _performCapture(struct DSVideo* video, int y) {
} }
uint16_t* vram = &video->vram[0x10000 * block + DSRegisterDISPCAPCNTGetWriteOffset(dispcap) * 0x4000]; uint16_t* vram = &video->vram[0x10000 * block + DSRegisterDISPCAPCNTGetWriteOffset(dispcap) * 0x4000];
const color_t* pixelsA; const color_t* pixelsA;
color_t pixels[DS_VIDEO_VERTICAL_PIXELS]; color_t pixels[DS_VIDEO_HORIZONTAL_PIXELS];
int width = DS_VIDEO_HORIZONTAL_PIXELS; int width = DS_VIDEO_HORIZONTAL_PIXELS;
switch (DSRegisterDISPCAPCNTGetCaptureSize(dispcap)) { switch (DSRegisterDISPCAPCNTGetCaptureSize(dispcap)) {
case 0: case 0: