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

[274] AppleSGLX/trunk/GL_aliases
by source_changes＠macosforge.org 28 Feb '09

28 Feb '09

Revision: 274 http://trac.macosforge.org/projects/xquartz/changeset/274 Author: jeremyhu(a)freedesktop.org Date: 2009-02-28 01:02:56 -0800 (Sat, 28 Feb 2009) Log Message: ----------- Added TexImage3DEXT to GL_aliases. Alphabatized GL_aliases. Modified Paths: -------------- AppleSGLX/trunk/GL_aliases Modified: AppleSGLX/trunk/GL_aliases =================================================================== --- AppleSGLX/trunk/GL_aliases 2009-02-27 21:21:33 UTC (rev 273) +++ AppleSGLX/trunk/GL_aliases 2009-02-28 09:02:56 UTC (rev 274) @@ -1,7 +1,8 @@ #GL_EXT_texture_object +alias AreTexturesResidentEXT AreTexturesResident +alias BindTextureEXT BindTexture +alias DeleteTexturesEXT DeleteTextures alias GenTexturesExt GenTextures -alias DeleteTexturesEXT DeleteTextures -alias BindTextureEXT BindTexture +alias IsTextureEXT IsTexture alias PrioritizeTexturesEXT PrioritizeTextures -alias AreTexturesResidentEXT AreTexturesResident -alias IsTextureEXT IsTexture +alias TexImage3DEXT TexImage3D

1 0

[273] AppleSGLX/trunk
by source_changes＠macosforge.org 27 Feb '09

27 Feb '09

Revision: 273 http://trac.macosforge.org/projects/xquartz/changeset/273 Author: gstaplin(a)apple.com Date: 2009-02-27 13:21:33 -0800 (Fri, 27 Feb 2009) Log Message: ----------- Move the special case for the same drawable up in the apple_glx_make_current_context path. This may improve performance a bit, but hasn't seemed to make a difference in reality. Also cleanup the glXSwapBuffers path a bit. There were some old #if 0, and also don't abort() if the GLXContext doesn't exist, just let a GLXBadCurrentWindow be sent. Modified Paths: -------------- AppleSGLX/trunk/apple_glx.c AppleSGLX/trunk/apple_glx_context.c AppleSGLX/trunk/glxcmds.c Modified: AppleSGLX/trunk/apple_glx.c =================================================================== --- AppleSGLX/trunk/apple_glx.c 2009-02-27 20:33:57 UTC (rev 272) +++ AppleSGLX/trunk/apple_glx.c 2009-02-27 21:21:33 UTC (rev 273) @@ -152,16 +152,7 @@ void apple_glx_swap_buffers(void *ptr) { struct apple_glx_context *ac = ptr; - assert(NULL != ac); - glFlush(); - -#if 0 - if(XAppleDRISwapBuffers(ac->apple_glx_drawable->display, - ac->screen, ac->apple_glx_drawable->drawable)) - return; -#endif - apple_cgl.flush_drawable(ac->context_obj); } Modified: AppleSGLX/trunk/apple_glx_context.c =================================================================== --- AppleSGLX/trunk/apple_glx_context.c 2009-02-27 20:33:57 UTC (rev 272) +++ AppleSGLX/trunk/apple_glx_context.c 2009-02-27 21:21:33 UTC (rev 273) @@ -267,6 +267,7 @@ CGLError cglerr; bool same_drawable = false; +#if 0 apple_glx_diagnostic("%s: oldac %p ac %p drawable 0x%lx\n", __func__, (void *)oldac, (void *)ac, drawable); @@ -275,9 +276,16 @@ __func__, (void *)(oldac ? oldac->context_obj : NULL), (void *)(ac ? ac->context_obj : NULL)); +#endif - assert(NULL != dpy); - + /* This a common path for GLUT and other apps, so special case it. */ + if(ac && ac->drawable && ac->drawable->drawable == drawable) { + same_drawable = true; + + if(ac->is_current) + return false; + } + /* Reset the is_current state of the old context, if non-NULL. */ if(oldac && (ac != oldac)) oldac->is_current = false; @@ -322,9 +330,6 @@ /* Find the drawable if possible, and retain a reference to it. */ newagd = apple_glx_drawable_find(drawable, APPLE_GLX_DRAWABLE_REFERENCE); } - - if(ac->drawable && ac->drawable == newagd) - same_drawable = true; /* * Try to destroy the old drawable, so long as the new one @@ -401,8 +406,6 @@ bool apple_glx_is_current_drawable(void *ptr, GLXDrawable drawable) { struct apple_glx_context *ac = ptr; - assert(NULL != ac); - return (ac->drawable && ac->drawable->drawable == drawable); } Modified: AppleSGLX/trunk/glxcmds.c =================================================================== --- AppleSGLX/trunk/glxcmds.c 2009-02-27 20:33:57 UTC (rev 272) +++ AppleSGLX/trunk/glxcmds.c 2009-02-27 21:21:33 UTC (rev 273) @@ -609,13 +609,8 @@ PUBLIC void glXSwapBuffers(Display *dpy, GLXDrawable drawable) { GLXContext gc = glXGetCurrentContext(); - - if(NULL == gc || NULL == gc->apple) { - fprintf(stderr, "%s: invalid context\n", __func__); - abort(); - } - - if(apple_glx_is_current_drawable(gc->apple, drawable)) { + + if(gc && apple_glx_is_current_drawable(gc->apple, drawable)) { apple_glx_swap_buffers(gc->apple); } else { __glXSendError(dpy, GLXBadCurrentWindow, 0, X_GLXSwapBuffers, false);

