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

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

20 Feb '09

Revision: 196 http://trac.macosforge.org/projects/xquartz/changeset/196 Author: gstaplin(a)apple.com Date: 2009-02-20 00:42:43 -0800 (Fri, 20 Feb 2009) Log Message: ----------- Add a bunch of empty functions for the old glX symbols we used to have. These were never really supported very well, and didn't work quite right if used. Modified Paths: -------------- AppleSGLX/trunk/gen_exports.tcl Added Paths: ----------- AppleSGLX/trunk/glx_empty.c Modified: AppleSGLX/trunk/gen_exports.tcl =================================================================== --- AppleSGLX/trunk/gen_exports.tcl 2009-02-20 04:24:49 UTC (rev 195) +++ AppleSGLX/trunk/gen_exports.tcl 2009-02-20 08:42:43 UTC (rev 196) @@ -1,5 +1,5 @@ if 0 { - 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 @@ -72,6 +72,21 @@ #Extensions lappend glxlist glXGetProcAddressARB + #Old extensions we don't support and never really have, but need for + #symbol compatibility. See also: glx_empty.c + lappend glxlist glXSwapIntervalSGI glXSwapIntervalMESA \ + glXGetSwapIntervalMESA glXBeginFrameTrackingMESA \ + glXEndFrameTrackingMESA glXGetFrameUsageMESA \ + glXQueryFrameTrackingMESA glXGetVideoSyncSGI \ + glXWaitVideoSyncSGI glXJoinSwapGroupSGIX \ + glXBindSwapBarrierSGIX glXQueryMaxSwapBarriersSGIX \ + glXGetSyncValuesOML glXSwapBuffersMscOML \ + glXWaitForMscOML glXWaitForSbcOML \ + glXAllocateMemoryMESA glXFreeMemoryMESA \ + glXGetMemoryOffsetMESA glXReleaseBuffersMESA \ + glXCreateGLXPixmapMESA glXCopySubBufferMESA + + set fd [open [lindex $argv 1] w] foreach f [lsort -dictionary [array names api]] { Added: AppleSGLX/trunk/glx_empty.c =================================================================== --- AppleSGLX/trunk/glx_empty.c (rev 0) +++ AppleSGLX/trunk/glx_empty.c 2009-02-20 08:42:43 UTC (rev 196) @@ -0,0 +1,257 @@ +#include "glxclient.h" +#include "glxextensions.h" +#include "glcontextmodes.h" + +/* +** GLX_SGI_swap_control +*/ +int glXSwapIntervalSGI(int interval) +{ + (void)interval; + return 0; +} + + +/* +** GLX_MESA_swap_control +*/ +int glXSwapIntervalMESA(unsigned int interval) +{ + (void) interval; + return GLX_BAD_CONTEXT; +} + + +int glXGetSwapIntervalMESA(void) +{ + return 0; +} + + +/* +** GLX_MESA_swap_frame_usage +*/ + +GLint glXBeginFrameTrackingMESA(Display *dpy, GLXDrawable drawable) +{ + int status = GLX_BAD_CONTEXT; + (void) dpy; + (void) drawable; + return status; +} + + +GLint glXEndFrameTrackingMESA(Display *dpy, GLXDrawable drawable) +{ + int status = GLX_BAD_CONTEXT; + (void) dpy; + (void) drawable; + return status; +} + + +GLint glXGetFrameUsageMESA(Display *dpy, GLXDrawable drawable, + GLfloat *usage) +{ + int status = GLX_BAD_CONTEXT; + (void) dpy; + (void) drawable; + (void) usage; + return status; +} + +GLint glXQueryFrameTrackingMESA(Display *dpy, GLXDrawable drawable, + int64_t *sbc, int64_t *missedFrames, + GLfloat *lastMissedUsage) +{ + int status = GLX_BAD_CONTEXT; + (void) dpy; + (void) drawable; + (void) sbc; + (void) missedFrames; + (void) lastMissedUsage; + return status; +} + +/* +** GLX_SGI_video_sync +*/ +int glXGetVideoSyncSGI(unsigned int *count) +{ + (void) count; + return GLX_BAD_CONTEXT; +} + +int glXWaitVideoSyncSGI(int divisor, int remainder, unsigned int *count) +{ + (void) count; + return GLX_BAD_CONTEXT; +} + + +/* +** GLX_SGIX_swap_group +*/ +void glXJoinSwapGroupSGIX(Display *dpy, GLXDrawable drawable, + GLXDrawable member) +{ + (void) dpy; + (void) drawable; + (void) member; +} + + +/* +** GLX_SGIX_swap_barrier +*/ +void glXBindSwapBarrierSGIX(Display *dpy, GLXDrawable drawable, + int barrier) +{ + (void) dpy; + (void) drawable; + (void) barrier; +} + +Bool glXQueryMaxSwapBarriersSGIX(Display *dpy, int screen, int *max) +{ + (void) dpy; + (void) screen; + (void) max; + return False; +} + + +/* +** GLX_OML_sync_control +*/ +Bool glXGetSyncValuesOML(Display *dpy, GLXDrawable drawable, + int64_t *ust, int64_t *msc, int64_t *sbc) +{ + (void) dpy; + (void) drawable; + (void) ust; + (void) msc; + (void) sbc; + return False; +} + +int64_t glXSwapBuffersMscOML(Display *dpy, GLXDrawable drawable, + int64_t target_msc, int64_t divisor, + int64_t remainder) +{ + (void) dpy; + (void) drawable; + (void) target_msc; + (void) divisor; + (void) remainder; + return 0; +} + + +Bool glXWaitForMscOML(Display * dpy, GLXDrawable drawable, + int64_t target_msc, int64_t divisor, + int64_t remainder, int64_t *ust, + int64_t *msc, int64_t *sbc) +{ + (void) dpy; + (void) drawable; + (void) target_msc; + (void) divisor; + (void) remainder; + (void) ust; + (void) msc; + (void) sbc; + return False; +} + + +Bool glXWaitForSbcOML(Display * dpy, GLXDrawable drawable, + int64_t target_sbc, int64_t *ust, + int64_t *msc, int64_t *sbc ) +{ + (void) dpy; + (void) drawable; + (void) target_sbc; + (void) ust; + (void) msc; + (void) sbc; + return False; +} + + +/** + * GLX_MESA_allocate_memory + */ +/*@{*/ + +PUBLIC void *glXAllocateMemoryMESA(Display *dpy, int scrn, + size_t size, float readFreq, + float writeFreq, float priority) +{ + (void) dpy; + (void) scrn; + (void) size; + (void) readFreq; + (void) writeFreq; + (void) priority; + return NULL; +} + + +PUBLIC void glXFreeMemoryMESA(Display *dpy, int scrn, void *pointer) +{ +#ifdef __DRI_ALLOCATE + __GLXscreenConfigs * const psc = GetGLXScreenConfigs( dpy, scrn ); + + if (psc && psc->allocate) + (*psc->allocate->freeMemory)(psc->__driScreen, pointer); + +#else + (void) dpy; + (void) scrn; + (void) pointer; +#endif /* GLX_DIRECT_RENDERING */ +} + + +PUBLIC GLuint glXGetMemoryOffsetMESA( Display *dpy, int scrn, + const void *pointer ) +{ + (void) dpy; + (void) scrn; + (void) pointer; + return ~0L; +} + +Bool glXReleaseBuffersMESA( Display *dpy, GLXDrawable d ) +{ + (void) dpy; + (void) d; + return False; +} + + +PUBLIC GLXPixmap glXCreateGLXPixmapMESA( Display *dpy, XVisualInfo *visual, + Pixmap pixmap, Colormap cmap ) +{ + (void) dpy; + (void) visual; + (void) pixmap; + (void) cmap; + return 0; +} + + +/** + * GLX_MESA_copy_sub_buffer + */ +void glXCopySubBufferMESA(Display *dpy, GLXDrawable drawable, + int x, int y, int width, int height) +{ + (void) dpy; + (void) drawable; + (void) x; + (void) y; + (void) width; + (void) height; +}

