mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-07 13:23:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

(360) Build fixes

Browse Source
This commit is contained in:
twinaphex 2015-04-26 05:44:30 +02:00
parent 0634c7e34f
commit e52eb7bcf2
3 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/d3d/d3d.cpp
View File

@ -170,8 +170,8 @@ void d3d_make_d3dpp(void *data,
gfx_ctx_get_video_size(d3d, &width, &height); gfx_ctx_get_video_size(d3d, &width, &height);
d3d->screen_width = width; global->video_data.width = width;
d3d->screen_height = height; global->video_data.height = height;
#endif #endif
d3dpp->BackBufferWidth = global->video_data.width; d3dpp->BackBufferWidth = global->video_data.width;
d3dpp->BackBufferHeight = global->video_data.height; d3dpp->BackBufferHeight = global->video_data.height;

15
gfx/d3d/render_chain_xdk.cpp
View File

@ -132,6 +132,7 @@ static void renderchain_set_vertices(void *data, unsigned pass,
{ {
d3d_video_t *d3d = (d3d_video_t*)data; d3d_video_t *d3d = (d3d_video_t*)data;
runloop_t *runloop = rarch_main_get_ptr(); runloop_t *runloop = rarch_main_get_ptr();
global_t *global = global_get_ptr();
xdk_renderchain_t *chain = (xdk_renderchain_t*)d3d->renderchain_data; xdk_renderchain_t *chain = (xdk_renderchain_t*)d3d->renderchain_data;
if (chain->last_width != width || chain->last_height != height) if (chain->last_width != width || chain->last_height != height)
@ -207,13 +208,13 @@ static void renderchain_set_vertices(void *data, unsigned pass,
#ifdef _XBOX #ifdef _XBOX
if (d3d->shader) if (d3d->shader)
{ {
renderchain_set_mvp(d3d, d3d->screen_width, d3d->screen_height, d3d->dev_rotation); renderchain_set_mvp(d3d, global->video_data.width, global->video_data.height, d3d->dev_rotation);
if (d3d->shader->use) if (d3d->shader->use)
d3d->shader->use(d3d, pass); d3d->shader->use(d3d, pass);
if (d3d->shader->set_params) if (d3d->shader->set_params)
d3d->shader->set_params(d3d, width, height, chain->tex_w, d3d->shader->set_params(d3d, width, height, chain->tex_w,
chain->tex_h, d3d->screen_width, chain->tex_h, global->video_data.width,
d3d->screen_height, runloop->frames.video.count, global->video_data.height, runloop->frames.video.count,
NULL, NULL, NULL, 0); NULL, NULL, NULL, 0);
} }
#endif #endif
@ -334,10 +335,10 @@ static bool xdk_renderchain_init(void *data,
return false; return false;
if (global->console.screen.viewports.custom_vp.width == 0) if (global->console.screen.viewports.custom_vp.width == 0)
global->console.screen.viewports.custom_vp.width = d3d->screen_width; global->console.screen.viewports.custom_vp.width = global->video_data.width;
if (global->console.screen.viewports.custom_vp.height == 0) if (global->console.screen.viewports.custom_vp.height == 0)
global->console.screen.viewports.custom_vp.height = d3d->screen_height; global->console.screen.viewports.custom_vp.height = global->video_data.height;
return true; return true;
} }
@ -359,6 +360,7 @@ static bool xdk_renderchain_render(void *data, const void *frame,
d3d_video_t *d3d = (d3d_video_t*)data; d3d_video_t *d3d = (d3d_video_t*)data;
LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev; LPDIRECT3DDEVICE d3dr = (LPDIRECT3DDEVICE)d3d->dev;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr();
xdk_renderchain_t *chain = (xdk_renderchain_t*)d3d->renderchain_data; xdk_renderchain_t *chain = (xdk_renderchain_t*)d3d->renderchain_data;
renderchain_blit_to_texture(chain, frame, width, height, pitch); renderchain_blit_to_texture(chain, frame, width, height, pitch);
@ -376,7 +378,8 @@ static bool xdk_renderchain_render(void *data, const void *frame,
d3d_set_stream_source(d3dr, i, chain->vertex_buf, 0, sizeof(Vertex)); d3d_set_stream_source(d3dr, i, chain->vertex_buf, 0, sizeof(Vertex));
d3d_draw_primitive(d3dr, D3DPT_TRIANGLESTRIP, 0, 2); d3d_draw_primitive(d3dr, D3DPT_TRIANGLESTRIP, 0, 2);
renderchain_set_mvp(d3d, d3d->screen_width, d3d->screen_height, d3d->dev_rotation); renderchain_set_mvp(d3d, global->video_data.width,
global->video_data.height, d3d->dev_rotation);
return true; return true;
} }

13
menu/drivers/rmenu_xui.cpp
View File

@ -423,6 +423,7 @@ static void rmenu_xui_frame(void)
d3d_video_t *d3d = NULL; d3d_video_t *d3d = NULL;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
global_t *global = global_get_ptr();
if (!menu) if (!menu)
return; return;
@ -439,12 +440,12 @@ static void rmenu_xui_frame(void)
(void)menu; (void)menu;
vp_full.X = 0; vp_full.X = 0;
vp_full.Y = 0; vp_full.Y = 0;
vp_full.Width = d3d->screen_width; vp_full.Width = global->video_data.width;
vp_full.Height = d3d->screen_height; vp_full.Height = global->video_data.height;
vp_full.MinZ = 0.0f; vp_full.MinZ = 0.0f;
vp_full.MaxZ = 1.0f; vp_full.MaxZ = 1.0f;
d3d_set_viewport(d3dr, &vp_full); d3d_set_viewport(d3dr, &vp_full);
app.RunFrame(); app.RunFrame();