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

[301] AppleSGLX/trunk/apple_visual.c
by source_changes＠macosforge.org 10 Mar '09

10 Mar '09

Revision: 301 http://trac.macosforge.org/projects/xquartz/changeset/301 Author: gstaplin(a)apple.com Date: 2009-03-09 20:00:47 -0700 (Mon, 09 Mar 2009) Log Message: ----------- Enable the kCGLPFAMultisample bit when multisampling is requested. Modified Paths: -------------- AppleSGLX/trunk/apple_visual.c Modified: AppleSGLX/trunk/apple_visual.c =================================================================== --- AppleSGLX/trunk/apple_visual.c 2009-03-10 02:21:16 UTC (rev 300) +++ AppleSGLX/trunk/apple_visual.c 2009-03-10 03:00:47 UTC (rev 301) @@ -30,6 +30,7 @@ #include <stdbool.h> #include <stdio.h> #include <stdlib.h> +#include <assert.h> #include <GL/gl.h> #include <OpenGL/OpenGL.h> #include <OpenGL/CGLContext.h> @@ -37,10 +38,14 @@ #include "apple_cgl.h" #include "apple_visual.h" +enum { + MAX_ATTR = 60 +}; + /*mode is a __GlcontextModes*/ void apple_visual_create_pfobj(CGLPixelFormatObj *pfobj, const void *mode, bool *double_buffered, bool offscreen) { - CGLPixelFormatAttribute attr[60]; + CGLPixelFormatAttribute attr[MAX_ATTR]; const __GLcontextModes *c = mode; int numattr = 0; GLint vsref = 0; @@ -59,7 +64,7 @@ * do want the closest match for the color, depth, and accum. */ attr[numattr++] = kCGLPFAClosestPolicy; - + if(c->stereoMode) attr[numattr++] = kCGLPFAStereo; @@ -92,6 +97,7 @@ } if(c->sampleBuffers > 0) { + attr[numattr++] = kCGLPFAMultisample; attr[numattr++] = kCGLPFASampleBuffers; attr[numattr++] = c->sampleBuffers; attr[numattr++] = kCGLPFASamples; @@ -100,6 +106,8 @@ attr[numattr++] = 0; + assert(numattr < MAX_ATTR); + error = apple_cgl.choose_pixel_format(attr, pfobj, &vsref); if(error) {

1 0

[300] AppleSGLX/trunk/tests/simple/multisample_glx.c
by source_changes＠macosforge.org 10 Mar '09

10 Mar '09

Revision: 300 http://trac.macosforge.org/projects/xquartz/changeset/300 Author: gstaplin(a)apple.com Date: 2009-03-09 19:21:16 -0700 (Mon, 09 Mar 2009) Log Message: ----------- Enhanced the multisample_glx test a bit to try to diagnose the samples not matching the expected 16. Modified Paths: -------------- AppleSGLX/trunk/tests/simple/multisample_glx.c Modified: AppleSGLX/trunk/tests/simple/multisample_glx.c =================================================================== --- AppleSGLX/trunk/tests/simple/multisample_glx.c 2009-03-10 02:12:05 UTC (rev 299) +++ AppleSGLX/trunk/tests/simple/multisample_glx.c 2009-03-10 02:21:16 UTC (rev 300) @@ -147,6 +147,11 @@ printf("visinfo->visualid %lx\n", visinfo->visualid); + glXGetFBConfigAttrib(dpy, fbconfig[bestfbi], GLX_FBCONFIG_ID, &value); + + printf("fbconfig id 0x%x\n", value); + + attr.background_pixel = 0; attr.border_pixel = 0; attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone); @@ -174,6 +179,8 @@ return EXIT_FAILURE; } + printf("GL_RENDERER %s\n", (char *) glGetString(GL_RENDERER)); + glEnable(GL_MULTISAMPLE); create_lists();

1 0

[299] AppleSGLX/trunk/apple_visual.c
by source_changes＠macosforge.org 10 Mar '09

10 Mar '09

Revision: 299 http://trac.macosforge.org/projects/xquartz/changeset/299 Author: gstaplin(a)apple.com Date: 2009-03-09 19:12:05 -0700 (Mon, 09 Mar 2009) Log Message: ----------- Add kCGLPFAClosestPolicy to the pixel format object creation attributes. This should provide more accurate matches of pixel format objects to GLXFBConfig and Visuals. Modified Paths: -------------- AppleSGLX/trunk/apple_visual.c Modified: AppleSGLX/trunk/apple_visual.c =================================================================== --- AppleSGLX/trunk/apple_visual.c 2009-03-09 05:34:18 UTC (rev 298) +++ AppleSGLX/trunk/apple_visual.c 2009-03-10 02:12:05 UTC (rev 299) @@ -52,7 +52,14 @@ attr[numattr++] = kCGLPFAColorSize; attr[numattr++] = 32; } - + + /* + * The program chose a config based on the fbconfigs or visuals. + * Those are based on the attributes from CGL, so we probably + * do want the closest match for the color, depth, and accum. + */ + attr[numattr++] = kCGLPFAClosestPolicy; + if(c->stereoMode) attr[numattr++] = kCGLPFAStereo;

1 0

[298] AppleSGLX/trunk/TODO
by source_changes＠macosforge.org 09 Mar '09

09 Mar '09

