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

[263] AppleSGLX/trunk/gen_exports.tcl
by source_changes＠macosforge.org 26 Feb '09

26 Feb '09

Revision: 263 http://trac.macosforge.org/projects/xquartz/changeset/263 Author: gstaplin(a)apple.com Date: 2009-02-26 07:04:50 -0800 (Thu, 26 Feb 2009) Log Message: ----------- Update gen_exports.tcl to include some SGIX stubs. This should allow building more Mesa apps (more easily at least), but the extension won't be listed by glXQueryExtensionsString. See also: the long comment in gen_exports.tcl. Modified Paths: -------------- AppleSGLX/trunk/gen_exports.tcl Modified: AppleSGLX/trunk/gen_exports.tcl =================================================================== --- AppleSGLX/trunk/gen_exports.tcl 2009-02-26 07:49:45 UTC (rev 262) +++ AppleSGLX/trunk/gen_exports.tcl 2009-02-26 15:04:50 UTC (rev 263) @@ -89,6 +89,30 @@ glXDestroyGLXPbufferSGIX glXSelectEventSGIX \ glXGetSelectedEventSGIX + #These are for GLX_SGIX_fbconfig, which isn't implemented, because + #we have the GLX 1.3 GLXFBConfig functions which are in the standard spec. + #It should be possible to support these to some extent. + #The old libGL somewhat supported the GLXFBConfigSGIX code, but lacked + #pbuffer, and pixmap support. + #We mainly just need these stubs for linking with apps, because for + #some reason the OpenGL site suggests using the latest glxext.h, + #and glxext.h defines all GLX extensions, which doesn't seem right for + #compile-time capability detection. + #See also: http://www.mesa3d.org/brianp/sig97/exten.htm#Compile + #which conflicts with: the ABI registry from what I saw on opengl.org. + #By disabling some of the #defines in glxext.h we break some software, + #and by enabling them without the symbols we break others (in Mesa). + #I think a lot of OpenGL-based programs have issues one way or another. + #It seems that even Mesa developers are confused on this issue, because + #Mesa-7.3/progs/xdemos/glxgears_fbconfig.c has comments about breakage + #in some comments. + lappend glxlist glXGetFBConfigAttribSGIX \ + glXChooseFBConfigSGIX \ + glXGetVisualFromFBConfigSGIX \ + glXCreateGLXPixmapWithConfigSGIX \ + glXCreateContextWithConfigSGIX \ + glXGetFBConfigFromVisualSGIX + set fd [open [lindex $argv 1] w]

1 0

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

26 Feb '09

Revision: 262 http://trac.macosforge.org/projects/xquartz/changeset/262 Author: gstaplin(a)apple.com Date: 2009-02-25 23:49:45 -0800 (Wed, 25 Feb 2009) Log Message: ----------- Test if the drawable is the current drawable in a safer way. Before if the context was new and glXSwapBuffers was called without a drawable made current, it would likely crash while dereferencing NULL. We want it to generate a nice XError instead. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_context.c Modified: AppleSGLX/trunk/apple_glx_context.c =================================================================== --- AppleSGLX/trunk/apple_glx_context.c 2009-02-26 07:12:59 UTC (rev 261) +++ AppleSGLX/trunk/apple_glx_context.c 2009-02-26 07:49:45 UTC (rev 262) @@ -489,7 +489,7 @@ assert(NULL != ac); - return (ac->drawable->drawable == drawable); + return (ac->drawable && ac->drawable->drawable == drawable); } /* Return true if an error occurred. */

1 0

[261] AppleSGLX/trunk/apple_glx_context.h
by source_changes＠macosforge.org 26 Feb '09

26 Feb '09

