mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-02 16:20:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

(GX) Use the inlined functions in the headers

Browse Source
This commit is contained in:
twinaphex 2014-02-21 02:00:00 +01:00
parent 041ec45132
commit b34b08c2a6
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gx/gx_video.c
View File

@ -99,13 +99,11 @@ extern rgui_handle_t *rgui;
static void gx_render_overlay(void *data); static void gx_render_overlay(void *data);
static void gx_free_overlay(gx_video_t *gx) static void gx_free_overlay(gx_video_t *gx)
{ {
#ifdef GX_OPTS
struct __gx_regdef *__gx = (struct __gx_regdef*)__gxregs; struct __gx_regdef *__gx = (struct __gx_regdef*)__gxregs;
#endif
free(gx->overlay); free(gx->overlay);
gx->overlay = NULL; gx->overlay = NULL;
gx->overlays = 0; gx->overlays = 0;
GX_InvalidateTexAll(); __GX_InvalidateTexAll(__gx);
} }
#endif #endif
@ -1112,9 +1110,7 @@ static bool gx_overlay_load(void *data, const struct texture_image *images, unsi
{ {
unsigned i; unsigned i;
gx_video_t *gx = (gx_video_t*)data; gx_video_t *gx = (gx_video_t*)data;
#ifdef GX_OPTS
struct __gx_regdef *__gx = (struct __gx_regdef*)__gxregs; struct __gx_regdef *__gx = (struct __gx_regdef*)__gxregs;
#endif
gx_free_overlay(gx); gx_free_overlay(gx);
gx->overlay = (struct gx_overlay_data*)calloc(num_images, sizeof(*gx->overlay)); gx->overlay = (struct gx_overlay_data*)calloc(num_images, sizeof(*gx->overlay));
@ -1134,7 +1130,7 @@ static bool gx_overlay_load(void *data, const struct texture_image *images, unsi
gx->overlay[i].alpha_mod = 1.0f; gx->overlay[i].alpha_mod = 1.0f;
} }
GX_InvalidateTexAll(); __GX_InvalidateTexAll(__gx);
return true; return true;
} }
@ -1191,14 +1187,12 @@ static void gx_overlay_set_alpha(void *data, unsigned image, float mod)
static void gx_render_overlay(void *data) static void gx_render_overlay(void *data)
{ {
gx_video_t *gx = (gx_video_t*)data; gx_video_t *gx = (gx_video_t*)data;
#ifdef GX_OPTS
struct __gx_regdef *__gx = (struct __gx_regdef*)__gxregs; struct __gx_regdef *__gx = (struct __gx_regdef*)__gxregs;
#endif
GX_SetCurrentMtx(GX_PNMTX1); __GX_SetCurrentMtx(__gx, GX_PNMTX1);
GX_SetVtxDesc(GX_VA_POS, GX_DIRECT); __GX_SetVtxDesc(__gx, GX_VA_POS, GX_DIRECT);
GX_SetVtxDesc(GX_VA_TEX0, GX_DIRECT); __GX_SetVtxDesc(__gx, GX_VA_TEX0, GX_DIRECT);
GX_SetVtxDesc(GX_VA_CLR0, GX_DIRECT); __GX_SetVtxDesc(__gx, GX_VA_CLR0, GX_DIRECT);
for (unsigned i = 0; i < gx->overlays; i++) for (unsigned i = 0; i < gx->overlays; i++)
{ {
@ -1223,9 +1217,9 @@ static void gx_render_overlay(void *data)
GX_End(); GX_End();
} }
GX_SetVtxDesc(GX_VA_POS, GX_INDEX8); __GX_SetVtxDesc(__gx, GX_VA_POS, GX_INDEX8);
GX_SetVtxDesc(GX_VA_TEX0, GX_INDEX8); __GX_SetVtxDesc(__gx, GX_VA_TEX0, GX_INDEX8);
GX_SetVtxDesc(GX_VA_CLR0, GX_INDEX8); __GX_SetVtxDesc(__gx, GX_VA_CLR0, GX_INDEX8);
} }
static const video_overlay_interface_t gx_overlay_interface = { static const video_overlay_interface_t gx_overlay_interface = {