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

[186] AppleSGLX/trunk/glxext.c
by source_changes＠macosforge.org 20 Feb '09

20 Feb '09

Revision: 186 http://trac.macosforge.org/projects/xquartz/changeset/186 Author: gstaplin(a)apple.com Date: 2009-02-19 19:06:07 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Set the GLX minor version to 4/GLX_MINOR_VERSION, so that we are forcing 1.4, even if the X server is 1.2. This works even with the 2.3.2.1 XQuartz, because so much of this implementation is different due to things like the AppleDRI, and our implementation of GLXPixmaps and GLXPbuffers. Modified Paths: -------------- AppleSGLX/trunk/glxext.c Modified: AppleSGLX/trunk/glxext.c =================================================================== --- AppleSGLX/trunk/glxext.c 2009-02-20 02:58:31 UTC (rev 185) +++ AppleSGLX/trunk/glxext.c 2009-02-20 03:06:07 UTC (rev 186) @@ -1,6 +1,7 @@ /* * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008) * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved. + * Copyright (C) 2009 Apple Inc. * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -240,7 +241,8 @@ return GL_FALSE; } *major = reply.majorVersion; - *minor = min(reply.minorVersion, GLX_MINOR_VERSION); + *minor = GLX_MINOR_VERSION; + // *minor = min(reply.minorVersion, GLX_MINOR_VERSION); return GL_TRUE; }

1 0

[185] AppleSGLX/trunk/glxcmds.c
by source_changes＠macosforge.org 20 Feb '09

20 Feb '09

Revision: 185 http://trac.macosforge.org/projects/xquartz/changeset/185 Author: gstaplin(a)apple.com Date: 2009-02-19 18:58:31 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Set the GLX extensions string to the list of supported GLX extensions. Modified Paths: -------------- AppleSGLX/trunk/glxcmds.c Modified: AppleSGLX/trunk/glxcmds.c =================================================================== --- AppleSGLX/trunk/glxcmds.c 2009-02-20 02:41:23 UTC (rev 184) +++ AppleSGLX/trunk/glxcmds.c 2009-02-20 02:58:31 UTC (rev 185) @@ -493,6 +493,7 @@ if (major) *major = priv->majorVersion; if (minor) *minor = priv->minorVersion; + return GL_TRUE; } @@ -1097,6 +1098,11 @@ PUBLIC const char *glXQueryExtensionsString( Display *dpy, int screen ) { + static const char extstr[] = "GLX_ARB_get_proc_address "; + + return extstr; + +#if 0 __GLXscreenConfigs *psc; __GLXdisplayPrivate *priv; @@ -1121,6 +1127,7 @@ } return psc->effectiveGLXexts; +#endif } PUBLIC const char *glXGetClientString( Display *dpy, int name )

1 0

[184] AppleSGLX/trunk/glxcmds.c
by source_changes＠macosforge.org 20 Feb '09

20 Feb '09

