diff --git a/gfx/common/uwpgdi.h b/gfx/common/uwpgdi.h deleted file mode 100644 index e28b4a3c38..0000000000 --- a/gfx/common/uwpgdi.h +++ /dev/null @@ -1,37 +0,0 @@ -#ifndef UWPGDI_H_ -#define UWPGDI_H_ - - -#include - -#include - -#if !defined(_GDI32_) -#define WINGDIAPI_UWP __declspec(dllimport) -#else -#define WINGDIAPI_UWP __declspec(dllexport) -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/* - * Undeclared APIs exported by libgallium on UWP - */ - -WINGDIAPI_UWP HGLRC WINAPI wglCreateContext(HDC); -WINGDIAPI_UWP BOOL WINAPI wglDeleteContext(HGLRC); -WINGDIAPI_UWP BOOL WINAPI wglMakeCurrent(HDC, HGLRC); -WINGDIAPI_UWP BOOL APIENTRY wglSwapBuffers(HDC hdc); -WINGDIAPI_UWP PROC APIENTRY wglGetProcAddress(LPCSTR lpszProc); -WINGDIAPI_UWP BOOL APIENTRY wglShareLists( - HGLRC unnamedParam1, - HGLRC unnamedParam2 -); - -#ifdef __cplusplus -} -#endif - -#endif UWPGDI_H_ diff --git a/gfx/drivers_context/wgl_ctx.c b/gfx/drivers_context/wgl_ctx.c index 21684c5d9a..3804bac819 100644 --- a/gfx/drivers_context/wgl_ctx.c +++ b/gfx/drivers_context/wgl_ctx.c @@ -56,7 +56,36 @@ #endif #ifdef __WINRT__ -#include "../common/uwpgdi.h" +#include + +#if !defined(_GDI32_) +#define WINGDIAPI_UWP __declspec(dllimport) +#else +#define WINGDIAPI_UWP __declspec(dllexport) +#endif + +#ifdef __cplusplus +extern "C" { +#endif + +/* + * Undeclared APIs exported by libgallium on UWP + */ + +WINGDIAPI_UWP HGLRC WINAPI wglCreateContext(HDC); +WINGDIAPI_UWP BOOL WINAPI wglDeleteContext(HGLRC); +WINGDIAPI_UWP BOOL WINAPI wglMakeCurrent(HDC, HGLRC); +WINGDIAPI_UWP BOOL APIENTRY wglSwapBuffers(HDC hdc); +WINGDIAPI_UWP PROC APIENTRY wglGetProcAddress(LPCSTR lpszProc); +WINGDIAPI_UWP BOOL APIENTRY wglShareLists( + HGLRC unnamedParam1, + HGLRC unnamedParam2 +); + +#ifdef __cplusplus +} +#endif + #endif #if (defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_OPENGL_CORE)) && !defined(HAVE_OPENGLES)