1 0

[272] AppleSGLX/tags/AppleSGLX-53/
by source_changes＠macosforge.org 27 Feb '09

27 Feb '09

Revision: 272 http://trac.macosforge.org/projects/xquartz/changeset/272 Author: jeremyhu(a)freedesktop.org Date: 2009-02-27 12:33:57 -0800 (Fri, 27 Feb 2009) Log Message: ----------- Tagging AppleSGLX-53 Added Paths: ----------- AppleSGLX/tags/AppleSGLX-53/

1 0

[271] AppleSGLX/trunk
by source_changes＠macosforge.org 27 Feb '09

27 Feb '09

Revision: 271 http://trac.macosforge.org/projects/xquartz/changeset/271 Author: gstaplin(a)apple.com Date: 2009-02-27 00:33:31 -0800 (Fri, 27 Feb 2009) Log Message: ----------- Add more diagnostics to try to figure out what is causing Togl/Chimera problems, beyond the CGL display list incompatibilities. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_context.c AppleSGLX/trunk/apple_glx_surface.c Modified: AppleSGLX/trunk/apple_glx_context.c =================================================================== --- AppleSGLX/trunk/apple_glx_context.c 2009-02-27 08:00:42 UTC (rev 270) +++ AppleSGLX/trunk/apple_glx_context.c 2009-02-27 08:33:31 UTC (rev 271) @@ -180,10 +180,13 @@ ac->next = context_list; context_list = ac; + *ptr = ac; + + apple_glx_diagnostic("%s: ac %p ac->context_obj %p\n", + __func__, (void *)ac, (void *)ac->context_obj); + unlock_context_list(); - *ptr = ac; - return false; } @@ -193,7 +196,13 @@ if(NULL == ac) return; + apple_glx_diagnostic("%s: ac %p ac->context_obj %p\n", + __func__, (void *)ac, (void *)ac->context_obj); + if(apple_cgl.get_current_context() == ac->context_obj) { + apple_glx_diagnostic("%s: context ac->context_obj %p " + "is still current!\n", __func__, + (void *)ac->context_obj); if(apple_cgl.set_current_context(NULL)) { abort(); } @@ -258,6 +267,15 @@ CGLError cglerr; bool same_drawable = false; + apple_glx_diagnostic("%s: oldac %p ac %p drawable 0x%lx\n", + __func__, (void *)oldac, (void *)ac, + drawable); + + apple_glx_diagnostic("%s: oldac->context_obj %p ac->context_obj %p\n", + __func__, + (void *)(oldac ? oldac->context_obj : NULL), + (void *)(ac ? ac->context_obj : NULL)); + assert(NULL != dpy); /* Reset the is_current state of the old context, if non-NULL. */ @@ -341,8 +359,10 @@ * context is already current. */ - if(same_drawable && ac->is_current) + if(same_drawable && ac->is_current) { + apple_glx_diagnostic("%s: same_drawable and ac->is_current\n"); return false; + } cglerr = apple_cgl.set_current_context(ac->context_obj); Modified: AppleSGLX/trunk/apple_glx_surface.c =================================================================== --- AppleSGLX/trunk/apple_glx_surface.c 2009-02-27 08:00:42 UTC (rev 270) +++ AppleSGLX/trunk/apple_glx_surface.c 2009-02-27 08:33:31 UTC (rev 271) @@ -62,6 +62,9 @@ assert(APPLE_GLX_DRAWABLE_SURFACE == d->type); + apple_glx_diagnostic("%s: ac->context_obj %p s->surface_id %u\n", + __func__, (void *)ac->context_obj, s->surface_id); + error = xp_attach_gl_context(ac->context_obj, s->surface_id); if(error) {