1 0

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

20 Feb '09

Revision: 195 http://trac.macosforge.org/projects/xquartz/changeset/195 Author: gstaplin(a)apple.com Date: 2009-02-19 20:24:49 -0800 (Thu, 19 Feb 2009) Log Message: ----------- mark another item done in the TODO Modified Paths: -------------- AppleSGLX/trunk/TODO Modified: AppleSGLX/trunk/TODO =================================================================== --- AppleSGLX/trunk/TODO 2009-02-20 04:17:34 UTC (rev 194) +++ AppleSGLX/trunk/TODO 2009-02-20 04:24:49 UTC (rev 195) @@ -33,7 +33,7 @@ DONE Test glXDestroyGLXPixmap(). -Add support for the newer glXCreatePixmap (from 1.4). We have glXCreateGLXPixmap working. +DONE Add support for the newer glXCreatePixmap (from 1.4). We have glXCreateGLXPixmap working. -- Feb 10, 2009

1 0

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

20 Feb '09

Revision: 194 http://trac.macosforge.org/projects/xquartz/changeset/194 Author: gstaplin(a)apple.com Date: 2009-02-19 20:17:34 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Add a shared context test. It's a test from Mesa by Brian Paul with a compatible license. Modified Paths: -------------- AppleSGLX/trunk/tests/tests.mk Added Paths: ----------- AppleSGLX/trunk/tests/shared/ AppleSGLX/trunk/tests/shared/shared.mk AppleSGLX/trunk/tests/shared/sharedtex.c Added: AppleSGLX/trunk/tests/shared/shared.mk =================================================================== --- AppleSGLX/trunk/tests/shared/shared.mk (rev 0) +++ AppleSGLX/trunk/tests/shared/shared.mk 2009-02-20 04:17:34 UTC (rev 194) @@ -0,0 +1,3 @@ +$(TEST_BUILD_DIR)/sharedtex: tests/shared/sharedtex.c $(LIBGL) + $(CC) tests/shared/sharedtex.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/sharedtex $(LINK_TEST) + Added: AppleSGLX/trunk/tests/shared/sharedtex.c =================================================================== --- AppleSGLX/trunk/tests/shared/sharedtex.c (rev 0) +++ AppleSGLX/trunk/tests/shared/sharedtex.c 2009-02-20 04:17:34 UTC (rev 194) @@ -0,0 +1,324 @@ +/* + * Test sharing of texture objects by two rendering contexts. + * In particular, test that changing a texture object in one context + * effects the texture in the second context. + * + * Brian Paul + * 30 Apr 2008 + * + * Copyright (C) 2008 Brian Paul All Rights Reserved. + * + * 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 + * BRIAN PAUL 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. + */ + + +#include <GL/gl.h> +#include <GL/glx.h> +#include <assert.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <X11/keysym.h> + + +#define MAX_CONTEXTS 2 + +#define TEX_SIZE 32 + +static const char *DisplayName = NULL; +static Display *Dpy; +static XVisualInfo *VisInfo; +static Window Win; +static GLXContext Contexts[MAX_CONTEXTS]; +static int WinWidth = 300, WinHeight = 300; + +static int DrawContext = 0, TexContext = 1; + +static GLuint TexObj = 0; +static GLboolean NewTexture = GL_FALSE; + + +static void +Error(const char *msg) +{ + fprintf(stderr, "sharedtex error: %s\n", msg); + exit(1); +} + + +static void +CreateWindow(const char *name) +{ + int attrib[] = { GLX_RGBA, + GLX_RED_SIZE, 1, + GLX_GREEN_SIZE, 1, + GLX_BLUE_SIZE, 1, + GLX_DOUBLEBUFFER, + None }; + int scrnum; + XSetWindowAttributes attr; + unsigned long mask; + Window root; + int xpos = 0, ypos = 0; + static int n = 0; + + scrnum = DefaultScreen(Dpy); + root = RootWindow(Dpy, scrnum); + + VisInfo = glXChooseVisual(Dpy, scrnum, attrib); + if (!VisInfo) { + Error("Unable to find RGB, double-buffered visual"); + } + + /* window attributes */ + xpos = (n % 10) * 100; + ypos = (n / 10) * 100; + n++; + + attr.background_pixel = 0; + attr.border_pixel = 0; + attr.colormap = XCreateColormap(Dpy, root, VisInfo->visual, AllocNone); + attr.event_mask = StructureNotifyMask | ExposureMask | KeyPressMask; + mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; + + Win = XCreateWindow(Dpy, root, xpos, ypos, WinWidth, WinHeight, + 0, VisInfo->depth, InputOutput, + VisInfo->visual, mask, &attr); + if (!Win) { + Error("Couldn't create window"); + } + + { + XSizeHints sizehints; + sizehints.x = xpos; + sizehints.y = ypos; + sizehints.width = WinWidth; + sizehints.height = WinHeight; + sizehints.flags = USSize | USPosition; + XSetNormalHints(Dpy, Win, &sizehints); + XSetStandardProperties(Dpy, Win, name, name, + None, (char **)NULL, 0, &sizehints); + } + + XMapWindow(Dpy, Win); +} + + +/** + * Change texture image, using TexContext + */ +static void +ModifyTexture(void) +{ + GLuint tex[TEX_SIZE][TEX_SIZE]; + GLuint c0, c1; + int i, j; + + if (Win && !glXMakeCurrent(Dpy, Win, Contexts[TexContext])) { + Error("glXMakeCurrent failed"); + } + + /* choose two random colors */ + c0 = rand() & 0xffffffff; + c1 = rand() & 0xffffffff; + + for (i = 0; i < TEX_SIZE; i++) { + for (j = 0; j < TEX_SIZE; j++) { + if (((i / 4) ^ (j / 4)) & 1) { + tex[i][j] = c0; + } + else { + tex[i][j] = c1; + } + } + } + + glBindTexture(GL_TEXTURE_2D, TexObj); + glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, TEX_SIZE, TEX_SIZE, 0, + GL_RGBA, GL_UNSIGNED_BYTE, tex); + + NewTexture = GL_TRUE; +} + + +static void +InitContext(void) +{ + glGenTextures(1, &TexObj); + assert(TexObj); + glBindTexture(GL_TEXTURE_2D, TexObj); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR); + glEnable(GL_TEXTURE_2D); + + printf("GL_RENDERER = %s\n", (char*) glGetString(GL_RENDERER)); +} + + +static void +Setup(void) +{ + int i; + + Dpy = XOpenDisplay(DisplayName); + if (!Dpy) { + Error("Unable to open display"); + } + + CreateWindow("sharedtex"); + + for (i = 0; i < MAX_CONTEXTS; i++) { + GLXContext share = i > 0 ? Contexts[0] : 0; + + Contexts[i] = glXCreateContext(Dpy, VisInfo, share, True); + if (!Contexts[i]) { + Error("Unable to create GLX context"); + } + + if (!glXMakeCurrent(Dpy, Win, Contexts[i])) { + Error("glXMakeCurrent failed"); + } + + InitContext(); + } + + ModifyTexture(); +} + + +/** + * Redraw window, using DrawContext + */ +static void +Redraw(void) +{ + static float rot = 0.0; + float ar; + + rot += 1.0; + + if (Win && !glXMakeCurrent(Dpy, Win, Contexts[DrawContext])) { + Error("glXMakeCurrent failed"); + } + + glViewport(0, 0, WinWidth, WinHeight); + ar = (float) WinWidth / (float) WinHeight; + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glOrtho(-ar, ar, -1.0, 1.0, -1.0, 1.0); + glMatrixMode(GL_MODELVIEW); + + glShadeModel(GL_FLAT); + glClearColor(0.5, 0.5, 0.5, 1.0); + glClear(GL_COLOR_BUFFER_BIT); + + glPushMatrix(); + glRotatef(rot, 0, 0, 1); + glScalef(0.7, 0.7, 0.7); + + if (NewTexture) { + /* rebind to get new contents */ + glBindTexture(GL_TEXTURE_2D, TexObj); + NewTexture = GL_FALSE; + } + + /* draw textured quad */ + glBegin(GL_POLYGON); + glTexCoord2f( 0.0, 0.0 ); glVertex2f( -1.0, -1.0 ); + glTexCoord2f( 1.0, 0.0 ); glVertex2f( 1.0, -1.0 ); + glTexCoord2f( 1.0, 1.0 ); glVertex2f( 1.0, 1.0 ); + glTexCoord2f( 0.0, 1.0 ); glVertex2f( -1.0, 1.0 ); + glEnd(); + + glPopMatrix(); + + if (Win) + glXSwapBuffers(Dpy, Win); +} + + +static void +EventLoop(void) +{ + while (1) { + while (XPending(Dpy) > 0) { + XEvent event; + XNextEvent(Dpy, &event); + + switch (event.type) { + case Expose: + Redraw(); + break; + case ConfigureNotify: + WinWidth = event.xconfigure.width; + WinHeight = event.xconfigure.height; + break; + case KeyPress: + { + char buf[100]; + KeySym keySym; + XComposeStatus stat; + XLookupString(&event.xkey, buf, sizeof(buf), &keySym, &stat); + switch (keySym) { + case XK_Escape: + exit(0); + break; + case XK_t: + case XK_T: + ModifyTexture(); + break; + default: + ; + } + } + Redraw(); + break; + default: + /*no-op*/ ; + } + } + + Redraw(); + usleep(10000); + } +} + + + + +int +main(int argc, char *argv[]) +{ + int i; + + for (i = 1; i < argc; i++) { + if (strcmp(argv[i], "-display") == 0 && i < argc) { + DisplayName = argv[i+1]; + i++; + } + } + + Setup(); + + printf("Press 't' to change texture image/colors\n"); + + EventLoop(); + + return 0; +} Modified: AppleSGLX/trunk/tests/tests.mk =================================================================== --- AppleSGLX/trunk/tests/tests.mk 2009-02-20 04:01:49 UTC (rev 193) +++ AppleSGLX/trunk/tests/tests.mk 2009-02-20 04:17:34 UTC (rev 194) @@ -15,6 +15,7 @@ include tests/engine/engine.mk include tests/glxpixmap/glxpixmap.mk include tests/triangle_glx_single/triangle_glx.mk +include tests/shared/shared.mk tests: $(TEST_BUILD_DIR)/simple $(TEST_BUILD_DIR)/fbconfigs $(TEST_BUILD_DIR)/triangle_glx \ @@ -26,4 +27,5 @@ $(TEST_BUILD_DIR)/create_destroy_context_with_drawable \ $(TEST_BUILD_DIR)/create_destroy_context_with_drawable_2 \ $(TEST_BUILD_DIR)/render_types \ - $(TEST_BUILD_DIR)/glxpixmap_create_destroy + $(TEST_BUILD_DIR)/glxpixmap_create_destroy \ + $(TEST_BUILD_DIR)/sharedtex