Revision: 298 http://trac.macosforge.org/projects/xquartz/changeset/298 Author: gstaplin(a)apple.com Date: 2009-03-08 22:34:18 -0700 (Sun, 08 Mar 2009) Log Message: ----------- Mark a few more TODO items DONE. Modified Paths: -------------- AppleSGLX/trunk/TODO Modified: AppleSGLX/trunk/TODO =================================================================== --- AppleSGLX/trunk/TODO 2009-03-08 21:04:31 UTC (rev 297) +++ AppleSGLX/trunk/TODO 2009-03-09 05:34:18 UTC (rev 298) @@ -19,10 +19,14 @@ DONE Test glXGetCurrentDisplay(). It appears correct. -- -Improve the glX symbol compatibility with the old libGL. +DONE Improve the glX symbol compatibility with the old libGL. -Work out something for the GLXFBConfig optimal width/height. These types -of things aren't really exposed AFAIK by CGL. +DONE Work out something for the GLXFBConfig optimal width/height. These types +of things aren't really exposed AFAIK by CGL. We can't do this, so we +don't enable the extension that enables the optimal pbuffer width/height. +Specifically don't enable the SGIX_pbuffer: +#define GLX_OPTIMAL_PBUFFER_WIDTH_SGIX 0x8019 +#define GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX 0x801A Verify the XError behavior of GLXPixmap support functions. @@ -106,7 +110,7 @@ -- OLD: -Add glxext.h support, and support functions. +DONE Add glxext.h support, and support functions. ----

1 0

[297] AppleSGLX/trunk/glxext.c
by source_changes＠macosforge.org 08 Mar '09

08 Mar '09

Revision: 297 http://trac.macosforge.org/projects/xquartz/changeset/297 Author: gstaplin(a)apple.com Date: 2009-03-08 14:04:31 -0700 (Sun, 08 Mar 2009) Log Message: ----------- The glxext.c client code wasn't handling some tags properly. The X server will need some changes to fully fix the problem with invalid tags. Modified Paths: -------------- AppleSGLX/trunk/glxext.c Modified: AppleSGLX/trunk/glxext.c =================================================================== --- AppleSGLX/trunk/glxext.c 2009-03-08 20:48:53 UTC (rev 296) +++ AppleSGLX/trunk/glxext.c 2009-03-08 21:04:31 UTC (rev 297) @@ -254,15 +254,33 @@ } +/* + * We don't want to enable this GLX_OML_swap_method in glxext.h, + * because we can't support it. The X server writes it out though, + * so we should handle it somehow, to avoid false warnings. + */ +enum { + IGNORE_GLX_SWAP_METHOD_OML = 0x8060 +}; + + +/* + * getVisualConfigs uses the !tagged_only path. + * getFBConfigs uses the tagged_only path. + */ _X_HIDDEN void __glXInitializeVisualConfigFromTags( __GLcontextModes *config, int count, const INT32 *bp, Bool tagged_only, Bool fbconfig_style_tags ) { int i; - + long int tag, tagvalue; + if (!tagged_only) { - /* Copy in the first set of properties */ + /* + * Copy in the first set of properties. + * There should only be 18 initial properties. + */ config->visualID = *bp++; config->visualType = _gl_convert_from_x_visual_type( *bp++ ); @@ -289,8 +307,8 @@ /* AppleSGLX supports pixmap and pbuffers with all config. */ config->drawableType = GLX_WINDOW_BIT | GLX_PIXMAP_BIT | GLX_PBUFFER_BIT; - - count -= __GLX_MIN_CONFIG_PROPS; + /* Unfortunately this can create an ABI compatibility problem. */ + count -= 18; } /* @@ -303,7 +321,9 @@ config-> tag = ( fbconfig_style_tags ) ? *bp++ : 1 for (i = 0; i < count; i += 2 ) { - switch(*bp++) { + tag = *bp++; + + switch(tag) { case GLX_RGBA: FETCH_OR_SET( rgbMode ); break; @@ -450,14 +470,20 @@ config->yInverted = *bp++; break; #endif + case IGNORE_GLX_SWAP_METHOD_OML: + /* We ignore this tag. See the comment above this function. */ + ++bp; + break; + case None: i = count; break; default: if(getenv("LIBGL_DIAGNOSTIC")) { - long int tag = *bp; - fprintf(stderr, "WARNING: unknown GLX tag from server: %ld\n", - tag); + tagvalue = *bp++; + fprintf(stderr, "WARNING: unknown GLX tag from server: " + "tag 0x%lx value 0x%lx\n", + tag, tagvalue); } break; } @@ -485,8 +511,6 @@ if (nprops == 0) return NULL; - /* FIXME: Is the __GLX_MIN_CONFIG_PROPS test correct for FBconfigs? */ - /* Check number of properties */ if (nprops < __GLX_MIN_CONFIG_PROPS || nprops > __GLX_MAX_CONFIG_PROPS) return NULL; @@ -511,8 +535,6 @@ * The XQuartz 2.3.2.1 X server doesn't set this properly, so * set the proper bits here. * AppleSGLX supports windows, pixmaps, and pbuffers with all config. - * The xorg-server-1.6-apple branch supports pixmaps, but we those - * will fail at runtime with XQuartz 2.3.2.1. */ m->drawableType = GLX_WINDOW_BIT | GLX_PIXMAP_BIT | GLX_PBUFFER_BIT;

1 0

[296] AppleSGLX/trunk
by source_changes＠macosforge.org 08 Mar '09

08 Mar '09

