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

3DS: Move texture to VRAM, fixing the lockup (requires newer sf2dlib)

This commit is contained in:
Jeffrey Pfau 2015-09-03 22:39:35 -07:00
parent 664a46c5a9
commit 3ab6a5db6b
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/platform/3ds/main.c
View File

@ -67,7 +67,7 @@ static void _setup(struct GBAGUIRunner* runner) {
} }
GBAVideoSoftwareRendererCreate(&renderer); GBAVideoSoftwareRendererCreate(&renderer);
renderer.outputBuffer = linearAlloc(256 * VIDEO_VERTICAL_PIXELS * 2); renderer.outputBuffer = linearMemAlign(256 * 256 * 2, 0x100);
renderer.outputBufferStride = 256; renderer.outputBufferStride = 256;
runner->context.renderer = &renderer.d; runner->context.renderer = &renderer.d;
@ -115,8 +115,6 @@ static void _drawFrame(struct GBAGUIRunner* runner, bool faded) {
UNUSED(runner); UNUSED(runner);
GSPGPU_FlushDataCache(0, renderer.outputBuffer, 256 * VIDEO_VERTICAL_PIXELS * 2); GSPGPU_FlushDataCache(0, renderer.outputBuffer, 256 * VIDEO_VERTICAL_PIXELS * 2);
GX_SetDisplayTransfer(0, renderer.outputBuffer, GX_BUFFER_DIM(256, VIDEO_VERTICAL_PIXELS), tex->data, GX_BUFFER_DIM(256, VIDEO_VERTICAL_PIXELS), 0x000002202); GX_SetDisplayTransfer(0, renderer.outputBuffer, GX_BUFFER_DIM(256, VIDEO_VERTICAL_PIXELS), tex->data, GX_BUFFER_DIM(256, VIDEO_VERTICAL_PIXELS), 0x000002202);
gspWaitForPPF();
GSPGPU_FlushDataCache(0, tex->data, 256 * VIDEO_VERTICAL_PIXELS * 2);
sf2d_draw_texture_scale_blend(tex, 40, 296, 1, -1, 0xFFFFFF3F | (faded ? 0 : 0xC0)); sf2d_draw_texture_scale_blend(tex, 40, 296, 1, -1, 0xFFFFFF3F | (faded ? 0 : 0xC0));
#if RESAMPLE_LIBRARY == RESAMPLE_BLIP_BUF #if RESAMPLE_LIBRARY == RESAMPLE_BLIP_BUF
if (!hasSound) { if (!hasSound) {
@ -128,7 +126,7 @@ static void _drawFrame(struct GBAGUIRunner* runner, bool faded) {
static void _drawScreenshot(struct GBAGUIRunner* runner, const uint32_t* pixels, bool faded) { static void _drawScreenshot(struct GBAGUIRunner* runner, const uint32_t* pixels, bool faded) {
UNUSED(runner); UNUSED(runner);
u16* newPixels = linearMemAlign(256 * VIDEO_VERTICAL_PIXELS * 2, 0x80); u16* newPixels = linearMemAlign(256 * VIDEO_VERTICAL_PIXELS * 2, 0x100);
unsigned y, x; unsigned y, x;
for (y = 0; y < VIDEO_VERTICAL_PIXELS; ++y) { for (y = 0; y < VIDEO_VERTICAL_PIXELS; ++y) {
for (x = 0; x < VIDEO_HORIZONTAL_PIXELS; ++x) { for (x = 0; x < VIDEO_HORIZONTAL_PIXELS; ++x) {
@ -256,8 +254,7 @@ int main() {
sf2d_init(); sf2d_init();
sf2d_set_clear_color(0); sf2d_set_clear_color(0);
tex = sf2d_create_texture(256, 256, TEXFMT_RGB565, SF2D_PLACE_RAM); tex = sf2d_create_texture(256, 256, TEXFMT_RGB565, SF2D_PLACE_VRAM);
memset(tex->data, 0, 256 * 256 * 2);
sdmcArchive = (FS_archive) { sdmcArchive = (FS_archive) {
ARCH_SDMC, ARCH_SDMC,