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

[156] AppleSGLX/trunk/apple_glx_context.c
by source_changes＠macosforge.org 16 Feb '09

16 Feb '09

Revision: 156 http://trac.macosforge.org/projects/xquartz/changeset/156 Author: gstaplin(a)apple.com Date: 2009-02-16 15:57:14 -0800 (Mon, 16 Feb 2009) Log Message: ----------- Use the new pitch from the apple pixmap API in the make current code. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_context.c Modified: AppleSGLX/trunk/apple_glx_context.c =================================================================== --- AppleSGLX/trunk/apple_glx_context.c 2009-02-16 23:56:05 UTC (rev 155) +++ AppleSGLX/trunk/apple_glx_context.c 2009-02-16 23:57:14 UTC (rev 156) @@ -425,25 +425,20 @@ break; case APPLE_GLX_DRAWABLE_PIXMAP: { - int width, height; + int width, height, pitch, bpp; void *ptr; apple_cgl.clear_drawable(ac->context_obj); if(false == apple_glx_pixmap_data(dpy, ac->drawable->drawable, - &width, &height, + &width, &height, &pitch, &bpp, &ptr)) { - - - fprintf(stderr, "invalid GLXPixmap: 0x%lx\n", ac->drawable->drawable); return true; } - printf("%s ptr %p\n", __func__, ptr); - cglerr = apple_cgl.set_off_screen(ac->context_obj, width, height, - width * /*FIXME?*/ 4, ptr); + pitch, ptr); if(kCGLNoError != cglerr) { fprintf(stderr, "set off screen: %s\n",

1 0

[155] AppleSGLX/trunk
by source_changes＠macosforge.org 16 Feb '09

16 Feb '09

Revision: 155 http://trac.macosforge.org/projects/xquartz/changeset/155 Author: gstaplin(a)apple.com Date: 2009-02-16 15:56:05 -0800 (Mon, 16 Feb 2009) Log Message: ----------- Extend the apple pixmap API to support pitch and bytes per pixel (bpp). Modified Paths: -------------- AppleSGLX/trunk/apple_glx_pixmap.c AppleSGLX/trunk/apple_glx_pixmap.h Modified: AppleSGLX/trunk/apple_glx_pixmap.c =================================================================== --- AppleSGLX/trunk/apple_glx_pixmap.c 2009-02-16 23:46:31 UTC (rev 154) +++ AppleSGLX/trunk/apple_glx_pixmap.c 2009-02-16 23:56:05 UTC (rev 155) @@ -183,7 +183,7 @@ } bool apple_glx_pixmap_data(Display *dpy, GLXPixmap pixmap, int *width, - int *height, void **ptr) { + int *height, int *pitch, int *bpp, void **ptr) { struct apple_glx_pixmap *p; bool result = false; @@ -192,6 +192,8 @@ if(find_pixmap(pixmap, &p)) { *width = p->width; *height = p->height; + *pitch = p->pitch; + *bpp = p->bpp; *ptr = p->buffer; result = true; } @@ -200,4 +202,3 @@ return result; } - Modified: AppleSGLX/trunk/apple_glx_pixmap.h =================================================================== --- AppleSGLX/trunk/apple_glx_pixmap.h 2009-02-16 23:46:31 UTC (rev 154) +++ AppleSGLX/trunk/apple_glx_pixmap.h 2009-02-16 23:56:05 UTC (rev 155) @@ -42,6 +42,6 @@ /* 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, void **ptr); + int *height, int *pitch, int *bpp, void **ptr); #endif

1 0

[154] AppleSGLX/trunk
by source_changes＠macosforge.org 16 Feb '09

16 Feb '09

