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

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

04 Mar '09

Revision: 281 http://trac.macosforge.org/projects/xquartz/changeset/281 Author: gstaplin(a)apple.com Date: 2009-03-03 16:13:42 -0800 (Tue, 03 Mar 2009) Log Message: ----------- Add an improved version of the surface test. This version destroys the window between: glXMakeCurrent(dpy, None, ctx); and glXMakeCurrent(dpy, mainwin, ctx); It seems to be leaking in the client here, but leaks is reporting 0 leaks, which would seem to indicate we have a list or similar data structure that isn't being delinked. Modified Paths: -------------- AppleSGLX/trunk/tests/tests.mk AppleSGLX/trunk/tests/triangle_glx/triangle_glx.mk Added Paths: ----------- AppleSGLX/trunk/tests/triangle_glx/triangle_glx_surface-2.c Modified: AppleSGLX/trunk/tests/tests.mk =================================================================== --- AppleSGLX/trunk/tests/tests.mk 2009-03-03 20:22:24 UTC (rev 280) +++ AppleSGLX/trunk/tests/tests.mk 2009-03-04 00:13:42 UTC (rev 281) @@ -32,5 +32,7 @@ $(TEST_BUILD_DIR)/glxpixmap_destroy_invalid \ $(TEST_BUILD_DIR)/multisample_glx \ $(TEST_BUILD_DIR)/glthreads \ - $(TEST_BUILD_DIR)/triangle_glx_surface + $(TEST_BUILD_DIR)/triangle_glx_surface \ + $(TEST_BUILD_DIR)/triangle_glx_surface-2 + Modified: AppleSGLX/trunk/tests/triangle_glx/triangle_glx.mk =================================================================== --- AppleSGLX/trunk/tests/triangle_glx/triangle_glx.mk 2009-03-03 20:22:24 UTC (rev 280) +++ AppleSGLX/trunk/tests/triangle_glx/triangle_glx.mk 2009-03-04 00:13:42 UTC (rev 281) @@ -3,3 +3,6 @@ $(TEST_BUILD_DIR)/triangle_glx_surface: tests/triangle_glx/triangle_glx_surface.c $(LIBGL) $(CC) tests/triangle_glx/triangle_glx_surface.c -Iinclude -o $(TEST_BUILD_DIR)/triangle_glx_surface $(LINK_TEST) + +$(TEST_BUILD_DIR)/triangle_glx_surface-2: tests/triangle_glx/triangle_glx_surface-2.c $(LIBGL) + $(CC) tests/triangle_glx/triangle_glx_surface-2.c -Iinclude -o $(TEST_BUILD_DIR)/triangle_glx_surface-2 $(LINK_TEST) Added: AppleSGLX/trunk/tests/triangle_glx/triangle_glx_surface-2.c =================================================================== --- AppleSGLX/trunk/tests/triangle_glx/triangle_glx_surface-2.c (rev 0) +++ AppleSGLX/trunk/tests/triangle_glx/triangle_glx_surface-2.c 2009-03-04 00:13:42 UTC (rev 281) @@ -0,0 +1,132 @@ +#include <stdio.h> +#include <stdlib.h> +#include <X11/Xlib.h> +#include <GL/glx.h> + +Window mainwin; +GLXContext ctx; +Window root, win; +XVisualInfo *visinfo; +XSetWindowAttributes attr; + +void draw(Display *dpy, Window w) { + printf("draw window 0x%lx\n", w); + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + glLoadIdentity(); + glColor3f(0.5f, 0.5f, 1.0f); + glBegin(GL_TRIANGLES); + glVertex3f( 0.0f, 1.0f, 0.0f); + glVertex3f(-1.0f,-1.0f, 0.0f); + glVertex3f( 1.0f,-1.0f, 0.0f); + glEnd(); + glXSwapBuffers(dpy, w); +} + +void resize(Display *dpy, Window w, int width, int height) { + glViewport(0, 0, width, height); + draw(dpy, w); +} + +void event_loop(Display *dpy) { + XEvent event; + + while(1) { + if(XPending(dpy) > 0) { + XNextEvent(dpy, &event); + + switch(event.type) { + case Expose: + draw(dpy, mainwin); + break; + + case ConfigureNotify: + resize(dpy, mainwin, event.xconfigure.width, + event.xconfigure.height); + break; + } + } + + draw(dpy, mainwin); + /* This should destroy the surface. */ + glXMakeCurrent(dpy, None, ctx); + + XSync(dpy, False); + + printf("destroying mainwin 0x%lx\n", mainwin); + XDestroyWindow(dpy, mainwin); + + mainwin = XCreateWindow(dpy, root, /*x*/ 0, /*y*/ 0, + /*width*/ 400, /*height*/ 400, + 0, visinfo->depth, InputOutput, + visinfo->visual, + CWBackPixel | CWBorderPixel + | CWColormap | CWEventMask, + &attr); + + printf("created mainwin 0x%lx\n", mainwin); + + /* This should recreate the surface. */ + glXMakeCurrent(dpy, mainwin, ctx); + } +} + +int main() { + Display *dpy; + int attrib[] = { GLX_RGBA, + GLX_RED_SIZE, 8, + GLX_GREEN_SIZE, 8, + GLX_BLUE_SIZE, 8, + GLX_DEPTH_SIZE, 24, + GLX_DOUBLEBUFFER, + None }; + int eventbase, errorbase; + int screen; + + dpy = XOpenDisplay(NULL); + + if(NULL == dpy) { + fprintf(stderr, "error: unable to open display!\n"); + return EXIT_FAILURE; + } + + if(!glXQueryExtension(dpy, &eventbase, &errorbase)) { + fprintf(stderr, "GLX is not available!\n"); + return EXIT_FAILURE; + } + + screen = DefaultScreen(dpy); + root = RootWindow(dpy, screen); + + visinfo = glXChooseVisual(dpy, screen, attrib); + + if(!visinfo) { + fprintf(stderr, "error: couldn't get an RGBA, double-buffered visual!\n"); + return EXIT_FAILURE; + } + + attr.background_pixel = 0; + attr.border_pixel = 0; + attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone); + attr.event_mask = StructureNotifyMask | ExposureMask; + + mainwin = win = XCreateWindow(dpy, root, /*x*/ 0, /*y*/ 0, + /*width*/ 400, /*height*/ 400, + 0, visinfo->depth, InputOutput, + visinfo->visual, + CWBackPixel | CWBorderPixel | CWColormap | CWEventMask, + &attr); + + ctx = glXCreateContext(dpy, visinfo, NULL, True ); + if(!ctx) { + fprintf(stderr, "error: glXCreateContext failed!\n"); + return EXIT_FAILURE; + } + + XMapWindow(dpy, win); + + glXMakeCurrent(dpy, win, ctx); + + event_loop(dpy); + + return EXIT_SUCCESS; +}