Revision: 261 http://trac.macosforge.org/projects/xquartz/changeset/261 Author: gstaplin(a)apple.com Date: 2009-02-25 23:12:59 -0800 (Wed, 25 Feb 2009) Log Message: ----------- Commit a file I missed during the surface notify update changes. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_context.h Modified: AppleSGLX/trunk/apple_glx_context.h =================================================================== --- AppleSGLX/trunk/apple_glx_context.h 2009-02-26 07:12:02 UTC (rev 260) +++ AppleSGLX/trunk/apple_glx_context.h 2009-02-26 07:12:59 UTC (rev 261) @@ -48,6 +48,7 @@ pthread_t thread_id; int screen; bool double_buffered; + bool need_update; bool is_current; /* True if the context is current in some thread. */ bool made_current; /* True if the context has ever been made current. */ struct apple_glx_context *previous, *next; @@ -68,4 +69,8 @@ unsigned long mask, int *errorptr, bool *x11errorptr); +int apple_glx_context_surface_changed(unsigned int uid, pthread_t caller); + +void apple_glx_context_update(void *ptr); + #endif /*APPLE_GLX_CONTEXT_H*/

1 0

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

26 Feb '09

Revision: 260 http://trac.macosforge.org/projects/xquartz/changeset/260 Author: gstaplin(a)apple.com Date: 2009-02-25 23:12:02 -0800 (Wed, 25 Feb 2009) Log Message: ----------- Mark another item done. Modified Paths: -------------- AppleSGLX/trunk/TODO Modified: AppleSGLX/trunk/TODO =================================================================== --- AppleSGLX/trunk/TODO 2009-02-26 07:05:26 UTC (rev 259) +++ AppleSGLX/trunk/TODO 2009-02-26 07:12:02 UTC (rev 260) @@ -1,6 +1,6 @@ -- Feb 20, 2009 -Fix glXCreateWindow and glXDestroyWindow. +DONE Fix glXCreateWindow and glXDestroyWindow. Add API major version testing to the apple_cgl layer. This way we can avoid future API fiascos. Jordan suggested this a while ago.

1 0

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

26 Feb '09