Revision: 184 http://trac.macosforge.org/projects/xquartz/changeset/184 Author: gstaplin(a)apple.com Date: 2009-02-19 18:41:23 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Make glXIsDirect use the requested direct boolean value specified with glXCreateContext, rather than assuming direct is true always. This should work around any apps that expect GLXPixmaps and GLXPbuffers to not be available with a direct context, and avoid confusing apps. Remove some unused code in various paths for indirect rendering. This helps to make the patterns more clear. Modified Paths: -------------- AppleSGLX/trunk/glxcmds.c Modified: AppleSGLX/trunk/glxcmds.c =================================================================== --- AppleSGLX/trunk/glxcmds.c 2009-02-20 02:15:56 UTC (rev 183) +++ AppleSGLX/trunk/glxcmds.c 2009-02-20 02:41:23 UTC (rev 184) @@ -378,9 +378,11 @@ LockDisplay(dpy); mode = _gl_context_modes_find_visual(psc->visuals, vis->visualid); - if (NULL == mode) { + if(NULL == mode) { xError error; + LockDisplay(dpy); + error.errorCode = BadValue; error.resourceID = vis->visualid; error.sequenceNumber = dpy->request; @@ -416,6 +418,10 @@ return NULL; } + gc->currentContextTag = -1; + gc->mode = mode; + gc->isDirect = allowDirect; + UnlockDisplay(dpy); return gc; @@ -564,10 +570,7 @@ PUBLIC void glXCopyContext(Display *dpy, GLXContext source, GLXContext dest, unsigned long mask) { - xGLXCopyContextReq *req; GLXContext gc = __glXGetCurrentContext(); - GLXContextTag tag; - CARD8 opcode; int errorcode; if(apple_glx_copy_context(gc->apple, source->apple, dest->apple, @@ -588,80 +591,9 @@ return; } - - return; - - opcode = __glXSetupForCommand(dpy); - if (!opcode) { - return; - } - -#ifdef GLX_DIRECT_RENDERING - if (gc->driContext) { - /* NOT_DONE: This does not work yet */ - } -#endif - - /* - ** If the source is the current context, send its tag so that the context - ** can be flushed before the copy. - */ - if (source == gc && dpy == gc->currentDpy) { - tag = gc->currentContextTag; - } else { - tag = 0; - } - - /* Send the glXCopyContext request */ - LockDisplay(dpy); - GetReq(GLXCopyContext,req); - req->reqType = opcode; - req->glxCode = X_GLXCopyContext; - req->source = source ? source->xid : None; - req->dest = dest ? dest->xid : None; - req->mask = mask; - req->contextTag = tag; - UnlockDisplay(dpy); - SyncHandle(); } - /** - * Determine if a context uses direct rendering. - * - * \param dpy Display where the context was created. - * \param contextID ID of the context to be tested. - * - * \returns \c GL_TRUE if the context is direct rendering or not. - */ -static Bool __glXIsDirect(Display *dpy, GLXContextID contextID) -{ - xGLXIsDirectReq *req; - xGLXIsDirectReply reply; - CARD8 opcode; - - /* AppleSGLX is always direct. */ - return GL_TRUE; - - opcode = __glXSetupForCommand(dpy); - if (!opcode) { - return GL_FALSE; - } - - /* Send the glXIsDirect request */ - LockDisplay(dpy); - GetReq(GLXIsDirect,req); - req->reqType = opcode; - req->glxCode = X_GLXIsDirect; - req->context = contextID; - _XReply(dpy, (xReply*) &reply, 0, False); - UnlockDisplay(dpy); - SyncHandle(); - - return reply.isDirect; -} - -/** * \todo * Shouldn't this function \b always return \c GL_FALSE when * \c GLX_DIRECT_RENDERING is not defined? Do we really need to bother with @@ -669,14 +601,25 @@ */ PUBLIC Bool glXIsDirect(Display *dpy, GLXContext gc) { - if (!gc) { - return GL_FALSE; - } else { - /* AppleSGLX is always direct. */ - return GL_TRUE; + xError error; + + if(NULL == gc) { + LockDisplay(dpy); + + error.errorCode = GLXBadContext; + error.resourceID = 0; + error.sequenceNumber = dpy->request; + error.type = X_Error; + error.majorCode = gc->majorOpcode; + error.minorCode = X_GLXIsDirect; + _XError(dpy, &error); + + UnlockDisplay(dpy); + + return False; } - //return __glXIsDirect(dpy, gc->xid); + return gc->isDirect; } PUBLIC GLXPixmap glXCreateGLXPixmap(Display *dpy, XVisualInfo *vis, @@ -1424,6 +1367,7 @@ PUBLIC GLXContext glXImportContextEXT(Display *dpy, GLXContextID contextID) { +#if 0 GLXContext ctx; if (contextID == None) { @@ -1440,6 +1384,8 @@ } } return ctx; +#endif + return NULL; } PUBLIC void glXFreeContextEXT(Display *dpy, GLXContext ctx)

1 0

[183] AppleSGLX/trunk/glxcmds.c
by source_changes＠macosforge.org 20 Feb '09

20 Feb '09