1 0

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

20 Feb '09

Revision: 193 http://trac.macosforge.org/projects/xquartz/changeset/193 Author: gstaplin(a)apple.com Date: 2009-02-19 20:01:49 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Handle the old context differently in the case of MakeContextCurrent. I forgot that the code returns &dummyContext if the pthread_get_specific is NULL. So the test was invalid. We need a shared context test added to the test suite. Modified Paths: -------------- AppleSGLX/trunk/glxcurrent.c Modified: AppleSGLX/trunk/glxcurrent.c =================================================================== --- AppleSGLX/trunk/glxcurrent.c 2009-02-20 03:56:39 UTC (rev 192) +++ AppleSGLX/trunk/glxcurrent.c 2009-02-20 04:01:49 UTC (rev 193) @@ -137,7 +137,9 @@ { const GLXContext oldGC = __glXGetCurrentContext(); - if(apple_glx_make_current_context(dpy, oldGC ? oldGC->apple : NULL, + if(apple_glx_make_current_context(dpy, + (oldGC && oldGC != &dummyContext) ? + oldGC->apple : NULL, gc ? gc->apple : NULL, draw)) return GL_FALSE;

1 0

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

20 Feb '09

Revision: 192 http://trac.macosforge.org/projects/xquartz/changeset/192 Author: gstaplin(a)apple.com Date: 2009-02-19 19:56:39 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Remove a test for a non-NULL context in MakeContextCurrent. The test was added before the patterns were added for calling apple_cgl.set_current_context(NULL) in the case of a NULL gc. Tested with builds/create_destroy_context_alone and builds/create_destroy_context_with_drawable. Modified Paths: -------------- AppleSGLX/trunk/glxcurrent.c Modified: AppleSGLX/trunk/glxcurrent.c =================================================================== --- AppleSGLX/trunk/glxcurrent.c 2009-02-20 03:51:10 UTC (rev 191) +++ AppleSGLX/trunk/glxcurrent.c 2009-02-20 03:56:39 UTC (rev 192) @@ -137,12 +137,10 @@ { const GLXContext oldGC = __glXGetCurrentContext(); - if(gc) { - if(apple_glx_make_current_context(dpy, oldGC ? oldGC->apple : NULL, - gc ? gc->apple : NULL, - draw)) - return GL_FALSE; - } + if(apple_glx_make_current_context(dpy, oldGC ? oldGC->apple : NULL, + gc ? gc->apple : NULL, + draw)) + return GL_FALSE; __glXLock();