1 0

[280] AppleSGLX/trunk/apple_glx_surface.c
by source_changes＠macosforge.org 03 Mar '09

03 Mar '09

Revision: 280 http://trac.macosforge.org/projects/xquartz/changeset/280 Author: gstaplin(a)apple.com Date: 2009-03-03 12:22:24 -0800 (Tue, 03 Mar 2009) Log Message: ----------- Add the uid to the create surface diagnostic. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_surface.c Modified: AppleSGLX/trunk/apple_glx_surface.c =================================================================== --- AppleSGLX/trunk/apple_glx_surface.c 2009-03-03 20:13:41 UTC (rev 279) +++ AppleSGLX/trunk/apple_glx_surface.c 2009-03-03 20:22:24 UTC (rev 280) @@ -140,8 +140,9 @@ return true; } - apple_glx_diagnostic("%s: created a surface for 0x%lx\n", - __func__, d->drawable); + apple_glx_diagnostic("%s: created a surface for drawable 0x%lx" + " with uid %u\n", + __func__, d->drawable, s->uid); return false; /*success*/ }

1 0

[279] AppleSGLX/trunk/apple_glx_surface.c
by source_changes＠macosforge.org 03 Mar '09

03 Mar '09

Revision: 279 http://trac.macosforge.org/projects/xquartz/changeset/279 Author: gstaplin(a)apple.com Date: 2009-03-03 12:13:41 -0800 (Tue, 03 Mar 2009) Log Message: ----------- Add the uid to the diagnostic for the surface destruction. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_surface.c Modified: AppleSGLX/trunk/apple_glx_surface.c =================================================================== --- AppleSGLX/trunk/apple_glx_surface.c 2009-03-03 20:04:18 UTC (rev 278) +++ AppleSGLX/trunk/apple_glx_surface.c 2009-03-03 20:13:41 UTC (rev 279) @@ -109,8 +109,8 @@ XAppleDRIDestroySurface(d->display, DefaultScreen(d->display), d->drawable); - apple_glx_diagnostic("%s: destroyed a surface for drawable 0x%lx\n", - __func__, d->drawable); + apple_glx_diagnostic("%s: destroyed a surface for drawable 0x%lx uid %u\n", + __func__, d->drawable, s->uid); } /* Return true if an error occured. */