Revision: 296 http://trac.macosforge.org/projects/xquartz/changeset/296 Author: gstaplin(a)apple.com Date: 2009-03-08 13:48:53 -0700 (Sun, 08 Mar 2009) Log Message: ----------- Work around a surface destruction issue on withdraw/unmap, by recreating the surface in 2 possible paths (glViewport and glXSwapBuffers). This isn't ideal, but it fixes the test case, and should resolve the issue with most apps. There may be an app or 2 that have redraw issues even after this. The old libGL had black windows after a withdraw/unmap remap pattern, due to surfaces being destroyed, and the old libGL didn't recreate them. The old libGL also leaked surfaces in some cases. Modified Paths: -------------- AppleSGLX/trunk/apple_glx.c AppleSGLX/trunk/apple_glx_context.c AppleSGLX/trunk/apple_glx_context.h AppleSGLX/trunk/apple_xgl_api_viewport.c AppleSGLX/trunk/glxcmds.c Modified: AppleSGLX/trunk/apple_glx.c =================================================================== --- AppleSGLX/trunk/apple_glx.c 2009-03-08 04:08:32 UTC (rev 295) +++ AppleSGLX/trunk/apple_glx.c 2009-03-08 20:48:53 UTC (rev 296) @@ -141,6 +141,8 @@ void apple_glx_swap_buffers(void *ptr) { struct apple_glx_context *ac = ptr; + + /* This may not be needed with CGLFlushDrawable: */ glFlush(); apple_cgl.flush_drawable(ac->context_obj); } Modified: AppleSGLX/trunk/apple_glx_context.c =================================================================== --- AppleSGLX/trunk/apple_glx_context.c 2009-03-08 04:08:32 UTC (rev 295) +++ AppleSGLX/trunk/apple_glx_context.c 2009-03-08 20:48:53 UTC (rev 296) @@ -142,6 +142,7 @@ ac->need_update = false; ac->is_current = false; ac->made_current = false; + ac->last_surface_window = None; apple_visual_create_pfobj(&ac->pixel_format_obj, mode, &ac->double_buffered, /*offscreen*/ false); @@ -291,7 +292,7 @@ oldac->is_current = false; if(NULL == ac) { - /*Clear the current context.*/ + /*Clear the current context for this thread.*/ apple_cgl.set_current_context(NULL); if(oldac) { @@ -301,6 +302,9 @@ oldac->drawable->destroy(oldac->drawable); oldac->drawable = NULL; } + + /* Invalidate this to prevent surface recreation. */ + oldac->last_surface_window = None; } return false; @@ -321,6 +325,9 @@ ac->drawable->destroy(ac->drawable); ac->drawable = NULL; } + + /* Invalidate this to prevent surface recreation. */ + ac->last_surface_window = None; apple_glx_diagnostic("%s: drawable is None, error is: %d\n", __func__, error); @@ -389,6 +396,9 @@ ac->thread_id = pthread_self(); + /* This will be set if the pending_destroy code indicates it should be: */ + ac->last_surface_window = None; + switch(ac->drawable->type) { case APPLE_GLX_DRAWABLE_PBUFFER: case APPLE_GLX_DRAWABLE_SURFACE: @@ -408,10 +418,19 @@ return false; } -bool apple_glx_is_current_drawable(void *ptr, GLXDrawable drawable) { +bool apple_glx_is_current_drawable(Display *dpy, void *ptr, + GLXDrawable drawable) { struct apple_glx_context *ac = ptr; + + if(ac->drawable && ac->drawable->drawable == drawable) { + return true; + } else if(NULL == ac->drawable && None != ac->last_surface_window) { + apple_glx_context_update(dpy, ac); - return (ac->drawable && ac->drawable->drawable == drawable); + return (ac->drawable && ac->drawable->drawable == drawable); + } + + return false; } bool apple_glx_copy_context(void *currentptr, void *srcptr, void *destptr, @@ -484,9 +503,19 @@ return updated; } -void apple_glx_context_update(void *ptr) { +void apple_glx_context_update(Display *dpy, void *ptr) { struct apple_glx_context *ac = ptr; + if(NULL == ac->drawable && None != ac->last_surface_window) { + bool failed; + + /* Attempt to recreate the surface for a destroyed drawable. */ + failed = apple_glx_make_current_context(dpy, ac, ac, ac->last_surface_window); + + apple_glx_diagnostic("%s: surface recreation failed? %s\n", __func__, + failed ? "YES" : "NO"); + } + if(ac->need_update) { xp_update_gl_context(ac->context_obj); ac->need_update = false; @@ -509,6 +538,8 @@ d = ac->drawable; + ac->last_surface_window = d->drawable; + ac->drawable = NULL; /* Modified: AppleSGLX/trunk/apple_glx_context.h =================================================================== --- AppleSGLX/trunk/apple_glx_context.h 2009-03-08 04:08:32 UTC (rev 295) +++ AppleSGLX/trunk/apple_glx_context.h 2009-03-08 20:48:53 UTC (rev 296) @@ -50,6 +50,13 @@ 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. */ + + /* + * last_surface is set by the pending_destroy code handler for a drawable. + * Due to a CG difference, we have to recreate a surface if the window + * is unmapped and mapped again. + */ + Window last_surface_window; struct apple_glx_context *previous, *next; }; @@ -59,7 +66,7 @@ void apple_glx_destroy_context(void **ptr, Display *dpy); bool apple_glx_make_current_context(Display *dpy, void *oldptr, void *ptr, GLXDrawable drawable); -bool apple_glx_is_current_drawable(void *ptr, GLXDrawable drawable); +bool apple_glx_is_current_drawable(Display *dpy, void *ptr, GLXDrawable drawable); bool apple_glx_copy_context(void *currentptr, void *srcptr, void *destptr, unsigned long mask, int *errorptr, @@ -67,6 +74,6 @@ int apple_glx_context_surface_changed(unsigned int uid, pthread_t caller); -void apple_glx_context_update(void *ptr); +void apple_glx_context_update(Display *dpy, void *ptr); #endif /*APPLE_GLX_CONTEXT_H*/ Modified: AppleSGLX/trunk/apple_xgl_api_viewport.c =================================================================== --- AppleSGLX/trunk/apple_xgl_api_viewport.c 2009-03-08 04:08:32 UTC (rev 295) +++ AppleSGLX/trunk/apple_xgl_api_viewport.c 2009-03-08 20:48:53 UTC (rev 296) @@ -34,9 +34,10 @@ void glViewport(GLint x, GLint y, GLsizei width, GLsizei height) { GLXContext gc = __glXGetCurrentContext(); + Display *dpy = glXGetCurrentDisplay(); if(gc && gc->apple) - apple_glx_context_update(gc->apple); + apple_glx_context_update(dpy, gc->apple); __gl_api.Viewport(x, y, width, height); } Modified: AppleSGLX/trunk/glxcmds.c =================================================================== --- AppleSGLX/trunk/glxcmds.c 2009-03-08 04:08:32 UTC (rev 295) +++ AppleSGLX/trunk/glxcmds.c 2009-03-08 20:48:53 UTC (rev 296) @@ -610,7 +610,7 @@ PUBLIC void glXSwapBuffers(Display *dpy, GLXDrawable drawable) { GLXContext gc = glXGetCurrentContext(); - if(gc && apple_glx_is_current_drawable(gc->apple, drawable)) { + if(gc && apple_glx_is_current_drawable(dpy, gc->apple, drawable)) { apple_glx_swap_buffers(gc->apple); } else { __glXSendError(dpy, GLXBadCurrentWindow, 0, X_GLXSwapBuffers, false);

