March 2009 - Xquartz-changes - lists.macosforge.org

[311] trunk/pkg/README.2.3.3.txt
by source_changes＠macosforge.org 15 Mar '09

15 Mar '09

Revision: 311 http://trac.macosforge.org/projects/xquartz/changeset/311 Author: jeremyhu(a)freedesktop.org Date: 2009-03-15 13:17:33 -0700 (Sun, 15 Mar 2009) Log Message: ----------- More 2.3.3 version updates Modified Paths: -------------- trunk/pkg/README.2.3.3.txt Modified: trunk/pkg/README.2.3.3.txt =================================================================== --- trunk/pkg/README.2.3.3.txt 2009-03-15 19:28:57 UTC (rev 310) +++ trunk/pkg/README.2.3.3.txt 2009-03-15 20:17:33 UTC (rev 311) @@ -34,7 +34,7 @@ * xcb-proto 1.4 * xf86rushproto 1.1.2 * lib: - * AppleSGLX 54 + * AppleSGLX 55 * Support the same version of OpenGL as OpenGL.framework (2.1) * GLSL and other features now supported * Many extensions from OpenGL.framework are now available @@ -60,7 +60,7 @@ * pixman 0.14.0 * xtrans 1.2.3 * server: - * Xquartz fixes from xorg-server-1.4.2-apple36 + * Xquartz fixes from xorg-server-1.4.2-apple37 * DRI Updates for new libGL * Fix CapsLock

1 0

[310] AppleSGLX/tags/AppleSGLX-55/
by source_changes＠macosforge.org 15 Mar '09

15 Mar '09

Revision: 310 http://trac.macosforge.org/projects/xquartz/changeset/310 Author: jeremyhu(a)freedesktop.org Date: 2009-03-15 12:28:57 -0700 (Sun, 15 Mar 2009) Log Message: ----------- Tagging AppleSGLX-55 Added Paths: ----------- AppleSGLX/tags/AppleSGLX-55/

1 0

[309] AppleSGLX/trunk/apple_visual.c
by source_changes＠macosforge.org 13 Mar '09

13 Mar '09

Revision: 309 http://trac.macosforge.org/projects/xquartz/changeset/309 Author: jeremyhu(a)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; } /*

1 0

[308] AppleSGLX/trunk/glxcurrent.c
by source_changes＠macosforge.org 13 Mar '09

13 Mar '09

Revision: 308 http://trac.macosforge.org/projects/xquartz/changeset/308 Author: gstaplin(a)apple.com Date: 2009-03-12 21:29:11 -0700 (Thu, 12 Mar 2009) Log Message: ----------- Add a bit more of a diagnostic to the glXMakeCurrent path. This will help with debugging in the future I suspect. Modified Paths: -------------- AppleSGLX/trunk/glxcurrent.c Modified: AppleSGLX/trunk/glxcurrent.c =================================================================== --- AppleSGLX/trunk/glxcurrent.c 2009-03-13 01:23:55 UTC (rev 307) +++ AppleSGLX/trunk/glxcurrent.c 2009-03-13 04:29:11 UTC (rev 308) @@ -36,7 +36,7 @@ #include <stdlib.h> #include <pthread.h> #include "glxclient.h" - +#include "apple_glx.h" #include "apple_glx_context.h" /* @@ -136,12 +136,17 @@ Bool pre13) { const GLXContext oldGC = __glXGetCurrentContext(); - - if(apple_glx_make_current_context(dpy, - (oldGC && oldGC != &dummyContext) ? - oldGC->apple : NULL, - gc ? gc->apple : NULL, - draw)) + bool error; + + error = apple_glx_make_current_context(dpy, + (oldGC && oldGC != &dummyContext) ? + oldGC->apple : NULL, + gc ? gc->apple : NULL, + draw); + + apple_glx_diagnostic("%s: error %s\n", __func__, error ? "YES" : "NO"); + + if(error) return GL_FALSE; __glXLock();

1 0

[307] trunk/pkg/README.2.3.3.txt
by source_changes＠macosforge.org 13 Mar '09