1 0

[278] AppleSGLX/trunk
by source_changes＠macosforge.org 03 Mar '09

03 Mar '09

Revision: 278 http://trac.macosforge.org/projects/xquartz/changeset/278 Author: gstaplin(a)apple.com Date: 2009-03-03 12:04:18 -0800 (Tue, 03 Mar 2009) Log Message: ----------- Add more diagnostics for surfaces and drawables. It seems I was wrong about the test code not causing a leak. The drawables are created and destroyed, but it seems that the WindowServer grows. Something appears to be leaking and I'm not sure what yet. I will verify with some printf statements in the X server to make sure it's destroying the surface when XAppleDRIDestroySurface is called. 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-03 19:51:51 UTC (rev 277) +++ AppleSGLX/trunk/apple_glx_drawable.c 2009-03-03 20:04:18 UTC (rev 278) @@ -170,6 +170,10 @@ bool result; d->lock(d); + + apple_glx_diagnostic("%s: %p ->reference_count before -- %d\n", __func__, + (void *)d, d->reference_count); + d->reference_count--; if(d->reference_count > 0) { Modified: AppleSGLX/trunk/apple_glx_surface.c =================================================================== --- AppleSGLX/trunk/apple_glx_surface.c 2009-03-03 19:51:51 UTC (rev 277) +++ AppleSGLX/trunk/apple_glx_surface.c 2009-03-03 20:04:18 UTC (rev 278) @@ -109,7 +109,8 @@ XAppleDRIDestroySurface(d->display, DefaultScreen(d->display), d->drawable); - apple_glx_diagnostic("destroyed a surface for 0x%lx\n", d->drawable); + apple_glx_diagnostic("%s: destroyed a surface for drawable 0x%lx\n", + __func__, d->drawable); } /* Return true if an error occured. */ @@ -139,7 +140,8 @@ return true; } - apple_glx_diagnostic("created a surface for 0x%lx\n", d->drawable); + apple_glx_diagnostic("%s: created a surface for 0x%lx\n", + __func__, d->drawable); return false; /*success*/ }

1 0

[277] AppleSGLX/trunk/tests
by source_changes＠macosforge.org 03 Mar '09

03 Mar '09