1 0

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

20 Feb '09

Revision: 191 http://trac.macosforge.org/projects/xquartz/changeset/191 Author: gstaplin(a)apple.com Date: 2009-02-19 19:51:10 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Avoid a crash if the previous current context was NULL, and the new current context is NULL, by avoiding the dereference of a NULL pointer. Modified Paths: -------------- AppleSGLX/trunk/glxcurrent.c Modified: AppleSGLX/trunk/glxcurrent.c =================================================================== --- AppleSGLX/trunk/glxcurrent.c 2009-02-20 03:41:00 UTC (rev 190) +++ AppleSGLX/trunk/glxcurrent.c 2009-02-20 03:51:10 UTC (rev 191) @@ -152,8 +152,10 @@ * cannot be NULL, therefore if they are the same, gc is not * NULL and not the dummy. */ - gc->currentDrawable = draw; - gc->currentReadable = read; + if(gc) { + gc->currentDrawable = draw; + gc->currentReadable = read; + } } else { if (oldGC != &dummyContext) {

1 0

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

20 Feb '09

Revision: 190 http://trac.macosforge.org/projects/xquartz/changeset/190 Author: gstaplin(a)apple.com Date: 2009-02-19 19:41:00 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Make glXSelectEvent and glXGetSelectedEvent work, by adding calls and XError handling to the glx_pbuffer.c code. Modified Paths: -------------- AppleSGLX/trunk/glx_pbuffer.c Modified: AppleSGLX/trunk/glx_pbuffer.c =================================================================== --- AppleSGLX/trunk/glx_pbuffer.c 2009-02-20 03:37:50 UTC (rev 189) +++ AppleSGLX/trunk/glx_pbuffer.c 2009-02-20 03:41:00 UTC (rev 190) @@ -44,6 +44,7 @@ #include "apple_glx_pbuffer.h" #include "apple_glx_pixmap.h" +#if 0 /** * Change a drawable's attribute. * @@ -107,8 +108,8 @@ return; } +#endif - #if 0 /** * Destroy a pbuffer. @@ -707,15 +708,33 @@ PUBLIC void glXSelectEvent(Display *dpy, GLXDrawable drawable, unsigned long mask) { + GLXContext gc = __glXGetCurrentContext(); + xError error; + XWindowAttributes xwattr; -#if 0 - CARD32 attribs[2]; + if(apple_glx_pbuffer_set_event_mask(drawable, mask)) + return; /*done*/ - attribs[0] = (CARD32) GLX_EVENT_MASK; - attribs[1] = (CARD32) mask; + /* + * The spec allows a window, but currently there are no valid + * events for a window, so do nothing. + */ + if(XGetWindowAttributes(dpy, drawable, &xwattr)) + return; /*done*/ - ChangeDrawableAttribute( dpy, drawable, attribs, 1 ); -#endif + /* The drawable seems to be invalid. Report an error. */ + + LockDisplay(dpy); + + error.errorCode = GLXBadDrawable; + error.resourceID = 0; + error.sequenceNumber = dpy->request; + error.type = X_Error; + error.majorCode = (gc) ? gc->majorOpcode : 0; + error.minorCode = X_GLXChangeDrawableAttributes; + _XError(dpy, &error); + + UnlockDisplay(dpy); } @@ -725,22 +744,36 @@ PUBLIC void glXGetSelectedEvent(Display *dpy, GLXDrawable drawable, unsigned long *mask) { - unsigned int value; + GLXContext gc = __glXGetCurrentContext(); + xError error; + XWindowAttributes xwattr; + + if(apple_glx_pbuffer_get_event_mask(drawable, mask)) + return; /*done*/ - *mask = 0; - /* - * This is a no-op with Apple CGL pbuffers. - * We could perhaps match the glXSelectEvent input. - */ - return; + /* + * The spec allows a window, but currently there are no valid + * events for a window, so do nothing, but set the mask to 0. + */ + if(XGetWindowAttributes(dpy, drawable, &xwattr)) { + /* The window is valid, so set the mask to 0.*/ + *mask = 0; + return; /*done*/ + } - /* The non-sense with value is required because on LP64 platforms - * sizeof(unsigned int) != sizeof(unsigned long). On little-endian - * we could just type-cast the pointer, but why? - */ + /* The drawable seems to be invalid. Report an error. */ - GetDrawableAttribute( dpy, drawable, GLX_EVENT_MASK_SGIX, & value ); - *mask = value; + LockDisplay(dpy); + + error.errorCode = GLXBadDrawable; + error.resourceID = 0; + error.sequenceNumber = dpy->request; + error.type = X_Error; + error.majorCode = (gc) ? gc->majorOpcode : 0; + error.minorCode = X_GLXChangeDrawableAttributes; + _XError(dpy, &error); + + UnlockDisplay(dpy); }