Revision: 259 http://trac.macosforge.org/projects/xquartz/changeset/259 Author: gstaplin(a)apple.com Date: 2009-02-25 23:05:26 -0800 (Wed, 25 Feb 2009) Log Message: ----------- Make the xp_update_gl_context thread safe. When a surface notify event occurs the code will now set a need_update boolean in each affected context. Also optimize the make current path a bit to avoid setting current if already current. Do the same with the drawable search and setting. Modified Paths: -------------- AppleSGLX/trunk/Makefile AppleSGLX/trunk/apple_glx.c AppleSGLX/trunk/apple_glx_context.c AppleSGLX/trunk/gen_api_library.tcl Added Paths: ----------- AppleSGLX/trunk/apple_xgl_api_viewport.c AppleSGLX/trunk/apple_xgl_api_viewport.h Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-25 21:09:24 UTC (rev 258) +++ AppleSGLX/trunk/Makefile 2009-02-26 07:05:26 UTC (rev 259) @@ -32,7 +32,8 @@ 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_xgl_api_read.o glx_empty.o glx_error.o + apple_glx_pixmap.o apple_xgl_api_read.o glx_empty.o glx_error.o \ + apple_xgl_api_viewport.o #This is used for building the tests. #The tests don't require installation. @@ -50,6 +51,7 @@ apple_glx_drawable.o: apple_glx_drawable.h apple_glx_drawable.c apple_glx_pixmap.h apple_glx_pbuffer.h 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 glcontextmodes.o: glcontextmodes.c glcontextmodes.h glxext.o: glxext.c glxreply.o: glxreply.c Modified: AppleSGLX/trunk/apple_glx.c =================================================================== --- AppleSGLX/trunk/apple_glx.c 2009-02-25 21:09:24 UTC (rev 258) +++ AppleSGLX/trunk/apple_glx.c 2009-02-26 07:05:26 UTC (rev 259) @@ -1,5 +1,5 @@ /* - Copyright (c) 2008 Apple Inc. + 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 @@ -58,22 +58,33 @@ } static void surface_notify_handler(Display *dpy, unsigned int uid, int kind) { - xp_surface_id sid; - CGLContextObj contextobj; - if(apple_glx_get_surface_from_uid(uid, &sid, &contextobj)) { - /* The surface was probably destroyed. */ - return; - } + switch(kind) { + case AppleDRISurfaceNotifyDestroyed: { + xp_surface_id sid; + CGLContextObj contextobj; - switch(kind) { - case AppleDRISurfaceNotifyDestroyed: + if(apple_glx_get_surface_from_uid(uid, &sid, &contextobj)) { + /* The surface was probably destroyed. */ + return; + } + + /* FIXME this needs more thread safety. */ + apple_cgl.clear_drawable(contextobj); xp_destroy_surface(sid); + } break; - case AppleDRISurfaceNotifyChanged: - xp_update_gl_context(contextobj); + case AppleDRISurfaceNotifyChanged: { + int updated; + + updated = apple_glx_context_surface_changed(uid, pthread_self()); + +#ifdef LIBGL_DEBUG + printf("surface notify updated %d\n", updated); +#endif + } break; default: Modified: AppleSGLX/trunk/apple_glx_context.c =================================================================== --- AppleSGLX/trunk/apple_glx_context.c 2009-02-25 21:09:24 UTC (rev 258) +++ AppleSGLX/trunk/apple_glx_context.c 2009-02-26 07:05:26 UTC (rev 259) @@ -139,6 +139,7 @@ ac->thread_id = pthread_self(); ac->screen = screen; ac->double_buffered = false; + ac->need_update = false; ac->is_current = false; ac->made_current = false; @@ -315,13 +316,14 @@ assert(NULL != dpy); /* Reset the is_current state of the old context, if non-NULL. */ - if(oldac) + if(oldac && (ac != oldac)) oldac->is_current = false; if(NULL == ac) { /*Clear the current context.*/ apple_cgl.set_current_context(NULL); - + oldac->is_current = false; + return false; } @@ -337,7 +339,12 @@ return false; } - newagd = apple_glx_find_drawable(dpy, drawable); + /* This is an optimisation to avoid searching for the drawable. */ + if(ac->drawable && ac->drawable->drawable == drawable) { + newagd = ac->drawable; + } else { + newagd = apple_glx_find_drawable(dpy, drawable); + } if(ac->drawable == newagd) same_drawable = true; @@ -371,6 +378,13 @@ } } + /* + * Avoid this costly path if this is the same drawable and the + * context is already current. + */ + if(same_drawable && ac->is_current) + return false; + cglerr = apple_cgl.set_current_context(ac->context_obj); if(kCGLNoError != cglerr) { @@ -556,3 +570,38 @@ unlock_context_list(); } + +/* + * The value returned is the total number of contexts set to update. + * It's meant for debugging/introspection. + */ +int apple_glx_context_surface_changed(unsigned int uid, pthread_t caller) { + struct apple_glx_context *ac; + int updated = 0; + + lock_context_list(); + + for(ac = context_list; ac; ac = ac->next) { + if(ac->drawable && ac->drawable->uid == uid) { + ac->need_update = true; + ++updated; + } + } + + unlock_context_list(); + + return updated; +} + +void apple_glx_context_update(void *ptr) { + struct apple_glx_context *ac = ptr; + + if(ac->need_update) { + xp_update_gl_context(ac->context_obj); + ac->need_update = false; + +#ifdef LIBGL_DEBUG + printf("updating context %p\n", ptr); +#endif + } +} Added: AppleSGLX/trunk/apple_xgl_api_viewport.c =================================================================== --- AppleSGLX/trunk/apple_xgl_api_viewport.c (rev 0) +++ AppleSGLX/trunk/apple_xgl_api_viewport.c 2009-02-26 07:05:26 UTC (rev 259) @@ -0,0 +1,42 @@ +/* + 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"), 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. +*/ +#include "apple_glx_context.h" +#include "apple_xgl_api.h" +#include "apple_xgl_api_viewport.h" + +extern struct apple_xgl_api __gl_api; + +void glViewport(GLint x, GLint y, GLsizei width, GLsizei height) { + GLXContext gc = __glXGetCurrentContext(); + + if(gc && gc->apple) + apple_glx_context_update(gc->apple); + + __gl_api.Viewport(x, y, width, height); +} Added: AppleSGLX/trunk/apple_xgl_api_viewport.h =================================================================== --- AppleSGLX/trunk/apple_xgl_api_viewport.h (rev 0) +++ AppleSGLX/trunk/apple_xgl_api_viewport.h 2009-02-26 07:05:26 UTC (rev 259) @@ -0,0 +1,36 @@ +/* + 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"), 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. +*/ +#ifndef APPLE_XGL_API_VIEWPORT_H +#define APPLE_XGL_API_VIEWPORT_H + +#include "glxclient.h" + +void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); + +#endif Modified: AppleSGLX/trunk/gen_api_library.tcl =================================================================== --- AppleSGLX/trunk/gen_api_library.tcl 2009-02-25 21:09:24 UTC (rev 258) +++ AppleSGLX/trunk/gen_api_library.tcl 2009-02-26 07:05:26 UTC (rev 259) @@ -127,8 +127,11 @@ #These are special to glXMakeContextCurrent. #See also: apple_xgl_api_read.c. - lappend exclude ReadPixels CopyPixels CopyColorTable + lappend exclude ReadPixels CopyPixels CopyColorTable + #This is excluded to work with surface updates. + lappend exclude Viewport + foreach f $sorted { if {$f in $exclude} { continue