1 0

[270] AppleSGLX/trunk
by source_changes＠macosforge.org 27 Feb '09

27 Feb '09

Revision: 270 http://trac.macosforge.org/projects/xquartz/changeset/270 Author: gstaplin(a)apple.com Date: 2009-02-27 00:00:42 -0800 (Fri, 27 Feb 2009) Log Message: ----------- Remove some dead unused code. apple_glx_destroy_drawable_in_any isn't needed any more. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_context.c AppleSGLX/trunk/apple_glx_drawable.h Modified: AppleSGLX/trunk/apple_glx_context.c =================================================================== --- AppleSGLX/trunk/apple_glx_context.c 2009-02-27 02:04:06 UTC (rev 269) +++ AppleSGLX/trunk/apple_glx_context.c 2009-02-27 08:00:42 UTC (rev 270) @@ -447,25 +447,6 @@ return false; } -void apple_glx_destroy_drawable_in_any(Display *dpy, GLXDrawable d) { - struct apple_glx_context *ac; - struct apple_glx_drawable *agd; - - lock_context_list(); - - for(ac = context_list; ac; ac = ac->next) { - if(ac->drawable && ac->drawable->drawable == d) { - agd = ac->drawable; - ac->drawable = NULL; - agd->release(agd); - (void)agd->destroy(agd); - apple_cgl.clear_drawable(ac->context_obj); - } - } - - unlock_context_list(); -} - /* * The value returned is the total number of contexts set to update. * It's meant for debugging/introspection. Modified: AppleSGLX/trunk/apple_glx_drawable.h =================================================================== --- AppleSGLX/trunk/apple_glx_drawable.h 2009-02-27 02:04:06 UTC (rev 269) +++ AppleSGLX/trunk/apple_glx_drawable.h 2009-02-27 08:00:42 UTC (rev 270) @@ -149,8 +149,6 @@ void apple_glx_garbage_collect_drawables(Display *dpy); -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.

1 0

[269] AppleSGLX/trunk/tests/pbuffer/pbuffer_destroy.c
by source_changes＠macosforge.org 27 Feb '09

27 Feb '09

Revision: 269 http://trac.macosforge.org/projects/xquartz/changeset/269 Author: gstaplin(a)apple.com Date: 2009-02-26 18:04:06 -0800 (Thu, 26 Feb 2009) Log Message: ----------- Enhance the pbuffer_destroy test to show destructor info by making the context not be current with the pbuffer. Modified Paths: -------------- AppleSGLX/trunk/tests/pbuffer/pbuffer_destroy.c Modified: AppleSGLX/trunk/tests/pbuffer/pbuffer_destroy.c =================================================================== --- AppleSGLX/trunk/tests/pbuffer/pbuffer_destroy.c 2009-02-27 02:01:38 UTC (rev 268) +++ AppleSGLX/trunk/tests/pbuffer/pbuffer_destroy.c 2009-02-27 02:04:06 UTC (rev 269) @@ -160,6 +160,8 @@ draw(dpy); glXDestroyPbuffer(dpy, pbuf); draw(dpy); - + glXMakeCurrent(dpy, None, ctx); + draw(dpy); + return EXIT_SUCCESS; }

1 0

[268] AppleSGLX/trunk/Makefile
by source_changes＠macosforge.org 27 Feb '09

27 Feb '09

