We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] patch to enable SDL_GL_GetProcAddress

sdl.diff (text/plain), 13.59 KB, created by goblin hack on 2015-07-28 03:15:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: goblin hack

Created: 2015-07-28 03:15:16 UTC

Size: 13.59 KB

patch

obsolete

>diff -r 9d44e8794a9b include/SDL_config.h
>--- a/include/SDL_config.h	Sun Jul 19 19:56:16 2015 -0300
>+++ b/include/SDL_config.h	Mon Jul 27 23:03:47 2015 -0400
>@@ -1,3 +1,4 @@
>+/* include/SDL_config.h.  Generated from SDL_config.h.in by configure.  */
> /*
>   Simple DirectMedia Layer
>   Copyright (C) 1997-2015 Sam Lantinga <slouken@libsdl.org>
>@@ -22,34 +23,338 @@
> #ifndef _SDL_config_h
> #define _SDL_config_h
> 
>+/**
>+ *  \file SDL_config.h.in
>+ *
>+ *  This is a set of defines to configure the SDL features
>+ */
>+
>+/* General platform specific identifiers */
> #include "SDL_platform.h"
> 
>-/**
>- *  \file SDL_config.h
>- */
>-
>-/* Add any platform that doesn't build using the configure system. */
>-#ifdef USING_PREMAKE_CONFIG_H
>-#include "SDL_config_premake.h"
>-#elif defined(__WIN32__)
>-#include "SDL_config_windows.h"
>-#elif defined(__WINRT__)
>-#include "SDL_config_winrt.h"
>-#elif defined(__MACOSX__)
>-#include "SDL_config_macosx.h"
>-#elif defined(__IPHONEOS__)
>-#include "SDL_config_iphoneos.h"
>-#elif defined(__ANDROID__)
>-#include "SDL_config_android.h"
>-#elif defined(__PSP__)
>-#include "SDL_config_psp.h"
>-#else
>-/* This is a minimal configuration just to get SDL running on new platforms */
>-#include "SDL_config_minimal.h"
>-#endif /* platform config */
>-
>-#ifdef USING_GENERATED_CONFIG_H
>-#error Wrong SDL_config.h, check your include path?
>+/* Make sure that this isn't included by Visual C++ */
>+#ifdef _MSC_VER
>+#error You should run hg revert SDL_config.h 
> #endif
> 
>+/* C language features */
>+/* #undef const */
>+/* #undef inline */
>+/* #undef volatile */
>+
>+/* C datatypes */
>+#ifdef __LP64__
>+#define SIZEOF_VOIDP 8
>+#else
>+#define SIZEOF_VOIDP 4
>+#endif
>+#define HAVE_GCC_ATOMICS 1
>+/* #undef HAVE_GCC_SYNC_LOCK_TEST_AND_SET */
>+
>+/* #undef HAVE_DDRAW_H */
>+/* #undef HAVE_DINPUT_H */
>+/* #undef HAVE_DSOUND_H */
>+/* #undef HAVE_DXGI_H */
>+/* #undef HAVE_XINPUT_H */
>+
>+/* Comment this if you want to build without any C library requirements */
>+#define HAVE_LIBC 1
>+#if HAVE_LIBC
>+
>+/* Useful headers */
>+#define HAVE_ALLOCA_H 1
>+#define HAVE_SYS_TYPES_H 1
>+#define HAVE_STDIO_H 1
>+#define STDC_HEADERS 1
>+#define HAVE_STDLIB_H 1
>+#define HAVE_STDARG_H 1
>+/* #undef HAVE_MALLOC_H */
>+#define HAVE_MEMORY_H 1
>+#define HAVE_STRING_H 1
>+#define HAVE_STRINGS_H 1
>+#define HAVE_INTTYPES_H 1
>+#define HAVE_STDINT_H 1
>+#define HAVE_CTYPE_H 1
>+#define HAVE_MATH_H 1
>+#define HAVE_ICONV_H 1
>+#define HAVE_SIGNAL_H 1
>+/* #undef HAVE_ALTIVEC_H */
>+/* #undef HAVE_PTHREAD_NP_H */
>+/* #undef HAVE_LIBUDEV_H */
>+/* #undef HAVE_DBUS_DBUS_H */
>+/* #undef HAVE_IBUS_IBUS_H */
>+
>+/* C library functions */
>+#define HAVE_MALLOC 1
>+#define HAVE_CALLOC 1
>+#define HAVE_REALLOC 1
>+#define HAVE_FREE 1
>+#define HAVE_ALLOCA 1
>+#ifndef __WIN32__ /* Don't use C runtime versions of these on Windows */
>+#define HAVE_GETENV 1
>+#define HAVE_SETENV 1
>+#define HAVE_PUTENV 1
>+#define HAVE_UNSETENV 1
>+#endif
>+#define HAVE_QSORT 1
>+#define HAVE_ABS 1
>+#define HAVE_BCOPY 1
>+#define HAVE_MEMSET 1
>+#define HAVE_MEMCPY 1
>+#define HAVE_MEMMOVE 1
>+#define HAVE_MEMCMP 1
>+#define HAVE_STRLEN 1
>+#define HAVE_STRLCPY 1
>+#define HAVE_STRLCAT 1
>+#define HAVE_STRDUP 1
>+/* #undef HAVE__STRREV */
>+/* #undef HAVE__STRUPR */
>+/* #undef HAVE__STRLWR */
>+/* #undef HAVE_INDEX */
>+/* #undef HAVE_RINDEX */
>+#define HAVE_STRCHR 1
>+#define HAVE_STRRCHR 1
>+#define HAVE_STRSTR 1
>+/* #undef HAVE_ITOA */
>+/* #undef HAVE__LTOA */
>+/* #undef HAVE__UITOA */
>+/* #undef HAVE__ULTOA */
>+#define HAVE_STRTOL 1
>+#define HAVE_STRTOUL 1
>+/* #undef HAVE__I64TOA */
>+/* #undef HAVE__UI64TOA */
>+#define HAVE_STRTOLL 1
>+#define HAVE_STRTOULL 1
>+#define HAVE_STRTOD 1
>+#define HAVE_ATOI 1
>+#define HAVE_ATOF 1
>+#define HAVE_STRCMP 1
>+#define HAVE_STRNCMP 1
>+/* #undef HAVE__STRICMP */
>+#define HAVE_STRCASECMP 1
>+/* #undef HAVE__STRNICMP */
>+#define HAVE_STRNCASECMP 1
>+/* #undef HAVE_SSCANF */
>+#define HAVE_VSSCANF 1
>+/* #undef HAVE_SNPRINTF */
>+#define HAVE_VSNPRINTF 1
>+#define HAVE_M_PI /**/
>+#define HAVE_ATAN 1
>+#define HAVE_ATAN2 1
>+#define HAVE_ACOS 1
>+#define HAVE_ASIN 1
>+#define HAVE_CEIL 1
>+#define HAVE_COPYSIGN 1
>+#define HAVE_COS 1
>+#define HAVE_COSF 1
>+#define HAVE_FABS 1
>+#define HAVE_FLOOR 1
>+#define HAVE_LOG 1
>+#define HAVE_POW 1
>+#define HAVE_SCALBN 1
>+#define HAVE_SIN 1
>+#define HAVE_SINF 1
>+#define HAVE_SQRT 1
>+#define HAVE_SQRTF 1
>+#define HAVE_TAN 1
>+#define HAVE_TANF 1
>+#define HAVE_FSEEKO 1
>+/* #undef HAVE_FSEEKO64 */
>+#define HAVE_SIGACTION 1
>+#define HAVE_SA_SIGACTION 1
>+#define HAVE_SETJMP 1
>+#define HAVE_NANOSLEEP 1
>+#define HAVE_SYSCONF 1
>+#define HAVE_SYSCTLBYNAME 1
>+/* #undef HAVE_CLOCK_GETTIME */
>+/* #undef HAVE_GETPAGESIZE */
>+#define HAVE_MPROTECT 1
>+#define HAVE_ICONV 1
>+#define HAVE_PTHREAD_SETNAME_NP 1
>+/* #undef HAVE_PTHREAD_SET_NAME_NP */
>+/* #undef HAVE_SEM_TIMEDWAIT */
>+
>+#else
>+#define HAVE_STDARG_H 1
>+#define HAVE_STDDEF_H 1
>+#define HAVE_STDINT_H 1
>+#endif /* HAVE_LIBC */
>+
>+/* SDL internal assertion support */
>+/* #undef SDL_DEFAULT_ASSERT_LEVEL */
>+
>+/* Allow disabling of core subsystems */
>+/* #undef SDL_ATOMIC_DISABLED */
>+/* #undef SDL_AUDIO_DISABLED */
>+/* #undef SDL_CPUINFO_DISABLED */
>+/* #undef SDL_EVENTS_DISABLED */
>+/* #undef SDL_FILE_DISABLED */
>+/* #undef SDL_JOYSTICK_DISABLED */
>+/* #undef SDL_HAPTIC_DISABLED */
>+/* #undef SDL_LOADSO_DISABLED */
>+/* #undef SDL_RENDER_DISABLED */
>+/* #undef SDL_THREADS_DISABLED */
>+/* #undef SDL_TIMERS_DISABLED */
>+/* #undef SDL_VIDEO_DISABLED */
>+/* #undef SDL_POWER_DISABLED */
>+/* #undef SDL_FILESYSTEM_DISABLED */
>+
>+/* Enable various audio drivers */
>+/* #undef SDL_AUDIO_DRIVER_ALSA */
>+/* #undef SDL_AUDIO_DRIVER_ALSA_DYNAMIC */
>+/* #undef SDL_AUDIO_DRIVER_ARTS */
>+/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
>+/* #undef SDL_AUDIO_DRIVER_PULSEAUDIO */
>+/* #undef SDL_AUDIO_DRIVER_PULSEAUDIO_DYNAMIC */
>+/* #undef SDL_AUDIO_DRIVER_HAIKU */
>+/* #undef SDL_AUDIO_DRIVER_BSD */
>+#define SDL_AUDIO_DRIVER_COREAUDIO 1
>+#define SDL_AUDIO_DRIVER_DISK 1
>+#define SDL_AUDIO_DRIVER_DUMMY 1
>+/* #undef SDL_AUDIO_DRIVER_ANDROID */
>+/* #undef SDL_AUDIO_DRIVER_XAUDIO2 */
>+/* #undef SDL_AUDIO_DRIVER_DSOUND */
>+/* #undef SDL_AUDIO_DRIVER_ESD */
>+/* #undef SDL_AUDIO_DRIVER_ESD_DYNAMIC */
>+/* #undef SDL_AUDIO_DRIVER_NACL */
>+/* #undef SDL_AUDIO_DRIVER_NAS */
>+/* #undef SDL_AUDIO_DRIVER_NAS_DYNAMIC */
>+/* #undef SDL_AUDIO_DRIVER_SNDIO */
>+/* #undef SDL_AUDIO_DRIVER_SNDIO_DYNAMIC */
>+/* #undef SDL_AUDIO_DRIVER_OSS */
>+/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */
>+/* #undef SDL_AUDIO_DRIVER_PAUDIO */
>+/* #undef SDL_AUDIO_DRIVER_QSA */
>+/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */
>+/* #undef SDL_AUDIO_DRIVER_WINMM */
>+/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND */
>+/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC */
>+/* #undef SDL_AUDIO_DRIVER_EMSCRIPTEN */
>+
>+/* Enable various input drivers */
>+/* #undef SDL_INPUT_LINUXEV */
>+/* #undef SDL_INPUT_LINUXKD */
>+/* #undef SDL_INPUT_TSLIB */
>+/* #undef SDL_JOYSTICK_HAIKU */
>+/* #undef SDL_JOYSTICK_DINPUT */
>+/* #undef SDL_JOYSTICK_XINPUT */
>+/* #undef SDL_JOYSTICK_DUMMY */
>+#define SDL_JOYSTICK_IOKIT 1
>+/* #undef SDL_JOYSTICK_LINUX */
>+/* #undef SDL_JOYSTICK_ANDROID */
>+/* #undef SDL_JOYSTICK_WINMM */
>+/* #undef SDL_JOYSTICK_USBHID */
>+/* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
>+/* #undef SDL_JOYSTICK_EMSCRIPTEN */
>+/* #undef SDL_HAPTIC_DUMMY */
>+/* #undef SDL_HAPTIC_LINUX */
>+#define SDL_HAPTIC_IOKIT 1
>+/* #undef SDL_HAPTIC_DINPUT */
>+/* #undef SDL_HAPTIC_XINPUT */
>+
>+/* Enable various shared object loading systems */
>+/* #undef SDL_LOADSO_HAIKU */
>+#define SDL_LOADSO_DLOPEN 1
>+/* #undef SDL_LOADSO_DUMMY */
>+/* #undef SDL_LOADSO_LDG */
>+/* #undef SDL_LOADSO_WINDOWS */
>+
>+/* Enable various threading systems */
>+#define SDL_THREAD_PTHREAD 1
>+#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1
>+/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */
>+/* #undef SDL_THREAD_WINDOWS */
>+
>+/* Enable various timer systems */
>+/* #undef SDL_TIMER_HAIKU */
>+/* #undef SDL_TIMER_DUMMY */
>+#define SDL_TIMER_UNIX 1
>+/* #undef SDL_TIMER_WINDOWS */
>+
>+/* Enable various video drivers */
>+/* #undef SDL_VIDEO_DRIVER_HAIKU */
>+#define SDL_VIDEO_DRIVER_COCOA 1
>+/* #undef SDL_VIDEO_DRIVER_DIRECTFB */
>+/* #undef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC */
>+#define SDL_VIDEO_DRIVER_DUMMY 1
>+/* #undef SDL_VIDEO_DRIVER_WINDOWS */
>+/* #undef SDL_VIDEO_DRIVER_WAYLAND */
>+/* #undef SDL_VIDEO_DRIVER_WAYLAND_QT_TOUCH */
>+/* #undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC */
>+/* #undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_EGL */
>+/* #undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_CURSOR */
>+/* #undef SDL_VIDEO_DRIVER_WAYLAND_DYNAMIC_XKBCOMMON */
>+/* #undef SDL_VIDEO_DRIVER_MIR */
>+/* #undef SDL_VIDEO_DRIVER_MIR_DYNAMIC */
>+/* #undef SDL_VIDEO_DRIVER_MIR_DYNAMIC_XKBCOMMON */
>+#define SDL_VIDEO_DRIVER_X11 1
>+/* #undef SDL_VIDEO_DRIVER_RPI */
>+/* #undef SDL_VIDEO_DRIVER_ANDROID */
>+/* #undef SDL_VIDEO_DRIVER_EMSCRIPTEN */
>+#define SDL_VIDEO_DRIVER_X11_DYNAMIC "/usr/X11R6/lib/libX11.6.dylib"
>+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "/usr/X11R6/lib/libXext.6.dylib"
>+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XCURSOR "/usr/X11R6/lib/libXcursor.1.dylib"
>+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINERAMA "/usr/X11R6/lib/libXinerama.1.dylib"
>+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT2 "/usr/X11R6/lib/libXi.6.dylib"
>+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "/usr/X11R6/lib/libXrandr.2.dylib"
>+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS "/usr/X11R6/lib/libXss.1.dylib"
>+#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XVIDMODE "/usr/X11R6/lib/libXxf86vm.1.dylib"
>+#define SDL_VIDEO_DRIVER_X11_XCURSOR 1
>+#define SDL_VIDEO_DRIVER_X11_XDBE 1
>+#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
>+#define SDL_VIDEO_DRIVER_X11_XINPUT2 1
>+#define SDL_VIDEO_DRIVER_X11_XINPUT2_SUPPORTS_MULTITOUCH 1
>+#define SDL_VIDEO_DRIVER_X11_XRANDR 1
>+#define SDL_VIDEO_DRIVER_X11_XSCRNSAVER 1
>+#define SDL_VIDEO_DRIVER_X11_XSHAPE 1
>+#define SDL_VIDEO_DRIVER_X11_XVIDMODE 1
>+#define SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1
>+#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY 1
>+#define SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM 1
>+/* #undef SDL_VIDEO_DRIVER_NACL */
>+/* #undef SDL_VIDEO_DRIVER_VIVANTE */
>+/* #undef SDL_VIDEO_DRIVER_VIVANTE_VDK */
>+
>+/* #undef SDL_VIDEO_RENDER_D3D */
>+/* #undef SDL_VIDEO_RENDER_D3D11 */
>+#define SDL_VIDEO_RENDER_OGL 1
>+/* #undef SDL_VIDEO_RENDER_OGL_ES */
>+/* #undef SDL_VIDEO_RENDER_OGL_ES2 */
>+/* #undef SDL_VIDEO_RENDER_DIRECTFB */
>+
>+/* Enable OpenGL support */
>+#define SDL_VIDEO_OPENGL 1
>+/* #undef SDL_VIDEO_OPENGL_ES */
>+/* #undef SDL_VIDEO_OPENGL_ES2 */
>+/* #undef SDL_VIDEO_OPENGL_BGL */
>+#define SDL_VIDEO_OPENGL_CGL 1
>+/* #undef SDL_VIDEO_OPENGL_EGL */
>+#define SDL_VIDEO_OPENGL_GLX 1
>+/* #undef SDL_VIDEO_OPENGL_WGL */
>+/* #undef SDL_VIDEO_OPENGL_OSMESA */
>+/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
>+
>+/* Enable system power support */
>+/* #undef SDL_POWER_LINUX */
>+/* #undef SDL_POWER_WINDOWS */
>+#define SDL_POWER_MACOSX 1
>+/* #undef SDL_POWER_HAIKU */
>+/* #undef SDL_POWER_ANDROID */
>+/* #undef SDL_POWER_EMSCRIPTEN */
>+/* #undef SDL_POWER_HARDWIRED */
>+
>+/* Enable system filesystem support */
>+/* #undef SDL_FILESYSTEM_HAIKU */
>+#define SDL_FILESYSTEM_COCOA 1
>+/* #undef SDL_FILESYSTEM_DUMMY */
>+/* #undef SDL_FILESYSTEM_UNIX */
>+/* #undef SDL_FILESYSTEM_WINDOWS */
>+/* #undef SDL_FILESYSTEM_NACL */
>+/* #undef SDL_FILESYSTEM_ANDROID */
>+/* #undef SDL_FILESYSTEM_EMSCRIPTEN */
>+
>+/* Enable assembly routines */
>+#define SDL_ASSEMBLY_ROUTINES 1
>+/* #undef SDL_ALTIVEC_BLITTERS */
>+
> #endif /* _SDL_config_h */
>diff -r 9d44e8794a9b include/SDL_revision.h
>--- a/include/SDL_revision.h	Sun Jul 19 19:56:16 2015 -0300
>+++ b/include/SDL_revision.h	Mon Jul 27 23:03:47 2015 -0400
>@@ -1,2 +1,2 @@
>-#define SDL_REVISION "hg-0:aaaaaaaaaaah"
>-#define SDL_REVISION_NUMBER 0
>+#define SDL_REVISION "hg-9811:9d44e8794a9b"
>+#define SDL_REVISION_NUMBER 9811
>diff -r 9d44e8794a9b src/video/windows/SDL_windowsopengl.c
>--- a/src/video/windows/SDL_windowsopengl.c	Sun Jul 19 19:56:16 2015 -0300
>+++ b/src/video/windows/SDL_windowsopengl.c	Mon Jul 27 23:03:47 2015 -0400
>@@ -332,14 +332,12 @@
> }
> 
> void
>-WIN_GL_InitExtensions(_THIS)
>+WIN_GL_InitExtensions(_THIS, HWND hwnd)
> {
>     const char *(WINAPI * wglGetExtensionsStringARB) (HDC) = 0;
>     const char *extensions;
>-    HWND hwnd;
>     HDC hdc;
>     HGLRC hglrc;
>-    PIXELFORMATDESCRIPTOR pfd;
> 
>     if (!_this->gl_data) {
>         return;
>@@ -347,7 +345,7 @@
> 
>     hwnd =
>         CreateWindow(SDL_Appname, SDL_Appname, (WS_POPUP | WS_DISABLED), 0, 0,
>-        10, 10, NULL, NULL, SDL_Instance, NULL);
>+                     10, 10, NULL, NULL, SDL_Instance, NULL);
>     if (!hwnd) {
>         return;
>     }
>@@ -355,10 +353,6 @@
> 
>     hdc = GetDC(hwnd);
> 
>-    WIN_GL_SetupPixelFormat(_this, &pfd);
>-
>-    SetPixelFormat(hdc, ChoosePixelFormat(hdc, &pfd), &pfd);
>-
>     hglrc = _this->gl_data->wglCreateContext(hdc);
>     if (!hglrc) {
>         return;
>diff -r 9d44e8794a9b src/video/windows/SDL_windowsopengl.h
>--- a/src/video/windows/SDL_windowsopengl.h	Sun Jul 19 19:56:16 2015 -0300
>+++ b/src/video/windows/SDL_windowsopengl.h	Mon Jul 27 23:03:47 2015 -0400
>@@ -64,7 +64,7 @@
> extern int WIN_GL_GetSwapInterval(_THIS);
> extern void WIN_GL_SwapWindow(_THIS, SDL_Window * window);
> extern void WIN_GL_DeleteContext(_THIS, SDL_GLContext context);
>-extern void WIN_GL_InitExtensions(_THIS);
>+extern void WIN_GL_InitExtensions(_THIS, HWND);
> extern SDL_bool WIN_GL_SetPixelFormatFrom(_THIS, SDL_Window * fromWindow, SDL_Window * toWindow);
> 
> #ifndef WGL_ARB_pixel_format
>diff -r 9d44e8794a9b src/video/windows/SDL_windowswindow.c
>--- a/src/video/windows/SDL_windowswindow.c	Sun Jul 19 19:56:16 2015 -0300
>+++ b/src/video/windows/SDL_windowswindow.c	Mon Jul 27 23:03:47 2015 -0400
>@@ -279,7 +279,7 @@
> #if SDL_VIDEO_OPENGL_WGL
>     /* We need to initialize the extensions before deciding how to create ES profiles */
>     if (window->flags & SDL_WINDOW_OPENGL) {
>-        WIN_GL_InitExtensions(_this);
>+        WIN_GL_InitExtensions(_this, hwnd);
>     }
> #endif
>

Actions: View | Diff

Attachments on bug 3077: 2229

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.