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

[176] AppleSGLX/trunk
by source_changes＠macosforge.org 19 Feb '09

19 Feb '09

Revision: 176 http://trac.macosforge.org/projects/xquartz/changeset/176 Author: gstaplin(a)apple.com Date: 2009-02-19 14:39:03 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Add apple_glx_pixmap_query. It's used by glXQueryDrawable. Also remove the is_current from the pixmap struct -- it was an incomplete idea. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_context.c AppleSGLX/trunk/apple_glx_pixmap.c AppleSGLX/trunk/apple_glx_pixmap.h AppleSGLX/trunk/glx_pbuffer.c Modified: AppleSGLX/trunk/apple_glx_context.c =================================================================== --- AppleSGLX/trunk/apple_glx_context.c 2009-02-19 07:15:19 UTC (rev 175) +++ AppleSGLX/trunk/apple_glx_context.c 2009-02-19 22:39:03 UTC (rev 176) @@ -434,8 +434,7 @@ if(false == apple_glx_pixmap_data(dpy, ac->drawable->drawable, &width, &height, &pitch, &bpp, - &ptr, &ctxobjptr, - /*mark current*/ true)) { + &ptr, &ctxobjptr)) { return true; } Modified: AppleSGLX/trunk/apple_glx_pixmap.c =================================================================== --- AppleSGLX/trunk/apple_glx_pixmap.c 2009-02-19 07:15:19 UTC (rev 175) +++ AppleSGLX/trunk/apple_glx_pixmap.c 2009-02-19 22:39:03 UTC (rev 176) @@ -38,6 +38,7 @@ #include "apple_visual.h" #include "apple_glx_pixmap.h" #include "appledri.h" +#include "glcontextmodes.h" struct apple_glx_pixmap { GLXPixmap xpixmap; @@ -48,8 +49,9 @@ int fd; CGLPixelFormatObj pixel_format_obj; CGLContextObj context_obj; - bool is_current; - struct apple_glx_pixmap *next, *previous; + GLint fbconfigID; + + struct apple_glx_pixmap *next, *previous; }; static pthread_mutex_t pixmap_lock = PTHREAD_MUTEX_INITIALIZER; @@ -99,6 +101,7 @@ struct apple_glx_pixmap *p; bool double_buffered; CGLError error; + const __GLcontextModes *cmodes = mode; p = malloc(sizeof(*p)); @@ -149,9 +152,9 @@ free(p); return true; } + + p->fbconfigID = cmodes->fbconfigID; - p->is_current = false; - lock_pixmap_list(); p->previous = NULL; @@ -224,7 +227,7 @@ bool apple_glx_pixmap_data(Display *dpy, GLXPixmap pixmap, int *width, int *height, int *pitch, int *bpp, void **ptr, - void **contextptr, bool mark_current) { + void **contextptr) { struct apple_glx_pixmap *p; bool result = false; @@ -237,9 +240,7 @@ *bpp = p->bpp; *ptr = p->buffer; *contextptr = p->context_obj; - - p->is_current = mark_current; - + result = true; } @@ -247,3 +248,34 @@ return result; } + + +bool apple_glx_pixmap_query(GLXPixmap pixmap, int attr, unsigned int *value) { + bool result = false; + struct apple_glx_pixmap *p; + + lock_pixmap_list(); + + if(find_pixmap(pixmap, &p)) { + switch(attr) { + case GLX_WIDTH: + *value = p->width; + result = true; + break; + + case GLX_HEIGHT: + *value = p->height; + result = true; + break; + + case GLX_FBCONFIG_ID: + *value = p->fbconfigID; + result = true; + break; + } + } + + unlock_pixmap_list(); + + return result; +} Modified: AppleSGLX/trunk/apple_glx_pixmap.h =================================================================== --- AppleSGLX/trunk/apple_glx_pixmap.h 2009-02-19 07:15:19 UTC (rev 175) +++ AppleSGLX/trunk/apple_glx_pixmap.h 2009-02-19 22:39:03 UTC (rev 176) @@ -45,6 +45,9 @@ /* Returns true if the pixmap is valid, and there is data for it. */ bool apple_glx_pixmap_data(Display *dpy, GLXPixmap pixmap, int *width, int *height, int *pitch, int *bpp, void **ptr, - void **contextptr, bool mark_current); + void **contextptr); +bool apple_glx_pixmap_query(GLXPixmap pixmap, int attribute, + unsigned int *value); + #endif Modified: AppleSGLX/trunk/glx_pbuffer.c =================================================================== --- AppleSGLX/trunk/glx_pbuffer.c 2009-02-19 07:15:19 UTC (rev 175) +++ AppleSGLX/trunk/glx_pbuffer.c 2009-02-19 22:39:03 UTC (rev 176) @@ -42,6 +42,7 @@ //#include "glheader.h" #include "apple_glx_pbuffer.h" +#include "apple_glx_pixmap.h" /** * Change a drawable's attribute. @@ -650,6 +651,10 @@ GLXContext gc = __glXGetCurrentContext(); xError error; + + if(apple_glx_pixmap_query(drawable, attribute, value)) + return; /*done*/ + switch(attribute) { case GLX_WIDTH: { int width;