Revision: 183 http://trac.macosforge.org/projects/xquartz/changeset/183 Author: gstaplin(a)apple.com Date: 2009-02-19 18:15:56 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Clean up some unused code that was #if 0ed out in glxcmds.c. Use the name modes consistently for the __GLcontextModes. Modified Paths: -------------- AppleSGLX/trunk/glxcmds.c Modified: AppleSGLX/trunk/glxcmds.c =================================================================== --- AppleSGLX/trunk/glxcmds.c 2009-02-20 02:13:54 UTC (rev 182) +++ AppleSGLX/trunk/glxcmds.c 2009-02-20 02:15:56 UTC (rev 183) @@ -684,38 +684,14 @@ { int screen = vis->screen; __GLXscreenConfigs *const psc = GetGLXScreenConfigs(dpy, screen); - const __GLcontextModes *mode; + const __GLcontextModes *modes; - mode = _gl_context_modes_find_visual(psc->visuals, vis->visualid); + modes = _gl_context_modes_find_visual(psc->visuals, vis->visualid); - if(apple_glx_pixmap_create(dpy, vis->screen, pixmap, mode)) + if(apple_glx_pixmap_create(dpy, vis->screen, pixmap, modes)) return None; return pixmap; - -#if 0 - xGLXCreateGLXPixmapReq *req; - GLXPixmap xid; - CARD8 opcode; - - opcode = __glXSetupForCommand(dpy); - if (!opcode) { - return None; - } - - /* Send the glXCreateGLXPixmap request */ - LockDisplay(dpy); - GetReq(GLXCreateGLXPixmap,req); - req->reqType = opcode; - req->glxCode = X_GLXCreateGLXPixmap; - req->screen = vis->screen; - req->visual = vis->visualid; - req->pixmap = pixmap; - req->glxpixmap = xid = XAllocID(dpy); - UnlockDisplay(dpy); - SyncHandle(); - return xid; -#endif } /* @@ -724,25 +700,6 @@ PUBLIC void glXDestroyGLXPixmap(Display *dpy, GLXPixmap glxpixmap) { apple_glx_pixmap_destroy(dpy, glxpixmap); - -#if 0 - xGLXDestroyGLXPixmapReq *req; - CARD8 opcode; - - opcode = __glXSetupForCommand(dpy); - if (!opcode) { - return; - } - - /* Send the glXDestroyGLXPixmap request */ - LockDisplay(dpy); - GetReq(GLXDestroyGLXPixmap,req); - req->reqType = opcode; - req->glxCode = X_GLXDestroyGLXPixmap; - req->glxpixmap = glxpixmap; - UnlockDisplay(dpy); - SyncHandle(); -#endif } PUBLIC void glXSwapBuffers(Display *dpy, GLXDrawable drawable) {

1 0

[182] AppleSGLX/trunk/glx_pbuffer.c
by source_changes＠macosforge.org 20 Feb '09

20 Feb '09

Revision: 182 http://trac.macosforge.org/projects/xquartz/changeset/182 Author: gstaplin(a)apple.com Date: 2009-02-19 18:13:54 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Add support for glXCreatePixmap and glXDestroyPixmap. These are the GLXFBConfig variety of GLXPixmaps. Modified Paths: -------------- AppleSGLX/trunk/glx_pbuffer.c Modified: AppleSGLX/trunk/glx_pbuffer.c =================================================================== --- AppleSGLX/trunk/glx_pbuffer.c 2009-02-20 00:09:01 UTC (rev 181) +++ AppleSGLX/trunk/glx_pbuffer.c 2009-02-20 02:13:54 UTC (rev 182) @@ -724,7 +724,11 @@ { unsigned int value; - /*This is a no-op with Apple CGL pbuffers.*/ + *mask = 0; + /* + * This is a no-op with Apple CGL pbuffers. + * We could perhaps match the glXSelectEvent input. + */ return; /* The non-sense with value is required because on LP64 platforms @@ -741,9 +745,12 @@ glXCreatePixmap( Display *dpy, GLXFBConfig config, Pixmap pixmap, const int *attrib_list ) { - return CreateDrawable( dpy, (__GLcontextModes *) config, - (Drawable) pixmap, attrib_list, - X_GLXCreatePixmap ); + const __GLcontextModes *modes = (const __GLcontextModes *)config; + + if(apple_glx_pixmap_create(dpy, modes->screen, pixmap, modes)) + return None; + + return pixmap; } @@ -760,7 +767,7 @@ PUBLIC void glXDestroyPixmap(Display *dpy, GLXPixmap pixmap) { - DestroyDrawable( dpy, (GLXDrawable) pixmap, X_GLXDestroyPixmap ); + apple_glx_pixmap_destroy(dpy, pixmap); }

