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

Refactor some code to enable compositing code to be shared

This commit is contained in:
Jeffrey Pfau 2013-04-24 00:50:17 -07:00
parent 0d7657e845
commit 40b00e7927
2 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/gba/renderers/video-software.c
View File

@ -16,7 +16,8 @@ static void GBAVideoSoftwareRendererUpdateDISPCNT(struct GBAVideoSoftwareRendere
static void GBAVideoSoftwareRendererWriteBGCNT(struct GBAVideoSoftwareRenderer* renderer, struct GBAVideoSoftwareBackground* bg, uint16_t value); static void GBAVideoSoftwareRendererWriteBGCNT(struct GBAVideoSoftwareRenderer* renderer, struct GBAVideoSoftwareBackground* bg, uint16_t value);
static void GBAVideoSoftwareRendererWriteBLDCNT(struct GBAVideoSoftwareRenderer* renderer, uint16_t value); static void GBAVideoSoftwareRendererWriteBLDCNT(struct GBAVideoSoftwareRenderer* renderer, uint16_t value);
static void _drawBackgroundMode0(struct GBAVideoSoftwareRenderer* renderer, struct GBAVideoSoftwareBackground* background, uint16_t* output, int y); static void _composite(struct GBAVideoSoftwareRenderer* renderer, int offset, int entry, struct PixelFlags flags);
static void _drawBackgroundMode0(struct GBAVideoSoftwareRenderer* renderer, struct GBAVideoSoftwareBackground* background, int y);
static void _updatePalettes(struct GBAVideoSoftwareRenderer* renderer); static void _updatePalettes(struct GBAVideoSoftwareRenderer* renderer);
static inline uint16_t _brighten(uint16_t color, int y); static inline uint16_t _brighten(uint16_t color, int y);
@ -182,10 +183,11 @@ static void GBAVideoSoftwareRendererDrawScanline(struct GBAVideoRenderer* render
} }
memset(softwareRenderer->flags, 0, sizeof(softwareRenderer->flags)); memset(softwareRenderer->flags, 0, sizeof(softwareRenderer->flags));
softwareRenderer->row = row;
for (int i = 0; i < 4; ++i) { for (int i = 0; i < 4; ++i) {
if (softwareRenderer->sortedBg[i]->enabled) { if (softwareRenderer->sortedBg[i]->enabled) {
_drawBackgroundMode0(softwareRenderer, softwareRenderer->sortedBg[i], row, y); _drawBackgroundMode0(softwareRenderer, softwareRenderer->sortedBg[i], y);
} }
} }
} }
@ -263,8 +265,16 @@ static void GBAVideoSoftwareRendererWriteBLDCNT(struct GBAVideoSoftwareRenderer*
} }
} }
static void _composite(struct GBAVideoSoftwareRenderer* renderer, int offset, int entry, struct PixelFlags flags) {
if (renderer->blendEffect == BLEND_NONE || !flags.target1) {
renderer->row[offset] = renderer->d.palette[entry];
} else if (renderer->blendEffect == BLEND_BRIGHTEN || renderer->blendEffect == BLEND_DARKEN) {
renderer->row[offset] = renderer->variantPalette[entry];
}
renderer->flags[offset].finalized = 1;
}
static void _drawBackgroundMode0(struct GBAVideoSoftwareRenderer* renderer, struct GBAVideoSoftwareBackground* background, uint16_t* output, int y) { static void _drawBackgroundMode0(struct GBAVideoSoftwareRenderer* renderer, struct GBAVideoSoftwareBackground* background, int y) {
int start = 0; int start = 0;
int end = VIDEO_HORIZONTAL_PIXELS; int end = VIDEO_HORIZONTAL_PIXELS;
int inX = start + background->x; int inX = start + background->x;
@ -297,12 +307,12 @@ static void _drawBackgroundMode0(struct GBAVideoSoftwareRenderer* renderer, stru
uint16_t tileData = renderer->d.vram[charBase]; uint16_t tileData = renderer->d.vram[charBase];
tileData >>= ((outX + inX) & 0x3) << 2; tileData >>= ((outX + inX) & 0x3) << 2;
if (tileData & 0xF) { if (tileData & 0xF) {
if (renderer->blendEffect == BLEND_NONE || !background->target1) { struct PixelFlags flags = {
output[outX] = renderer->d.palette[(tileData & 0xF) | (mapData.palette << 4)]; .finalized = 1,
} else if (renderer->blendEffect == BLEND_BRIGHTEN || renderer->blendEffect == BLEND_DARKEN) { .target1 = background->target1,
output[outX] = renderer->variantPalette[(tileData & 0xF) | (mapData.palette << 4)]; .target2 = background->target2
} };
renderer->flags[outX].finalized = 1; _composite(renderer, outX, (tileData & 0xF) | (mapData.palette << 4), flags);
} }
} }
} }

4
src/gba/renderers/video-software.h
View File

@ -38,6 +38,8 @@ enum BlendEffect {
struct PixelFlags { struct PixelFlags {
unsigned finalized : 1; unsigned finalized : 1;
unsigned target1 : 1;
unsigned target2 : 1;
}; };
struct GBAVideoSoftwareRenderer { struct GBAVideoSoftwareRenderer {
@ -63,6 +65,8 @@ struct GBAVideoSoftwareRenderer {
struct GBAVideoSoftwareBackground bg[4]; struct GBAVideoSoftwareBackground bg[4];
struct GBAVideoSoftwareBackground* sortedBg[4]; struct GBAVideoSoftwareBackground* sortedBg[4];
uint16_t* row;
pthread_mutex_t mutex; pthread_mutex_t mutex;
pthread_cond_t cond; pthread_cond_t cond;
}; };