1 0

[175] AppleSGLX/trunk/tests/cgl_growth.c
by source_changes＠macosforge.org 19 Feb '09

19 Feb '09

Revision: 175 http://trac.macosforge.org/projects/xquartz/changeset/175 Author: gstaplin(a)apple.com Date: 2009-02-18 23:15:19 -0800 (Wed, 18 Feb 2009) Log Message: ----------- The memory leak that I found earlier seems to be in CGL. This is a test case that duplicates the problem using pure CGL and C. Added Paths: ----------- AppleSGLX/trunk/tests/cgl_growth.c Added: AppleSGLX/trunk/tests/cgl_growth.c =================================================================== --- AppleSGLX/trunk/tests/cgl_growth.c (rev 0) +++ AppleSGLX/trunk/tests/cgl_growth.c 2009-02-19 07:15:19 UTC (rev 175) @@ -0,0 +1,128 @@ +/* Test case for a CGL leak that seems to involve glRectf and only occurs + * with CGLSetOffScreen (from what I've seen so far). + * Author: George Staplin. + */ + +#include <stdio.h> +#include <stdlib.h> +#include <OpenGL/CGLCurrent.h> +#include <OpenGL/CGLTypes.h> +#include <OpenGL/OpenGL.h> + +int main(int argc, char *argv[]) { + CGLPixelFormatAttribute attr[60]; + CGLPixelFormatObj pfobj; + CGLContextObj ctxobj; + int numattr = 0; + GLint vsref = 0; + CGLError error; + int width, height, pitch; + void *ptr; + double rcolor, gcolor, bcolor; + + attr[numattr++] = kCGLPFAOffScreen; + attr[numattr++] = kCGLPFAColorSize; + attr[numattr++] = 32; + +#if 0 + attr[numattr++] = kCGLPFAColorSize; + attr[numattr++] = 24; +#endif + attr[numattr++] = kCGLPFAAlphaSize; + attr[numattr++] = 8; + attr[numattr++] = kCGLPFAAccumSize; + attr[numattr++] = 32; + attr[numattr++] = 0; + + width = 300; + height = 300; + pitch = width * 4; + + ptr = malloc(pitch * height); + if(NULL == ptr) + abort(); + + rcolor = 0.0; + gcolor = 0.0; + bcolor = 0.0; + +#if 0 + while(1) { + error = CGLChoosePixelFormat(attr, &pfobj, &vsref); + + if(kCGLNoError != error) + abort(); + + error = CGLCreateContext(pfobj, NULL, &ctxobj); + + if(kCGLNoError != error) + abort(); + + error = CGLSetCurrentContext(ctxobj); + + if(kCGLNoError != error) + abort(); + + CGLSetCurrentContext(NULL); + CGLDestroyPixelFormat(pfobj); + CGLDestroyContext(ctxobj); + } + +#else + /* This is the leak path with glRectf. */ + while(1) { + error = CGLChoosePixelFormat(attr, &pfobj, &vsref); + + if(kCGLNoError != error) + abort(); + + error = CGLCreateContext(pfobj, NULL, &ctxobj); + + if(kCGLNoError != error) + abort(); + + error = CGLSetCurrentContext(ctxobj); + + if(kCGLNoError != error) + abort(); + + error = CGLSetOffScreen(ctxobj, width, height, pitch, ptr); + + if(kCGLNoError != error) + abort(); + + glShadeModel( GL_FLAT ); + glClearColor( 0.5, 0.5, 0.5, 1.0 ); + glClear( GL_COLOR_BUFFER_BIT ); + glViewport( 0, 0, 300, 300 ); + glOrtho( -1.0, 1.0, -1.0, 1.0, -1.0, 1.0 ); + glColor3f( rcolor, gcolor, bcolor); + /* The glRectf makes the whole process grow RPRVT in Leopard. */ + /* Try to comment this out and watch how the bug goes away: */ + glRectf( -0.75, -0.75, 0.75, 0.75 ); + + rcolor += 0.01; + gcolor += 0.02; + bcolor += 0.03; + + if(rcolor >= 1.0) + rcolor = 0.0; + + if(gcolor >= 1.0) + gcolor = 0.0; + + if(bcolor >= 1.0) + bcolor = 0.0; + + CGLClearDrawable(ctxobj); + + CGLSetCurrentContext(NULL); + CGLDestroyPixelFormat(pfobj); + CGLDestroyContext(ctxobj); + + printf("r %g b %g b %g\n", rcolor, gcolor, bcolor); + } +#endif + + return EXIT_FAILURE; +}

1 0

[174] AppleSGLX/trunk/apple_glx_pixmap.c
by source_changes＠macosforge.org 19 Feb '09

19 Feb '09