1 0

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

20 Feb '09

Revision: 189 http://trac.macosforge.org/projects/xquartz/changeset/189 Author: gstaplin(a)apple.com Date: 2009-02-19 19:37:50 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Add an event_mask to the apple_glx_pbuffer structure. Add the getters and setters for that event mask. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_pbuffer.c Modified: AppleSGLX/trunk/apple_glx_pbuffer.c =================================================================== --- AppleSGLX/trunk/apple_glx_pbuffer.c 2009-02-20 03:37:08 UTC (rev 188) +++ AppleSGLX/trunk/apple_glx_pbuffer.c 2009-02-20 03:37:50 UTC (rev 189) @@ -38,6 +38,7 @@ int width, height; GLint fbconfigID; CGLPBufferObj buffer_obj; + unsigned long event_mask; struct apple_glx_pbuffer *previous, *next; }; @@ -140,6 +141,8 @@ pbuf->fbconfigID = modes->fbconfigID; + pbuf->event_mask = 0; + *result = pbuf->xid; /* Link the pbuffer into the list. */ @@ -318,3 +321,25 @@ return result; } + +bool apple_glx_pbuffer_set_event_mask(GLXDrawable d, unsigned long mask) { + struct apple_glx_pbuffer *pbuf; + + if(find_pbuffer(d, &pbuf)) { + pbuf->event_mask = mask; + return true; + } + + return false; +} + +bool apple_glx_pbuffer_get_event_mask(GLXDrawable d, unsigned long *mask) { + struct apple_glx_pbuffer *pbuf; + + if(find_pbuffer(d, &pbuf)) { + *mask = pbuf->event_mask; + return true; + } + + return false; +}

