Revision: 309 http://trac.macosforge.org/projects/xquartz/changeset/309 Author: jeremyhu@freedesktop.org Date: 2009-03-13 15:26:12 -0700 (Fri, 13 Mar 2009) Log Message: ----------- Removed LIBGL_ALWAYS_HARDWARE. kCGLPFAAccelerated is now used by default. You can use the new environmnet variable LIBGL_ALLOW_SOFTWARE to not include kCGLPFAAccelerated in our attributes. Modified Paths: -------------- AppleSGLX/trunk/apple_visual.c Modified: AppleSGLX/trunk/apple_visual.c =================================================================== --- AppleSGLX/trunk/apple_visual.c 2009-03-13 04:29:11 UTC (rev 308) +++ AppleSGLX/trunk/apple_visual.c 2009-03-13 22:26:12 UTC (rev 309) @@ -38,6 +38,7 @@ #include "glcontextmodes.h" #include "apple_cgl.h" #include "apple_visual.h" +#include "apple_glx.h" enum { MAX_ATTR = 60 @@ -53,18 +54,19 @@ CGLError error = 0; if(offscreen) { + apple_glx_diagnostic("offscreen rendering enabled. Using kCGLPFAOffScreen\n"); + attr[numattr++] = kCGLPFAOffScreen; - attr[numattr++] = kCGLPFAColorSize; attr[numattr++] = 32; - } else if(getenv("LIBGL_ALWAYS_HARDWARE") != NULL) { - fprintf(stderr, "libGL: Hardware rendering forced.\n"); - attr[numattr++] = kCGLPFAAccelerated; - attr[numattr++] = kCGLPFANoRecovery; } else if(getenv("LIBGL_ALWAYS_SOFTWARE") != NULL) { - fprintf(stderr, "libGL: Software rendering forced.\n"); + apple_glx_diagnostic("Software rendering requested. Using kCGLRendererGenericFloatID.\n"); attr[numattr++] = kCGLPFARendererID; attr[numattr++] = kCGLRendererGenericFloatID; + } else if(getenv("LIBGL_ALLOW_SOFTWARE") != NULL) { + apple_glx_diagnostic("Software rendering is not being excluded. Not using kCGLPFAAccelerated.\n"); + } else { + attr[numattr++] = kCGLPFAAccelerated; } /*