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

[291] AppleSGLX/trunk
by source_changes＠macosforge.org 07 Mar '09

07 Mar '09

Revision: 291 http://trac.macosforge.org/projects/xquartz/changeset/291 Author: gstaplin(a)apple.com Date: 2009-03-07 01:21:53 -0800 (Sat, 07 Mar 2009) Log Message: ----------- Add a test for glXGetCurrentDisplay. Update the TODO (a few more items DONE). Modified Paths: -------------- AppleSGLX/trunk/TODO AppleSGLX/trunk/tests/triangle_glx/triangle_glx.c Modified: AppleSGLX/trunk/TODO =================================================================== --- AppleSGLX/trunk/TODO 2009-03-07 09:10:09 UTC (rev 290) +++ AppleSGLX/trunk/TODO 2009-03-07 09:21:53 UTC (rev 291) @@ -2,7 +2,7 @@ DONE Fix glXCreateWindow and glXDestroyWindow. -Add API major version testing to the apple_cgl layer. This way we can avoid +DONE Add API major version testing to the apple_cgl layer. This way we can avoid future API fiascos. Jordan suggested this a while ago. -- Feb 16, 2009 @@ -16,7 +16,7 @@ DONE glXGetCurrentReadDrawable should also report the read drawable. It appears correct. -Test glXGetCurrentDisplay(). It appears correct. +DONE Test glXGetCurrentDisplay(). It appears correct. -- Improve the glX symbol compatibility with the old libGL. @@ -46,7 +46,7 @@ Test glXCopyContext. -Add the PBUFFER_BIT to the fbconfigs/visualconfigs in the X server. This is actually unclear. We should perhaps set that bit in the libGL instead. +DONE (in 1.6) Add the PBUFFER_BIT to the fbconfigs/visualconfigs in the X server. This is actually unclear. We should perhaps set that bit in the libGL instead. DONE Test the pbuffer by using glReadPixels to verify it's being written to. @@ -62,7 +62,7 @@ -- Feb 7, 2009 -Extend the GL_aliases for compatibility with the old libGL (wherever possible). +DONE Extend the GL_aliases for compatibility with the old libGL (wherever possible). -- Feb 5, 2009 @@ -83,7 +83,7 @@ DONE test glXQueryServerString, glXGetClientString, and glXGetProcAddress. -Use CGLGetVersion to assert ABI major version compatibility with the OpenGL framework. +DONE Use CGLGetVersion to assert ABI major version compatibility with the OpenGL framework. DONE Work out the include/GL/gl.h problems (with the ARB functions). Modified: AppleSGLX/trunk/tests/triangle_glx/triangle_glx.c =================================================================== --- AppleSGLX/trunk/tests/triangle_glx/triangle_glx.c 2009-03-07 09:10:09 UTC (rev 290) +++ AppleSGLX/trunk/tests/triangle_glx/triangle_glx.c 2009-03-07 09:21:53 UTC (rev 291) @@ -98,6 +98,8 @@ XMapWindow(dpy, win); glXMakeCurrent(dpy, win, ctx); + printf("passed dpy %p current dpy %p\n", (void *)dpy, + (void *)glXGetCurrentDisplay()); event_loop(dpy);

1 0

[290] AppleSGLX/trunk
by source_changes＠macosforge.org 07 Mar '09

07 Mar '09