Revision: 174 http://trac.macosforge.org/projects/xquartz/changeset/174 Author: gstaplin(a)apple.com Date: 2009-02-18 21:41:17 -0800 (Wed, 18 Feb 2009) Log Message: ----------- Improve apple_glx_pixmap_destroy error handling in an effort to determine where something seems to be leaking memory. /usr/bin/leaks doesn't find the missing allocation, and it's not related to the drawable structures leaking from what I gather with the new introspection of the drawables count. It's not a big leak, but it's a noticeable leak after some time. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_pixmap.c Modified: AppleSGLX/trunk/apple_glx_pixmap.c =================================================================== --- AppleSGLX/trunk/apple_glx_pixmap.c 2009-02-19 05:22:57 UTC (rev 173) +++ AppleSGLX/trunk/apple_glx_pixmap.c 2009-02-19 05:41:17 UTC (rev 174) @@ -170,7 +170,7 @@ void apple_glx_pixmap_destroy(Display *dpy, GLXPixmap pixmap) { struct apple_glx_pixmap *p; - + lock_pixmap_list(); if(find_pixmap(pixmap, &p)) { @@ -181,10 +181,18 @@ (void)apple_cgl.destroy_pixel_format(p->pixel_format_obj); (void)apple_cgl.destroy_context(p->context_obj); XAppleDRIDestroyPixmap(dpy, pixmap); - munmap(p->buffer, p->size); - close(p->fd); - shm_unlink(p->path); + if(munmap(p->buffer, p->size)) + perror("munmap"); + + if(-1 == close(p->fd)) + perror("close"); + + if(shm_unlink(p->path)) + perror("shm_unlink"); + + /* Delink the pixmap from the pixmap_list. */ + if(p->previous) { p->previous->next = p->next; } else {

1 0

[173] AppleSGLX/trunk
by source_changes＠macosforge.org 19 Feb '09

19 Feb '09

Revision: 173 http://trac.macosforge.org/projects/xquartz/changeset/173 Author: gstaplin(a)apple.com Date: 2009-02-18 21:22:57 -0800 (Wed, 18 Feb 2009) Log Message: ----------- Rename the drawables global list to drawables_list. Add apple_glx_get_drawable_count() for use with debugging a resource leak. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_drawable.c AppleSGLX/trunk/apple_glx_drawable.h Modified: AppleSGLX/trunk/apple_glx_drawable.c =================================================================== --- AppleSGLX/trunk/apple_glx_drawable.c 2009-02-19 05:08:28 UTC (rev 172) +++ AppleSGLX/trunk/apple_glx_drawable.c 2009-02-19 05:22:57 UTC (rev 173) @@ -39,7 +39,7 @@ #include "appledri.h" static pthread_mutex_t drawables_lock = PTHREAD_MUTEX_INITIALIZER; -static struct apple_glx_drawable *drawables = NULL; +static struct apple_glx_drawable *drawables_list = NULL; static void lock_drawables_list(void) { int err; @@ -75,7 +75,7 @@ * 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; i; i = i->next) { + for(i = drawables_list; i; i = i->next) { if(i->drawable == drawable) { agd = i; break; @@ -174,7 +174,7 @@ * The item must be at the head of the list, if it * has no previous pointer. */ - drawables = agd->next; + drawables_list = agd->next; } if(agd->next) @@ -287,12 +287,12 @@ lock_drawables_list(); /* Link the new drawable into the global list. */ - agd->next = drawables; + agd->next = drawables_list; - if(drawables) - drawables->previous = agd; + if(drawables_list) + drawables_list->previous = agd; - drawables = agd; + drawables_list = agd; unlock_drawables_list(); @@ -319,7 +319,7 @@ int (*old_handler)(Display *, XErrorEvent *); - if(NULL == drawables) + if(NULL == drawables_list) return; old_handler = XSetErrorHandler(error_handler); @@ -328,7 +328,7 @@ lock_drawables_list(); - for(d = drawables; d;) { + for(d = drawables_list; d;) { dnext = d->next; d->lock(d); @@ -372,3 +372,17 @@ unlock_drawables_list(); } + +unsigned int apple_glx_get_drawable_count(void) { + unsigned int result = 0; + struct apple_glx_drawable *d; + + lock_drawables_list(); + + for(d = drawables_list; d; d = d->next) + ++result; + + unlock_drawables_list(); + + return result; +} Modified: AppleSGLX/trunk/apple_glx_drawable.h =================================================================== --- AppleSGLX/trunk/apple_glx_drawable.h 2009-02-19 05:08:28 UTC (rev 172) +++ AppleSGLX/trunk/apple_glx_drawable.h 2009-02-19 05:22:57 UTC (rev 173) @@ -98,4 +98,10 @@ void apple_glx_destroy_drawable_in_any(Display *dpy, GLXDrawable d); +/* + * This returns the total number of drawables. + * It's mostly intended for debugging and introspection. + */ +unsigned int apple_glx_get_drawable_count(void); + #endif

1 0

[172] AppleSGLX/trunk/tests/glxpixmap/glxpixmap_create_destroy.c
by source_changes＠macosforge.org 19 Feb '09

19 Feb '09