1 0

[295] AppleSGLX/trunk/tests/triangle_glx/triangle_glx_withdraw_remap.c
by source_changes＠macosforge.org 08 Mar '09

08 Mar '09

Revision: 295 http://trac.macosforge.org/projects/xquartz/changeset/295 Author: gstaplin(a)apple.com Date: 2009-03-07 20:08:32 -0800 (Sat, 07 Mar 2009) Log Message: ----------- Add some more debug output to the failing withdraw/remap test. Modified Paths: -------------- AppleSGLX/trunk/tests/triangle_glx/triangle_glx_withdraw_remap.c Modified: AppleSGLX/trunk/tests/triangle_glx/triangle_glx_withdraw_remap.c =================================================================== --- AppleSGLX/trunk/tests/triangle_glx/triangle_glx_withdraw_remap.c 2009-03-08 04:03:12 UTC (rev 294) +++ AppleSGLX/trunk/tests/triangle_glx/triangle_glx_withdraw_remap.c 2009-03-08 04:08:32 UTC (rev 295) @@ -32,10 +32,14 @@ break; case KeyPress: + printf("withdrawing window...\n"); XWithdrawWindow(dpy, event.xkey.window, DefaultScreen(dpy)); XFlush(dpy); + printf("sleeping...\n"); sleep(1); + printf("mapping window again...\n"); XMapWindow(dpy, event.xkey.window); + printf("drawing...\n"); draw(dpy, event.xkey.window); XFlush(dpy); break;

1 0

[294] AppleSGLX/trunk/tests
by source_changes＠macosforge.org 08 Mar '09

08 Mar '09

