duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Misc 3DS cleanup and tweaks

Browse source
This commit is contained in:
Clownacy 2020-10-13 20:00:30 +01:00
parent 65aac0bb21
commit 0f6768e6e6
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/Backends/Rendering/3DS.cpp
View file

@ -102,7 +102,7 @@ void RenderBackend_DrawScreen(void)
{ {
if (!frame_started) if (!frame_started)
{ {
C3D_FrameBegin(C3D_FRAME_SYNCDRAW); C3D_FrameBegin(0);
frame_started = true; frame_started = true;
} }
@ -156,7 +156,7 @@ RenderBackend_Surface* RenderBackend_CreateSurface(size_t width, size_t height,
} }
else 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) if (surface->render_target != NULL)
return surface; return surface;
@ -203,12 +203,12 @@ void RenderBackend_UploadSurface(RenderBackend_Surface *surface, const unsigned
{ {
Backend_PrintInfo("RenderBackend_UploadSurface"); 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; const unsigned char *src = pixels;
unsigned char *dst = rgba_buffer; unsigned char *dst = abgr_buffer;
// Convert from colour-keyed RGB to ABGR // Convert from colour-keyed RGB to ABGR
for (size_t i = 0; i < width * height; ++i) 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 // 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 else
{ {
@ -240,7 +240,7 @@ ATTRIBUTE_HOT void RenderBackend_Blit(RenderBackend_Surface *source_surface, con
{ {
if (!frame_started) if (!frame_started)
{ {
C3D_FrameBegin(C3D_FRAME_SYNCDRAW); C3D_FrameBegin(0);
frame_started = true; frame_started = true;
} }
@ -270,7 +270,7 @@ ATTRIBUTE_HOT void RenderBackend_ColourFill(RenderBackend_Surface *surface, cons
{ {
if (!frame_started) if (!frame_started)
{ {
C3D_FrameBegin(C3D_FRAME_SYNCDRAW); C3D_FrameBegin(0);
frame_started = true; frame_started = true;
} }