mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 22:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(XDK D3D) Deinit more state in deinit_chain

Browse Source
This commit is contained in:
twinaphex 2014-05-29 19:51:12 +02:00
parent 49d47e1aaf
commit 1fbdb85fb0
1 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
xdk/xdk_d3d.cpp
View File

@ -80,6 +80,16 @@ static void d3d_deinit_chain(void *data)
if (d3d->tex) if (d3d->tex)
d3d->tex->Release(); d3d->tex->Release();
d3d->tex = NULL; d3d->tex = NULL;
if (d3d->vertex_buf)
d3d->vertex_buf->Release();
d3d->vertex_buf = NULL;
#ifndef _XBOX1
if (d3d->v_decl)
d3d->v_decl->Release();
d3d->v_decl = NULL;
#endif
} }
static void d3d_deinitialize(void *data) static void d3d_deinitialize(void *data)
@ -117,7 +127,6 @@ static void d3d_free(void *data)
DestroyWindow(d3d->hWnd); DestroyWindow(d3d->hWnd);
#endif #endif
if (d3d) if (d3d)
free(d3d); free(d3d);
@ -633,35 +642,39 @@ static bool d3d_construct(void *data, const video_info_t *info, const input_driv
return true; return true;
} }
static void *d3d_init(const video_info_t *vid, const input_driver_t **input, void **input_data) static void *d3d_init(const video_info_t *info, const input_driver_t **input, void **input_data)
{ {
d3d_video_t *d3d = (d3d_video_t*)calloc(1, sizeof(d3d_video_t)); d3d_video_t *vid = new d3d_video_t();
if (!d3d) if (!vid)
return NULL; return NULL;
d3d->ctx_driver = d3d_get_context(d3d); vid->ctx_driver = d3d_get_context(vid);
if (!d3d->ctx_driver) if (!vid->ctx_driver)
{ {
free(d3d); free(vid);
return NULL; return NULL;
} }
//default values //default values
d3d->g_pD3D = NULL; vid->g_pD3D = NULL;
d3d->dev = NULL; vid->dev = NULL;
d3d->dev_rotation = 0; vid->dev_rotation = 0;
d3d->needs_restore = false; vid->needs_restore = false;
d3d->should_resize = false; #ifdef HAVE_CG
d3d->vsync = vid->vsync; vid->cgCtx = NULL;
#endif
vid->should_resize = false;
vid->vsync = info->vsync;
//vid->chain = NULL;
if (!d3d_construct(d3d, vid, input, input_data)) if (!d3d_construct(vid, info, input, input_data))
{ {
RARCH_ERR("[D3D]: Failed to init D3D.\n"); RARCH_ERR("[D3D]: Failed to init D3D.\n");
delete d3d; delete vid;
return NULL; return NULL;
} }
return d3d; return vid;
} }
#ifdef HAVE_RMENU #ifdef HAVE_RMENU
@ -869,12 +882,12 @@ static void renderchain_set_vertices(void *data, unsigned pass,
static void renderchain_render_pass(void *data, const void *frame, unsigned width, unsigned height, static void renderchain_render_pass(void *data, const void *frame, unsigned width, unsigned height,
unsigned pitch, unsigned rotation) unsigned pitch, unsigned rotation)
{ {
d3d_video_t *d3d = (d3d_video_t*)data; #ifdef _XBOX360
LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev;
#ifndef _XBOX1
DWORD fetchConstant; DWORD fetchConstant;
UINT64 pendingMask3; UINT64 pendingMask3;
#endif #endif
d3d_video_t *d3d = (d3d_video_t*)data;
LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev;
#ifdef _XBOX1 #ifdef _XBOX1
d3dr->SetFlickerFilter(g_extern.console.screen.flicker_filter_index); d3dr->SetFlickerFilter(g_extern.console.screen.flicker_filter_index);
d3dr->SetSoftDisplayFilter(g_extern.lifecycle_state & (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE)); d3dr->SetSoftDisplayFilter(g_extern.lifecycle_state & (1ULL << MODE_VIDEO_SOFT_FILTER_ENABLE));
@ -882,14 +895,18 @@ static void renderchain_render_pass(void *data, const void *frame, unsigned widt
renderchain_blit_to_texture(d3d, frame, width, height, pitch); renderchain_blit_to_texture(d3d, frame, width, height, pitch);
renderchain_set_vertices(d3d, 1, width, height); renderchain_set_vertices(d3d, 1, width, height);
#ifdef _XBOX
if (g_extern.frame_count) if (g_extern.frame_count)
{
#ifdef _XBOX1 #ifdef _XBOX1
d3dr->SwitchTexture(0, d3d->tex); d3dr->SwitchTexture(0, d3d->tex);
#elif defined _XBOX360 #elif defined _XBOX360
d3dr->SetTextureFetchConstant(0, d3d->tex); d3dr->SetTextureFetchConstant(0, d3d->tex);
#endif #endif
else if (d3d->tex) }
RD3DDevice_SetTexture(d3dr, 0, d3d->tex); else
#endif
if (d3d->tex) { RD3DDevice_SetTexture(d3dr, 0, d3d->tex); }
RD3DDevice_SetViewport(d3d->dev, &d3d->final_viewport); RD3DDevice_SetViewport(d3d->dev, &d3d->final_viewport);
// TODO - use translate_filter on last param - and create pass->filter // TODO - use translate_filter on last param - and create pass->filter
RD3DDevice_SetSamplerState_MinFilter(d3dr, 0, g_settings.video.smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT); RD3DDevice_SetSamplerState_MinFilter(d3dr, 0, g_settings.video.smooth ? D3DTEXF_LINEAR : D3DTEXF_POINT);