Revision: 172 http://trac.macosforge.org/projects/xquartz/changeset/172 Author: gstaplin(a)apple.com Date: 2009-02-18 21:08:28 -0800 (Wed, 18 Feb 2009) Log Message: ----------- Greatly improve the create and destroy GLXPixmap test. This creates and destroys GLXPixmaps, as well as the base pixmap, and draws with Xlib and OpenGL to the same drawable. It's quite nice looking too. Modified Paths: -------------- AppleSGLX/trunk/tests/glxpixmap/glxpixmap_create_destroy.c Modified: AppleSGLX/trunk/tests/glxpixmap/glxpixmap_create_destroy.c =================================================================== --- AppleSGLX/trunk/tests/glxpixmap/glxpixmap_create_destroy.c 2009-02-19 04:41:03 UTC (rev 171) +++ AppleSGLX/trunk/tests/glxpixmap/glxpixmap_create_destroy.c 2009-02-19 05:08:28 UTC (rev 172) @@ -13,10 +13,12 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <unistd.h> static GLXContext ctx; static XVisualInfo *visinfo; static GC gc; +static GC rectgc; static Window make_rgb_window( Display *dpy, unsigned int width, unsigned int height ) @@ -158,6 +160,8 @@ Pixmap pm; GLXPixmap glxpm; int eventbase, errorbase; + double rcolor, gcolor, bcolor; + XGCValues gcval; dpy = XOpenDisplay(NULL); @@ -176,6 +180,10 @@ XMapWindow(dpy, win); + rcolor = 0.0; + gcolor = 0.0; + bcolor = 0.0; + while(1) { glxpm = make_pixmap( dpy, win, 300, 300, &pm ); @@ -194,15 +202,46 @@ glClear( GL_COLOR_BUFFER_BIT ); glViewport( 0, 0, 300, 300 ); glOrtho( -1.0, 1.0, -1.0, 1.0, -1.0, 1.0 ); - glColor3f( 0.0, 0.0, 1.0 ); + glColor3f( rcolor, gcolor, bcolor); glRectf( -0.75, -0.75, 0.75, 0.75 ); glFlush(); glFinish(); + gcval.foreground = WhitePixel(dpy, DefaultScreen(dpy)); + + rectgc = XCreateGC(dpy, pm, GCForeground, &gcval); + + XFillRectangle(dpy, pm, rectgc, 130, 130, 40, 40); + + XCopyArea( dpy, pm, win, + gc, 0, 0, 300, 300, /* gc, src pos, size */ + 0, 0 ); + + glXWaitX(); + + XFreeGC(dpy, rectgc); + glXMakeCurrent(dpy, None, ctx); glXDestroyGLXPixmap(dpy, glxpm); + + XFreePixmap(dpy, pm); + + rcolor += 0.01; + gcolor += 0.02; + bcolor += 0.03; + + if(rcolor >= 1.0) + rcolor = 0.0; + + if(gcolor >= 1.0) + gcolor = 0.0; + + if(bcolor >= 1.0) + bcolor = 0.0; + + usleep(5000); } /* NOT REACHED */

1 0

[171] AppleSGLX/trunk/appledristr.h
by source_changes＠macosforge.org 19 Feb '09

19 Feb '09

Revision: 171 http://trac.macosforge.org/projects/xquartz/changeset/171 Author: gstaplin(a)apple.com Date: 2009-02-18 20:41:03 -0800 (Wed, 18 Feb 2009) Log Message: ----------- Add a missing B16 to the length of the AppleDRI DestroyPixmapReq. This isn't strictly needed AFAIK, because the B16 macros are no-ops IIRC, but who knows what the future may bring, and the rest of the structs use the macros. Modified Paths: -------------- AppleSGLX/trunk/appledristr.h Modified: AppleSGLX/trunk/appledristr.h =================================================================== --- AppleSGLX/trunk/appledristr.h 2009-02-19 04:22:27 UTC (rev 170) +++ AppleSGLX/trunk/appledristr.h 2009-02-19 04:41:03 UTC (rev 171) @@ -226,7 +226,7 @@ typedef struct { CARD8 reqType; /*1*/ CARD8 driReqType; /*2*/ - CARD16 length; /*4*/ + CARD16 length B16; /*4*/ CARD32 drawable B32; /*8*/ } xAppleDRIDestroyPixmapReq;

1 0

[170] AppleSGLX/trunk/tests
by source_changes＠macosforge.org 19 Feb '09

19 Feb '09