Revision: 268 http://trac.macosforge.org/projects/xquartz/changeset/268 Author: gstaplin(a)apple.com Date: 2009-02-26 18:01:38 -0800 (Thu, 26 Feb 2009) Log Message: ----------- Fix the Makefile with Jeremy's changes merged. Modified Paths: -------------- AppleSGLX/trunk/Makefile Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-27 01:58:44 UTC (rev 267) +++ AppleSGLX/trunk/Makefile 2009-02-27 02:01:38 UTC (rev 268) @@ -33,7 +33,7 @@ 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_xgl_api_read.o glx_empty.o glx_error.o \ - apple_xgl_api_viewport.o + apple_xgl_api_viewport.o apple_glx_surface.o #This is used for building the tests. #The tests don't require installation. @@ -48,7 +48,7 @@ .c.o: $(COMPILE) $< -apple_glx_drawable.o: apple_glx_drawable.h apple_glx_drawable.c apple_glx_pixmap.h apple_glx_pbuffer.h +apple_glx_drawable.o: apple_glx_drawable.h apple_glx_drawable.c apple_xgl_api.o: apple_xgl_api.h apple_xgl_api.c apple_xgl_api_stereo.c apple_xgl_api_read.o: apple_xgl_api_read.h apple_xgl_api_read.c apple_xgl_api.h apple_xgl_api_viewport.o: apple_xgl_api_viewport.h apple_xgl_api_viewport.c apple_xgl_api.h @@ -67,8 +67,9 @@ apple_glx.o: apple_glx.h apple_glx.c apple_xgl_api.h apple_visual.o: apple_visual.h apple_visual.c apple_cgl.o: apple_cgl.h apple_cgl.c -apple_glx_pbuffer.o: apple_glx_pbuffer.h apple_glx_pbuffer.c -apple_glx_pixmap.o: apple_glx_pixmap.h apple_glx_pixmap.c appledri.h +apple_glx_pbuffer.o: apple_glx_drawable.h apple_glx_pbuffer.c +apple_glx_pixmap.o: apple_glx_drawable.h apple_glx_pixmap.c appledri.h +apple_glx_surface.o: apple_glx_drawable.h apple_glx_surface.c appledri.h xfont.o: xfont.c glxclient.h compsize.o: compsize.c renderpix.o: renderpix.c

1 0

[266] AppleSGLX/trunk/Makefile
by source_changes＠macosforge.org 26 Feb '09

26 Feb '09

Revision: 266 http://trac.macosforge.org/projects/xquartz/changeset/266 Author: jeremyhu(a)freedesktop.org Date: 2009-02-26 10:42:26 -0800 (Thu, 26 Feb 2009) Log Message: ----------- MacPorts buildfix. Modified Paths: -------------- AppleSGLX/trunk/Makefile Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-26 16:53:21 UTC (rev 265) +++ AppleSGLX/trunk/Makefile 2009-02-26 18:42:26 UTC (rev 266) @@ -3,7 +3,7 @@ CC=gcc GL_CFLAGS=-Wall -ggdb3 -Os -DPTHREADS -D_REENTRANT -DPUBLIC="" $(RC_CFLAGS) $(CFLAGS) -GL_LDFLAGS=-L$(X11_DIR)/lib $(LDFLAGS) -Wl,-single_module +GL_LDFLAGS=-L$(INSTALL_DIR)/lib -L$(X11_DIR)/lib $(LDFLAGS) -Wl,-single_module TCLSH=tclsh8.5

1 0

[265] AppleSGLX/trunk/apple_xgl_api_stereo.c
by source_changes＠macosforge.org 26 Feb '09

26 Feb '09