Revision: 290 http://trac.macosforge.org/projects/xquartz/changeset/290 Author: gstaplin(a)apple.com Date: 2009-03-07 01:10:09 -0800 (Sat, 07 Mar 2009) Log Message: ----------- Add some detection and stderr output for when the CGL major version changes. Modified Paths: -------------- AppleSGLX/trunk/apple_cgl.c AppleSGLX/trunk/apple_cgl.h Modified: AppleSGLX/trunk/apple_cgl.c =================================================================== --- AppleSGLX/trunk/apple_cgl.c 2009-03-07 08:55:38 UTC (rev 289) +++ AppleSGLX/trunk/apple_cgl.c 2009-03-07 09:10:09 UTC (rev 290) @@ -33,6 +33,7 @@ #include <dlfcn.h> #include "apple_cgl.h" +#include "apple_glx.h" #ifndef OPENGL_FRAMEWORK_PATH #define OPENGL_FRAMEWORK_PATH "/System/Library/Frameworks/OpenGL.framework/OpenGL" @@ -59,6 +60,7 @@ void apple_cgl_init(void) { void *h; + GLint major = 0, minor = 0; if(initialized) return; @@ -74,6 +76,17 @@ dl_handle = h; + apple_cgl.get_version = sym(h, "CGLGetVersion"); + + apple_cgl.get_version(&major, &minor); + + apple_glx_diagnostic("CGL major %d minor %d\n", major, minor); + + if(1 != major) { + fprintf(stderr, "WARNING: the CGL major version has changed!\n" + "libGL may be incompatible!\n"); + } + apple_cgl.choose_pixel_format = sym(h, "CGLChoosePixelFormat"); apple_cgl.destroy_pixel_format = sym(h, "CGLDestroyPixelFormat"); Modified: AppleSGLX/trunk/apple_cgl.h =================================================================== --- AppleSGLX/trunk/apple_cgl.h 2009-03-07 08:55:38 UTC (rev 289) +++ AppleSGLX/trunk/apple_cgl.h 2009-03-07 09:10:09 UTC (rev 290) @@ -39,6 +39,8 @@ #include <OpenGL/gl.h> struct apple_cgl_api { + void (*get_version)(GLint *majorvers, GLint *minorvers); + CGLError (*choose_pixel_format)(const CGLPixelFormatAttribute *attribs, CGLPixelFormatObj *pix, GLint *npix); CGLError (*destroy_pixel_format)(CGLPixelFormatObj pix);

1 0

[289] AppleSGLX/trunk
by source_changes＠macosforge.org 07 Mar '09

07 Mar '09

Revision: 289 http://trac.macosforge.org/projects/xquartz/changeset/289 Author: gstaplin(a)apple.com Date: 2009-03-07 00:55:38 -0800 (Sat, 07 Mar 2009) Log Message: ----------- Fix an error that occurred with an invalid GLXPbuffer generating a failed XGetGeometry XErrorEvent. The proper XError for glXQueryDrawable is GLXBadDrawable, so add some error catching to fall through to the __glXSendError(). Modified Paths: -------------- AppleSGLX/trunk/glx_pbuffer.c AppleSGLX/trunk/tests/pbuffer/pbuffer_destroy.c Modified: AppleSGLX/trunk/glx_pbuffer.c =================================================================== --- AppleSGLX/trunk/glx_pbuffer.c 2009-03-06 19:11:36 UTC (rev 288) +++ AppleSGLX/trunk/glx_pbuffer.c 2009-03-07 08:55:38 UTC (rev 289) @@ -31,19 +31,34 @@ */ #include <inttypes.h> +#include <pthread.h> #include "glxclient.h" #include <X11/extensions/extutil.h> #include <X11/extensions/Xext.h> #include <assert.h> #include <string.h> -//#include "glapi.h" #include "glxextensions.h" #include "glcontextmodes.h" -//#include "glheader.h" + #include "apple_glx_drawable.h" #include "glx_error.h" + +static pthread_mutex_t queryLock = PTHREAD_MUTEX_INITIALIZER; + +/* + * This is protected by the queryLock. + * Unfortunately XSetErrorHandler requires a lock. + */ +static int errorCount = 0; + +static int +errorHandler(Display *dpy, XErrorEvent *error) { + ++errorCount; + return 0; /* don't exit */ +} + /** * Create a new pbuffer. */ @@ -109,7 +124,6 @@ } } - /** * Query an attribute of a drawable. */ @@ -119,6 +133,7 @@ Window root; int x, y; unsigned int width, height, bd, depth; + int (*old_handler)(Display *, XErrorEvent *); if(apple_glx_pixmap_query(drawable, attribute, value)) return; /*done*/ @@ -126,6 +141,15 @@ if(apple_glx_pbuffer_query(drawable, attribute, value)) return; /*done*/ + /* + * This is used because XSetErrorHandler changes global state. + * Ideally we should prevent other threads from calling XSetErrorHandler. + * Another way of handling this might be a private display connection. + */ + pthread_mutex_lock(&queryLock); + + old_handler = XSetErrorHandler(errorHandler); + if(XGetGeometry(dpy, drawable, &root, &x, &y, &width, &height, &bd, &depth)) { switch(attribute) { case GLX_WIDTH: @@ -139,7 +163,10 @@ /*FALL THROUGH*/ } + XSetErrorHandler(old_handler); + pthread_mutex_unlock(&queryLock); + __glXSendError(dpy, GLXBadDrawable, drawable, X_GLXGetDrawableAttributes, false); } Modified: AppleSGLX/trunk/tests/pbuffer/pbuffer_destroy.c =================================================================== --- AppleSGLX/trunk/tests/pbuffer/pbuffer_destroy.c 2009-03-06 19:11:36 UTC (rev 288) +++ AppleSGLX/trunk/tests/pbuffer/pbuffer_destroy.c 2009-03-07 08:55:38 UTC (rev 289) @@ -7,32 +7,6 @@ GLXPbuffer pbuf; void dump_pbuffer(Display *dpy) { - size_t length = 400 * 400 * /*RGBA*/ 4; - void *p = malloc(length); - unsigned char *cp; - int x, y; - - if(NULL == p) { - perror("malloc"); - abort(); - } - - memset(p, 0, length); - - glReadPixels(0, 0, 400, 400, GL_RGBA, GL_UNSIGNED_BYTE, p); - - cp = p; - for(y = 0; y < 400; ++y) { - for(x = 0; x < 400; ++x) { - printf("%d %d %d %d, ", cp[0], cp[1], cp[2], cp[3]); - cp += 4; - } - putchar('\n'); - } - - free(p); - - { unsigned int width = 0, height = 0, fbid = 0; glXQueryDrawable(dpy, pbuf, GLX_WIDTH, &width); @@ -41,8 +15,6 @@ printf("queried drawable width %u height %u fbconfigID %x\n", width, height, fbid); - - } } void draw(Display *dpy) { @@ -160,7 +132,9 @@ draw(dpy); glXDestroyPbuffer(dpy, pbuf); draw(dpy); + /* This should release the final reference to the pbuffer. */ glXMakeCurrent(dpy, None, ctx); + printf("Expect a GLXBadDrawable error.\n"); draw(dpy); return EXIT_SUCCESS;