Revision: 170 http://trac.macosforge.org/projects/xquartz/changeset/170 Author: gstaplin(a)apple.com Date: 2009-02-18 20:22:27 -0800 (Wed, 18 Feb 2009) Log Message: ----------- Add create/destroy test for GLXPixmaps. Modified Paths: -------------- AppleSGLX/trunk/tests/glxpixmap/glxpixmap.mk AppleSGLX/trunk/tests/tests.mk Added Paths: ----------- AppleSGLX/trunk/tests/glxpixmap/glxpixmap_create_destroy.c Modified: AppleSGLX/trunk/tests/glxpixmap/glxpixmap.mk =================================================================== --- AppleSGLX/trunk/tests/glxpixmap/glxpixmap.mk 2009-02-18 19:52:08 UTC (rev 169) +++ AppleSGLX/trunk/tests/glxpixmap/glxpixmap.mk 2009-02-19 04:22:27 UTC (rev 170) @@ -1,2 +1,6 @@ $(TEST_BUILD_DIR)/glxpixmap: tests/glxpixmap/glxpixmap.c $(LIBGL) $(CC) tests/glxpixmap/glxpixmap.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/glxpixmap $(LINK_TEST) + +$(TEST_BUILD_DIR)/glxpixmap_create_destroy: tests/glxpixmap/glxpixmap_create_destroy.c $(LIBGL) + $(CC) tests/glxpixmap/glxpixmap_create_destroy.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/glxpixmap_create_destroy $(LINK_TEST) + Added: AppleSGLX/trunk/tests/glxpixmap/glxpixmap_create_destroy.c =================================================================== --- AppleSGLX/trunk/tests/glxpixmap/glxpixmap_create_destroy.c (rev 0) +++ AppleSGLX/trunk/tests/glxpixmap/glxpixmap_create_destroy.c 2009-02-19 04:22:27 UTC (rev 170) @@ -0,0 +1,212 @@ + + +/* + * A demonstration of using the GLXPixmap functions. This program is in + * the public domain. + * + * Brian Paul + */ + + +#include <GL/gl.h> +#include <GL/glx.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + +static GLXContext ctx; +static XVisualInfo *visinfo; +static GC gc; + +static Window make_rgb_window( Display *dpy, + unsigned int width, unsigned int height ) +{ + const int sbAttrib[] = { GLX_RGBA, + GLX_RED_SIZE, 1, + GLX_GREEN_SIZE, 1, + GLX_BLUE_SIZE, 1, + None }; + const int dbAttrib[] = { GLX_RGBA, + GLX_RED_SIZE, 1, + GLX_GREEN_SIZE, 1, + GLX_BLUE_SIZE, 1, + GLX_DOUBLEBUFFER, + None }; + int scrnum; + XSetWindowAttributes attr; + unsigned long mask; + Window root; + Window win; + + scrnum = DefaultScreen( dpy ); + root = RootWindow( dpy, scrnum ); + + visinfo = glXChooseVisual( dpy, scrnum, (int *) sbAttrib ); + if (!visinfo) { + visinfo = glXChooseVisual( dpy, scrnum, (int *) dbAttrib ); + if (!visinfo) { + printf("Error: couldn't get an RGB visual\n"); + exit(1); + } + } + + /* window attributes */ + attr.background_pixel = 0; + attr.border_pixel = 0; + /* TODO: share root colormap if possible */ + attr.colormap = XCreateColormap( dpy, root, visinfo->visual, AllocNone); + attr.event_mask = StructureNotifyMask | ExposureMask; + mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; + + win = XCreateWindow( dpy, root, 0, 0, width, height, + 0, visinfo->depth, InputOutput, + visinfo->visual, mask, &attr ); + + /* make an X GC so we can do XCopyArea later */ + gc = XCreateGC( dpy, win, 0, NULL ); + + /* need indirect context */ + ctx = glXCreateContext( dpy, visinfo, NULL, False ); + if (!ctx) { + printf("Error: glXCreateContext failed\n"); + exit(-1); + } + + printf("Direct rendering: %s\n", glXIsDirect(dpy, ctx) ? "Yes" : "No"); + + return win; +} + + +static GLXPixmap make_pixmap( Display *dpy, Window win, + unsigned int width, unsigned int height, + Pixmap *pixmap) +{ + Pixmap pm; + GLXPixmap glxpm; + XWindowAttributes attr; + + pm = XCreatePixmap( dpy, win, width, height, visinfo->depth ); + if (!pm) { + printf("Error: XCreatePixmap failed\n"); + exit(-1); + } + + XGetWindowAttributes( dpy, win, &attr ); + + printf("pm %lx\n", pm); + /* + * IMPORTANT: + * Use the glXCreateGLXPixmapMESA funtion when using Mesa because + * Mesa needs to know the colormap associated with a pixmap in order + * to render correctly. This is because Mesa allows RGB rendering + * into any kind of visual, not just TrueColor or DirectColor. + */ +#ifdef GLX_MESA_pixmap_colormap + if (strstr(glXQueryExtensionsString(dpy, 0), "GLX_MESA_pixmap_colormap")) { + /* stand-alone Mesa, specify the colormap */ + glxpm = glXCreateGLXPixmapMESA( dpy, visinfo, pm, attr.colormap ); + } + else { + glxpm = glXCreateGLXPixmap( dpy, visinfo, pm ); + } +#else + /* This will work with Mesa too if the visual is TrueColor or DirectColor */ + glxpm = glXCreateGLXPixmap( dpy, visinfo, pm ); +#endif + + if (!glxpm) { + printf("Error: GLXCreateGLXPixmap failed\n"); + exit(-1); + } + + *pixmap = pm; + + return glxpm; +} + + + +static void event_loop( Display *dpy, GLXPixmap pm ) +{ + XEvent event; + + while (1) { + XNextEvent( dpy, &event ); + + switch (event.type) { + case Expose: + printf("Redraw\n"); + /* copy the image from GLXPixmap to window */ + XCopyArea( dpy, pm, event.xany.window, /* src, dest */ + gc, 0, 0, 300, 300, /* gc, src pos, size */ + 0, 0 ); /* dest pos */ + break; + case ConfigureNotify: + /* nothing */ + break; + } + } +} + + + +int main( int argc, char *argv[] ) +{ + Display *dpy; + Window win; + Pixmap pm; + GLXPixmap glxpm; + int eventbase, errorbase; + + dpy = XOpenDisplay(NULL); + + if(NULL == dpy) { + fprintf(stderr, "error: opening display\n"); + return EXIT_FAILURE; + } + + if(!glXQueryExtension(dpy, &eventbase, &errorbase)) { + fprintf(stderr, "GLX is not available!\n"); + return EXIT_FAILURE; + } + + + win = make_rgb_window( dpy, 300, 300 ); + + XMapWindow(dpy, win); + + while(1) { + glxpm = make_pixmap( dpy, win, 300, 300, &pm ); + + printf("glxpm 0x%lx\n", glxpm); + + if(!glXMakeCurrent(dpy, glxpm, ctx)) { + fprintf(stderr, "glXMakeCurrent failed!\n"); + return EXIT_FAILURE; + } + + printf("GL_RENDERER: %s\n", (char *) glGetString(GL_RENDERER)); + + /* Render an image into the pixmap */ + glShadeModel( GL_FLAT ); + glClearColor( 0.5, 0.5, 0.5, 1.0 ); + glClear( GL_COLOR_BUFFER_BIT ); + glViewport( 0, 0, 300, 300 ); + glOrtho( -1.0, 1.0, -1.0, 1.0, -1.0, 1.0 ); + glColor3f( 0.0, 0.0, 1.0 ); + glRectf( -0.75, -0.75, 0.75, 0.75 ); + glFlush(); + + glFinish(); + + glXMakeCurrent(dpy, None, ctx); + + glXDestroyGLXPixmap(dpy, glxpm); + } + + /* NOT REACHED */ + event_loop( dpy, pm ); + + return 0; +} Modified: AppleSGLX/trunk/tests/tests.mk =================================================================== --- AppleSGLX/trunk/tests/tests.mk 2009-02-18 19:52:08 UTC (rev 169) +++ AppleSGLX/trunk/tests/tests.mk 2009-02-19 04:22:27 UTC (rev 170) @@ -25,4 +25,5 @@ $(TEST_BUILD_DIR)/create_destroy_context_alone \ $(TEST_BUILD_DIR)/create_destroy_context_with_drawable \ $(TEST_BUILD_DIR)/create_destroy_context_with_drawable_2 \ - $(TEST_BUILD_DIR)/render_types + $(TEST_BUILD_DIR)/render_types \ + $(TEST_BUILD_DIR)/glxpixmap_create_destroy

