|
@@ -5322,15 +5322,15 @@ _SOKOL_PRIVATE void _sapp_wgl_init(void) {
|
|
|
_sapp_fail("Failed to load opengl32.dll\n");
|
|
|
}
|
|
|
SOKOL_ASSERT(_sapp.wgl.opengl32);
|
|
|
- _sapp.wgl.CreateContext = (PFN_wglCreateContext) GetProcAddress(_sapp.wgl.opengl32, "wglCreateContext");
|
|
|
+ _sapp.wgl.CreateContext = (PFN_wglCreateContext)(void*) GetProcAddress(_sapp.wgl.opengl32, "wglCreateContext");
|
|
|
SOKOL_ASSERT(_sapp.wgl.CreateContext);
|
|
|
- _sapp.wgl.DeleteContext = (PFN_wglDeleteContext) GetProcAddress(_sapp.wgl.opengl32, "wglDeleteContext");
|
|
|
+ _sapp.wgl.DeleteContext = (PFN_wglDeleteContext)(void*) GetProcAddress(_sapp.wgl.opengl32, "wglDeleteContext");
|
|
|
SOKOL_ASSERT(_sapp.wgl.DeleteContext);
|
|
|
- _sapp.wgl.GetProcAddress = (PFN_wglGetProcAddress) GetProcAddress(_sapp.wgl.opengl32, "wglGetProcAddress");
|
|
|
+ _sapp.wgl.GetProcAddress = (PFN_wglGetProcAddress)(void*) GetProcAddress(_sapp.wgl.opengl32, "wglGetProcAddress");
|
|
|
SOKOL_ASSERT(_sapp.wgl.GetProcAddress);
|
|
|
- _sapp.wgl.GetCurrentDC = (PFN_wglGetCurrentDC) GetProcAddress(_sapp.wgl.opengl32, "wglGetCurrentDC");
|
|
|
+ _sapp.wgl.GetCurrentDC = (PFN_wglGetCurrentDC)(void*) GetProcAddress(_sapp.wgl.opengl32, "wglGetCurrentDC");
|
|
|
SOKOL_ASSERT(_sapp.wgl.GetCurrentDC);
|
|
|
- _sapp.wgl.MakeCurrent = (PFN_wglMakeCurrent) GetProcAddress(_sapp.wgl.opengl32, "wglMakeCurrent");
|
|
|
+ _sapp.wgl.MakeCurrent = (PFN_wglMakeCurrent)(void*) GetProcAddress(_sapp.wgl.opengl32, "wglMakeCurrent");
|
|
|
SOKOL_ASSERT(_sapp.wgl.MakeCurrent);
|
|
|
|
|
|
_sapp.wgl.msg_hwnd = CreateWindowExW(WS_EX_OVERLAPPEDWINDOW,
|
|
@@ -5421,11 +5421,11 @@ _SOKOL_PRIVATE void _sapp_wgl_load_extensions(void) {
|
|
|
if (!_sapp.wgl.MakeCurrent(_sapp.wgl.msg_dc, rc)) {
|
|
|
_sapp_fail("WGL: Failed to make context current\n");
|
|
|
}
|
|
|
- _sapp.wgl.GetExtensionsStringEXT = (PFNWGLGETEXTENSIONSSTRINGEXTPROC) _sapp.wgl.GetProcAddress("wglGetExtensionsStringEXT");
|
|
|
- _sapp.wgl.GetExtensionsStringARB = (PFNWGLGETEXTENSIONSSTRINGARBPROC) _sapp.wgl.GetProcAddress("wglGetExtensionsStringARB");
|
|
|
- _sapp.wgl.CreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC) _sapp.wgl.GetProcAddress("wglCreateContextAttribsARB");
|
|
|
- _sapp.wgl.SwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC) _sapp.wgl.GetProcAddress("wglSwapIntervalEXT");
|
|
|
- _sapp.wgl.GetPixelFormatAttribivARB = (PFNWGLGETPIXELFORMATATTRIBIVARBPROC) _sapp.wgl.GetProcAddress("wglGetPixelFormatAttribivARB");
|
|
|
+ _sapp.wgl.GetExtensionsStringEXT = (PFNWGLGETEXTENSIONSSTRINGEXTPROC)(void*) _sapp.wgl.GetProcAddress("wglGetExtensionsStringEXT");
|
|
|
+ _sapp.wgl.GetExtensionsStringARB = (PFNWGLGETEXTENSIONSSTRINGARBPROC)(void*) _sapp.wgl.GetProcAddress("wglGetExtensionsStringARB");
|
|
|
+ _sapp.wgl.CreateContextAttribsARB = (PFNWGLCREATECONTEXTATTRIBSARBPROC)(void*) _sapp.wgl.GetProcAddress("wglCreateContextAttribsARB");
|
|
|
+ _sapp.wgl.SwapIntervalEXT = (PFNWGLSWAPINTERVALEXTPROC)(void*) _sapp.wgl.GetProcAddress("wglSwapIntervalEXT");
|
|
|
+ _sapp.wgl.GetPixelFormatAttribivARB = (PFNWGLGETPIXELFORMATATTRIBIVARBPROC)(void*) _sapp.wgl.GetProcAddress("wglGetPixelFormatAttribivARB");
|
|
|
_sapp.wgl.arb_multisample = _sapp_wgl_ext_supported("WGL_ARB_multisample");
|
|
|
_sapp.wgl.arb_create_context = _sapp_wgl_ext_supported("WGL_ARB_create_context");
|
|
|
_sapp.wgl.arb_create_context_profile = _sapp_wgl_ext_supported("WGL_ARB_create_context_profile");
|
|
@@ -6085,12 +6085,12 @@ _SOKOL_PRIVATE void _sapp_win32_init_dpi(void) {
|
|
|
GETDPIFORMONITOR_T fn_getdpiformonitor = 0;
|
|
|
HINSTANCE user32 = LoadLibraryA("user32.dll");
|
|
|
if (user32) {
|
|
|
- fn_setprocessdpiaware = (SETPROCESSDPIAWARE_T) GetProcAddress(user32, "SetProcessDPIAware");
|
|
|
+ fn_setprocessdpiaware = (SETPROCESSDPIAWARE_T)(void*) GetProcAddress(user32, "SetProcessDPIAware");
|
|
|
}
|
|
|
HINSTANCE shcore = LoadLibraryA("shcore.dll");
|
|
|
if (shcore) {
|
|
|
- fn_setprocessdpiawareness = (SETPROCESSDPIAWARENESS_T) GetProcAddress(shcore, "SetProcessDpiAwareness");
|
|
|
- fn_getdpiformonitor = (GETDPIFORMONITOR_T) GetProcAddress(shcore, "GetDpiForMonitor");
|
|
|
+ fn_setprocessdpiawareness = (SETPROCESSDPIAWARENESS_T)(void*) GetProcAddress(shcore, "SetProcessDpiAwareness");
|
|
|
+ fn_getdpiformonitor = (GETDPIFORMONITOR_T)(void*) GetProcAddress(shcore, "GetDpiForMonitor");
|
|
|
}
|
|
|
if (fn_setprocessdpiawareness) {
|
|
|
/* if the app didn't request HighDPI rendering, let Windows do the upscaling */
|