1 0

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

06 Mar '09

Revision: 288 http://trac.macosforge.org/projects/xquartz/changeset/288 Author: jeremyhu(a)freedesktop.org Date: 2009-03-06 11:11:36 -0800 (Fri, 06 Mar 2009) Log Message: ----------- Updated release notes for 2.3.3-rc1 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-06 15:18:07 UTC (rev 287) +++ trunk/pkg/README.2.3.3.txt 2009-03-06 19:11:36 UTC (rev 288) @@ -26,13 +26,15 @@ * xterm 242 * Xephyr, Xnest, Xfake, Xvfb 1.6.0 * proto: + * applewmproto 1.2.0 * dri2proto 1.99.3 - * randrproto 1.2.99.3 + * randrproto 1.3.0 + * xproto 7.0.15 * xextproto 7.0.5 * xcb-proto 1.4 * xf86rushproto 1.1.2 * lib: - * AppleSGLX 52 + * AppleSGLX 54 * 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 @@ -43,6 +45,7 @@ * fontconfig * Avoid rebuilding font caches when switching between archs * freetype 2.3.8 + * libAppleWM 1.2.0 * libICE 1.0.5 * libpng 1.2.35 * CVE-2009-0040 @@ -52,11 +55,12 @@ * Avoid lock failures with AFP home directories * libXext 1.0.5 * libXfont 1.4.0 - * libXrandr 1.2.99.4 + * libXi 1.2.1 + * libXrandr 1.3.0 * pixman 0.14.0 * xtrans 1.2.3 * server: - * Xquartz fixes from xorg-server-1.4.2-apple35 + * Xquartz fixes from xorg-server-1.4.2-apple36 * DRI Updates for new libGL * Fix CapsLock

1 0

[287] AppleSGLX/tags/AppleSGLX-54/
by source_changes＠macosforge.org 06 Mar '09

06 Mar '09

Revision: 287 http://trac.macosforge.org/projects/xquartz/changeset/287 Author: jeremyhu(a)freedesktop.org Date: 2009-03-06 07:18:07 -0800 (Fri, 06 Mar 2009) Log Message: ----------- Tagging AppleSGLX-54 Added Paths: ----------- AppleSGLX/tags/AppleSGLX-54/

1 0

[286] AppleSGLX/trunk/apple_glx_drawable.c
by source_changes＠macosforge.org 05 Mar '09