Revision: 294 http://trac.macosforge.org/projects/xquartz/changeset/294 Author: gstaplin(a)apple.com Date: 2009-03-07 20:03:12 -0800 (Sat, 07 Mar 2009) Log Message: ----------- Add a new test that fails due to surface destruction events being dispatched when a window is withdrawn. I'm not sure yet why this occurs, but it's obviously wrong. triangle_glx_withdraw_remap starts when you type a key with the window active. This is the type of unexpected side effect I thought might occur when I fixed the surface destruction events. Though I didn't anticipate this particular failure. I found this while running the glut tests suite. Modified Paths: -------------- AppleSGLX/trunk/tests/tests.mk AppleSGLX/trunk/tests/triangle_glx/triangle_glx.mk Added Paths: ----------- AppleSGLX/trunk/tests/triangle_glx/triangle_glx_withdraw_remap.c Modified: AppleSGLX/trunk/tests/tests.mk =================================================================== --- AppleSGLX/trunk/tests/tests.mk 2009-03-07 23:04:22 UTC (rev 293) +++ AppleSGLX/trunk/tests/tests.mk 2009-03-08 04:03:12 UTC (rev 294) @@ -33,6 +33,6 @@ $(TEST_BUILD_DIR)/multisample_glx \ $(TEST_BUILD_DIR)/glthreads \ $(TEST_BUILD_DIR)/triangle_glx_surface \ - $(TEST_BUILD_DIR)/triangle_glx_surface-2 + $(TEST_BUILD_DIR)/triangle_glx_surface-2 \ + $(TEST_BUILD_DIR)/triangle_glx_withdraw_remap - Modified: AppleSGLX/trunk/tests/triangle_glx/triangle_glx.mk =================================================================== --- AppleSGLX/trunk/tests/triangle_glx/triangle_glx.mk 2009-03-07 23:04:22 UTC (rev 293) +++ AppleSGLX/trunk/tests/triangle_glx/triangle_glx.mk 2009-03-08 04:03:12 UTC (rev 294) @@ -6,3 +6,6 @@ $(TEST_BUILD_DIR)/triangle_glx_surface-2: tests/triangle_glx/triangle_glx_surface-2.c $(LIBGL) $(CC) tests/triangle_glx/triangle_glx_surface-2.c -Iinclude -o $(TEST_BUILD_DIR)/triangle_glx_surface-2 $(LINK_TEST) + +$(TEST_BUILD_DIR)/triangle_glx_withdraw_remap: tests/triangle_glx/triangle_glx_withdraw_remap.c $(LIBGL) + $(CC) tests/triangle_glx/triangle_glx_withdraw_remap.c -Iinclude -o $(TEST_BUILD_DIR)/triangle_glx_withdraw_remap $(LINK_TEST) Added: AppleSGLX/trunk/tests/triangle_glx/triangle_glx_withdraw_remap.c =================================================================== --- AppleSGLX/trunk/tests/triangle_glx/triangle_glx_withdraw_remap.c (rev 0) +++ AppleSGLX/trunk/tests/triangle_glx/triangle_glx_withdraw_remap.c 2009-03-08 04:03:12 UTC (rev 294) @@ -0,0 +1,118 @@ +#include <stdio.h> +#include <stdlib.h> +#include <X11/Xlib.h> +#include <GL/glx.h> + +void draw(Display *dpy, Window w) { + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + glLoadIdentity(); + glColor3f(0.5f, 0.5f, 1.0f); + glBegin(GL_TRIANGLES); + glVertex3f( 0.0f, 1.0f, 0.0f); + glVertex3f(-1.0f,-1.0f, 0.0f); + glVertex3f( 1.0f,-1.0f, 0.0f); + glEnd(); + glXSwapBuffers(dpy, w); +} + +void resize(Display *dpy, Window w, int width, int height) { + glViewport(0, 0, width, height); + draw(dpy, w); +} + +void event_loop(Display *dpy) { + XEvent event; + + while(1) { + XNextEvent(dpy, &event); + + switch(event.type) { + case Expose: + draw(dpy, event.xexpose.window); + break; + + case KeyPress: + XWithdrawWindow(dpy, event.xkey.window, DefaultScreen(dpy)); + XFlush(dpy); + sleep(1); + XMapWindow(dpy, event.xkey.window); + draw(dpy, event.xkey.window); + XFlush(dpy); + break; + + case ConfigureNotify: + resize(dpy, event.xconfigure.window, event.xconfigure.width, + event.xconfigure.height); + break; + } + } +} + +int main() { + Display *dpy; + int attrib[] = { GLX_RGBA, + GLX_RED_SIZE, 8, + GLX_GREEN_SIZE, 8, + GLX_BLUE_SIZE, 8, + GLX_DEPTH_SIZE, 24, + GLX_DOUBLEBUFFER, + None }; + int eventbase, errorbase; + int screen; + Window root, win; + XVisualInfo *visinfo; + XSetWindowAttributes attr; + GLXContext ctx; + + dpy = XOpenDisplay(NULL); + + if(NULL == dpy) { + fprintf(stderr, "error: unable to open display!\n"); + return EXIT_FAILURE; + } + + if(!glXQueryExtension(dpy, &eventbase, &errorbase)) { + fprintf(stderr, "GLX is not available!\n"); + return EXIT_FAILURE; + } + + screen = DefaultScreen(dpy); + root = RootWindow(dpy, screen); + + visinfo = glXChooseVisual(dpy, screen, attrib); + + if(!visinfo) { + fprintf(stderr, "error: couldn't get an RGBA, double-buffered visual!\n"); + return EXIT_FAILURE; + } + + attr.background_pixel = 0; + attr.border_pixel = 0; + attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone); + attr.event_mask = StructureNotifyMask | ExposureMask | KeyPressMask; + + win = XCreateWindow(dpy, root, /*x*/ 0, /*y*/ 0, + /*width*/ 400, /*height*/ 400, + 0, visinfo->depth, InputOutput, + visinfo->visual, + CWBackPixel | CWBorderPixel | CWColormap | CWEventMask, + &attr); + + ctx = glXCreateContext(dpy, visinfo, NULL, True ); + if(!ctx) { + fprintf(stderr, "error: glXCreateContext failed!\n"); + return EXIT_FAILURE; + } + + XMapWindow(dpy, win); + + glXMakeCurrent(dpy, win, ctx); + printf("passed dpy %p current dpy %p\n", (void *)dpy, + (void *)glXGetCurrentDisplay()); + + printf("Press any key to withdraw, sleep, and remap.\n"); + + event_loop(dpy); + + return EXIT_SUCCESS; +}

1 0

[293] AppleSGLX/trunk
by source_changes＠macosforge.org 07 Mar '09

07 Mar '09