1 0

[258] trunk/pkg/README.2.3.3.txt
by source_changes＠macosforge.org 25 Feb '09

25 Feb '09

Revision: 258 http://trac.macosforge.org/projects/xquartz/changeset/258 Author: jeremyhu(a)freedesktop.org Date: 2009-02-25 13:09:24 -0800 (Wed, 25 Feb 2009) Log Message: ----------- kdrive Modified Paths: -------------- trunk/pkg/README.2.3.3.txt Modified: trunk/pkg/README.2.3.3.txt =================================================================== --- trunk/pkg/README.2.3.3.txt 2009-02-25 21:07:13 UTC (rev 257) +++ trunk/pkg/README.2.3.3.txt 2009-02-25 21:09:24 UTC (rev 258) @@ -24,6 +24,7 @@ * Fixed a bug when the window was told to unmaximize when it was already not maximized. * xinput 1.4.0 * xterm 242 + * Xephyr, Xnest, Xfake, Xvfb 1.6.0 * proto: * dri2proto 1.99.3 * randrproto 1.2.99.3

1 0

[257] trunk/pkg/README.2.3.3.txt
by source_changes＠macosforge.org 25 Feb '09

25 Feb '09

Revision: 257 http://trac.macosforge.org/projects/xquartz/changeset/257 Author: jeremyhu(a)freedesktop.org Date: 2009-02-25 13:07:13 -0800 (Wed, 25 Feb 2009) Log Message: ----------- capslock not in 2.3.3 Modified Paths: -------------- trunk/pkg/README.2.3.3.txt Modified: trunk/pkg/README.2.3.3.txt =================================================================== --- trunk/pkg/README.2.3.3.txt 2009-02-25 21:02:46 UTC (rev 256) +++ trunk/pkg/README.2.3.3.txt 2009-02-25 21:07:13 UTC (rev 257) @@ -57,6 +57,7 @@ * server: * Xquartz fixes from xorg-server-1.4.2-apple35 * DRI Updates for new libGL + * Fix CapsLock == Changes in 2.3.2.1 == * All changes in 2.3.2 plus:

1 0

[254] AppleSGLX/tags/AppleSGLX-52/
by source_changes＠macosforge.org 24 Feb '09