Revision: 154 http://trac.macosforge.org/projects/xquartz/changeset/154 Author: gstaplin(a)apple.com Date: 2009-02-16 15:46:31 -0800 (Mon, 16 Feb 2009) Log Message: ----------- Make the AppleDRI interface a bit more robust with regard to buffer sizes, and changes to the implementation, if for example another surface library is used at some point in the future. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_pixmap.c AppleSGLX/trunk/appledri.c AppleSGLX/trunk/appledri.h AppleSGLX/trunk/appledristr.h Modified: AppleSGLX/trunk/apple_glx_pixmap.c =================================================================== --- AppleSGLX/trunk/apple_glx_pixmap.c 2009-02-16 23:42:57 UTC (rev 153) +++ AppleSGLX/trunk/apple_glx_pixmap.c 2009-02-16 23:46:31 UTC (rev 154) @@ -40,7 +40,7 @@ struct apple_glx_pixmap { GLXPixmap xpixmap; void *buffer; - int width, height; + int width, height, pitch, /*bytes per pixel*/ bpp; size_t size; char path[PATH_MAX]; int fd; @@ -98,8 +98,8 @@ p->buffer = NULL; if(!XAppleDRICreatePixmap(dpy, screen, pixmap, - &p->width, &p->height, &p->size, - p->path, PATH_MAX)) { + &p->width, &p->height, &p->pitch, &p->bpp, + &p->size, p->path, PATH_MAX)) { free(p); return true; } Modified: AppleSGLX/trunk/appledri.c =================================================================== --- AppleSGLX/trunk/appledri.c 2009-02-16 23:42:57 UTC (rev 153) +++ AppleSGLX/trunk/appledri.c 2009-02-16 23:46:31 UTC (rev 154) @@ -370,8 +370,8 @@ } Bool XAppleDRICreatePixmap(Display *dpy, int screen, Drawable drawable, - int *width, int *height, size_t *size, - char *bufname, size_t bufnamesize) { + int *width, int *height, int *pitch, int *bpp, + size_t *size, char *bufname, size_t bufnamesize) { XExtDisplayInfo *info = find_display(dpy); xAppleDRICreatePixmapReq *req; xAppleDRICreatePixmapReply rep; @@ -402,6 +402,8 @@ *width = rep.width; *height = rep.height; + *pitch = rep.pitch; + *bpp = rep.bpp; *size = rep.size; UnlockDisplay(dpy); Modified: AppleSGLX/trunk/appledri.h =================================================================== --- AppleSGLX/trunk/appledri.h 2009-02-16 23:42:57 UTC (rev 153) +++ AppleSGLX/trunk/appledri.h 2009-02-16 23:46:31 UTC (rev 154) @@ -113,8 +113,8 @@ Bool XAppleDRISwapBuffers(Display *dpy, int screen, Drawable drawable); Bool XAppleDRICreatePixmap(Display *dpy, int screen, Drawable drawable, - int *width, int *height, size_t *size, - char *bufname, size_t bufnamesize); + int *width, int *height, int *pitch, int *bpp, + size_t *size, char *bufname, size_t bufnamesize); Bool XAppleDRIDestroyPixmap(Display *dpy, Pixmap pixmap); Modified: AppleSGLX/trunk/appledristr.h =================================================================== --- AppleSGLX/trunk/appledristr.h 2009-02-16 23:42:57 UTC (rev 153) +++ AppleSGLX/trunk/appledristr.h 2009-02-16 23:46:31 UTC (rev 154) @@ -215,10 +215,10 @@ CARD32 length B32; /*8*/ CARD32 width B32; /*12*/ CARD32 height B32; /*16*/ - CARD32 size B32; /*20*/ - CARD32 stringLength B32; /*24*/ - CARD32 pad2; /*28*/ - CARD32 pad3; /*32*/ + CARD32 pitch B32; /*20*/ + CARD32 bpp B32; /*24*/ + CARD32 size B32; /*28*/ + CARD32 stringLength B32; /*32*/ } xAppleDRICreatePixmapReply; #define sz_xAppleDRICreatePixmapReply 32

1 0

[153] AppleSGLX/trunk/Makefile
by source_changes＠macosforge.org 16 Feb '09

16 Feb '09

Revision: 153 http://trac.macosforge.org/projects/xquartz/changeset/153 Author: gstaplin(a)apple.com Date: 2009-02-16 15:42:57 -0800 (Mon, 16 Feb 2009) Log Message: ----------- Add a depedency to the apple_glx_pixmap target for appledri.h Modified Paths: -------------- AppleSGLX/trunk/Makefile Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-16 23:02:51 UTC (rev 152) +++ AppleSGLX/trunk/Makefile 2009-02-16 23:42:57 UTC (rev 153) @@ -90,7 +90,7 @@ apple_glx_pbuffer.o: apple_glx_pbuffer.h apple_glx_pbuffer.c $(COMPILE) apple_glx_pbuffer.c -apple_glx_pixmap.o: apple_glx_pixmap.h apple_glx_pixmap.c +apple_glx_pixmap.o: apple_glx_pixmap.h apple_glx_pixmap.c appledri.h $(COMPILE) apple_glx_pixmap.c xfont.o: xfont.c glxclient.h

