mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-24 00:39:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D) Remove dependencies on video_data

Browse Source
This commit is contained in:
twinaphex 2015-05-20 02:30:31 +02:00
parent 23fe7886d2
commit b2d57fd07d
1 changed files with 32 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
gfx/d3d/d3d.cpp
View File

@ -170,13 +170,12 @@ void d3d_make_d3dpp(void *data,
unsigned width = 0; unsigned width = 0;
unsigned height = 0; unsigned height = 0;
gfx_ctx_get_video_size(d3d, &width, &height); gfx_ctx_get_video_size(d3d, &width, &height);
global->video_data.width = width; video_driver_set_size_width(width);
global->video_data.height = height; video_driver_set_size_height(height);
#endif #endif
d3dpp->BackBufferWidth = global->video_data.width; video_driver_get_size(&d3dpp->BackBufferWidth, &d3dpp->BackBufferHeight);
d3dpp->BackBufferHeight = global->video_data.height;
} }
#ifdef _XBOX #ifdef _XBOX
@ -273,6 +272,7 @@ static bool d3d_init_base(void *data, const video_info_t *info)
static bool d3d_initialize(d3d_video_t *d3d, const video_info_t *info) static bool d3d_initialize(d3d_video_t *d3d, const video_info_t *info)
{ {
unsigned width, height;
bool ret = true; bool ret = true;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
driver_t *driver = driver_get_ptr(); driver_t *driver = driver_get_ptr();
@ -329,10 +329,10 @@ static bool d3d_initialize(d3d_video_t *d3d, const video_info_t *info)
if (!ret) if (!ret)
return ret; return ret;
video_driver_get_size(&width, &height);
d3d_calculate_rect(d3d, d3d_calculate_rect(d3d,
global->video_data.width, width, height, info->force_aspect, global->system.aspect_ratio);
global->video_data.height,
info->force_aspect, global->system.aspect_ratio);
if (!d3d_init_chain(d3d, info)) if (!d3d_init_chain(d3d, info))
{ {
@ -474,21 +474,30 @@ static void d3d_set_nonblock_state(void *data, bool state)
static bool d3d_alive(void *data) static bool d3d_alive(void *data)
{ {
unsigned temp_width = 0, temp_height = 0;
int ret = false;
d3d_video_t *d3d = (d3d_video_t*)data; d3d_video_t *d3d = (d3d_video_t*)data;
bool quit = false; bool quit = false;
bool resize = false; bool resize = false;
global_t *global = global_get_ptr();
if (!gfx_ctx_check_window(d3d, &quit, &resize, if (gfx_ctx_check_window(d3d, &quit, &resize,
&global->video_data.width, &global->video_data.height)) &temp_width, &temp_height))
return false; {
if (quit)
d3d->quitting = quit;
else if (resize)
d3d->should_resize = true;
if (quit) ret = !quit;
d3d->quitting = quit; }
else if (resize)
d3d->should_resize = true;
return !quit; if (temp_width != 0 && temp_height != 0)
{
video_driver_set_size_width(temp_width);
video_driver_set_size_height(temp_height);
}
return ret;
} }
static bool d3d_focus(void *data) static bool d3d_focus(void *data)
@ -627,20 +636,20 @@ static bool d3d_construct(d3d_video_t *d3d,
#else #else
gfx_ctx_get_video_size(d3d, &full_x, &full_y); gfx_ctx_get_video_size(d3d, &full_x, &full_y);
#endif #endif
global->video_data.width = info->fullscreen ? full_x : info->width; video_driver_set_size_width(info->fullscreen ? full_x : info->width);
global->video_data.height = info->fullscreen ? full_y : info->height; video_driver_set_size_height(info->fullscreen ? full_y : info->height);
#ifndef _XBOX #ifndef _XBOX
#ifdef HAVE_WINDOW #ifdef HAVE_WINDOW
char buffer[128]; char buffer[128];
unsigned win_width = global->video_data.width; unsigned win_width, win_height;
unsigned win_height = global->video_data.height;
RECT rect = {0}; RECT rect = {0};
video_driver_get_size(&win_width, &win_height);
if (!info->fullscreen) if (!info->fullscreen)
{ {
rect.right = global->video_data.width; video_driver_get_size(&rect.right, &rect.bottom);
rect.bottom = global->video_data.height;
AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE); AdjustWindowRect(&rect, WS_OVERLAPPEDWINDOW, FALSE);
win_width = rect.right - rect.left; win_width = rect.right - rect.left;
win_height = rect.bottom - rect.top; win_height = rect.bottom - rect.top;