Revision: 277 http://trac.macosforge.org/projects/xquartz/changeset/277 Author: gstaplin(a)apple.com Date: 2009-03-03 11:51:51 -0800 (Tue, 03 Mar 2009) Log Message: ----------- Add a torture test for surface creation and destruction. You can verify it with: env LIBGL_DIAGNOSTIC=1 ./testbuilds/triangle_glx_surface It doesn't appear that the X server or libGL clients grow with the test, so I believe the cleanup is occurring properly. Modified Paths: -------------- AppleSGLX/trunk/tests/tests.mk AppleSGLX/trunk/tests/triangle_glx/triangle_glx.mk Added Paths: ----------- AppleSGLX/trunk/tests/triangle_glx/triangle_glx_surface.c Modified: AppleSGLX/trunk/tests/tests.mk =================================================================== --- AppleSGLX/trunk/tests/tests.mk 2009-03-03 19:39:40 UTC (rev 276) +++ AppleSGLX/trunk/tests/tests.mk 2009-03-03 19:51:51 UTC (rev 277) @@ -31,5 +31,6 @@ $(TEST_BUILD_DIR)/drawable_types \ $(TEST_BUILD_DIR)/glxpixmap_destroy_invalid \ $(TEST_BUILD_DIR)/multisample_glx \ - $(TEST_BUILD_DIR)/glthreads + $(TEST_BUILD_DIR)/glthreads \ + $(TEST_BUILD_DIR)/triangle_glx_surface Modified: AppleSGLX/trunk/tests/triangle_glx/triangle_glx.mk =================================================================== --- AppleSGLX/trunk/tests/triangle_glx/triangle_glx.mk 2009-03-03 19:39:40 UTC (rev 276) +++ AppleSGLX/trunk/tests/triangle_glx/triangle_glx.mk 2009-03-03 19:51:51 UTC (rev 277) @@ -1,2 +1,5 @@ $(TEST_BUILD_DIR)/triangle_glx: tests/triangle_glx/triangle_glx.c $(LIBGL) $(CC) tests/triangle_glx/triangle_glx.c -Iinclude -o $(TEST_BUILD_DIR)/triangle_glx $(LINK_TEST) + +$(TEST_BUILD_DIR)/triangle_glx_surface: tests/triangle_glx/triangle_glx_surface.c $(LIBGL) + $(CC) tests/triangle_glx/triangle_glx_surface.c -Iinclude -o $(TEST_BUILD_DIR)/triangle_glx_surface $(LINK_TEST) Added: AppleSGLX/trunk/tests/triangle_glx/triangle_glx_surface.c =================================================================== --- AppleSGLX/trunk/tests/triangle_glx/triangle_glx_surface.c (rev 0) +++ AppleSGLX/trunk/tests/triangle_glx/triangle_glx_surface.c 2009-03-03 19:51:51 UTC (rev 277) @@ -0,0 +1,115 @@ +#include <stdio.h> +#include <stdlib.h> +#include <X11/Xlib.h> +#include <GL/glx.h> + +Window mainwin; +GLXContext ctx; + +void draw(Display *dpy, Window w) { + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + glLoadIdentity(); + glColor3f(0.5f, 0.5f, 1.0f); + glBegin(GL_TRIANGLES); + glVertex3f( 0.0f, 1.0f, 0.0f); + glVertex3f(-1.0f,-1.0f, 0.0f); + glVertex3f( 1.0f,-1.0f, 0.0f); + glEnd(); + glXSwapBuffers(dpy, w); +} + +void resize(Display *dpy, Window w, int width, int height) { + glViewport(0, 0, width, height); + draw(dpy, w); +} + +void event_loop(Display *dpy) { + XEvent event; + + while(1) { + if(XPending(dpy) > 0) { + XNextEvent(dpy, &event); + + switch(event.type) { + case Expose: + draw(dpy, event.xexpose.window); + break; + + case ConfigureNotify: + resize(dpy, event.xconfigure.window, event.xconfigure.width, + event.xconfigure.height); + break; + } + } + + draw(dpy, mainwin); + /* This should destroy the surface. */ + glXMakeCurrent(dpy, None, ctx); + /* This should recreate the surface. */ + glXMakeCurrent(dpy, mainwin, ctx); + } +} + +int main() { + Display *dpy; + int attrib[] = { GLX_RGBA, + GLX_RED_SIZE, 8, + GLX_GREEN_SIZE, 8, + GLX_BLUE_SIZE, 8, + GLX_DEPTH_SIZE, 24, + GLX_DOUBLEBUFFER, + None }; + int eventbase, errorbase; + int screen; + Window root, win; + XVisualInfo *visinfo; + XSetWindowAttributes attr; + + dpy = XOpenDisplay(NULL); + + if(NULL == dpy) { + fprintf(stderr, "error: unable to open display!\n"); + return EXIT_FAILURE; + } + + if(!glXQueryExtension(dpy, &eventbase, &errorbase)) { + fprintf(stderr, "GLX is not available!\n"); + return EXIT_FAILURE; + } + + screen = DefaultScreen(dpy); + root = RootWindow(dpy, screen); + + visinfo = glXChooseVisual(dpy, screen, attrib); + + if(!visinfo) { + fprintf(stderr, "error: couldn't get an RGBA, double-buffered visual!\n"); + return EXIT_FAILURE; + } + + attr.background_pixel = 0; + attr.border_pixel = 0; + attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone); + attr.event_mask = StructureNotifyMask | ExposureMask; + + mainwin = win = XCreateWindow(dpy, root, /*x*/ 0, /*y*/ 0, + /*width*/ 400, /*height*/ 400, + 0, visinfo->depth, InputOutput, + visinfo->visual, + CWBackPixel | CWBorderPixel | CWColormap | CWEventMask, + &attr); + + ctx = glXCreateContext(dpy, visinfo, NULL, True ); + if(!ctx) { + fprintf(stderr, "error: glXCreateContext failed!\n"); + return EXIT_FAILURE; + } + + XMapWindow(dpy, win); + + glXMakeCurrent(dpy, win, ctx); + + event_loop(dpy); + + return EXIT_SUCCESS; +}

