From 0f6768e6e6ebb7415ba98e9326f8a1f37d2e69b3 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Tue, 13 Oct 2020 20:00:30 +0100 Subject: [PATCH] Misc 3DS cleanup and tweaks --- src/Backends/Rendering/3DS.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Backends/Rendering/3DS.cpp b/src/Backends/Rendering/3DS.cpp index 0e098732..3a1e324f 100644 --- a/src/Backends/Rendering/3DS.cpp +++ b/src/Backends/Rendering/3DS.cpp @@ -102,7 +102,7 @@ void RenderBackend_DrawScreen(void) { if (!frame_started) { - C3D_FrameBegin(C3D_FRAME_SYNCDRAW); + C3D_FrameBegin(0); frame_started = true; } @@ -156,7 +156,7 @@ RenderBackend_Surface* RenderBackend_CreateSurface(size_t width, size_t height, } else { - surface->render_target = C3D_RenderTargetCreateFromTex(&surface->texture, GPU_TEXFACE_2D, 0, GPU_RB_DEPTH16); + surface->render_target = C3D_RenderTargetCreateFromTex(&surface->texture, GPU_TEXFACE_2D, 0, -1); if (surface->render_target != NULL) return surface; @@ -203,12 +203,12 @@ void RenderBackend_UploadSurface(RenderBackend_Surface *surface, const unsigned { Backend_PrintInfo("RenderBackend_UploadSurface"); - unsigned char *rgba_buffer = (unsigned char*)linearAlloc(width * height * 4); + unsigned char *abgr_buffer = (unsigned char*)linearAlloc(width * height * 4); - if (rgba_buffer != NULL) + if (abgr_buffer != NULL) { const unsigned char *src = pixels; - unsigned char *dst = rgba_buffer; + unsigned char *dst = abgr_buffer; // Convert from colour-keyed RGB to ABGR for (size_t i = 0; i < width * height; ++i) @@ -224,11 +224,11 @@ void RenderBackend_UploadSurface(RenderBackend_Surface *surface, const unsigned } // ensure data is in physical ram - GSPGPU_FlushDataCache(rgba_buffer, width * height * 4); + GSPGPU_FlushDataCache(abgr_buffer, width * height * 4); - C3D_SyncDisplayTransfer((u32*)rgba_buffer, GX_BUFFER_DIM(width, height), (u32*)surface->texture.data, GX_BUFFER_DIM(surface->texture.width, surface->texture.height), TEXTURE_TRANSFER_FLAGS); + C3D_SyncDisplayTransfer((u32*)abgr_buffer, GX_BUFFER_DIM(width, height), (u32*)surface->texture.data, GX_BUFFER_DIM(surface->texture.width, surface->texture.height), TEXTURE_TRANSFER_FLAGS); - linearFree(rgba_buffer); + linearFree(abgr_buffer); } else { @@ -240,7 +240,7 @@ ATTRIBUTE_HOT void RenderBackend_Blit(RenderBackend_Surface *source_surface, con { if (!frame_started) { - C3D_FrameBegin(C3D_FRAME_SYNCDRAW); + C3D_FrameBegin(0); frame_started = true; } @@ -270,7 +270,7 @@ ATTRIBUTE_HOT void RenderBackend_ColourFill(RenderBackend_Surface *surface, cons { if (!frame_started) { - C3D_FrameBegin(C3D_FRAME_SYNCDRAW); + C3D_FrameBegin(0); frame_started = true; }