1 0

[169] trunk/pkg/README.2.4.0.txt
by source_changes＠macosforge.org 18 Feb '09

18 Feb '09

Revision: 169 http://trac.macosforge.org/projects/xquartz/changeset/169 Author: jeremyhu(a)freedesktop.org Date: 2009-02-18 11:52:08 -0800 (Wed, 18 Feb 2009) Log Message: ----------- libXfont 1.4.0 Modified Paths: -------------- trunk/pkg/README.2.4.0.txt Modified: trunk/pkg/README.2.4.0.txt =================================================================== --- trunk/pkg/README.2.4.0.txt 2009-02-18 11:28:00 UTC (rev 168) +++ trunk/pkg/README.2.4.0.txt 2009-02-18 19:52:08 UTC (rev 169) @@ -38,6 +38,7 @@ * libxcb 1.2 * libX11 1.2 * libXext 1.0.5 + * libXfont 1.4.0 * libXrandr 1.2.99.4 * pixman 0.14.0 * xtrans 1.2.3

1 0

[168] AppleSGLX/trunk/apple_glx_pixmap.c
by source_changes＠macosforge.org 18 Feb '09

18 Feb '09

Revision: 168 http://trac.macosforge.org/projects/xquartz/changeset/168 Author: gstaplin(a)apple.com Date: 2009-02-18 03:28:00 -0800 (Wed, 18 Feb 2009) Log Message: ----------- If the current CGL context is from a GLXPixmap then set the CGL context to NULL when destroying the GLXPimap. Note: the previous commit also fixed a bug in free() ordering. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_pixmap.c Modified: AppleSGLX/trunk/apple_glx_pixmap.c =================================================================== --- AppleSGLX/trunk/apple_glx_pixmap.c 2009-02-18 11:23:56 UTC (rev 167) +++ AppleSGLX/trunk/apple_glx_pixmap.c 2009-02-18 11:28:00 UTC (rev 168) @@ -174,6 +174,10 @@ lock_pixmap_list(); if(find_pixmap(pixmap, &p)) { + if(p->context_obj == apple_cgl.get_current_context()) { + apple_cgl.set_current_context(NULL); + } + (void)apple_cgl.destroy_pixel_format(p->pixel_format_obj); (void)apple_cgl.destroy_context(p->context_obj); XAppleDRIDestroyPixmap(dpy, pixmap);