1 0

[152] AppleSGLX/trunk
by source_changes＠macosforge.org 16 Feb '09

16 Feb '09

Revision: 152 http://trac.macosforge.org/projects/xquartz/changeset/152 Author: gstaplin(a)apple.com Date: 2009-02-16 15:02:51 -0800 (Mon, 16 Feb 2009) Log Message: ----------- Finish the XAppleDRIDestroyPixmap code and X protocol data. Modified Paths: -------------- AppleSGLX/trunk/appledri.c AppleSGLX/trunk/appledri.h AppleSGLX/trunk/appledristr.h Modified: AppleSGLX/trunk/appledri.c =================================================================== --- AppleSGLX/trunk/appledri.c 2009-02-16 22:51:15 UTC (rev 151) +++ AppleSGLX/trunk/appledri.c 2009-02-16 23:02:51 UTC (rev 152) @@ -386,14 +386,14 @@ req->drawable = drawable; if(!_XReply(dpy, (xReply *)&rep, 0, xFalse)) { - puts("REPLY ERROR"); - UnlockDisplay(dpy); SyncHandle(); return False; } + /* printf("rep.stringLength %d\n", (int) rep.stringLength); + */ if(rep.stringLength > 0 && rep.stringLength <= bufnamesize) { _XReadPad(dpy, bufname, rep.stringLength); @@ -417,6 +417,23 @@ return True; } -void XAppleDRIDestroyPixmap(Display *dpy, Pixmap pixmap) { +/* + * Call it a drawable, because we really don't know what it is + * until it reaches the server, and we should keep that in mind. + */ +Bool XAppleDRIDestroyPixmap(Display *dpy, Pixmap drawable) { + XExtDisplayInfo *info = find_display(dpy); + xAppleDRIDestroyPixmapReq *req; + AppleDRICheckExtension(dpy, info, False); + + LockDisplay(dpy); + GetReq(AppleDRIDestroyPixmap, req); + req->reqType = info->codes->major_opcode; + req->driReqType = X_AppleDRIDestroyPixmap; + req->drawable = drawable; + UnlockDisplay(dpy); + SyncHandle(); + + return True; } Modified: AppleSGLX/trunk/appledri.h =================================================================== --- AppleSGLX/trunk/appledri.h 2009-02-16 22:51:15 UTC (rev 151) +++ AppleSGLX/trunk/appledri.h 2009-02-16 23:02:51 UTC (rev 152) @@ -50,8 +50,8 @@ #define X_AppleDRICreateSharedBuffer 5 #define X_AppleDRISwapBuffers 6 #define X_AppleDRICreatePixmap 7 +#define X_AppleDRIDestroyPixmap 8 - /* Requests up to and including 18 were used in a previous version */ /* Events */ @@ -116,7 +116,7 @@ int *width, int *height, size_t *size, char *bufname, size_t bufnamesize); -void XAppleDRIDestroyPixmap(Display *dpy, Pixmap pixmap); +Bool XAppleDRIDestroyPixmap(Display *dpy, Pixmap pixmap); _XFUNCPROTOEND Modified: AppleSGLX/trunk/appledristr.h =================================================================== --- AppleSGLX/trunk/appledristr.h 2009-02-16 22:51:15 UTC (rev 151) +++ AppleSGLX/trunk/appledristr.h 2009-02-16 23:02:51 UTC (rev 152) @@ -223,6 +223,15 @@ #define sz_xAppleDRICreatePixmapReply 32 +typedef struct { + CARD8 reqType; /*1*/ + CARD8 driReqType; /*2*/ + CARD16 length; /*4*/ + CARD32 drawable B32; /*8*/ +} xAppleDRIDestroyPixmapReq; + +#define sz_xAppleDRIDestroyPixmapReq 8 + #ifdef _APPLEDRI_SERVER_ void AppleDRISendEvent (

1 0

[151] AppleSGLX/trunk/TODO
by source_changes＠macosforge.org 16 Feb '09

16 Feb '09