05 Mar '09

Revision: 286 http://trac.macosforge.org/projects/xquartz/changeset/286 Author: gstaplin(a)apple.com Date: 2009-03-05 02:35:52 -0800 (Thu, 05 Mar 2009) Log Message: ----------- Simplify and refactor a release pattern. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_drawable.c Modified: AppleSGLX/trunk/apple_glx_drawable.c =================================================================== --- AppleSGLX/trunk/apple_glx_drawable.c 2009-03-05 10:29:58 UTC (rev 285) +++ AppleSGLX/trunk/apple_glx_drawable.c 2009-03-05 10:35:52 UTC (rev 286) @@ -460,9 +460,7 @@ * release it, and call destroy_drawable which doesn't destroy * if the reference_count is > 0. */ - d->lock(d); - d->reference_count--; - d->unlock(d); + d->release(d); apple_glx_diagnostic("%s d->reference_count %d\n", __func__, d->reference_count);

1 0

[285] AppleSGLX/trunk
by source_changes＠macosforge.org 05 Mar '09

05 Mar '09

Revision: 285 http://trac.macosforge.org/projects/xquartz/changeset/285 Author: gstaplin(a)apple.com Date: 2009-03-05 02:29:58 -0800 (Thu, 05 Mar 2009) Log Message: ----------- Fix a deadlock pattern with surface destruction. Make the drawable mutex be a recursive type to resolve this issue. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_drawable.c AppleSGLX/trunk/apple_glx_surface.c Modified: AppleSGLX/trunk/apple_glx_drawable.c =================================================================== --- AppleSGLX/trunk/apple_glx_drawable.c 2009-03-04 01:13:18 UTC (rev 284) +++ AppleSGLX/trunk/apple_glx_drawable.c 2009-03-05 10:29:58 UTC (rev 285) @@ -205,19 +205,41 @@ static void common_init(Display *dpy, GLXDrawable drawable, struct apple_glx_drawable *d) { int err; - + pthread_mutexattr_t attr; + d->display = dpy; d->reference_count = 0; d->drawable = drawable; d->type = -1; - err = pthread_mutex_init(&d->mutex, NULL); + err = pthread_mutexattr_init(&attr); + + if(err) { + fprintf(stderr, "pthread_mutexattr_init error: %d\n", err); + abort(); + } + + /* + * There are some patterns that require a recursive mutex, + * when working with locks that protect the apple_glx_drawable, + * and reference functions like ->reference, and ->release. + */ + err = pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); + + if(err) { + fprintf(stderr, "error: setting pthread mutex type: %d\n", err); + abort(); + } + + err = pthread_mutex_init(&d->mutex, &attr); if(err) { fprintf(stderr, "pthread_mutex_init error: %d\n", err); abort(); } + (void)pthread_mutexattr_destroy(&attr); + d->lock = drawable_lock; d->unlock = drawable_unlock; Modified: AppleSGLX/trunk/apple_glx_surface.c =================================================================== --- AppleSGLX/trunk/apple_glx_surface.c 2009-03-04 01:13:18 UTC (rev 284) +++ AppleSGLX/trunk/apple_glx_surface.c 2009-03-05 10:29:58 UTC (rev 285) @@ -187,7 +187,7 @@ void apple_glx_surface_destroy(unsigned int uid) { struct apple_glx_drawable *d; - d = apple_glx_drawable_find_by_uid(uid, APPLE_GLX_DRAWABLE_REFERENCE + d = apple_glx_drawable_find_by_uid(uid, APPLE_GLX_DRAWABLE_REFERENCE | APPLE_GLX_DRAWABLE_LOCK); if(d) {

1 0

[284] AppleSGLX/trunk
by source_changes＠macosforge.org 04 Mar '09

04 Mar '09

