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

(XDK D3D) Changes pt. 2

Browse Source
This commit is contained in:
twinaphex 2014-06-07 06:11:36 +02:00
parent c09c5c1109
commit 4ad1246fc4
2 changed files with 38 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gfx/d3d9/d3d.cpp
View File

@ -535,8 +535,11 @@ static void d3d_overlay_render(void *data, overlay_t *overlay)
#endif
0,
D3DPOOL_MANAGED,
&overlay->vert_buf,
NULL);
&overlay->vert_buf
#ifndef _XBOX1
,NULL
#endif
);
}
for (unsigned i = 0; i < 4; i++)
@ -584,6 +587,7 @@ static void d3d_overlay_render(void *data, overlay_t *overlay)
d3d->dev->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
d3d->dev->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
#ifndef _XBOX1
// set vertex decl for overlay
D3DVERTEXELEMENT vElems[4] = {
{0, 0, D3DDECLTYPE_FLOAT3, D3DDECLMETHOD_DEFAULT, D3DDECLUSAGE_POSITION, 0},
@ -595,6 +599,7 @@ static void d3d_overlay_render(void *data, overlay_t *overlay)
d3d->dev->CreateVertexDeclaration(vElems, &vertex_decl);
d3d->dev->SetVertexDeclaration(vertex_decl);
vertex_decl->Release();
#endif
d3d->dev->SetStreamSource(0, overlay->vert_buf, 0, sizeof(overlay_vertex));
@ -790,13 +795,13 @@ static bool d3d_frame(void *data, const void *frame,
}
#endif
RARCH_PERFORMANCE_STOP(d3d_frame);
#ifdef HAVE_MENU
if (g_extern.lifecycle_state & (1ULL << MODE_MENU) && driver.menu_ctx && driver.menu_ctx->frame)
driver.menu_ctx->frame();
#endif
RARCH_PERFORMANCE_STOP(d3d_frame);
if (d3d && d3d->ctx_driver && d3d->ctx_driver->update_window_title)
d3d->ctx_driver->update_window_title(d3d);

45
xdk/xdk_d3d.cpp
View File

@ -859,11 +859,12 @@ static void d3d_calculate_rect(void *data, unsigned width, unsigned height,
}
static bool d3d_frame(void *data, const void *frame,
unsigned width, unsigned height, unsigned pitch, const char *msg)
unsigned width, unsigned height, unsigned pitch,
const char *msg)
{
D3DVIEWPORT screen_vp;
d3d_video_t *d3d = (d3d_video_t*)data;
LPDIRECT3DDEVICE d3dr = d3d->dev;
LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev;
if (!frame)
return true;
@ -921,17 +922,17 @@ static bool d3d_frame(void *data, const void *frame,
#endif
}
#ifdef _XBOX
render_pass(d3d, frame, width, height, pitch, d3d->dev_rotation);
#ifdef HAVE_MENU
if (g_extern.lifecycle_state & (1ULL << MODE_MENU) && driver.menu_ctx && driver.menu_ctx->frame)
driver.menu_ctx->frame();
if (d3d && d3d->rgui_texture_enable)
d3d_draw_texture(d3d);
#else
if (!renderchain_render(d3d->chain, frame, width, height, pitch, d3d->dev_rotation))
{
RARCH_ERR("[D3D]: Failed to render scene.\n");
return false;
}
#endif
if (msg)
if (d3d->font_ctx && d3d->font_ctx->render_msg && msg)
{
#if defined(_XBOX1)
float msg_width = 60;
@ -947,6 +948,14 @@ static bool d3d_frame(void *data, const void *frame,
d3d->font_ctx->render_msg(d3d, msg, &font_parms);
}
#ifdef HAVE_MENU
if (g_extern.lifecycle_state & (1ULL << MODE_MENU) && driver.menu_ctx && driver.menu_ctx->frame)
driver.menu_ctx->frame();
if (d3d && d3d->rgui_texture_enable)
d3d_draw_texture(d3d);
#endif
RARCH_PERFORMANCE_STOP(d3d_frame);
if (d3d && d3d->ctx_driver && d3d->ctx_driver->update_window_title)
@ -987,7 +996,7 @@ static bool d3d_alive(void *data)
else if (resize)
d3d->should_resize = true;
return !d3d->quitting;
return !quit;
}
static bool d3d_focus(void *data)
@ -1025,8 +1034,6 @@ static void d3d_set_aspect_ratio(void *data, unsigned aspect_ratio_idx)
d3d->should_resize = true;
}
static void d3d_set_filtering(void *data, unsigned index, bool set_smooth) { }
static void d3d_apply_state_changes(void *data)
{
d3d_video_t *d3d = (d3d_video_t*)data;
@ -1063,7 +1070,7 @@ static void d3d_set_osd_msg(void *data, const char *msg, void *userdata)
}
static const video_poke_interface_t d3d_poke_interface = {
d3d_set_filtering,
NULL,
#ifdef HAVE_FBO
NULL,
NULL,
@ -1187,6 +1194,12 @@ static bool d3d_construct(void *data, const video_info_t *info, const input_driv
SetFocus(d3d->hWnd);
#endif
#ifdef HAVE_WINDOW
ShowWindow(d3d->hWnd, SW_RESTORE);
UpdateWindow(d3d->hWnd);
SetForegroundWindow(d3d->hWnd);
SetFocus(d3d->hWnd);
#endif
d3d->video_info = *info;
if (!d3d_initialize(d3d, &d3d->video_info))
@ -1202,7 +1215,7 @@ static bool d3d_construct(void *data, const video_info_t *info, const input_driv
static const gfx_ctx_driver_t *d3d_get_context(void *data)
{
d3d_video_t *d3d = (d3d_video_t*)data;
// TODO: GL core contexts through ANGLE?
enum gfx_ctx_api api;
unsigned major, minor;
#if defined(_XBOX1)
@ -1213,7 +1226,7 @@ static const gfx_ctx_driver_t *d3d_get_context(void *data)
major = 9;
#endif
minor = 0;
return gfx_ctx_init_first(d3d, api, major, minor, false);
return gfx_ctx_init_first(driver.video_data, api, major, minor, false);
}
static void *d3d_init(const video_info_t *info, const input_driver_t **input, void **input_data)