Revision: 265 http://trac.macosforge.org/projects/xquartz/changeset/265 Author: gstaplin(a)apple.com Date: 2009-02-26 08:53:21 -0800 (Thu, 26 Feb 2009) Log Message: ----------- Fix an issue with glDrawBuffer that may solve a Pymol problem. The GL_BACK was being translated to a GL_BACK_LEFT and GL_BACK_RIGHT correctly, however the GL_FRONT should also be translated to GL_FRONT_LEFT and GL_FRONT_RIGHT, because glDrawBuffers (which the glDrawBuffer calls) doesn't accept GL_FRONT! So this was producing errors, and most code doesn't call glGetError, but should, so that's why this went unnoticed. I suspect some video cards handle the error differently, and that may be why this occurred only with some video drivers. This was found during usage of the OpenGL Profiler, which as I understand it didn't work correctly with the old libGL. It seems to work fine with AppleSGLX though. So hurray! It may fix Pymol! Modified Paths: -------------- AppleSGLX/trunk/apple_xgl_api_stereo.c Modified: AppleSGLX/trunk/apple_xgl_api_stereo.c =================================================================== --- AppleSGLX/trunk/apple_xgl_api_stereo.c 2009-02-26 15:45:08 UTC (rev 264) +++ AppleSGLX/trunk/apple_xgl_api_stereo.c 2009-02-26 16:53:21 UTC (rev 265) @@ -5,12 +5,20 @@ void glDrawBuffer(GLenum mode) { GLenum buf[2]; GLsizei n = 0; - - if(GL_BACK == mode) { + + switch(mode) { + case GL_BACK: buf[0] = GL_BACK_LEFT; buf[1] = GL_BACK_RIGHT; n = 2; - } else { + break; + case GL_FRONT: + buf[0] = GL_FRONT_LEFT; + buf[1] = GL_FRONT_RIGHT; + n = 2; + break; + + default: buf[0] = mode; n = 1; } @@ -23,7 +31,7 @@ GLenum newbuf[n + 2]; GLsizei i, outi = 0; bool have_back = false; - + for(i = 0; i < n; ++i) { if(GL_BACK == bufs[i]) { have_back = true;

1 0

[264] AppleSGLX/trunk
by source_changes＠macosforge.org 26 Feb '09

26 Feb '09

Revision: 264 http://trac.macosforge.org/projects/xquartz/changeset/264 Author: gstaplin(a)apple.com Date: 2009-02-26 07:45:08 -0800 (Thu, 26 Feb 2009) Log Message: ----------- Improve the multisample_glx test. It seems that glXCreateContext doesn't support the GLX_SAMPLE_BUFFERS and friends, perhaps because the visuals strip out that code. However, we can use glXCreateNewContext (part of GLX 1.3) to create a GLXContext that does enable the sampling. What's odd is that the test worked before with xserver 1.6, and 1.4 reported 0 samples, and sample buffers. Also reindent a bit of code in glxext.c. Modified Paths: -------------- AppleSGLX/trunk/glxext.c AppleSGLX/trunk/tests/simple/multisample_glx.c Modified: AppleSGLX/trunk/glxext.c =================================================================== --- AppleSGLX/trunk/glxext.c 2009-02-26 15:04:50 UTC (rev 263) +++ AppleSGLX/trunk/glxext.c 2009-02-26 15:45:08 UTC (rev 264) @@ -420,7 +420,7 @@ config->sampleBuffers = *bp++; break; case GLX_SAMPLES_SGIS: - config->samples = *bp++; + config->samples = *bp++; break; case GLX_BIND_TO_TEXTURE_RGB_EXT: config->bindToTextureRgb = *bp++; Modified: AppleSGLX/trunk/tests/simple/multisample_glx.c =================================================================== --- AppleSGLX/trunk/tests/simple/multisample_glx.c 2009-02-26 15:04:50 UTC (rev 263) +++ AppleSGLX/trunk/tests/simple/multisample_glx.c 2009-02-26 15:45:08 UTC (rev 264) @@ -89,6 +89,8 @@ GLX_GREEN_SIZE, 8, GLX_BLUE_SIZE, 8, GLX_ALPHA_SIZE, 8, + GLX_SAMPLE_BUFFERS, 1, + GLX_SAMPLES, 1, None }; @@ -157,10 +159,11 @@ CWBackPixel | CWBorderPixel | CWColormap | CWEventMask, &attr); - ctx = glXCreateContext(dpy, visinfo, NULL, True ); + ctx = glXCreateNewContext(dpy, fbconfig[bestfbi], GLX_WINDOW_BIT, + NULL, True); if (!ctx) { - fprintf(stderr, "error: glXCreateContext failed!\n"); + fprintf(stderr, "error: glXCreateNewContext failed!\n"); return EXIT_FAILURE; }

1 0