Revision: 293 http://trac.macosforge.org/projects/xquartz/changeset/293 Author: gstaplin(a)apple.com Date: 2009-03-07 15:04:22 -0800 (Sat, 07 Mar 2009) Log Message: ----------- Update the listing of defined extensions in glxext.h, based on further inspection of the ABI registry. It seems I was right before, the extensions should be defined where available and implemented only. I was confused by a paragraph I read on this issue, that I thought contradicted, which lead me to believe things had changed. glxext.c: comment out some unhandled EXT/SGIX/OML config cases with #if 0. include/GL/glxext.h: define many extensions to 0, and then undef these 0 defs. This should prevent code using extensions from failing to build, due to a lack of the implementation support functions for those extensions. glcontextmodes.c: Comment out unsupported extensions with #if 0. This allows us to build. glxcmds.c: get the GLX_SGIX_fbconfig working properly. These simple changes should fix it. glxextensions.c: change some Y to N for extensions we don't support. With the default xorg-server-1.4-apple we now support: GLX extensions: GLX_ARB_get_proc_address, GLX_ARB_multisample, GLX_EXT_visual_rating, GLX_SGIX_fbconfig GLX_SGIX_fbconfig is used with some versions of glut. I want to test this a bit more, to verify that we don't have any regressions and it genuinely works. Before the extension wasn't listed as available by glXQueryExtensionsString(), but code could build with support for it. ARB_multisample uses the same values for GLX_SAMPLES and GLX_SAMPLE_BUFFERS. GLX_EXT_visual_rating gives us the Slow rating for some configs, which can be useful. GLX_ARB_get_proc_address was made part of 1.4, but we keep the ARB around for the many GLX-based apps that require it. Modified Paths: -------------- AppleSGLX/trunk/glcontextmodes.c AppleSGLX/trunk/glx_empty.c AppleSGLX/trunk/glxcmds.c AppleSGLX/trunk/glxext.c AppleSGLX/trunk/glxextensions.c AppleSGLX/trunk/include/GL/glxext.h Modified: AppleSGLX/trunk/glcontextmodes.c =================================================================== --- AppleSGLX/trunk/glcontextmodes.c 2009-03-07 14:15:44 UTC (rev 292) +++ AppleSGLX/trunk/glcontextmodes.c 2009-03-07 23:04:22 UTC (rev 293) @@ -266,9 +266,12 @@ case GLX_LEVEL: *value_return = mode->level; return 0; +#if 0 + /* This isn't supported by CGL. */ case GLX_TRANSPARENT_TYPE_EXT: *value_return = mode->transparentPixel; return 0; +#endif case GLX_TRANSPARENT_RED_VALUE: *value_return = mode->transparentRed; return 0; @@ -314,6 +317,8 @@ case GLX_MAX_PBUFFER_PIXELS: *value_return = mode->maxPbufferPixels; return 0; +#if 0 + /* These aren't supported by CGL. */ case GLX_OPTIMAL_PBUFFER_WIDTH_SGIX: *value_return = mode->optimalPbufferWidth; return 0; @@ -323,10 +328,12 @@ case GLX_SWAP_METHOD_OML: *value_return = mode->swapMethod; return 0; - case GLX_SAMPLE_BUFFERS_SGIS: +#endif + + case GLX_SAMPLE_BUFFERS: *value_return = mode->sampleBuffers; return 0; - case GLX_SAMPLES_SGIS: + case GLX_SAMPLES: *value_return = mode->samples; return 0; case GLX_BIND_TO_TEXTURE_RGB_EXT: @@ -349,7 +356,10 @@ * It is ONLY for communication between the GLX client and the GLX * server. */ +#if 0 + /* Not supported by AppleSGLX. */ case GLX_VISUAL_SELECT_GROUP_SGIX: +#endif default: return GLX_BAD_ATTRIBUTE; Modified: AppleSGLX/trunk/glx_empty.c =================================================================== --- AppleSGLX/trunk/glx_empty.c 2009-03-07 14:15:44 UTC (rev 292) +++ AppleSGLX/trunk/glx_empty.c 2009-03-07 23:04:22 UTC (rev 293) @@ -278,6 +278,55 @@ return None; } +#if 0 +/* GLX_SGIX_fbconfig */ +PUBLIC int glXGetFBConfigAttribSGIX (Display *dpy, void *config, int a, int *b) { + (void)dpy; + (void)config; + (void)a; + (void)b; + return 0; +} + +PUBLIC void *glXChooseFBConfigSGIX(Display *dpy, int a, int *b, int *c) { + (void)dpy; + (void)a; + (void)b; + (void)c; + return NULL; +} + +PUBLIC GLXPixmap glXCreateGLXPixmapWithConfigSGIX (Display *dpy, void *config, Pixmap p) { + (void)dpy; + (void)config; + (void)p; + return None; +} + +PUBLIC GLXContext glXCreateContextWithConfigSGIX (Display *dpy, void *config, int a, + GLXContext b, Bool c) { + (void)dpy; + (void)config; + (void)a; + (void)b; + (void)c; + return NULL; +} + +PUBLIC XVisualInfo * glXGetVisualFromFBConfigSGIX (Display *dpy, void *config) { + (void)dpy; + (void)config; + return NULL; +} + +PUBLIC void *glXGetFBConfigFromVisualSGIX (Display *dpy, XVisualInfo *visinfo) { + (void)dpy; + (void)visinfo; + return NULL; +} +#endif + + PUBLIC GLX_ALIAS_VOID(glXDestroyGLXPbufferSGIX, (Display *dpy, GLXDrawable pbuf), (dpy, pbuf), Modified: AppleSGLX/trunk/glxcmds.c =================================================================== --- AppleSGLX/trunk/glxcmds.c 2009-03-07 14:15:44 UTC (rev 292) +++ AppleSGLX/trunk/glxcmds.c 2009-03-07 23:04:22 UTC (rev 293) @@ -1043,11 +1043,6 @@ 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; @@ -1072,7 +1067,6 @@ } return psc->effectiveGLXexts; -#endif } PUBLIC const char *glXGetClientString( Display *dpy, int name ) @@ -1502,6 +1496,12 @@ return None; } + if(apple_glx_pixmap_create(dpy, fbconfig->screen, pixmap, fbconfig)) + return None; + + return pixmap; + + psc = GetGLXScreenConfigs( dpy, fbconfig->screen ); if ( (psc != NULL) && __glXExtensionBitIsEnabled( psc, SGIX_fbconfig_bit ) ) { @@ -1569,7 +1569,6 @@ return NULL; } - #if 0 /* AppleSGLX may someday need to support this for X11 OpenGL compositing managers. */ /** Modified: AppleSGLX/trunk/glxext.c =================================================================== --- AppleSGLX/trunk/glxext.c 2009-03-07 14:15:44 UTC (rev 292) +++ AppleSGLX/trunk/glxext.c 2009-03-07 23:04:22 UTC (rev 293) @@ -404,24 +404,36 @@ case GLX_MAX_PBUFFER_PIXELS: config->maxPbufferPixels = *bp++; break; +#if 0 + /* We can't currently support these with CGL. */ case GLX_OPTIMAL_PBUFFER_WIDTH_SGIX: config->optimalPbufferWidth = *bp++; break; case GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX: config->optimalPbufferHeight = *bp++; break; +#endif +#if 0 + /* Not supported. */ case GLX_VISUAL_SELECT_GROUP_SGIX: config->visualSelectGroup = *bp++; break; +#endif +#if 0 + /* Changing the swap method is not supported by Xplugin. */ case GLX_SWAP_METHOD_OML: config->swapMethod = *bp++; break; - case GLX_SAMPLE_BUFFERS_SGIS: +#endif + /* These 2 have the same values as the SGIS versions, and ARB. */ + case GLX_SAMPLE_BUFFERS: config->sampleBuffers = *bp++; break; - case GLX_SAMPLES_SGIS: + case GLX_SAMPLES: config->samples = *bp++; break; +#if 0 + /*These are part of GLX_EXT_texture_from_pixmap */ case GLX_BIND_TO_TEXTURE_RGB_EXT: config->bindToTextureRgb = *bp++; break; @@ -437,6 +449,7 @@ case GLX_Y_INVERTED_EXT: config->yInverted = *bp++; break; +#endif case None: i = count; break; Modified: AppleSGLX/trunk/glxextensions.c =================================================================== --- AppleSGLX/trunk/glxextensions.c 2009-03-07 14:15:44 UTC (rev 292) +++ AppleSGLX/trunk/glxextensions.c 2009-03-07 23:04:22 UTC (rev 293) @@ -74,34 +74,34 @@ { GLX(ARB_multisample), VER(1,4), Y, Y, N, N }, { GLX(ARB_render_texture), VER(0,0), N, N, N, N }, { GLX(ATI_pixel_format_float), VER(0,0), N, N, N, N }, - { GLX(EXT_import_context), VER(0,0), Y, Y, N, N }, - { GLX(EXT_visual_info), VER(0,0), Y, Y, N, N }, + { GLX(EXT_import_context), VER(0,0), N, N, N, N }, + { GLX(EXT_visual_info), VER(0,0), N, N, N, N }, { GLX(EXT_visual_rating), VER(0,0), Y, Y, N, N }, - { GLX(MESA_agp_offset), VER(0,0), N, N, N, Y }, /* Deprecated */ - { GLX(MESA_allocate_memory), VER(0,0), Y, N, N, Y }, - { GLX(MESA_copy_sub_buffer), VER(0,0), Y, N, N, N }, + { GLX(MESA_agp_offset), VER(0,0), N, N, N, N }, /* Deprecated */ + { GLX(MESA_allocate_memory), VER(0,0), N, N, N, N }, + { GLX(MESA_copy_sub_buffer), VER(0,0), N, N, N, N }, { GLX(MESA_pixmap_colormap), VER(0,0), N, N, N, N }, /* Deprecated */ { GLX(MESA_release_buffers), VER(0,0), N, N, N, N }, /* Deprecated */ - { GLX(MESA_swap_control), VER(0,0), Y, N, N, Y }, - { GLX(MESA_swap_frame_usage), VER(0,0), Y, N, N, Y }, + { GLX(MESA_swap_control), VER(0,0), N, N, N, N }, + { GLX(MESA_swap_frame_usage), VER(0,0), N, N, N, N }, { GLX(NV_float_buffer), VER(0,0), N, N, N, N }, { GLX(NV_render_depth_texture), VER(0,0), N, N, N, N }, { GLX(NV_render_texture_rectangle), VER(0,0), N, N, N, N }, - { GLX(NV_vertex_array_range), VER(0,0), N, N, N, Y }, /* Deprecated */ - { GLX(OML_swap_method), VER(0,0), Y, Y, N, N }, - { GLX(OML_sync_control), VER(0,0), Y, N, N, Y }, - { GLX(SGI_make_current_read), VER(1,3), Y, N, N, N }, - { GLX(SGI_swap_control), VER(0,0), Y, N, N, N }, - { GLX(SGI_video_sync), VER(0,0), Y, N, N, Y }, + { GLX(NV_vertex_array_range), VER(0,0), N, N, N, N }, /* Deprecated */ + { GLX(OML_swap_method), VER(0,0), N, N, N, N }, + { GLX(OML_sync_control), VER(0,0), N, N, N, N }, + { GLX(SGI_make_current_read), VER(1,3), N, N, N, N }, + { GLX(SGI_swap_control), VER(0,0), N, N, N, N }, + { GLX(SGI_video_sync), VER(0,0), N, N, N, N }, { GLX(SGIS_blended_overlay), VER(0,0), N, N, N, N }, { GLX(SGIS_color_range), VER(0,0), N, N, N, N }, - { GLX(SGIS_multisample), VER(0,0), Y, Y, N, N }, + { GLX(SGIS_multisample), VER(0,0), N, N, N, N }, { GLX(SGIX_fbconfig), VER(1,3), Y, Y, N, N }, - { GLX(SGIX_pbuffer), VER(1,3), Y, N, N, N }, + { GLX(SGIX_pbuffer), VER(1,3), N, N, N, N }, { GLX(SGIX_swap_barrier), VER(0,0), N, N, N, N }, { GLX(SGIX_swap_group), VER(0,0), N, N, N, N }, - { GLX(SGIX_visual_select_group), VER(0,0), Y, Y, N, N }, - { GLX(EXT_texture_from_pixmap), VER(0,0), Y, N, N, N }, + { GLX(SGIX_visual_select_group), VER(0,0), N, N, N, N }, + { GLX(EXT_texture_from_pixmap), VER(0,0), N, N, N, N }, { NULL } }; Modified: AppleSGLX/trunk/include/GL/glxext.h =================================================================== --- AppleSGLX/trunk/include/GL/glxext.h 2009-03-07 14:15:44 UTC (rev 292) +++ AppleSGLX/trunk/include/GL/glxext.h 2009-03-07 23:04:22 UTC (rev 293) @@ -28,6 +28,41 @@ ** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. */ +#define GLX_ARB_fbconfig_float 0 +#define GLX_EXT_visual_info 0 +#define GLX_EXT_import_context 0 +#define GLX_SGIS_shared_multisample 0 +#define GLX_SGIX_visual_select_group 0 +#define GLX_NV_present_video 0 +#define GLX_EXT_framebuffer_sRGB 0 +#define GLX_EXT_fbconfig_packed_float 0 +#define GLX_NV_float_buffer 0 +#define GLX_MESA_release_buffers 0 +#define GLX_SGIS_blended_overlay 0 +#define GLX_ARB_create_context 0 +#define GLX_SGIX_pbuffer 0 +#define GLX_SGIX_dmbuffer 0 +#define GLX_SGI_swap_control 0 +#define GLX_SGI_video_sync 0 +#define GLX_SGI_make_current_read 0 +#define GLX_SGIX_hyperpipe 0 +#define GLX_MESA_pixmap_colormap 0 +#define GLX_NV_video_out 0 +#define GLX_MESA_set_3dfx_mode 0 +#define GLX_3DFX_multisample 0 +#define GLX_SGIX_swap_group 0 +#define GLX_SGIX_video_source 0 +#define GLX_NV_swap_group 0 +#define GLX_EXT_texture_from_pixmap 0 +#define GLX_OML_swap_method 0 +#define GLX_MESA_copy_sub_buffer 0 +#define GLX_SGIX_video_resize 0 +#define GLX_MESA_agp_offset 0 +#define GLX_SGIX_swap_barrier 0 +#define GLX_SGI_cushion 0 +#define GLX_OML_sync_control 0 +#define GLX_SUN_get_transparent_index 0 + #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) #define WIN32_LEAN_AND_MEAN 1 #include <windows.h> @@ -825,6 +860,40 @@ #define GLX_NV_swap_group 1 #endif +#undef GLX_ARB_fbconfig_float +#undef GLX_EXT_visual_info +#undef GLX_EXT_import_context +#undef GLX_SGIS_shared_multisample +#undef GLX_SGIX_visual_select_group +#undef GLX_NV_present_video +#undef GLX_EXT_framebuffer_sRGB +#undef GLX_EXT_fbconfig_packed_float +#undef GLX_NV_float_buffer +#undef GLX_MESA_release_buffers +#undef GLX_SGIS_blended_overlay +#undef GLX_ARB_create_context +#undef GLX_SGIX_pbuffer +#undef GLX_SGIX_dmbuffer +#undef GLX_SGI_swap_control +#undef GLX_SGI_video_sync +#undef GLX_SGI_make_current_read +#undef GLX_SGIX_hyperpipe +#undef GLX_MESA_pixmap_colormap +#undef GLX_NV_video_out +#undef GLX_MESA_set_3dfx_mode +#undef GLX_3DFX_multisample +#undef GLX_SGIX_swap_group +#undef GLX_SGIX_video_source +#undef GLX_NV_swap_group +#undef GLX_EXT_texture_from_pixmap +#undef GLX_OML_swap_method +#undef GLX_MESA_copy_sub_buffer +#undef GLX_SGIX_video_resize +#undef GLX_MESA_agp_offset +#undef GLX_SGIX_swap_barrier +#undef GLX_SGI_cushion +#undef GLX_OML_sync_control +#undef GLX_SUN_get_transparent_index #ifdef __cplusplus }