1 0

[167] AppleSGLX/trunk
by source_changes＠macosforge.org 18 Feb '09

18 Feb '09

Revision: 167 http://trac.macosforge.org/projects/xquartz/changeset/167 Author: gstaplin(a)apple.com Date: 2009-02-18 03:23:56 -0800 (Wed, 18 Feb 2009) Log Message: ----------- Make the OffScreen attribute not be enabled for every CGLPixelFormatObj. This works, but could use further testing, especially with context and drawable destruction when the active context was from a GLXPixmap. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_context.c AppleSGLX/trunk/apple_glx_pixmap.c AppleSGLX/trunk/apple_glx_pixmap.h AppleSGLX/trunk/apple_visual.c AppleSGLX/trunk/apple_visual.h AppleSGLX/trunk/glxcmds.c Modified: AppleSGLX/trunk/apple_glx_context.c =================================================================== --- AppleSGLX/trunk/apple_glx_context.c 2009-02-18 08:07:43 UTC (rev 166) +++ AppleSGLX/trunk/apple_glx_context.c 2009-02-18 11:23:56 UTC (rev 167) @@ -141,7 +141,7 @@ ac->made_current = false; apple_visual_create_pfobj(&ac->pixel_format_obj, mode, - &ac->double_buffered); + &ac->double_buffered, /*offscreen*/ false); error = apple_cgl.create_context(ac->pixel_format_obj, sharedac ? sharedac->context_obj : NULL, @@ -427,17 +427,30 @@ case APPLE_GLX_DRAWABLE_PIXMAP: { int width, height, pitch, bpp; void *ptr; - + CGLContextObj ctxobj; + void *ctxobjptr; apple_cgl.clear_drawable(ac->context_obj); if(false == apple_glx_pixmap_data(dpy, ac->drawable->drawable, &width, &height, &pitch, &bpp, - &ptr)) { + &ptr, &ctxobjptr, + /*mark current*/ true)) { return true; } + + ctxobj = ctxobjptr; - cglerr = apple_cgl.set_off_screen(ac->context_obj, width, height, + cglerr = apple_cgl.set_current_context(ctxobj); + + if(kCGLNoError != cglerr) { + fprintf(stderr, "set current context: %s\n", + apple_cgl.error_string(cglerr)); + + return true; + } + + cglerr = apple_cgl.set_off_screen(ctxobj, width, height, pitch, ptr); if(kCGLNoError != cglerr) { Modified: AppleSGLX/trunk/apple_glx_pixmap.c =================================================================== --- AppleSGLX/trunk/apple_glx_pixmap.c 2009-02-18 08:07:43 UTC (rev 166) +++ AppleSGLX/trunk/apple_glx_pixmap.c 2009-02-18 11:23:56 UTC (rev 167) @@ -34,6 +34,8 @@ #include <sys/types.h> #include <sys/mman.h> #include <unistd.h> +#include "apple_cgl.h" +#include "apple_visual.h" #include "apple_glx_pixmap.h" #include "appledri.h" @@ -44,6 +46,9 @@ size_t size; char path[PATH_MAX]; int fd; + CGLPixelFormatObj pixel_format_obj; + CGLContextObj context_obj; + bool is_current; struct apple_glx_pixmap *next, *previous; }; @@ -89,9 +94,12 @@ /* Return true if an error occurred. */ -bool apple_glx_pixmap_create(Display *dpy, int screen, Pixmap pixmap) { +bool apple_glx_pixmap_create(Display *dpy, int screen, Pixmap pixmap, + const void *mode) { struct apple_glx_pixmap *p; - + bool double_buffered; + CGLError error; + p = malloc(sizeof(*p)); p->xpixmap = pixmap; @@ -127,6 +135,23 @@ return true; } + apple_visual_create_pfobj(&p->pixel_format_obj, mode, &double_buffered, + /*offscreen*/ true); + + error = apple_cgl.create_context(p->pixel_format_obj, NULL, + &p->context_obj); + + if(kCGLNoError != error) { + (void)apple_cgl.destroy_pixel_format(p->pixel_format_obj); + munmap(p->buffer, p->size); + XAppleDRIDestroyPixmap(dpy, pixmap); + shm_unlink(p->path); + free(p); + return true; + } + + p->is_current = false; + lock_pixmap_list(); p->previous = NULL; @@ -149,11 +174,12 @@ lock_pixmap_list(); if(find_pixmap(pixmap, &p)) { + (void)apple_cgl.destroy_pixel_format(p->pixel_format_obj); + (void)apple_cgl.destroy_context(p->context_obj); XAppleDRIDestroyPixmap(dpy, pixmap); munmap(p->buffer, p->size); close(p->fd); shm_unlink(p->path); - free(p); if(p->previous) { p->previous->next = p->next; @@ -163,6 +189,8 @@ if(p->next) p->next->previous = p->previous; + + free(p); } unlock_pixmap_list(); @@ -183,7 +211,8 @@ } bool apple_glx_pixmap_data(Display *dpy, GLXPixmap pixmap, int *width, - int *height, int *pitch, int *bpp, void **ptr) { + int *height, int *pitch, int *bpp, void **ptr, + void **contextptr, bool mark_current) { struct apple_glx_pixmap *p; bool result = false; @@ -195,6 +224,10 @@ *pitch = p->pitch; *bpp = p->bpp; *ptr = p->buffer; + *contextptr = p->context_obj; + + p->is_current = mark_current; + result = true; } Modified: AppleSGLX/trunk/apple_glx_pixmap.h =================================================================== --- AppleSGLX/trunk/apple_glx_pixmap.h 2009-02-18 08:07:43 UTC (rev 166) +++ AppleSGLX/trunk/apple_glx_pixmap.h 2009-02-18 11:23:56 UTC (rev 167) @@ -33,8 +33,10 @@ #include <limits.h> #include "GL/glx.h" +/* mode is a __GLcontextModes * */ /* Returns true if an error occurred. */ -bool apple_glx_pixmap_create(Display *dpy, int screen, Pixmap pixmap); +bool apple_glx_pixmap_create(Display *dpy, int screen, Pixmap pixmap, + const void *mode); void apple_glx_pixmap_destroy(Display *dpy, Pixmap pixmap); @@ -42,6 +44,7 @@ /* Returns true if the pixmap is valid, and there is data for it. */ bool apple_glx_pixmap_data(Display *dpy, GLXPixmap pixmap, int *width, - int *height, int *pitch, int *bpp, void **ptr); + int *height, int *pitch, int *bpp, void **ptr, + void **contextptr, bool mark_current); #endif Modified: AppleSGLX/trunk/apple_visual.c =================================================================== --- AppleSGLX/trunk/apple_visual.c 2009-02-18 08:07:43 UTC (rev 166) +++ AppleSGLX/trunk/apple_visual.c 2009-02-18 11:23:56 UTC (rev 167) @@ -35,24 +35,24 @@ #include <OpenGL/CGLContext.h> #include "glcontextmodes.h" #include "apple_cgl.h" +#include "apple_visual.h" /*mode is a __GlcontextModes*/ void apple_visual_create_pfobj(CGLPixelFormatObj *pfobj, const void *mode, - bool *double_buffered) { + bool *double_buffered, bool offscreen) { CGLPixelFormatAttribute attr[60]; const __GLcontextModes *c = mode; int numattr = 0; GLint vsref = 0; CGLError error = 0; -#if 1 - /*TODO we only need this sometimes -- for GLXPixmaps!*/ - attr[numattr++] = kCGLPFAOffScreen; + if(offscreen) { + attr[numattr++] = kCGLPFAOffScreen; + + attr[numattr++] = kCGLPFAColorSize; + attr[numattr++] = 32; + } - attr[numattr++] = kCGLPFAColorSize; - attr[numattr++] = 32; -#endif - if(c->stereoMode) attr[numattr++] = kCGLPFAStereo; Modified: AppleSGLX/trunk/apple_visual.h =================================================================== --- AppleSGLX/trunk/apple_visual.h 2009-02-18 08:07:43 UTC (rev 166) +++ AppleSGLX/trunk/apple_visual.h 2009-02-18 11:23:56 UTC (rev 167) @@ -30,10 +30,11 @@ #ifndef APPLE_VISUAL_H #define APPLE_VISUAL_H +#include <stdbool.h> #include <OpenGL/CGLTypes.h> /* mode is expected to be of type __GLcontextModes. */ void apple_visual_create_pfobj(CGLPixelFormatObj *pfobj, const void *mode, - bool *double_buffered); + bool *double_buffered, bool offscreen); #endif Modified: AppleSGLX/trunk/glxcmds.c =================================================================== --- AppleSGLX/trunk/glxcmds.c 2009-02-18 08:07:43 UTC (rev 166) +++ AppleSGLX/trunk/glxcmds.c 2009-02-18 11:23:56 UTC (rev 167) @@ -682,7 +682,13 @@ PUBLIC GLXPixmap glXCreateGLXPixmap(Display *dpy, XVisualInfo *vis, Pixmap pixmap) { - if(apple_glx_pixmap_create(dpy, vis->screen, pixmap)) + int screen = vis->screen; + __GLXscreenConfigs *const psc = GetGLXScreenConfigs(dpy, screen); + const __GLcontextModes *mode; + + mode = _gl_context_modes_find_visual(psc->visuals, vis->visualid); + + if(apple_glx_pixmap_create(dpy, vis->screen, pixmap, mode)) return None; return pixmap;

1 0