mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D) Don't use new/delete

Browse Source
This commit is contained in:
twinaphex 2015-04-06 01:12:42 +02:00
parent 77b3705b89
commit 37c5c0d98a
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gfx/d3d/d3d.cpp
View File

@ -693,16 +693,13 @@ static void *d3d_init(const video_info_t *info,
}
#endif
vid = new d3d_video_t();
vid = (d3d_video_t*)calloc(1, sizeof(*vid));
if (!vid)
return NULL;
goto error;
vid->ctx_driver = d3d_get_context(vid);
if (!vid->ctx_driver)
{
delete vid;
return NULL;
}
goto error;
/* Default values */
vid->g_pD3D = NULL;
@ -721,8 +718,7 @@ static void *d3d_init(const video_info_t *info,
if (!d3d_construct(vid, info, input, input_data))
{
RARCH_ERR("[D3D]: Failed to init D3D.\n");
delete vid;
return NULL;
goto error;
}
#ifdef _XBOX
@ -731,6 +727,11 @@ static void *d3d_init(const video_info_t *info,
#endif
return vid;
error:
if (vid)
free(vid);
return NULL;
}
static void d3d_free(void *data)
@ -764,7 +765,7 @@ static void d3d_free(void *data)
#endif
if (d3d)
delete d3d;
free(d3d);
#ifndef _XBOX
UnregisterClass("RetroArch", GetModuleHandle(NULL));