mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

[GX] fix video driver to work with driver teardown

Browse Source
This commit is contained in:
Toad King 2014-05-30 20:21:07 -04:00
parent 1d36ab8c49
commit 54335ee496
1 changed files with 32 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
gx/gx_video.c
View File

@ -49,6 +49,8 @@ uint32_t g_orientation;
static struct static struct
{ {
uint32_t *data; // needs to be resizable uint32_t *data; // needs to be resizable
unsigned width;
unsigned height;
GXTexObj obj; GXTexObj obj;
} g_tex; } g_tex;
@ -335,6 +337,7 @@ static void gx_set_aspect_ratio(void *data, unsigned aspect_ratio_idx)
static void setup_video_mode(void *data) static void setup_video_mode(void *data)
{ {
unsigned i; unsigned i;
if (!g_framebuf[0])
for (i = 0; i < 2; i++) for (i = 0; i < 2; i++)
g_framebuf[i] = MEM_K0_TO_K1(memalign(32, 640 * 576 * VI_DISPLAY_PIX_SZ)); g_framebuf[i] = MEM_K0_TO_K1(memalign(32, 640 * 576 * VI_DISPLAY_PIX_SZ));
@ -375,9 +378,9 @@ static void init_texture(void *data, unsigned width, unsigned height)
__GX_InvalidateTexAll(__gx); __GX_InvalidateTexAll(__gx);
} }
static void init_vtx(void *data) static void init_vtx(void *data, const video_info_t *video)
{ {
(void)data; gx_video_t *gx = (gx_video_t*)data;
GX_SetCullMode(GX_CULL_NONE); GX_SetCullMode(GX_CULL_NONE);
GX_SetClipMode(GX_CLIP_DISABLE); GX_SetClipMode(GX_CLIP_DISABLE);
@ -410,13 +413,28 @@ static void init_vtx(void *data)
GX_InvVtxCache(); GX_InvVtxCache();
GX_SetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_CLEAR); GX_SetBlendMode(GX_BM_BLEND, GX_BL_SRCALPHA, GX_BL_INVSRCALPHA, GX_LO_CLEAR);
g_tex.data = memalign(32, 4 * 4 * 4);
memset(g_tex.data, 0, 4 * 4 * 4);
memset(&g_tex.obj, 0, sizeof(GXTexObj));
memset(&menu_tex.obj, 0, sizeof(GXTexObj));
DCFlushRange(g_tex.data, 4 * 4 * 4); if (gx->scale != video->input_scale || gx->rgb32 != video->rgb32)
init_texture(data, 4, 4); // for menu texture {
RARCH_LOG("[GX] reallocate texture\n");
free(g_tex.data);
g_tex.data = memalign(32, RARCH_SCALE_BASE * RARCH_SCALE_BASE * video->input_scale * video->input_scale * (video->rgb32 ? 4 : 2));
g_tex.width = g_tex.height = RARCH_SCALE_BASE * video->input_scale;
if (!g_tex.data)
{
RARCH_ERR("[GX] Error allocating video texture\n");
exit(1);
}
}
DCFlushRange(g_tex.data, g_tex.width * g_tex.height * video->rgb32 ? 4 : 2);
gx->rgb32 = video->rgb32;
gx->scale = video->input_scale;
gx->should_resize = true;
init_texture(data, g_tex.width, g_tex.height);
GX_Flush(); GX_Flush();
} }
@ -492,7 +510,7 @@ static void *gx_init(const video_info_t *video,
g_vsync = video->vsync; g_vsync = video->vsync;
setup_video_mode(gx); setup_video_mode(gx);
init_vtx(gx); init_vtx(gx, video);
build_disp_list(); build_disp_list();
gx->vp.full_width = gx_mode.fbWidth; gx->vp.full_width = gx_mode.fbWidth;
@ -895,6 +913,9 @@ static bool gx_frame(void *data, const void *frame,
LWP_ThreadSleep(g_video_cond); LWP_ThreadSleep(g_video_cond);
} }
width = min(g_tex.width, width);
height = min(g_tex.height, height);
if (width != gx_old_width || height != gx_old_height) if (width != gx_old_width || height != gx_old_height)
{ {
init_texture(data, width, height); init_texture(data, width, height);