Revision: 151 http://trac.macosforge.org/projects/xquartz/changeset/151 Author: gstaplin(a)apple.com Date: 2009-02-16 14:51:15 -0800 (Mon, 16 Feb 2009) Log Message: ----------- Add various items to get done for complete GLXPixmap support. Modified Paths: -------------- AppleSGLX/trunk/TODO Modified: AppleSGLX/trunk/TODO =================================================================== --- AppleSGLX/trunk/TODO 2009-02-16 22:49:35 UTC (rev 150) +++ AppleSGLX/trunk/TODO 2009-02-16 22:51:15 UTC (rev 151) @@ -1,3 +1,15 @@ +-- Feb 16, 2009 + +Make apple_visual_create_pfobj not use OffScreen always. +I suspect we can add a bool that indicates whether or not to create such +an object. We can also recreate the context, or possibly reconfigure it. + +Finish glXDestroyGLXPixmap(). + +Test glXDestroyGLXPixmap(). + +Add support for the newer GLX glXCreatePixmap. + -- Feb 10, 2009 Test glXCopyContext.

1 0

[150] AppleSGLX/trunk/apple_visual.c
by source_changes＠macosforge.org 16 Feb '09

16 Feb '09

Revision: 150 http://trac.macosforge.org/projects/xquartz/changeset/150 Author: gstaplin(a)apple.com Date: 2009-02-16 14:49:35 -0800 (Mon, 16 Feb 2009) Log Message: ----------- Add support for offscreen rendering to the pixel format obj. This will need to be rethought so that it's only enabled for GLXPixmaps. Modified Paths: -------------- AppleSGLX/trunk/apple_visual.c Modified: AppleSGLX/trunk/apple_visual.c =================================================================== --- AppleSGLX/trunk/apple_visual.c 2009-02-16 22:47:06 UTC (rev 149) +++ AppleSGLX/trunk/apple_visual.c 2009-02-16 22:49:35 UTC (rev 150) @@ -45,13 +45,13 @@ GLint vsref = 0; CGLError error = 0; -#if 0 - /*TODO make this be based on the preferences.*/ +#if 1 + /*TODO we only need this sometimes -- for GLXPixmaps!*/ attr[numattr++] = kCGLPFAOffScreen; attr[numattr++] = kCGLPFAColorSize; attr[numattr++] = 32; -#else +#endif if(c->stereoMode) attr[numattr++] = kCGLPFAStereo; @@ -90,7 +90,6 @@ attr[numattr++] = kCGLPFASamples; attr[numattr++] = c->samples; } -#endif attr[numattr++] = 0;

1 0

[149] AppleSGLX/trunk
by source_changes＠macosforge.org 16 Feb '09

16 Feb '09

Revision: 149 http://trac.macosforge.org/projects/xquartz/changeset/149 Author: gstaplin(a)apple.com Date: 2009-02-16 14:47:06 -0800 (Mon, 16 Feb 2009) Log Message: ----------- Start adding XAppleDRIDestroyPixmap. Modified Paths: -------------- AppleSGLX/trunk/appledri.c AppleSGLX/trunk/appledri.h Modified: AppleSGLX/trunk/appledri.c =================================================================== --- AppleSGLX/trunk/appledri.c 2009-02-16 22:46:30 UTC (rev 148) +++ AppleSGLX/trunk/appledri.c 2009-02-16 22:47:06 UTC (rev 149) @@ -417,3 +417,6 @@ return True; } +void XAppleDRIDestroyPixmap(Display *dpy, Pixmap pixmap) { + +} Modified: AppleSGLX/trunk/appledri.h =================================================================== --- AppleSGLX/trunk/appledri.h 2009-02-16 22:46:30 UTC (rev 148) +++ AppleSGLX/trunk/appledri.h 2009-02-16 22:47:06 UTC (rev 149) @@ -116,6 +116,8 @@ int *width, int *height, size_t *size, char *bufname, size_t bufnamesize); +void XAppleDRIDestroyPixmap(Display *dpy, Pixmap pixmap); + _XFUNCPROTOEND #endif /* _APPLEDRI_SERVER_ */

1 0

[148] AppleSGLX/trunk/tests/glxpixmap/glxpixmap.c
by source_changes＠macosforge.org 16 Feb '09

16 Feb '09