13 Mar '09

Revision: 307 http://trac.macosforge.org/projects/xquartz/changeset/307 Author: jeremyhu(a)freedesktop.org Date: 2009-03-12 18:23:55 -0700 (Thu, 12 Mar 2009) Log Message: ----------- freetype 2.3.9 Modified Paths: -------------- trunk/pkg/README.2.3.3.txt Modified: trunk/pkg/README.2.3.3.txt =================================================================== --- trunk/pkg/README.2.3.3.txt 2009-03-10 21:15:08 UTC (rev 306) +++ trunk/pkg/README.2.3.3.txt 2009-03-13 01:23:55 UTC (rev 307) @@ -44,7 +44,7 @@ * Threading support should be more stable * fontconfig * Avoid rebuilding font caches when switching between archs - * freetype 2.3.8 + * freetype 2.3.9 * libAppleWM 1.2.0 * libICE 1.0.5 * libpng 1.2.35

1 0

[306] AppleSGLX/trunk/Makefile
by source_changes＠macosforge.org 10 Mar '09

10 Mar '09

Revision: 306 http://trac.macosforge.org/projects/xquartz/changeset/306 Author: jeremyhu(a)freedesktop.org Date: 2009-03-10 14:15:08 -0700 (Tue, 10 Mar 2009) Log Message: ----------- Fixed install_name of our dylib Modified Paths: -------------- AppleSGLX/trunk/Makefile Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-03-10 19:35:38 UTC (rev 305) +++ AppleSGLX/trunk/Makefile 2009-03-10 21:15:08 UTC (rev 306) @@ -43,7 +43,7 @@ $(BUILD_DIR)/libGL.1.2.dylib: $(OBJECTS) -if ! test -d $(BUILD_DIR); then $(MKDIR) $(BUILD_DIR); fi - $(CC) $(GL_CFLAGS) -o $@ -dynamiclib -install_name $(INSTALL_DIR)/lib/libGL.1.2.dylib -compatibility_version 1.2 -current_version 1.2 -lXplugin -framework ApplicationServices -framework CoreFoundation $(GL_LDFLAGS) -lXext -lX11 -Wl,-exported_symbols_list,exports.list $(OBJECTS) + $(CC) $(GL_CFLAGS) -o $@ -dynamiclib -install_name $(INSTALL_DIR)/lib/libGL.1.dylib -compatibility_version 1.2 -current_version 1.2 -lXplugin -framework ApplicationServices -framework CoreFoundation $(GL_LDFLAGS) -lXext -lX11 -Wl,-exported_symbols_list,exports.list $(OBJECTS) .c.o: $(COMPILE) $<

1 0

[305] AppleSGLX/trunk/
by source_changes＠macosforge.org 10 Mar '09

10 Mar '09

Revision: 305 http://trac.macosforge.org/projects/xquartz/changeset/305 Author: jeremyhu(a)freedesktop.org Date: 2009-03-10 12:35:38 -0700 (Tue, 10 Mar 2009) Log Message: ----------- Updated svn:ignore for exports.list Property Changed: ---------------- AppleSGLX/trunk/ Property changes on: AppleSGLX/trunk ___________________________________________________________________ Modified: svn:ignore - builds testbuilds stage.* apple_xgl_api.h apple_xgl_api.c + builds testbuilds stage.* exports.list apple_xgl_api.h apple_xgl_api.c

1 0

[304] AppleSGLX/trunk/apple_visual.c
by source_changes＠macosforge.org 10 Mar '09

10 Mar '09