1 0

[276] AppleSGLX/trunk
by source_changes＠macosforge.org 03 Mar '09

03 Mar '09

Revision: 276 http://trac.macosforge.org/projects/xquartz/changeset/276 Author: gstaplin(a)apple.com Date: 2009-03-03 11:39:40 -0800 (Tue, 03 Mar 2009) Log Message: ----------- Add more diagnostics for surface creation an destruction. Add apple_glx_surface_destroy to potentialy destroy a surface soon after the surface has been destroyed in the X server. Reorder the functions that take a flags argument with LOCK and REFERENCE flags. We want the reference before the lock, because the reference uses the lock. This could have lead to deadlock, but didn't in practice, because only the pattern I added today would have used both flags. Improve the glViewport path behavior when the surface is destroyed. It will attempt to clear and destroy the drawable (assuming there are no more references to it in other contexts). Add a pending_destroy to the apple_glx_surface structure. Make apple_glx_surface_destroy set the pending_destroy for use by the glViewport path. Modified Paths: -------------- AppleSGLX/trunk/apple_glx.c AppleSGLX/trunk/apple_glx_context.c AppleSGLX/trunk/apple_glx_context.h AppleSGLX/trunk/apple_glx_drawable.c AppleSGLX/trunk/apple_glx_drawable.h AppleSGLX/trunk/apple_glx_surface.c Modified: AppleSGLX/trunk/apple_glx.c =================================================================== --- AppleSGLX/trunk/apple_glx.c 2009-03-01 01:34:27 UTC (rev 275) +++ AppleSGLX/trunk/apple_glx.c 2009-03-03 19:39:40 UTC (rev 276) @@ -75,25 +75,14 @@ static void surface_notify_handler(Display *dpy, unsigned int uid, int kind) { switch(kind) { - case AppleDRISurfaceNotifyDestroyed: { - xp_surface_id sid; - CGLContextObj contextobj; - - if(apple_glx_get_surface_from_uid(uid, &sid, &contextobj)) { - /* The surface was probably destroyed. */ - return; - } - - /* FIXME this needs more thread safety. */ - - apple_cgl.clear_drawable(contextobj); - xp_destroy_surface(sid); - } + case AppleDRISurfaceNotifyDestroyed: + apple_glx_diagnostic("%s: surface destroyed %u\n", __func__, uid); + apple_glx_surface_destroy(uid); break; - + case AppleDRISurfaceNotifyChanged: { int updated; - + updated = apple_glx_context_surface_changed(uid, pthread_self()); apple_glx_diagnostic("surface notify updated %d\n", updated); Modified: AppleSGLX/trunk/apple_glx_context.c =================================================================== --- AppleSGLX/trunk/apple_glx_context.c 2009-03-01 01:34:27 UTC (rev 275) +++ AppleSGLX/trunk/apple_glx_context.c 2009-03-03 19:39:40 UTC (rev 276) @@ -409,28 +409,6 @@ return (ac->drawable && ac->drawable->drawable == drawable); } -/* Return true if an error occurred. */ -bool apple_glx_get_surface_from_uid(unsigned int uid, xp_surface_id *sid, - CGLContextObj *contextobj) { - struct apple_glx_context *ac; - - lock_context_list(); - - for(ac = context_list; ac; ac = ac->next) { - if(ac->drawable && APPLE_GLX_DRAWABLE_SURFACE == ac->drawable->type - && ac->drawable->types.surface.uid == uid) { - *sid = ac->drawable->types.surface.surface_id; - *contextobj = ac->context_obj; - unlock_context_list(); - return false; - } - } - - unlock_context_list(); - - return true; -} - bool apple_glx_copy_context(void *currentptr, void *srcptr, void *destptr, unsigned long mask, int *errorptr, bool *x11errorptr) { @@ -508,6 +486,34 @@ xp_update_gl_context(ac->context_obj); ac->need_update = false; - apple_glx_diagnostic("updating context %p\n", ptr); + apple_glx_diagnostic("%s: updating context %p\n", __func__, ptr); } + + if(ac->drawable && APPLE_GLX_DRAWABLE_SURFACE == ac->drawable->type + && ac->drawable->types.surface.pending_destroy) { + apple_glx_diagnostic("%s: clearing drawable %p\n", __func__, ptr); + apple_cgl.clear_drawable(ac->context_obj); + + if(ac->drawable) { + struct apple_glx_drawable *d; + + apple_glx_diagnostic("%s: attempting to destroy drawable %p\n", + __func__, ptr); + apple_glx_diagnostic("%s: ac->drawable->drawable is 0x%lx\n", + __func__, ac->drawable->drawable); + + d = ac->drawable; + + ac->drawable = NULL; + + /* + * This will destroy the surface drawable if there are + * no references to it. + * It also subtracts 1 from the reference_count. + * If there are references to it, then it's probably made + * current in another context. + */ + d->destroy(d); + } + } } Modified: AppleSGLX/trunk/apple_glx_context.h =================================================================== --- AppleSGLX/trunk/apple_glx_context.h 2009-03-01 01:34:27 UTC (rev 275) +++ AppleSGLX/trunk/apple_glx_context.h 2009-03-03 19:39:40 UTC (rev 276) @@ -61,9 +61,6 @@ bool apple_glx_make_current_context(Display *dpy, void *oldptr, void *ptr, GLXDrawable drawable); bool apple_glx_is_current_drawable(void *ptr, GLXDrawable drawable); -bool apple_glx_get_surface_from_uid(unsigned int uid, xp_surface_id *sid, - CGLContextObj *contextobj); - bool apple_glx_copy_context(void *currentptr, void *srcptr, void *destptr, unsigned long mask, int *errorptr, bool *x11errorptr); Modified: AppleSGLX/trunk/apple_glx_drawable.c =================================================================== --- AppleSGLX/trunk/apple_glx_drawable.c 2009-03-01 01:34:27 UTC (rev 275) +++ AppleSGLX/trunk/apple_glx_drawable.c 2009-03-03 19:39:40 UTC (rev 276) @@ -70,10 +70,6 @@ lock_drawables_list(); - /* - * Pixmaps aren't required to have a globally unique ID from what I recall. - * so we use the display connection with the drawable lookup. - */ for(i = drawables_list; i; i = i->next) { if(i->drawable == drawable) { agd = i; @@ -147,8 +143,6 @@ if(d->next) d->next->previous = d->previous; - /* Temporarily increase the reference count. */ - d->reference_count++; unlock_drawables_list(); if (d->callbacks.destroy) { @@ -379,12 +373,12 @@ for(d = drawables_list; d; d = d->next) { if(d->type == type && d->drawable == drawable) { + if(flags & APPLE_GLX_DRAWABLE_REFERENCE) + d->reference(d); + if(flags & APPLE_GLX_DRAWABLE_LOCK) d->lock(d); - if(flags & APPLE_GLX_DRAWABLE_REFERENCE) - d->reference(d); - unlock_drawables_list(); return d; @@ -404,12 +398,12 @@ for(d = drawables_list; d; d = d->next) { if(d->drawable == drawable) { + if(flags & APPLE_GLX_DRAWABLE_REFERENCE) + d->reference(d); + if(flags & APPLE_GLX_DRAWABLE_LOCK) d->lock(d); - - if(flags & APPLE_GLX_DRAWABLE_REFERENCE) - d->reference(d); - + unlock_drawables_list(); return d; @@ -453,3 +447,31 @@ return false; } + +struct apple_glx_drawable * +apple_glx_drawable_find_by_uid(unsigned int uid, int flags) { + struct apple_glx_drawable *d; + + lock_drawables_list(); + + for(d = drawables_list; d; d = d->next) { + /* Only surfaces have a uid. */ + if(APPLE_GLX_DRAWABLE_SURFACE == d->type) { + if(d->types.surface.uid == uid) { + if(flags & APPLE_GLX_DRAWABLE_REFERENCE) + d->reference(d); + + if(flags & APPLE_GLX_DRAWABLE_LOCK) + d->lock(d); + + unlock_drawables_list(); + + return d; + } + } + } + + unlock_drawables_list(); + + return NULL; +} Modified: AppleSGLX/trunk/apple_glx_drawable.h =================================================================== --- AppleSGLX/trunk/apple_glx_drawable.h 2009-03-01 01:34:27 UTC (rev 275) +++ AppleSGLX/trunk/apple_glx_drawable.h 2009-03-03 19:39:40 UTC (rev 276) @@ -56,6 +56,7 @@ struct apple_glx_surface { xp_surface_id surface_id; unsigned int uid; + bool pending_destroy; }; struct apple_glx_pbuffer { @@ -165,12 +166,16 @@ bool apple_glx_drawable_destroy_by_type(Display *dpy, GLXDrawable drawable, int type); +struct apple_glx_drawable * +apple_glx_drawable_find_by_uid(unsigned int uid, int flags); /* Surfaces */ bool apple_glx_surface_create(Display *dpy, int screen, GLXDrawable drawable, struct apple_glx_drawable **resultptr); +void apple_glx_surface_destroy(unsigned int uid); + /* Pbuffers */ /* Returns true if an error occurred. */ @@ -205,4 +210,6 @@ bool apple_glx_pixmap_query(GLXPixmap pixmap, int attribute, unsigned int *value); + + #endif Modified: AppleSGLX/trunk/apple_glx_surface.c =================================================================== --- AppleSGLX/trunk/apple_glx_surface.c 2009-03-01 01:34:27 UTC (rev 275) +++ AppleSGLX/trunk/apple_glx_surface.c 2009-03-03 19:39:40 UTC (rev 276) @@ -37,6 +37,7 @@ static void surface_destroy(Display *dpy, struct apple_glx_drawable *d); + static struct apple_glx_drawable_callbacks callbacks = { .type = APPLE_GLX_DRAWABLE_SURFACE, .make_current = surface_make_current, @@ -92,6 +93,8 @@ static void surface_destroy(Display *dpy, struct apple_glx_drawable *d) { struct apple_glx_surface *s = &d->types.surface; + apple_glx_diagnostic("%s: s->surface_id %u\n", __func__, s->surface_id); + xp_error error = xp_destroy_surface(s->surface_id); if(error) { @@ -122,6 +125,8 @@ assert(None != d->drawable); + s->pending_destroy = false; + if(XAppleDRICreateSurface(dpy, screen, d->drawable, id, key, &s->uid)) { xp_error error; @@ -165,3 +170,26 @@ return false; } + +/* + * All surfaces are reference counted, and surfaces are only created + * when the window is made current. When all contexts no longer reference + * a surface drawable the apple_glx_drawable gets destroyed, and thus + * its surface is destroyed. + * + * However we can make the destruction occur a bit sooner by setting + * pending_destroy, which is then checked for in glViewport by + * apple_glx_context_update. + */ +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 + | APPLE_GLX_DRAWABLE_LOCK); + + if(d) { + d->types.surface.pending_destroy = true; + d->release(d); + d->unlock(d); + } +}

