libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-01-21 08:26:17 +00:00
Code Issues Actions 25 Packages Projects Releases Wiki Activity

(360) Add more error checking in D3D code

Browse Source
This commit is contained in:
twinaphex 2013-01-08 17:48:55 +01:00
parent b732dc14bd
commit 10fd5ea617
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/context/xdk_ctx.c
View File

@ -388,6 +388,7 @@ static bool gfx_ctx_xdk_init(void)
d3d->d3d_device = direct3d_create_ctx(D3D_SDK_VERSION);
if (!d3d->d3d_device)
{
RARCH_ERR("Could not create Direct3D context.\n");
free(d3d);
return NULL;
}
@ -500,7 +501,7 @@ const gfx_ctx_driver_t gfx_ctx_xdk = {
gfx_ctx_xdk_check_resolution,
gfx_ctx_xdk_set_fbo,
#if defined(HAVE_RMENU) || defined(_XBOX360)
#if defined(HAVE_RMENU)
gfx_ctx_xdk_menu_init,
gfx_ctx_xdk_menu_frame,
gfx_ctx_xdk_menu_free,

25
xdk/xdk_d3d.cpp
View File

@ -304,6 +304,7 @@ void xdk_d3d_deinit_fbo(void *data)
void xdk_d3d_init_fbo(void *data)
{
HRESULT ret;
xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)data;
if(!g_settings.video.render_to_texture)
@ -315,10 +316,16 @@ void xdk_d3d_init_fbo(void *data)
1, 0, g_extern.console.screen.gamma_correction ? ( D3DFORMAT )MAKESRGBFMT( D3DFMT_X8R8G8B8 ) : D3DFMT_X8R8G8B8,
0, &d3d->lpTexture_ot, NULL);
d3d->d3d_render_device->CreateRenderTarget(d3d->tex_w * g_settings.video.fbo.scale_x, d3d->tex_h * g_settings.video.fbo.scale_y,
ret = d3d->d3d_render_device->CreateRenderTarget(d3d->tex_w * g_settings.video.fbo.scale_x, d3d->tex_h * g_settings.video.fbo.scale_y,
g_extern.console.screen.gamma_correction ? ( D3DFORMAT )MAKESRGBFMT( D3DFMT_X8R8G8B8 ) : D3DFMT_X8R8G8B8, D3DMULTISAMPLE_NONE,
0, 0, &d3d->lpSurface, NULL);
if (ret != S_OK)
{
RARCH_ERR("[xdk_d3d_init_fbo::] Failed at CreateRenderTarget.\n");
return;
}
d3d->lpTexture_ot_as16srgb = *d3d->lpTexture_ot;
xdk_convert_texture_to_as16_srgb(d3d->lpTexture);
xdk_convert_texture_to_as16_srgb(&d3d->lpTexture_ot_as16srgb);
@ -431,6 +438,7 @@ void xdk_d3d_generate_pp(D3DPRESENT_PARAMETERS *d3dpp, const video_info_t *video
static void xdk_d3d_init_textures(void *data, const video_info_t *video)
{
HRESULT ret;
xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)data;
D3DPRESENT_PARAMETERS d3dpp;
@ -446,13 +454,19 @@ static void xdk_d3d_init_textures(void *data, const video_info_t *video)
d3d->lpTexture = NULL;
}
d3d->d3d_render_device->CreateTexture(d3d->tex_w, d3d->tex_h, 1, 0, d3d->texture_fmt,
ret = d3d->d3d_render_device->CreateTexture(d3d->tex_w, d3d->tex_h, 1, 0, d3d->texture_fmt,
0, &d3d->lpTexture
#ifdef _XBOX360
, NULL
#endif
);
if (ret != S_OK)
{
RARCH_ERR("[xdk_d3d_init_textures::] failed at CreateTexture.\n");
return;
}
D3DLOCKED_RECT d3dlr;
d3d->lpTexture->LockRect(0, &d3dlr, NULL, D3DLOCK_NOSYSLOCK);
memset(d3dlr.pBits, 0, d3d->tex_w * d3dlr.Pitch);
@ -518,6 +532,8 @@ static void xdk_d3d_reinit_textures(void *data, const video_info_t *video)
static void *xdk_d3d_init(const video_info_t *video, const input_driver_t **input, void **input_data)
{
HRESULT ret;
if (driver.video_data)
{
xdk_d3d_video_t *d3d = (xdk_d3d_video_t*)driver.video_data;
@ -549,8 +565,11 @@ static void *xdk_d3d_init(const video_info_t *video, const input_driver_t **inpu
D3DPRESENT_PARAMETERS d3dpp;
xdk_d3d_generate_pp(&d3dpp, video);
d3d->d3d_device->CreateDevice(0, D3DDEVTYPE_HAL, NULL, D3DCREATE_HARDWARE_VERTEXPROCESSING,
ret = d3d->d3d_device->CreateDevice(0, D3DDEVTYPE_HAL, NULL, D3DCREATE_HARDWARE_VERTEXPROCESSING,
&d3dpp, &d3d->d3d_render_device);
if (ret != S_OK)
RARCH_ERR("Failed at CreateDevice.\n");
d3d->d3d_render_device->Clear(0, NULL, D3DCLEAR_TARGET, 0xff000000, 1.0f, 0);
}
else