1 0

[292] AppleSGLX/trunk/apple_cgl.c
by source_changes＠macosforge.org 07 Mar '09

07 Mar '09

Revision: 292 http://trac.macosforge.org/projects/xquartz/changeset/292 Author: jeremyhu(a)freedesktop.org Date: 2009-03-07 06:15:44 -0800 (Sat, 07 Mar 2009) Log Message: ----------- Default to using Version A of OpenGL.framework to make us more compatible if the major version of OpenGL.framework changes out from under us. Allow a OPENGL_FRAMEWORK_PATH environment variable to choose our framework Modified Paths: -------------- AppleSGLX/trunk/apple_cgl.c Modified: AppleSGLX/trunk/apple_cgl.c =================================================================== --- AppleSGLX/trunk/apple_cgl.c 2009-03-07 09:21:53 UTC (rev 291) +++ AppleSGLX/trunk/apple_cgl.c 2009-03-07 14:15:44 UTC (rev 292) @@ -36,7 +36,7 @@ #include "apple_glx.h" #ifndef OPENGL_FRAMEWORK_PATH -#define OPENGL_FRAMEWORK_PATH "/System/Library/Frameworks/OpenGL.framework/OpenGL" +#define OPENGL_FRAMEWORK_PATH "/System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL" #endif static void *dl_handle = NULL; @@ -61,17 +61,23 @@ void apple_cgl_init(void) { void *h; GLint major = 0, minor = 0; + const char *opengl_framework_path; if(initialized) return; + + opengl_framework_path = getenv("OPENGL_FRAMEWORK_PATH"); + if(!opengl_framework_path) { + opengl_framework_path = OPENGL_FRAMEWORK_PATH; + } (void)dlerror(); /*drain dlerror*/ - h = dlopen(OPENGL_FRAMEWORK_PATH, RTLD_NOW); + h = dlopen(opengl_framework_path, RTLD_NOW); if(NULL == h) { - fprintf(stderr, "error: unable to dlopen " OPENGL_FRAMEWORK_PATH " : " "%s\n", - dlerror()); - abort(); + fprintf(stderr, "error: unable to dlopen %s : %s\n", opengl_framework_path, + dlerror()); + abort(); } dl_handle = h;

1 0