1 0

[275] AppleSGLX/trunk/include/GL/gl.h
by source_changes＠macosforge.org 01 Mar '09

01 Mar '09

Revision: 275 http://trac.macosforge.org/projects/xquartz/changeset/275 Author: jeremyhu(a)freedesktop.org Date: 2009-02-28 17:34:27 -0800 (Sat, 28 Feb 2009) Log Message: ----------- Add GLAPI GLAPIENTRY APIENTRY APIENTRYP GLAPIENTRYP Modified Paths: -------------- AppleSGLX/trunk/include/GL/gl.h Modified: AppleSGLX/trunk/include/GL/gl.h =================================================================== --- AppleSGLX/trunk/include/GL/gl.h 2009-02-28 09:02:56 UTC (rev 274) +++ AppleSGLX/trunk/include/GL/gl.h 2009-03-01 01:34:27 UTC (rev 275) @@ -57,5 +57,26 @@ #endif /* GL_MESA_packed_depth_stencil */ +/* Various other OS projects expect to get these macros from Mesa's gl.h */ +#ifndef GLAPI +#define GLAPI extern +#endif +#ifndef GLAPIENTRY +#define GLAPIENTRY +#endif + +#ifndef APIENTRY +#define APIENTRY GLAPIENTRY +#endif + +/* "P" suffix to be used for a pointer to a function */ +#ifndef APIENTRYP +#define APIENTRYP APIENTRY * +#endif + +#ifndef GLAPIENTRYP +#define GLAPIENTRYP GLAPIENTRY * +#endif + #endif /*__X_GL_H*/

1 0