CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2025-02-10 21:52:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'msvc'

Browse Source
This commit is contained in:
Brad Parker 2016-12-02 14:36:48 -05:00
commit 5be05b3f61
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gfx/drivers_context/wgl_ctx.cpp
View File

@ -1,7 +1,7 @@
/* RetroArch - A frontend for libretro. /* RetroArch - A frontend for libretro.
* Copyright (C) 2010-2014 - Hans-Kristian Arntzen * Copyright (C) 2010-2014 - Hans-Kristian Arntzen
* Copyright (C) 2011-2016 - Daniel De Matteis * Copyright (C) 2011-2016 - Daniel De Matteis
* *
* RetroArch is free software: you can redistribute it and/or modify it under the terms * RetroArch is free software: you can redistribute it and/or modify it under the terms
* of the GNU General Public License as published by the Free Software Found- * of the GNU General Public License as published by the Free Software Found-
* ation, either version 3 of the License, or (at your option) any later version. * ation, either version 3 of the License, or (at your option) any later version.
@ -23,10 +23,7 @@
#define _WIN32_WINNT 0x0500 //_WIN32_WINNT_WIN2K #define _WIN32_WINNT 0x0500 //_WIN32_WINNT_WIN2K
#endif #endif
#define UNICODE #include <encodings/win32.h>
#include <tchar.h>
#include <wchar.h>
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
@ -185,7 +182,7 @@ static void create_gl_context(HWND hwnd, bool *quit)
*aptr++ = win32_minor; *aptr++ = win32_minor;
/* Technically, we don't have core/compat until 3.2. /* Technically, we don't have core/compat until 3.2.
* Version 3.1 is either compat or not depending * Version 3.1 is either compat or not depending
* on GL_ARB_compatibility. * on GL_ARB_compatibility.
*/ */
if ((win32_major * 1000 + win32_minor) >= 3002) if ((win32_major * 1000 + win32_minor) >= 3002)
@ -434,7 +431,7 @@ static void *gfx_ctx_wgl_init(void *video_driver)
if (g_inited) if (g_inited)
return NULL; return NULL;
win32_window_reset(); win32_window_reset();
win32_monitor_init(); win32_monitor_init();
@ -596,7 +593,7 @@ static gfx_ctx_proc_t gfx_ctx_wgl_get_proc_address(const char *symbol)
} }
static bool gfx_ctx_wgl_get_metrics(void *data, static bool gfx_ctx_wgl_get_metrics(void *data,
enum display_metric_types type, float *value) enum display_metric_types type, float *value)
{ {
return win32_get_metrics(data, type, value); return win32_get_metrics(data, type, value);
} }