Revision: 304 http://trac.macosforge.org/projects/xquartz/changeset/304 Author: jeremyhu(a)freedesktop.org Date: 2009-03-10 12:24:21 -0700 (Tue, 10 Mar 2009) Log Message: ----------- Added support for LIBGL_ALWAYS_HARDWARE and LIBGL_ALWAYS_SOFTWARE Modified Paths: -------------- AppleSGLX/trunk/apple_visual.c Modified: AppleSGLX/trunk/apple_visual.c =================================================================== --- AppleSGLX/trunk/apple_visual.c 2009-03-10 19:03:03 UTC (rev 303) +++ AppleSGLX/trunk/apple_visual.c 2009-03-10 19:24:21 UTC (rev 304) @@ -34,6 +34,7 @@ #include <GL/gl.h> #include <OpenGL/OpenGL.h> #include <OpenGL/CGLContext.h> +#include <OpenGL/CGLRenderers.h> #include "glcontextmodes.h" #include "apple_cgl.h" #include "apple_visual.h" @@ -56,6 +57,14 @@ 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"); + attr[numattr++] = kCGLPFARendererID; + attr[numattr++] = kCGLRendererGenericFloatID; } /*

1 0

[303] AppleSGLX/trunk/apple_visual.c
by source_changes＠macosforge.org 10 Mar '09

10 Mar '09

Revision: 303 http://trac.macosforge.org/projects/xquartz/changeset/303 Author: jeremyhu(a)freedesktop.org Date: 2009-03-10 12:03:03 -0700 (Tue, 10 Mar 2009) Log Message: ----------- Whitespace edits. No code change Modified Paths: -------------- AppleSGLX/trunk/apple_visual.c Modified: AppleSGLX/trunk/apple_visual.c =================================================================== --- AppleSGLX/trunk/apple_visual.c 2009-03-10 19:01:01 UTC (rev 302) +++ AppleSGLX/trunk/apple_visual.c 2009-03-10 19:03:03 UTC (rev 303) @@ -44,20 +44,20 @@ /*mode is a __GlcontextModes*/ void apple_visual_create_pfobj(CGLPixelFormatObj *pfobj, const void *mode, - bool *double_buffered, bool offscreen) { + bool *double_buffered, bool offscreen) { CGLPixelFormatAttribute attr[MAX_ATTR]; const __GLcontextModes *c = mode; int numattr = 0; GLint vsref = 0; CGLError error = 0; - + if(offscreen) { - attr[numattr++] = kCGLPFAOffScreen; - - attr[numattr++] = kCGLPFAColorSize; - attr[numattr++] = 32; + attr[numattr++] = kCGLPFAOffScreen; + + attr[numattr++] = kCGLPFAColorSize; + attr[numattr++] = 32; } - + /* * The program chose a config based on the fbconfigs or visuals. * Those are based on the attributes from CGL, so we probably @@ -66,52 +66,52 @@ attr[numattr++] = kCGLPFAClosestPolicy; if(c->stereoMode) - attr[numattr++] = kCGLPFAStereo; + attr[numattr++] = kCGLPFAStereo; if(c->doubleBufferMode) { - attr[numattr++] = kCGLPFADoubleBuffer; - *double_buffered = true; + attr[numattr++] = kCGLPFADoubleBuffer; + *double_buffered = true; } else { - *double_buffered = false; + *double_buffered = false; } - + attr[numattr++] = kCGLPFAColorSize; attr[numattr++] = c->redBits + c->greenBits + c->blueBits; attr[numattr++] = kCGLPFAAlphaSize; attr[numattr++] = c->alphaBits; - + if((c->accumRedBits + c->accumGreenBits + c->accumBlueBits) > 0) { - attr[numattr++] = kCGLPFAAccumSize; - attr[numattr++] = c->accumRedBits + c->accumGreenBits + + attr[numattr++] = kCGLPFAAccumSize; + attr[numattr++] = c->accumRedBits + c->accumGreenBits + c->accumBlueBits + c->accumAlphaBits; } - + if(c->depthBits > 0) { - attr[numattr++] = kCGLPFADepthSize; - attr[numattr++] = c->depthBits; + attr[numattr++] = kCGLPFADepthSize; + attr[numattr++] = c->depthBits; } - + if(c->stencilBits > 0) { - attr[numattr++] = kCGLPFAStencilSize; - attr[numattr++] = c->stencilBits; + attr[numattr++] = kCGLPFAStencilSize; + attr[numattr++] = c->stencilBits; } - + if(c->sampleBuffers > 0) { - attr[numattr++] = kCGLPFAMultisample; - attr[numattr++] = kCGLPFASampleBuffers; + attr[numattr++] = kCGLPFAMultisample; + attr[numattr++] = kCGLPFASampleBuffers; attr[numattr++] = c->sampleBuffers; - attr[numattr++] = kCGLPFASamples; - attr[numattr++] = c->samples; + attr[numattr++] = kCGLPFASamples; + attr[numattr++] = c->samples; } attr[numattr++] = 0; - + assert(numattr < MAX_ATTR); - + error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref); - + if(error) { - fprintf(stderr, "error: %s\n", apple_cgl.error_string(error)); - abort(); + fprintf(stderr, "error: %s\n", apple_cgl.error_string(error)); + abort(); } - } +}