Revision: 148 http://trac.macosforge.org/projects/xquartz/changeset/148 Author: gstaplin(a)apple.com Date: 2009-02-16 14:46:30 -0800 (Mon, 16 Feb 2009) Log Message: ----------- Modify the test a bit for GLXPixmaps. Modified Paths: -------------- AppleSGLX/trunk/tests/glxpixmap/glxpixmap.c Modified: AppleSGLX/trunk/tests/glxpixmap/glxpixmap.c =================================================================== --- AppleSGLX/trunk/tests/glxpixmap/glxpixmap.c 2009-02-16 22:45:56 UTC (rev 147) +++ AppleSGLX/trunk/tests/glxpixmap/glxpixmap.c 2009-02-16 22:46:30 UTC (rev 148) @@ -193,12 +193,13 @@ 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, 1.0, 1.0 ); + glColor3f( 0.0, 0.0, 1.0 ); glRectf( -0.75, -0.75, 0.75, 0.75 ); glFlush(); XMapWindow( dpy, win ); event_loop( dpy, pm ); + return 0; }

1 0

[147] AppleSGLX/trunk
by source_changes＠macosforge.org 16 Feb '09

16 Feb '09

Revision: 147 http://trac.macosforge.org/projects/xquartz/changeset/147 Author: gstaplin(a)apple.com Date: 2009-02-16 14:45:56 -0800 (Mon, 16 Feb 2009) Log Message: ----------- Add support for GLXPixmaps and restructure the struct apple_glx_drawable a bit. Add appropriate branching in the apple_glx_context.c code for GLXPixmaps, and cleanup some of the Pbuffer code. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_context.c AppleSGLX/trunk/apple_glx_drawable.c AppleSGLX/trunk/apple_glx_drawable.h Modified: AppleSGLX/trunk/apple_glx_context.c =================================================================== --- AppleSGLX/trunk/apple_glx_context.c 2009-02-16 22:44:20 UTC (rev 146) +++ AppleSGLX/trunk/apple_glx_context.c 2009-02-16 22:45:56 UTC (rev 147) @@ -351,15 +351,7 @@ } if(NULL == newagd) { - CGLPBufferObj pbufobj; - bool is_pbuffer = false; - - /* First check if it's a pbuffer. */ - if(apple_glx_pbuffer_get(drawable, &pbufobj)) - is_pbuffer = true; - - if(apple_glx_create_drawable(dpy, ac, drawable, - is_pbuffer ? pbufobj : NULL, &newagd)) + if(apple_glx_create_drawable(dpy, ac, drawable, &newagd)) return true; /* Save the new drawable with the context structure. */ @@ -388,23 +380,31 @@ ac->is_current = true; assert(NULL != ac->context_obj); - assert(NULL != ac->drawable); - if(ac->drawable->is_pbuffer(ac->drawable)) { - - assert(NULL != ac->drawable->pbuffer_obj); + switch(ac->drawable->type) { + case APPLE_GLX_DRAWABLE_PBUFFER: { + CGLPBufferObj pbufobj; + if(false == apple_glx_pbuffer_get(ac->drawable->drawable, &pbufobj)) { + fprintf(stderr, "internal error: drawable is a pbuffer, " + "but the pbuffer layer was unable to retrieve " + "the CGLPBufferObj!\n"); + return true; + } + cglerr = apple_cgl.set_pbuffer(ac->context_obj, - ac->drawable->pbuffer_obj, + pbufobj, 0, 0, 0); - + if(kCGLNoError != cglerr) { fprintf(stderr, "set_pbuffer: %s\n", apple_cgl.error_string(cglerr)); return true; } - - } else { + } + break; + + case APPLE_GLX_DRAWABLE_SURFACE: error = xp_attach_gl_context(ac->context_obj, ac->drawable->surface_id); if(error) { @@ -419,10 +419,42 @@ * The first time a new context is made current the glViewport * and glScissor should be updated. */ - update_viewport_and_scissor(dpy, drawable); + update_viewport_and_scissor(dpy, ac->drawable->drawable); ac->made_current = true; } + break; + + case APPLE_GLX_DRAWABLE_PIXMAP: { + int width, height; + void *ptr; + + + apple_cgl.clear_drawable(ac->context_obj); + + if(false == apple_glx_pixmap_data(dpy, ac->drawable->drawable, + &width, &height, + &ptr)) { + + + fprintf(stderr, "invalid GLXPixmap: 0x%lx\n", ac->drawable->drawable); + return true; + } + + printf("%s ptr %p\n", __func__, ptr); + + cglerr = apple_cgl.set_off_screen(ac->context_obj, width, height, + width * /*FIXME?*/ 4, ptr); + + if(kCGLNoError != cglerr) { + fprintf(stderr, "set off screen: %s\n", + apple_cgl.error_string(cglerr)); + + return true; + } } + break; + } + ac->thread_id = pthread_self(); Modified: AppleSGLX/trunk/apple_glx_drawable.c =================================================================== --- AppleSGLX/trunk/apple_glx_drawable.c 2009-02-16 22:44:20 UTC (rev 146) +++ AppleSGLX/trunk/apple_glx_drawable.c 2009-02-16 22:45:56 UTC (rev 147) @@ -180,12 +180,8 @@ if(agd->next) agd->next->previous = agd->previous; - /* - * Only destroy the surface if it wasn't a pbuffer. - * - * The pbuffer should be cleaned up explicitly with glXDestroyPbuffer. - */ - if(!agd->pbuffer_obj) { + + if(APPLE_GLX_DRAWABLE_SURFACE == agd->type) { error = xp_destroy_surface(agd->surface_id); if(error) { @@ -216,15 +212,19 @@ } static bool is_pbuffer(struct apple_glx_drawable *agd) { - return agd->pbuffer_obj ? true : false; + return APPLE_GLX_DRAWABLE_PBUFFER == agd->type; } +static bool is_pixmap(struct apple_glx_drawable *agd) { + return APPLE_GLX_DRAWABLE_PIXMAP == agd->type; +} + bool apple_glx_create_drawable(Display *dpy, struct apple_glx_context *ac, GLXDrawable drawable, - CGLPBufferObj pbuf, struct apple_glx_drawable **agdResult) { struct apple_glx_drawable *agd; + CGLPBufferObj pbufobj; int err; *agdResult = NULL; @@ -241,8 +241,15 @@ agd->drawable = drawable; agd->surface_id = 0; agd->uid = 0; - agd->pbuffer_obj = pbuf; + agd->type = APPLE_GLX_DRAWABLE_SURFACE; + + if(apple_glx_pbuffer_get(drawable, &pbufobj)) + agd->type = APPLE_GLX_DRAWABLE_PBUFFER; + + if(apple_glx_is_pixmap(dpy, drawable)) + agd->type = APPLE_GLX_DRAWABLE_PIXMAP; + err = pthread_mutex_init(&agd->mutex, NULL); if(err) { @@ -259,6 +266,7 @@ agd->destroy = destroy_drawable_callback; agd->is_pbuffer = is_pbuffer; + agd->is_pixmap = is_pixmap; agd->width = -1; agd->height = -1; @@ -270,7 +278,8 @@ agd->previous = NULL; - if(!agd->pbuffer_obj && create_surface(dpy, ac, agd)) { + if(APPLE_GLX_DRAWABLE_SURFACE == agd->type + && create_surface(dpy, ac, agd)) { free(agd); return true; } Modified: AppleSGLX/trunk/apple_glx_drawable.h =================================================================== --- AppleSGLX/trunk/apple_glx_drawable.h 2009-02-16 22:44:20 UTC (rev 146) +++ AppleSGLX/trunk/apple_glx_drawable.h 2009-02-16 22:45:56 UTC (rev 147) @@ -37,14 +37,21 @@ #define XP_NO_X_HEADERS #include <Xplugin.h> #undef XP_NO_X_HEADERS +#include "apple_glx_pixmap.h" +enum { + APPLE_GLX_DRAWABLE_SURFACE = 1, + APPLE_GLX_DRAWABLE_PBUFFER, + APPLE_GLX_DRAWABLE_PIXMAP +}; + struct apple_glx_drawable { Display *display; int reference_count; GLXDrawable drawable; xp_surface_id surface_id; unsigned int uid; - CGLPBufferObj pbuffer_obj; + int type; /* APPLE_GLX_DRAWABLE_* */ /* * This mutex protects the reference count and any other drawable data. @@ -61,6 +68,8 @@ bool (*is_pbuffer)(struct apple_glx_drawable *agd); + bool (*is_pixmap)(struct apple_glx_drawable *agd); + /*BEGIN These are used for the mixed mode drawing... */ int width, height; int row_bytes; @@ -83,7 +92,6 @@ bool apple_glx_create_drawable(Display *dpy, struct apple_glx_context *ac, GLXDrawable drawable, - CGLPBufferObj pbuf, struct apple_glx_drawable **agd); void apple_glx_garbage_collect_drawables(Display *dpy);

1 0