Revision: 284 http://trac.macosforge.org/projects/xquartz/changeset/284 Author: gstaplin(a)apple.com Date: 2009-03-03 17:13:18 -0800 (Tue, 03 Mar 2009) Log Message: ----------- Add more diagnostics to the make current path. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_context.c AppleSGLX/trunk/apple_glx_surface.c Modified: AppleSGLX/trunk/apple_glx_context.c =================================================================== --- AppleSGLX/trunk/apple_glx_context.c 2009-03-04 01:12:45 UTC (rev 283) +++ AppleSGLX/trunk/apple_glx_context.c 2009-03-04 01:13:18 UTC (rev 284) @@ -307,20 +307,25 @@ } if(None == drawable) { + bool error = false; + /* Clear the current drawable for this context_obj. */ if(apple_cgl.set_current_context(ac->context_obj)) - return true; + error = true; if(apple_cgl.clear_drawable(ac->context_obj)) - return true; + error = true; if(ac->drawable) { ac->drawable->destroy(ac->drawable); ac->drawable = NULL; } - return false; + apple_glx_diagnostic("%s: drawable is None, error is: %d\n", + __func__, error); + + return error; } /* This is an optimisation to avoid searching for the current drawable. */ Modified: AppleSGLX/trunk/apple_glx_surface.c =================================================================== --- AppleSGLX/trunk/apple_glx_surface.c 2009-03-04 01:12:45 UTC (rev 283) +++ AppleSGLX/trunk/apple_glx_surface.c 2009-03-04 01:13:18 UTC (rev 284) @@ -85,7 +85,7 @@ ac->made_current = true; } - apple_glx_diagnostic("%s drawable 0x%lx\n", __func__, d->drawable); + apple_glx_diagnostic("%s: drawable 0x%lx\n", __func__, d->drawable); return false; }

1 0

[283] AppleSGLX/trunk/tests/triangle_glx/triangle_glx_surface-2.c
by source_changes＠macosforge.org 04 Mar '09

04 Mar '09

Revision: 283 http://trac.macosforge.org/projects/xquartz/changeset/283 Author: gstaplin(a)apple.com Date: 2009-03-03 17:12:45 -0800 (Tue, 03 Mar 2009) Log Message: ----------- Test for glXMakeCurrent failure in the surface test. Modified Paths: -------------- AppleSGLX/trunk/tests/triangle_glx/triangle_glx_surface-2.c Modified: AppleSGLX/trunk/tests/triangle_glx/triangle_glx_surface-2.c =================================================================== --- AppleSGLX/trunk/tests/triangle_glx/triangle_glx_surface-2.c 2009-03-04 01:00:09 UTC (rev 282) +++ AppleSGLX/trunk/tests/triangle_glx/triangle_glx_surface-2.c 2009-03-04 01:12:45 UTC (rev 283) @@ -48,9 +48,10 @@ draw(dpy, mainwin); /* This should destroy the surface. */ - glXMakeCurrent(dpy, None, ctx); - - XSync(dpy, False); + if(!glXMakeCurrent(dpy, None, ctx)) { + fprintf(stderr, "%s: make current None failed!\n"); + exit(EXIT_FAILURE); + } printf("destroying mainwin 0x%lx\n", mainwin); XDestroyWindow(dpy, mainwin); @@ -66,7 +67,10 @@ printf("created mainwin 0x%lx\n", mainwin); /* This should recreate the surface. */ - glXMakeCurrent(dpy, mainwin, ctx); + if(!glXMakeCurrent(dpy, mainwin, ctx)) { + fprintf(stderr, "%s: make mainwin current failed!\n"); + exit(EXIT_FAILURE); + } } }

1 0

[282] AppleSGLX/trunk/apple_glx_drawable.c
by source_changes＠macosforge.org 04 Mar '09

04 Mar '09

Revision: 282 http://trac.macosforge.org/projects/xquartz/changeset/282 Author: gstaplin(a)apple.com Date: 2009-03-03 17:00:09 -0800 (Tue, 03 Mar 2009) Log Message: ----------- Add more diagnostics for the drawable creation/destruction. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_drawable.c Modified: AppleSGLX/trunk/apple_glx_drawable.c =================================================================== --- AppleSGLX/trunk/apple_glx_drawable.c 2009-03-04 00:13:42 UTC (rev 281) +++ AppleSGLX/trunk/apple_glx_drawable.c 2009-03-04 01:00:09 UTC (rev 282) @@ -153,7 +153,9 @@ */ d->callbacks.destroy(d->display, d); } - + + apple_glx_diagnostic("%s: freeing %p\n", __func__, (void *)d); + free(d); /* So that the locks are balanced and the caller correctly unlocks. */ @@ -277,6 +279,8 @@ link_tail(d); + apple_glx_diagnostic("%s: new drawable %p\n", __func__, (void *)d); + *agdResult = d; return false;

1 0