1 0

[181] AppleSGLX/trunk
by source_changes＠macosforge.org 20 Feb '09

20 Feb '09

Revision: 181 http://trac.macosforge.org/projects/xquartz/changeset/181 Author: gstaplin(a)apple.com Date: 2009-02-19 16:09:01 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Update the Makefile target dependency so that apple_xgl_api_stereo.c changes trigger a rebuild. Update apple_xgl_api_stereo.c to implement glDrawBuffers slightly differently. I realized that the user could specify multiple GL_BACK flags by accident or perhaps on purpose. This skips all GL_BACK and appends GL_BACK_LEFT and GL_BACK_RIGHT to the end of bufs, if we had a GL_BACK. Modified Paths: -------------- AppleSGLX/trunk/Makefile AppleSGLX/trunk/apple_xgl_api_stereo.c Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-20 00:00:19 UTC (rev 180) +++ AppleSGLX/trunk/Makefile 2009-02-20 00:09:01 UTC (rev 181) @@ -39,7 +39,7 @@ apple_glx_drawable.o: apple_glx_drawable.h apple_glx_drawable.c apple_glx_pixmap.h apple_glx_pbuffer.h $(COMPILE) apple_glx_drawable.c -apple_xgl_api.o: apple_xgl_api.h apple_xgl_api.c +apple_xgl_api.o: apple_xgl_api.h apple_xgl_api.c apple_xgl_api_stereo.c $(COMPILE) apple_xgl_api.c apple_xgl_api_read.o: apple_xgl_api_read.h apple_xgl_api_read.c apple_xgl_api.h Modified: AppleSGLX/trunk/apple_xgl_api_stereo.c =================================================================== --- AppleSGLX/trunk/apple_xgl_api_stereo.c 2009-02-20 00:00:19 UTC (rev 180) +++ AppleSGLX/trunk/apple_xgl_api_stereo.c 2009-02-20 00:09:01 UTC (rev 181) @@ -20,19 +20,23 @@ void glDrawBuffers(GLsizei n, const GLenum *bufs) { - GLenum newbuf[n + 1]; + GLenum newbuf[n + 2]; GLsizei i, outi = 0; - bool back_handled = false; + bool have_back = false; for(i = 0; i < n; ++i) { - if(!back_handled && GL_BACK == bufs[i]) { - newbuf[outi++] = GL_BACK_LEFT; - newbuf[outi++] = GL_BACK_RIGHT; - back_handled = true; + if(GL_BACK == bufs[i]) { + have_back = true; + continue; } else { newbuf[outi++] = bufs[i]; } } + + if(have_back) { + newbuf[outi++] = GL_BACK_LEFT; + newbuf[outi++] = GL_BACK_RIGHT; + } __gl_api.DrawBuffers(outi, newbuf); }

1 0

[180] AppleSGLX/trunk/TODO
by source_changes＠macosforge.org 20 Feb '09

20 Feb '09

Revision: 180 http://trac.macosforge.org/projects/xquartz/changeset/180 Author: gstaplin(a)apple.com Date: 2009-02-19 16:00:19 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Update the TODO (many more things DONE). I think the apple_xgl_api_read.c code is actually thread safe already. It should be fine. Modified Paths: -------------- AppleSGLX/trunk/TODO Modified: AppleSGLX/trunk/TODO =================================================================== --- AppleSGLX/trunk/TODO 2009-02-19 23:55:11 UTC (rev 179) +++ AppleSGLX/trunk/TODO 2009-02-20 00:00:19 UTC (rev 180) @@ -1,13 +1,13 @@ -- Feb 16, 2009 -glXMakeContextCurrent's readable drawable needs to be set as the current +DONE glXMakeContextCurrent's readable drawable needs to be set as the current surface/pbuffer/pixmap if it's different than the normal drawable in the following routines: glReadPixels, glCopyPixels, glCopyColorTable -The old surface/pbuffer/pixmap needs to be restored after that. +DONE The old surface/pbuffer/pixmap needs to be restored after that. -glXGetCurrentReadDrawable should also report the read drawable. It appears correct. +DONE glXGetCurrentReadDrawable should also report the read drawable. It appears correct. Test glXGetCurrentDisplay(). It appears correct. -- @@ -20,10 +20,10 @@ Verify the XError behavior of GLXPixmap support functions. Test GLXPixmap support with various pixmap depths. - + Test GLXPixmap support with invalid pixmaps (to stress the protocol code). -Make apple_visual_create_pfobj not use OffScreen always. +DONE 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. Perhaps we could store the CGL attributes used for the pixel format object, and @@ -31,7 +31,7 @@ DONE Finish glXDestroyGLXPixmap(). -Test glXDestroyGLXPixmap(). +DONE Test glXDestroyGLXPixmap(). Add support for the newer glXCreatePixmap (from 1.4). We have glXCreateGLXPixmap working. @@ -39,11 +39,11 @@ Test glXCopyContext. -Add the PBUFFER_BIT to the fbconfigs/visualconfigs in the X server. +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. -PLAN Handle GLX_LARGEST_PBUFFER (it's unclear how to handle this so far). +DONE PLAN Handle GLX_LARGEST_PBUFFER (it's unclear how to handle this so far). DONE glXQueryDrawable support for Pbuffer drawables.

