diff options
Diffstat (limited to 'pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch')
-rw-r--r-- | pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch b/pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch deleted file mode 100644 index ff297a8df96..00000000000 --- a/pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch +++ /dev/null @@ -1,78 +0,0 @@ -From fff30cdea46616eb92f4dd9402ebd27fdb55e13b Mon Sep 17 00:00:00 2001 -From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -Date: Sun, 1 Jun 2014 04:29:19 -0700 -Subject: [PATCH 1/6] XQuartz: GLX: Use __glXEnableExtension to build - extensions list - -Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> -(cherry picked from commit 3790001ea29658872aebda00a03170e392b47878) ---- - hw/xquartz/GL/indirect.c | 37 +++++++++++++++++++++++++++++++------ - 1 file changed, 31 insertions(+), 6 deletions(-) - -diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c -index 19b7d86..4e6ab3d 100644 ---- a/hw/xquartz/GL/indirect.c -+++ b/hw/xquartz/GL/indirect.c -@@ -52,6 +52,7 @@ - - #include "visualConfigs.h" - #include "dri.h" -+#include "extension_string.h" - - #include "darwin.h" - #define GLAQUA_DEBUG_MSG(msg, args ...) ASL_LOG(ASL_LEVEL_DEBUG, "GLXAqua", \ -@@ -111,6 +112,10 @@ typedef struct __GLXAquaDrawable __GLXAquaDrawable; - */ - struct __GLXAquaScreen { - __GLXscreen base; -+ -+ /* Supported GLX extensions */ -+ unsigned char glx_enable_bits[__GLX_EXT_BYTES]; -+ - int index; - int num_vis; - }; -@@ -541,13 +546,33 @@ __glXAquaScreenProbe(ScreenPtr pScreen) - - screen->base.GLXmajor = 1; - screen->base.GLXminor = 4; -- screen->base.GLXextensions = strdup("GLX_SGIX_fbconfig " -- "GLX_SGIS_multisample " -- "GLX_ARB_multisample " -- "GLX_EXT_visual_info " -- "GLX_EXT_import_context "); - -- /*We may be able to add more GLXextensions at a later time. */ -+ memset(screen->glx_enable_bits, 0, __GLX_EXT_BYTES); -+ -+ __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_info"); -+ __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_rating"); -+ __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_import_context"); -+ __glXEnableExtension(screen->glx_enable_bits, "GLX_OML_swap_method"); -+ __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIX_fbconfig"); -+ -+ __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIS_multisample"); -+ __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_multisample"); -+ -+ //__glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_create_context"); -+ //__glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_create_context_profile"); -+ -+ // Generate the GLX extensions string (overrides that set by __glXScreenInit()) -+ { -+ unsigned int buffer_size = -+ __glXGetExtensionString(screen->glx_enable_bits, NULL); -+ if (buffer_size > 0) { -+ free(screen->base.GLXextensions); -+ -+ screen->base.GLXextensions = xnfalloc(buffer_size); -+ __glXGetExtensionString(screen->glx_enable_bits, -+ screen->base.GLXextensions); -+ } -+ } - - return &screen->base; - } --- -2.3.2 (Apple Git-55) - |