1 0

[188] AppleSGLX/trunk/apple_glx_pbuffer.h
by source_changes＠macosforge.org 20 Feb '09

20 Feb '09

Revision: 188 http://trac.macosforge.org/projects/xquartz/changeset/188 Author: gstaplin(a)apple.com Date: 2009-02-19 19:37:08 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Add functions for getting and setting the event mask for use by glXSelectEvent and glXGetSelectedEvent. Also remove some old declarations for functions that were removed previously during the update to apple_glx_pbuffer_query. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_pbuffer.h Modified: AppleSGLX/trunk/apple_glx_pbuffer.h =================================================================== --- AppleSGLX/trunk/apple_glx_pbuffer.h 2009-02-20 03:15:10 UTC (rev 187) +++ AppleSGLX/trunk/apple_glx_pbuffer.h 2009-02-20 03:37:08 UTC (rev 188) @@ -46,12 +46,10 @@ 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); -bool apple_glx_pbuffer_get_fbconfig_id(GLXDrawable d, XID *id); +/* Returns true if the GLXDrawable is a valid GLXPbuffer, and the mask is set. */ +bool apple_glx_pbuffer_set_event_mask(GLXDrawable d, unsigned long mask); -/* Returns true if an error occurred. */ -bool apple_glx_pbuffer_get_max_size(int *widthresult, int *heightresult); +/* Returns true if the GLXDrawable is a valid GLXPbuffer, and the *mask is set. */ +bool apple_glx_pbuffer_get_event_mask(GLXDrawable d, unsigned long *mask); #endif