1 0

[179] AppleSGLX/trunk/gen_api_library.tcl
by source_changes＠macosforge.org 19 Feb '09

19 Feb '09

Revision: 179 http://trac.macosforge.org/projects/xquartz/changeset/179 Author: gstaplin(a)apple.com Date: 2009-02-19 15:55:11 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Add gen_api_library.tcl that I missed in the last commit. It's for the same changes. Modified Paths: -------------- AppleSGLX/trunk/gen_api_library.tcl Modified: AppleSGLX/trunk/gen_api_library.tcl =================================================================== --- AppleSGLX/trunk/gen_api_library.tcl 2009-02-19 23:54:05 UTC (rev 178) +++ AppleSGLX/trunk/gen_api_library.tcl 2009-02-19 23:55:11 UTC (rev 179) @@ -124,8 +124,11 @@ set sorted [lsort -dictionary [array names api]] set exclude [list DrawBuffer DrawBuffers DrawBuffersARB] + + #These are special to glXMakeContextCurrent. + #See also: apple_xgl_api_read.c. + lappend exclude ReadPixels CopyPixels CopyColorTable - foreach f $sorted { if {$f in $exclude} { continue

1 0

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

19 Feb '09

Revision: 178 http://trac.macosforge.org/projects/xquartz/changeset/178 Author: gstaplin(a)apple.com Date: 2009-02-19 15:54:05 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Add support for glXMakeContextCurrent's readable drawable. This basically involves swapping the CGL drawable if the gc->currentReadable drawable doesn't match the gc->currentDrawable. The thread safety for these routines will come in a commit after this. Modified Paths: -------------- AppleSGLX/trunk/Makefile AppleSGLX/trunk/apple_xgl_api.c Added Paths: ----------- AppleSGLX/trunk/apple_xgl_api_read.c AppleSGLX/trunk/apple_xgl_api_read.h Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-19 23:09:20 UTC (rev 177) +++ AppleSGLX/trunk/Makefile 2009-02-19 23:54:05 UTC (rev 178) @@ -23,7 +23,7 @@ appledri.o apple_glx_context.o apple_glx.o pixel.o \ compsize.o apple_visual.o apple_cgl.o glxreply.o glcontextmodes.o \ apple_xgl_api.o apple_glx_drawable.o xfont.o apple_glx_pbuffer.o \ - apple_glx_pixmap.o + apple_glx_pixmap.o apple_xgl_api_read.o #This target is used for the tests. @@ -42,6 +42,9 @@ apple_xgl_api.o: apple_xgl_api.h apple_xgl_api.c $(COMPILE) apple_xgl_api.c +apple_xgl_api_read.o: apple_xgl_api_read.h apple_xgl_api_read.c apple_xgl_api.h + $(COMPILE) apple_xgl_api_read.c + glcontextmodes.o: glcontextmodes.c glcontextmodes.h $(COMPILE) glcontextmodes.c Modified: AppleSGLX/trunk/apple_xgl_api.c =================================================================== --- AppleSGLX/trunk/apple_xgl_api.c 2009-02-19 23:09:20 UTC (rev 177) +++ AppleSGLX/trunk/apple_xgl_api.c 2009-02-19 23:54:05 UTC (rev 178) @@ -408,9 +408,6 @@ void glCopyColorSubTable(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width) { __gl_api.CopyColorSubTable(target, start, x, y, width); } -void glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width) { - __gl_api.CopyColorTable(target, internalformat, x, y, width); -} void glCopyColorTableSGI(GLenum internalformat, GLint x, GLint y, GLsizei width) { /*noop*/ } @@ -426,9 +423,6 @@ void glCopyConvolutionFilter2DEXT(GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height) { /*noop*/ } -void glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type) { - __gl_api.CopyPixels(x, y, width, height, type); -} void glCopyTexImage1D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border) { __gl_api.CopyTexImage1D(target, level, internalformat, x, y, width, border); } @@ -1923,9 +1917,6 @@ void glReadInstrumentsSGIX(GLint marker) { /*noop*/ } -void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, void * pixels) { - __gl_api.ReadPixels(x, y, width, height, format, type, pixels); -} void glRectd(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2) { __gl_api.Rectd(x1, y1, x2, y2); } Added: AppleSGLX/trunk/apple_xgl_api_read.c =================================================================== --- AppleSGLX/trunk/apple_xgl_api_read.c (rev 0) +++ AppleSGLX/trunk/apple_xgl_api_read.c 2009-02-19 23:54:05 UTC (rev 178) @@ -0,0 +1,120 @@ +/* + Copyright (c) 2008, 2009 Apple Inc. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT + HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + Except as contained in this notice, the name(s) of the above + copyright holders shall not be used in advertising or otherwise to + promote the sale, use or other dealings in this Software without + prior written authorization. +*/ + +/* + * This file works with the glXMakeContextCurrent readable drawable. + * + * The way it works is by swapping the currentDrawable for the currentReadable + * drawable if they are different. + */ +#include <stdbool.h> +#include "apple_xgl_api_read.h" +#include "apple_xgl_api.h" +#include "apple_cgl.h" +#include "apple_glx_context.h" + +extern struct apple_xgl_api __gl_api; + +struct apple_xgl_saved_state { + bool swapped; +}; + +static void SetRead(struct apple_xgl_saved_state *saved) { + GLXContext gc = __glXGetCurrentContext(); + + /* + * By default indicate that the state was not swapped, so that UnsetRead + * functions correctly. + */ + saved->swapped = false; + + /* + * If the readable drawable isn't the same as the drawable then + * the user has requested a readable drawable with glXMakeContextCurrent(). + * We emulate this behavior by switching the current drawable. + */ + if(gc->currentReadable != gc->currentDrawable) { + Display *dpy = glXGetCurrentDisplay(); + + saved->swapped = true; + + if(apple_glx_make_current_context(dpy, gc, gc, gc->currentReadable)) { + /* An error occurred, so try to restore the old context state. */ + (void)apple_glx_make_current_context(dpy, gc, gc, gc->currentDrawable); + saved->swapped = false; + } + } +} + +static void UnsetRead(struct apple_xgl_saved_state *saved) { + if(saved->swapped) { + GLXContext gc = __glXGetCurrentContext(); + Display *dpy = glXGetCurrentDisplay(); + + if(apple_glx_make_current_context(dpy, gc, gc, gc->currentDrawable)) { + /* + * An error occurred restoring the drawable. + * It's unclear what to do about that. + */ + } + } +} + +void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, + GLenum format, GLenum type, void * pixels) { + struct apple_xgl_saved_state saved; + + SetRead(&saved); + + __gl_api.ReadPixels(x, y, width, height, format, type, pixels); + + UnsetRead(&saved); +} + +void glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, + GLenum type) { + struct apple_xgl_saved_state saved; + + SetRead(&saved); + + __gl_api.CopyPixels(x, y, width, height, type); + + UnsetRead(&saved); +} + +void glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, + GLsizei width) { + struct apple_xgl_saved_state saved; + + SetRead(&saved); + + __gl_api.CopyColorTable(target, internalformat, x, y, width); + + UnsetRead(&saved); +} Added: AppleSGLX/trunk/apple_xgl_api_read.h =================================================================== --- AppleSGLX/trunk/apple_xgl_api_read.h (rev 0) +++ AppleSGLX/trunk/apple_xgl_api_read.h 2009-02-19 23:54:05 UTC (rev 178) @@ -0,0 +1,46 @@ +/* + Copyright (c) 2008, 2009 Apple Inc. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT + HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + Except as contained in this notice, the name(s) of the above + copyright holders shall not be used in advertising or otherwise to + promote the sale, use or other dealings in this Software without + prior written authorization. +*/ + +/* + * This file works with the glXMakeContextCurrent readable drawable. + */ +#ifndef APPLE_XGL_API_READ_H +#define APPLE_XGL_API_READ_H + +#include "glxclient.h" + +extern void glReadPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, + GLenum type, void * pixels); + +extern void glCopyPixels(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type); + +extern void glCopyColorTable(GLenum target, GLenum internalformat, GLint x, GLint y, + GLsizei width); + +#endif