1 0

[302] AppleSGLX/trunk
by source_changes＠macosforge.org 10 Mar '09

10 Mar '09

Revision: 302 http://trac.macosforge.org/projects/xquartz/changeset/302 Author: jeremyhu(a)freedesktop.org Date: 2009-03-10 12:01:01 -0700 (Tue, 10 Mar 2009) Log Message: ----------- Moved some code not part of the lib into attic Added Paths: ----------- AppleSGLX/trunk/attic/apple_GL_extensions_gen.c AppleSGLX/trunk/attic/apple_GL_pbuffer_max.c Removed Paths: ------------- AppleSGLX/trunk/apple_GL_extensions_gen.c AppleSGLX/trunk/apple_GL_pbuffer_max.c Deleted: AppleSGLX/trunk/apple_GL_extensions_gen.c =================================================================== --- AppleSGLX/trunk/apple_GL_extensions_gen.c 2009-03-10 03:00:47 UTC (rev 301) +++ AppleSGLX/trunk/apple_GL_extensions_gen.c 2009-03-10 19:01:01 UTC (rev 302) @@ -1,55 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <OpenGL/OpenGL.h> - -static void print_extensions(const GLubyte *strings) { - int n = 1; - - printf("extension "); - - for(; *strings; ++strings) { - if(isspace(*strings)) - printf("\nextension"); - - putchar(*strings); - } - - putchar('\n'); - fflush(stdout); -} - -int main() { - CGLPixelFormatAttribute attribs[] = { - kCGLPFAAccelerated, - kCGLPFADoubleBuffer, - kCGLPFAColorSize, 24, - 0 - }; - - CGLPixelFormatObj pixobj; - GLint npix; - CGLError err; - CGLContextObj context; - - err = CGLChoosePixelFormat(attribs, &pixobj, &npix); - - if(err != kCGLNoError) { - fprintf(stderr, "choose pixel format error!\n"); - return EXIT_FAILURE; - } - - err = CGLCreateContext(pixobj, NULL, &context); - - if(err != kCGLNoError) { - fprintf(stderr, "create context error!\n"); - return EXIT_FAILURE; - } - - CGLSetCurrentContext(context); - - //printf("%s\n", glGetString(GL_EXTENSIONS)); - - print_extensions(glGetString(GL_EXTENSIONS)); - - return EXIT_SUCCESS; -} Deleted: AppleSGLX/trunk/apple_GL_pbuffer_max.c =================================================================== --- AppleSGLX/trunk/apple_GL_pbuffer_max.c 2009-03-10 03:00:47 UTC (rev 301) +++ AppleSGLX/trunk/apple_GL_pbuffer_max.c 2009-03-10 19:01:01 UTC (rev 302) @@ -1,42 +0,0 @@ -#include <stdio.h> -#include <stdlib.h> -#include <OpenGL/OpenGL.h> - -int main() { - CGLPixelFormatAttribute attribs[] = { - kCGLPFAAccelerated, - kCGLPFADoubleBuffer, - kCGLPFAColorSize, 24, - 0 - }; - - CGLPixelFormatObj pixobj; - GLint npix; - CGLError err; - CGLContextObj context; - GLint maxview[2]; - - err = CGLChoosePixelFormat(attribs, &pixobj, &npix); - - if(err != kCGLNoError) { - fprintf(stderr, "choose pixel format error!\n"); - return EXIT_FAILURE; - } - - err = CGLCreateContext(pixobj, NULL, &context); - - if(err != kCGLNoError) { - fprintf(stderr, "create context error!\n"); - return EXIT_FAILURE; - } - - CGLSetCurrentContext(context); - - maxview[0] = 0; - maxview[1] = 0; - glGetIntegerv(GL_MAX_VIEWPORT_DIMS, maxview); - - printf("max pbuffer width %d heigth %d\n", maxview[0], maxview[1]); - - return EXIT_SUCCESS; -} Copied: AppleSGLX/trunk/attic/apple_GL_extensions_gen.c (from rev 301, AppleSGLX/trunk/apple_GL_extensions_gen.c) =================================================================== --- AppleSGLX/trunk/attic/apple_GL_extensions_gen.c (rev 0) +++ AppleSGLX/trunk/attic/apple_GL_extensions_gen.c 2009-03-10 19:01:01 UTC (rev 302) @@ -0,0 +1,55 @@ +#include <stdio.h> +#include <stdlib.h> +#include <OpenGL/OpenGL.h> + +static void print_extensions(const GLubyte *strings) { + int n = 1; + + printf("extension "); + + for(; *strings; ++strings) { + if(isspace(*strings)) + printf("\nextension"); + + putchar(*strings); + } + + putchar('\n'); + fflush(stdout); +} + +int main() { + CGLPixelFormatAttribute attribs[] = { + kCGLPFAAccelerated, + kCGLPFADoubleBuffer, + kCGLPFAColorSize, 24, + 0 + }; + + CGLPixelFormatObj pixobj; + GLint npix; + CGLError err; + CGLContextObj context; + + err = CGLChoosePixelFormat(attribs, &pixobj, &npix); + + if(err != kCGLNoError) { + fprintf(stderr, "choose pixel format error!\n"); + return EXIT_FAILURE; + } + + err = CGLCreateContext(pixobj, NULL, &context); + + if(err != kCGLNoError) { + fprintf(stderr, "create context error!\n"); + return EXIT_FAILURE; + } + + CGLSetCurrentContext(context); + + //printf("%s\n", glGetString(GL_EXTENSIONS)); + + print_extensions(glGetString(GL_EXTENSIONS)); + + return EXIT_SUCCESS; +} Copied: AppleSGLX/trunk/attic/apple_GL_pbuffer_max.c (from rev 301, AppleSGLX/trunk/apple_GL_pbuffer_max.c) =================================================================== --- AppleSGLX/trunk/attic/apple_GL_pbuffer_max.c (rev 0) +++ AppleSGLX/trunk/attic/apple_GL_pbuffer_max.c 2009-03-10 19:01:01 UTC (rev 302) @@ -0,0 +1,42 @@ +#include <stdio.h> +#include <stdlib.h> +#include <OpenGL/OpenGL.h> + +int main() { + CGLPixelFormatAttribute attribs[] = { + kCGLPFAAccelerated, + kCGLPFADoubleBuffer, + kCGLPFAColorSize, 24, + 0 + }; + + CGLPixelFormatObj pixobj; + GLint npix; + CGLError err; + CGLContextObj context; + GLint maxview[2]; + + err = CGLChoosePixelFormat(attribs, &pixobj, &npix); + + if(err != kCGLNoError) { + fprintf(stderr, "choose pixel format error!\n"); + return EXIT_FAILURE; + } + + err = CGLCreateContext(pixobj, NULL, &context); + + if(err != kCGLNoError) { + fprintf(stderr, "create context error!\n"); + return EXIT_FAILURE; + } + + CGLSetCurrentContext(context); + + maxview[0] = 0; + maxview[1] = 0; + glGetIntegerv(GL_MAX_VIEWPORT_DIMS, maxview); + + printf("max pbuffer width %d heigth %d\n", maxview[0], maxview[1]); + + return EXIT_SUCCESS; +}

1 0