24 Feb '09

Revision: 254 http://trac.macosforge.org/projects/xquartz/changeset/254 Author: jeremyhu(a)freedesktop.org Date: 2009-02-23 23:51:04 -0800 (Mon, 23 Feb 2009) Log Message: ----------- Tagging AppleSGLX-52 Added Paths: ----------- AppleSGLX/tags/AppleSGLX-52/

1 0

[253] AppleSGLX/trunk
by source_changes＠macosforge.org 24 Feb '09

24 Feb '09

Revision: 253 http://trac.macosforge.org/projects/xquartz/changeset/253 Author: jeremyhu(a)freedesktop.org Date: 2009-02-23 23:50:21 -0800 (Mon, 23 Feb 2009) Log Message: ----------- Integrate code generation into Makefile. Build / Tested on Tiger Modified Paths: -------------- AppleSGLX/trunk/Makefile Property Changed: ---------------- AppleSGLX/trunk/ Property changes on: AppleSGLX/trunk ___________________________________________________________________ Modified: svn:ignore - builds testbuilds + builds testbuilds stage.* apple_xgl_api.h apple_xgl_api.c Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-24 05:01:15 UTC (rev 252) +++ AppleSGLX/trunk/Makefile 2009-02-24 07:50:21 UTC (rev 253) @@ -5,6 +5,8 @@ GL_CFLAGS=-Wall -ggdb3 -Os -DPTHREADS -D_REENTRANT -DPUBLIC="" $(RC_CFLAGS) $(CFLAGS) GL_LDFLAGS=-L$(X11_DIR)/lib $(LDFLAGS) -Wl,-single_module +TCLSH=tclsh8.5 + MKDIR=mkdir INSTALL=install LN=ln @@ -60,7 +62,7 @@ glxhash.o: glxhash.h glxhash.c appledri.o: appledri.h appledristr.h appledri.c apple_glx_context.o: apple_glx_context.c apple_glx_context.h apple_glx_context.h -apple_glx.o: apple_glx.h apple_glx.c +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 @@ -72,6 +74,10 @@ pixel.o: pixel.c glx_empty.o: glx_empty.c +apple_xgl_api.c: apple_xgl_api.h +apple_xgl_api.h: gen_api_header.tcl gen_api_library.tcl gen_code.tcl gen_defs.tcl gen_exports.tcl gen_funcs.tcl gen_types.tcl + $(TCLSH) gen_code.tcl + $(BUILD_DIR)/glxinfo: tests/glxinfo/glxinfo.c $(BUILD_DIR)/libGL.1.2.dylib $(CC) tests/glxinfo/glxinfo.c $(INCLUDE) -L$(X11_DIR)/lib -lX11 $(BUILD_DIR)/libGL.1.2.dylib -o $@ @@ -102,4 +108,5 @@ rm -rf $(TEST_BUILD_DIR) rm -f *.o *.a rm -f *.c~ *.h~ + rm -f apple_xgl_api.h apple_xgl_api.c rm -f *.dylib

1 0

[252] AppleSGLX/trunk/apple_glx.c
by source_changes＠macosforge.org 24 Feb '09

24 Feb '09

Revision: 252 http://trac.macosforge.org/projects/xquartz/changeset/252 Author: gstaplin(a)apple.com Date: 2009-02-23 21:01:15 -0800 (Mon, 23 Feb 2009) Log Message: ----------- Add a missing dlclose(). Modified Paths: -------------- AppleSGLX/trunk/apple_glx.c Modified: AppleSGLX/trunk/apple_glx.c =================================================================== --- AppleSGLX/trunk/apple_glx.c 2009-02-24 04:37:00 UTC (rev 251) +++ AppleSGLX/trunk/apple_glx.c 2009-02-24 05:01:15 UTC (rev 252) @@ -176,6 +176,8 @@ s = dlsym(libgl_handle, pname); } + dlclose(h); + return s; }

1 0