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

Merge pull request #2577 from heuripedes/master

Browse Source 
Win32 fixes
This commit is contained in:
Twinaphex 2015-12-20 23:22:42 +01:00
commit 3bb6f568a7
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/drivers_context/d3d_ctx.cpp
View File

@ -161,11 +161,9 @@ static bool gfx_ctx_d3d_bind_api(void *data,
static void *gfx_ctx_d3d_init(void *video_driver)
{
(void)video_driver;
win32_monitor_init();
return (void*)"d3d";
return video_driver;
}
static void gfx_ctx_d3d_destroy(void *data)

5
gfx/video_driver.c
View File

@ -423,7 +423,12 @@ static void init_video_input(const input_driver_t *tmp)
{
const input_driver_t **input = input_get_double_ptr();
if (*input)
{
if (!input_driver_get_data() && !input_driver_ctl(RARCH_INPUT_CTL_INIT, NULL))
goto error;
return;
}
/* Reset video frame count */
video_driver_frame_count = 0;