[120375] trunk/dports/x11/mesa
jeremyhu at macports.org
jeremyhu at macports.org
Sat May 24 20:45:38 PDT 2014
Revision: 120375
https://trac.macports.org/changeset/120375
Author: jeremyhu at macports.org
Date: 2014-05-24 20:45:38 -0700 (Sat, 24 May 2014)
Log Message:
-----------
mesa: Add code to help test Core Profile without it being default
Modified Paths:
--------------
trunk/dports/x11/mesa/Portfile
Added Paths:
-----------
trunk/dports/x11/mesa/files/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch
trunk/dports/x11/mesa/files/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch
trunk/dports/x11/mesa/files/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch
Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile 2014-05-25 02:03:42 UTC (rev 120374)
+++ trunk/dports/x11/mesa/Portfile 2014-05-25 03:45:38 UTC (rev 120375)
@@ -6,7 +6,7 @@
name mesa
epoch 1
version 8.0.5
-revision 2
+revision 3
categories x11 graphics
maintainers jeremyhu openmaintainer
license MIT
@@ -40,7 +40,10 @@
0008-glsl-initialise-const-force-glsl-extension-warning-i.patch \
0009-mesa-test-for-GL_EXT_framebuffer_sRGB-in-glPopAttrib.patch \
0011-Apple-glFlush-is-not-needed-with-CGLFlushDrawable.patch \
- 0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch
+ 0012-glapi-Avoid-heap-corruption-in-_glapi_table.patch \
+ 1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch \
+ 1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch \
+ 1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch
patch.pre_args -p1
use_configure no
Added: trunk/dports/x11/mesa/files/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch
===================================================================
--- trunk/dports/x11/mesa/files/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch (rev 0)
+++ trunk/dports/x11/mesa/files/1001-appleglx-Improve-error-reporting-if-CGLChoosePixelFo.patch 2014-05-25 03:45:38 UTC (rev 120375)
@@ -0,0 +1,30 @@
+From f0702d6e631bb912a230c081463bb51a0dde1bff Mon Sep 17 00:00:00 2001
+From: Jon TURNEY <jon.turney at dronecode.org.uk>
+Date: Mon, 12 May 2014 15:38:26 +0100
+Subject: [PATCH 1001/1003] appleglx: Improve error reporting if
+ CGLChoosePixelFormat() didn't find any matching pixel formats.
+
+Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
+Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 002a3a74273b81dfb226e1c3f0a8c18525ed0af4)
+---
+ src/glx/apple/apple_visual.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
+index 238c248..c6ede51 100644
+--- a/src/glx/apple/apple_visual.c
++++ b/src/glx/apple/apple_visual.c
+@@ -167,4 +167,9 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
+ fprintf(stderr, "error: %s\n", apple_cgl.error_string(error));
+ abort();
+ }
++
++ if (!*pfobj) {
++ fprintf(stderr, "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
++ abort();
++ }
+ }
+--
+1.9.2 (Apple Git-49)
+
Added: trunk/dports/x11/mesa/files/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch
===================================================================
--- trunk/dports/x11/mesa/files/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch (rev 0)
+++ trunk/dports/x11/mesa/files/1002-darwin-Write-errors-in-choosing-the-pixel-format-to-.patch 2014-05-25 03:45:38 UTC (rev 120375)
@@ -0,0 +1,55 @@
+From 1b2f877c8ef052b183c1f20ece6c6e4a7bfd237c Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 24 May 2014 14:13:33 -0700
+Subject: [PATCH 1002/1003] darwin: Write errors in choosing the pixel format
+ to the crash log
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 9eb1d36c978a9b15ae2e999c630492dfffd7f165)
+---
+ src/glx/apple/apple_visual.c | 18 ++++++++++++++++--
+ 1 file changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
+index c6ede51..951b213 100644
+--- a/src/glx/apple/apple_visual.c
++++ b/src/glx/apple/apple_visual.c
+@@ -63,6 +63,16 @@ enum
+ MAX_ATTR = 60
+ };
+
++static char __crashreporter_info_buff__[4096] = { 0 };
++static const char *__crashreporter_info__ __attribute__((__used__)) =
++ &__crashreporter_info_buff__[0];
++#if MAC_OS_X_VERSION_MIN_REQUIRED >= 1050
++// This is actually a toolchain requirement, but I'm not sure the correct check,
++// but it should be fine to just only include it for Leopard and later. This line
++// just tells the linker to never strip this symbol (such as for space optimization)
++__asm__ (".desc ___crashreporter_info__, 0x10");
++#endif
++
+ void
+ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * mode,
+ bool * double_buffered, bool * uses_stereo,
+@@ -164,12 +174,16 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
+ error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
+
+ if (error) {
+- fprintf(stderr, "error: %s\n", apple_cgl.error_string(error));
++ snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
++ "CGLChoosePixelFormat error: %s\n", apple_cgl.error_string(error));
++ fprintf(stderr, "%s", __crashreporter_info_buff__);
+ abort();
+ }
+
+ if (!*pfobj) {
+- fprintf(stderr, "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
++ snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
++ "No matching pixelformats found, perhaps try using LIBGL_ALLOW_SOFTWARE\n");
++ fprintf(stderr, "%s", __crashreporter_info_buff__);
+ abort();
+ }
+ }
+--
+1.9.2 (Apple Git-49)
+
Added: trunk/dports/x11/mesa/files/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch
===================================================================
--- trunk/dports/x11/mesa/files/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch (rev 0)
+++ trunk/dports/x11/mesa/files/1003-darwin-Guard-Core-Profile-usage-behind-a-testing-env.patch 2014-05-25 03:45:38 UTC (rev 120375)
@@ -0,0 +1,69 @@
+From 9d6e12eb6b06202519e48a7321f32944d7a34b0f Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+Date: Sat, 24 May 2014 14:08:16 -0700
+Subject: [PATCH 1003/1003] darwin: Guard Core Profile usage behind a testing
+ envvar
+
+Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
+(cherry picked from commit 04ce3be4010305902cc5ae81e8e0c8550d043a1e)
+---
+ src/glx/apple/apple_visual.c | 30 ++++++++++++++++++++----------
+ 1 file changed, 20 insertions(+), 10 deletions(-)
+
+diff --git a/src/glx/apple/apple_visual.c b/src/glx/apple/apple_visual.c
+index 951b213..046581b 100644
+--- a/src/glx/apple/apple_visual.c
++++ b/src/glx/apple/apple_visual.c
+@@ -82,16 +82,7 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
+ int numattr = 0;
+ GLint vsref = 0;
+ CGLError error = 0;
+-
+- /* Request an OpenGL 3.2 profile if one is available and supported */
+- attr[numattr++] = kCGLPFAOpenGLProfile;
+- attr[numattr++] = kCGLOGLPVersion_3_2_Core;
+-
+- /* Test for kCGLPFAOpenGLProfile support at runtime and roll it out if not supported */
+- attr[numattr] = 0;
+- error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
+- if (error == kCGLBadAttribute)
+- numattr -= 2;
++ bool use_core_profile = getenv("LIBGL_PROFILE_CORE");
+
+ if (offscreen) {
+ apple_glx_diagnostic
+@@ -167,12 +158,31 @@ apple_visual_create_pfobj(CGLPixelFormatObj * pfobj, const struct glx_config * m
+ attr[numattr++] = mode->samples;
+ }
+
++ /* Debugging support for Core profiles to support newer versions of OpenGL */
++ if (use_core_profile) {
++ attr[numattr++] = kCGLPFAOpenGLProfile;
++ attr[numattr++] = kCGLOGLPVersion_3_2_Core;
++ }
++
+ attr[numattr++] = 0;
+
+ assert(numattr < MAX_ATTR);
+
+ error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
+
++ if ((error == kCGLBadAttribute || vsref == 0) && use_core_profile) {
++ apple_glx_diagnostic
++ ("Trying again without CoreProfile: error=%s, vsref=%d\n", apple_cgl.error_string(error), vsref);
++
++ if (!error)
++ apple_cgl.destroy_pixel_format(*pfobj);
++
++ numattr -= 3;
++ attr[numattr++] = 0;
++
++ error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref);
++ }
++
+ if (error) {
+ snprintf(__crashreporter_info_buff__, sizeof(__crashreporter_info_buff__),
+ "CGLChoosePixelFormat error: %s\n", apple_cgl.error_string(error));
+--
+1.9.2 (Apple Git-49)
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140524/99675c5a/attachment.html>
More information about the macports-changes
mailing list