mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

(CTR) build fix.

Browse Source
This commit is contained in:
aliaspider 2017-12-25 08:51:50 +01:00
parent 2c865d862b
commit 1f143927ca
4 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ctr/gpu_old.c
View File

@ -306,3 +306,18 @@ void GPU_FinishDrawing()
GPUCMD_AddWrite(GPUREG_FRAMEBUFFER_INVALIDATE, 0x00000001); GPUCMD_AddWrite(GPUREG_FRAMEBUFFER_INVALIDATE, 0x00000001);
GPUCMD_AddWrite(GPUREG_EARLYDEPTH_CLEAR, 0x00000001); GPUCMD_AddWrite(GPUREG_EARLYDEPTH_CLEAR, 0x00000001);
} }
void GPU_Finalize(void)
{
GPUCMD_AddMaskedWrite(GPUREG_PRIMITIVE_CONFIG, 0x8, 0x00000000);
GPUCMD_AddWrite(GPUREG_FRAMEBUFFER_FLUSH, 0x00000001);
GPUCMD_AddWrite(GPUREG_FRAMEBUFFER_INVALIDATE, 0x00000001);
#if 0
GPUCMD_Split(NULL, NULL);
#else
GPUCMD_AddWrite(GPUREG_FINALIZE, 0x12345678);
//not the cleanest way of guaranteeing 0x10-byte size but whatever good enough for now
GPUCMD_AddWrite(GPUREG_FINALIZE,0x12345678);
#endif
}

2
ctr/gpu_old.h
View File

@ -235,3 +235,5 @@ void GPU_DrawElements(GPU_Primitive_t primitive, u32* indexArray, u32 n) DEPRECA
* @deprecated * @deprecated
*/ */
void GPU_FinishDrawing() DEPRECATED; void GPU_FinishDrawing() DEPRECATED;
void GPU_Finalize(void) DEPRECATED;

6
gfx/drivers/ctr_gfx.c
View File

@ -238,7 +238,7 @@ static void ctr_lcd_aptHook(APT_HookType hook, void* param)
CTRGU_ATTRIBFMT(GPU_SHORT, 4) << 0 | CTRGU_ATTRIBFMT(GPU_SHORT, 4) << 0 |
CTRGU_ATTRIBFMT(GPU_SHORT, 4) << 4, CTRGU_ATTRIBFMT(GPU_SHORT, 4) << 4,
sizeof(ctr_vertex_t)); sizeof(ctr_vertex_t));
GPUCMD_Finalize(); GPU_Finalize();
ctrGuFlushAndRun(true); ctrGuFlushAndRun(true);
gspWaitForEvent(GSPGPU_EVENT_P3D, false); gspWaitForEvent(GSPGPU_EVENT_P3D, false);
ctr->p3d_event_pending = false; ctr->p3d_event_pending = false;
@ -407,7 +407,7 @@ static void* ctr_init(const video_info_t* video,
CTRGU_ATTRIBFMT(GPU_SHORT, 4) << 0 | CTRGU_ATTRIBFMT(GPU_SHORT, 4) << 0 |
CTRGU_ATTRIBFMT(GPU_SHORT, 4) << 4, CTRGU_ATTRIBFMT(GPU_SHORT, 4) << 4,
sizeof(ctr_vertex_t)); sizeof(ctr_vertex_t));
GPUCMD_Finalize(); GPU_Finalize();
ctrGuFlushAndRun(true); ctrGuFlushAndRun(true);
ctr->p3d_event_pending = true; ctr->p3d_event_pending = true;
@ -779,7 +779,7 @@ static bool ctr_frame(void* data, const void* frame,
#endif #endif
GPU_FinishDrawing(); GPU_FinishDrawing();
GPUCMD_Finalize(); GPU_Finalize();
ctrGuFlushAndRun(true); ctrGuFlushAndRun(true);
ctrGuDisplayTransfer(true, ctr->drawbuffers.top.left, ctrGuDisplayTransfer(true, ctr->drawbuffers.top.left,

2
menu/cbs/menu_cbs_select.c
View File

@ -148,11 +148,13 @@ static int action_select_input_desc(const char *path, const char *label, unsigne
return action_right_input_desc(type, label, true); return action_right_input_desc(type, label, true);
} }
#ifdef HAVE_KEYMAPPER
static int action_select_input_desc_kbd(const char *path, const char *label, unsigned type, static int action_select_input_desc_kbd(const char *path, const char *label, unsigned type,
size_t idx) size_t idx)
{ {
return action_right_input_desc_kbd(type, label, true); return action_right_input_desc_kbd(type, label, true);
} }
#endif
static int action_select_netplay_connect_room(const char *path, const char *label, unsigned type, static int action_select_netplay_connect_room(const char *path, const char *label, unsigned type,
size_t idx) size_t idx)