1 0

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

19 Feb '09

Revision: 177 http://trac.macosforge.org/projects/xquartz/changeset/177 Author: gstaplin(a)apple.com Date: 2009-02-19 15:09:20 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Simplify the glXQueryDrawable path and extend it to support windows. Redesign the private interface for the pbuffer querying, and make it use the get_max_size() for the LARGEST_PBUFFER attribute. Tested with ./builds/pbuffer and ./builds/pbuffer_destroy. The latter still generates an XError message, as it should (to indicate correct behavior). Modified Paths: -------------- AppleSGLX/trunk/apple_glx_pbuffer.c AppleSGLX/trunk/apple_glx_pbuffer.h AppleSGLX/trunk/glx_pbuffer.c Modified: AppleSGLX/trunk/apple_glx_pbuffer.c =================================================================== --- AppleSGLX/trunk/apple_glx_pbuffer.c 2009-02-19 22:39:03 UTC (rev 176) +++ AppleSGLX/trunk/apple_glx_pbuffer.c 2009-02-19 23:09:20 UTC (rev 177) @@ -36,7 +36,7 @@ struct apple_glx_pbuffer { GLXPbuffer xid; /* our pixmap */ int width, height; - XID fbconfig_id; + GLint fbconfigID; CGLPBufferObj buffer_obj; struct apple_glx_pbuffer *previous, *next; }; @@ -95,7 +95,7 @@ struct apple_glx_pbuffer *pbuf; Window root; int screen; - __GLcontextModes *mode = (__GLcontextModes *)config; + __GLcontextModes *modes = (__GLcontextModes *)config; pbuf = malloc(sizeof(*pbuf)); @@ -109,9 +109,9 @@ pbuf->previous = NULL; pbuf->next = NULL; - /*TODO perhaps use GL_RGB if the config specifies a 0 alpha. */ err = apple_cgl.create_pbuffer(width, height, GL_TEXTURE_RECTANGLE_EXT, - GL_RGBA, 0, &pbuf->buffer_obj); + (modes->alphaBits > 0) ? GL_RGBA : GL_RGB, + 0, &pbuf->buffer_obj); if(kCGLNoError != err) { free(pbuf); @@ -138,8 +138,7 @@ return true; } - printf("mode->fbconfigID %d\n", mode->fbconfigID); - pbuf->fbconfig_id = mode->fbconfigID; + pbuf->fbconfigID = modes->fbconfigID; *result = pbuf->xid; @@ -204,41 +203,8 @@ return false; } -bool apple_glx_pbuffer_get_width(GLXDrawable d, int *width) { - struct apple_glx_pbuffer *pbuf; - - if(find_pbuffer(d, &pbuf)) { - *width = pbuf->width; - return true; - } - - return false; -} - -bool apple_glx_pbuffer_get_height(GLXDrawable d, int *height) { - struct apple_glx_pbuffer *pbuf; - - if(find_pbuffer(d, &pbuf)) { - *height = pbuf->height; - return true; - } - - return false; -} - -bool apple_glx_pbuffer_get_fbconfig_id(GLXDrawable d, XID *id) { - struct apple_glx_pbuffer *pbuf; - - if(find_pbuffer(d, &pbuf)) { - *id = pbuf->fbconfig_id; - return true; - } - - return false; -} - /* Return true if an error occurred. */ -bool apple_glx_pbuffer_get_max_size(int *widthresult, int *heightresult) { +static bool get_max_size(int *widthresult, int *heightresult) { CGLContextObj oldcontext; GLint ar[2]; @@ -299,6 +265,8 @@ apple_cgl.destroy_context(newcontext); apple_cgl.destroy_pixel_format(pfobj); } else { + /* We have a valid context. */ + glGetIntegerv(GL_MAX_VIEWPORT_DIMS, ar); } @@ -307,3 +275,46 @@ return false; } + +bool apple_glx_pbuffer_query(GLXPbuffer p, int attr, unsigned int *value) { + bool result = false; + struct apple_glx_pbuffer *pbuf; + + if(find_pbuffer(p, &pbuf)) { + switch(attr) { + case GLX_WIDTH: + *value = pbuf->width; + result = true; + break; + + case GLX_HEIGHT: + *value = pbuf->height; + result = true; + break; + + case GLX_PRESERVED_CONTENTS: + *value = true; + result = true; + break; + + case GLX_LARGEST_PBUFFER: { + int width, height; + if(get_max_size(&width, &height)) { + fprintf(stderr, "internal error: " + "unable to find the largest pbuffer!\n"); + } else { + *value = width; + result = true; + } + } + break; + + case GLX_FBCONFIG_ID: + *value = pbuf->fbconfigID; + result = true; + break; + } + } + + return result; +} Modified: AppleSGLX/trunk/apple_glx_pbuffer.h =================================================================== --- AppleSGLX/trunk/apple_glx_pbuffer.h 2009-02-19 22:39:03 UTC (rev 176) +++ AppleSGLX/trunk/apple_glx_pbuffer.h 2009-02-19 23:09:20 UTC (rev 177) @@ -42,6 +42,10 @@ /* Returns true if the drawable has a valid pbuffer object result. */ bool apple_glx_pbuffer_get(GLXDrawable d, CGLPBufferObj *result); +/* Returns true if the pbuffer was valid and the attribute. */ +bool apple_glx_pbuffer_query(GLXDrawable d, int attribute, + unsigned int *value); + /* These return true if the drawable is a valid Pbuffer: */ bool apple_glx_pbuffer_get_width(GLXDrawable d, int *width); bool apple_glx_pbuffer_get_height(GLXDrawable d, int *height); Modified: AppleSGLX/trunk/glx_pbuffer.c =================================================================== --- AppleSGLX/trunk/glx_pbuffer.c 2009-02-19 22:39:03 UTC (rev 176) +++ AppleSGLX/trunk/glx_pbuffer.c 2009-02-19 23:09:20 UTC (rev 177) @@ -649,54 +649,31 @@ glXQueryDrawable(Display *dpy, GLXDrawable drawable, int attribute, unsigned int *value) { GLXContext gc = __glXGetCurrentContext(); + Window root; + int x, y; + unsigned int width, height, bd, depth; xError error; if(apple_glx_pixmap_query(drawable, attribute, value)) return; /*done*/ - switch(attribute) { - case GLX_WIDTH: { - int width; + if(apple_glx_pbuffer_query(drawable, attribute, value)) + return; /*done*/ - if(apple_glx_pbuffer_get_width(drawable, &width)) { - *value = (unsigned int)width; + if(XGetGeometry(dpy, drawable, &root, &x, &y, &width, &height, &bd, &depth)) { + switch(attribute) { + case GLX_WIDTH: + *value = width; return; - } - } - break; - case GLX_HEIGHT: { - int height; - - if(apple_glx_pbuffer_get_height(drawable, &height)) { - *value = (unsigned int)height; + case GLX_HEIGHT: + *value = height; return; } + /*FALL THROUGH*/ } - break; - - case GLX_PRESERVED_CONTENTS: - *value = true; - return; - break; - - case GLX_FBCONFIG_ID: { - XID id; - - if(apple_glx_pbuffer_get_fbconfig_id(drawable, &id)) { - *value = id; - return; - } - } - break; - - default: - fprintf(stderr, "%s invalid attribute: %d\n", __func__, attribute); - abort(); - } - - + LockDisplay(dpy); error.errorCode = GLXBadDrawable;

1 0