1 0

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

20 Feb '09

Revision: 187 http://trac.macosforge.org/projects/xquartz/changeset/187 Author: gstaplin(a)apple.com Date: 2009-02-19 19:15:10 -0800 (Thu, 19 Feb 2009) Log Message: ----------- Make glXSelectEvent a no-op. Perhaps in the future it should check if the GLXDrawable is a valid GLXPbuffer, and save the mask for use with glXGetSelectedEvent. I'm going to look into adding that feature in a moment. The glXSelectEvent shouldn't actually do anything, because our Pbuffers can't be damaged, and we can't receive an event when they are, however it might be useful to have the glXGetSelectedEvent match the input mask for the glXSelectEvent. There is also the issue of issuing an XError if the drawable isn't a pbuffer or window. Technically it makes no sense to glXSelectEvent a window drawable, because there are no event types for windows according to the spec. So there is no valid mask for a window. I suspect this allowance was left in the spec for the future. Modified Paths: -------------- AppleSGLX/trunk/glx_pbuffer.c Modified: AppleSGLX/trunk/glx_pbuffer.c =================================================================== --- AppleSGLX/trunk/glx_pbuffer.c 2009-02-20 03:06:07 UTC (rev 186) +++ AppleSGLX/trunk/glx_pbuffer.c 2009-02-20 03:15:10 UTC (rev 187) @@ -707,12 +707,15 @@ PUBLIC void glXSelectEvent(Display *dpy, GLXDrawable drawable, unsigned long mask) { + +#if 0 CARD32 attribs[2]; attribs[0] = (CARD32) GLX_EVENT_MASK; attribs[1] = (CARD32) mask; ChangeDrawableAttribute( dpy, drawable, attribs, 1 ); +#endif }

1 0