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

[240] AppleSGLX/trunk/RELEASE_NOTES
by source_changes＠macosforge.org 22 Feb '09

22 Feb '09

Revision: 240 http://trac.macosforge.org/projects/xquartz/changeset/240 Author: gstaplin(a)apple.com Date: 2009-02-22 15:39:12 -0800 (Sun, 22 Feb 2009) Log Message: ----------- Add some release notes that may help Jeremy with the release announcement. Added Paths: ----------- AppleSGLX/trunk/RELEASE_NOTES Added: AppleSGLX/trunk/RELEASE_NOTES =================================================================== --- AppleSGLX/trunk/RELEASE_NOTES (rev 0) +++ AppleSGLX/trunk/RELEASE_NOTES 2009-02-22 23:39:12 UTC (rev 240) @@ -0,0 +1,68 @@ +AppleSGLX Release Notes + +o OpenGL Support + +AppleSGLX supports the same version of OpenGL as Leopard (OpenGL 2.1). +Many extensions from the OpenGL framework are now builtin. + +This adds support for GLSL, and a variety of other features. + +o Thread Support + +Thread support has been improved since the libGL in XQuartz 2.3.2.1. + +o GLX 1.4 Support + +The GLX 1.3 and 1.4 functions should all work with a few exceptions +as outlined in this document. + +o glXMakeContextCurrent (a GLX 1.3 feature) + +glXMakeContextCurrent should work with the readable drawable. The +OpenGL functions: glReadPixels, glCopyPixels, and glCopyColorTable, +should use the readable drawable if it's different than the rendering +drawable. + +o glXGetProcAddress (a GLX 1.4 feature and ARB extension) + +glXGetProcAddress should work and allow getting the address of any +extension functions you may need from the X11 libGL, or OpenGL framework +libGL. Previous versions of the X11 libGL didn't allow getting the newer +OpenGL framework addresses. + +o GLXPixmaps + +New support for GLXPixmaps works well with mixed X11 and OpenGL drawing +operations. You can create them using glXCreateGLXPixmap or +glXCreatePixmap. + +o GLXPbuffers + +Support for GLXPbuffers has been added. These are drawables that are +not possible to render to with X11, which is allowed by the spec. +A GLXPbuffer will never generate a clobber event, however +glXSelectEvent and glXGetSelectedEvent should operate normally. + +Clobber events are not generated due to low-level architectural +differences. The contents of your pbuffers will not be clobbered. + +o Shared Contexts + +Due to basic low-level architectural differences the usage of shared +contexts requires a similar visual or GLXFBConfig be used in the +creation of a shared context. It's best if you specify the same +visual. This is due to a CGL design difference, and not something +that is easily worked around. + +o Indirect + +The X server supports indirect fairly well, so OpenGL applications +can be run remotely and displayed by XQuartz. This means you can run +applications from a remote host on an XQuartz X server. + +AppleSGLX does not support indirect rendering. Any indirect context +created will appear to glXIsDirect as an indirect context, but it +does not actually support indirect rendering to a remote X server. + +AppleSGLX supports GLXPixmaps and GLXPbuffers with direct and indirect +contexts, though they are all direct contexts by definition (see above).

1 0

[239] AppleSGLX/trunk/tests
by source_changes＠macosforge.org 22 Feb '09

22 Feb '09

Revision: 239 http://trac.macosforge.org/projects/xquartz/changeset/239 Author: gstaplin(a)apple.com Date: 2009-02-22 15:06:59 -0800 (Sun, 22 Feb 2009) Log Message: ----------- This commit adds the mmap shared mapping tests I wrote. These were used to test the validity of the GLXPixmap design. We may end up using a similar pattern for other things like shared X11 and OpenGL rendering to windows, to fix the mixed X11 raster and OpenGL rendering problem. Added Paths: ----------- AppleSGLX/trunk/tests/shared_mapping/ AppleSGLX/trunk/tests/shared_mapping/NOTES AppleSGLX/trunk/tests/shared_mapping/bld.sh AppleSGLX/trunk/tests/shared_mapping/clean.sh AppleSGLX/trunk/tests/shared_mapping/client.c AppleSGLX/trunk/tests/shared_mapping/server.c Added: AppleSGLX/trunk/tests/shared_mapping/NOTES =================================================================== --- AppleSGLX/trunk/tests/shared_mapping/NOTES (rev 0) +++ AppleSGLX/trunk/tests/shared_mapping/NOTES 2009-02-22 23:06:59 UTC (rev 239) @@ -0,0 +1,8 @@ +The client and server programs are protypes to test the behavior +of GLXPixmap shared memory in a controlled environment + +The client faults after munmapping and truncating its fd, but the +server keeps going. This is a good thing from a security perspective. + +The client sees the servers changes, and the server can see the +client changes, but the server won't fault if the file is truncated. Added: AppleSGLX/trunk/tests/shared_mapping/bld.sh =================================================================== --- AppleSGLX/trunk/tests/shared_mapping/bld.sh (rev 0) +++ AppleSGLX/trunk/tests/shared_mapping/bld.sh 2009-02-22 23:06:59 UTC (rev 239) @@ -0,0 +1,2 @@ +gcc client.c -o client +gcc server.c -o server Added: AppleSGLX/trunk/tests/shared_mapping/clean.sh =================================================================== --- AppleSGLX/trunk/tests/shared_mapping/clean.sh (rev 0) +++ AppleSGLX/trunk/tests/shared_mapping/clean.sh 2009-02-22 23:06:59 UTC (rev 239) @@ -0,0 +1 @@ +rm -f client server *~ Added: AppleSGLX/trunk/tests/shared_mapping/client.c =================================================================== --- AppleSGLX/trunk/tests/shared_mapping/client.c (rev 0) +++ AppleSGLX/trunk/tests/shared_mapping/client.c 2009-02-22 23:06:59 UTC (rev 239) @@ -0,0 +1,55 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <sys/mman.h> +#include <fcntl.h> +#include <unistd.h> + +int main(int argc, char *argv[]) { + int fd; + size_t length; + void *buffer; + + fd = shm_open("FOOBAR", O_RDWR, 0); + + if(-1 == fd) { + perror("shm_open"); + return EXIT_FAILURE; + } + + + length = sysconf(_SC_PAGESIZE) * 2; + + buffer = mmap(NULL, length, + PROT_READ | PROT_WRITE, + MAP_FILE | MAP_SHARED, fd, 0); + + if(MAP_FAILED == buffer) { + perror("mmap"); + shm_unlink("FOOBAR"); + close(fd); + return EXIT_FAILURE; + } + + while(1) { + unsigned char *cp, *cplimit; + + cp = buffer; + cplimit = cp + length; + + while(cp < cplimit) { + printf("cp %x\n", *cp); + ++cp; + } + + if(-1 == munmap(buffer, length)) + perror("munmap"); + + if(-1 == ftruncate(fd, 10)) + perror("ftruncate"); + } + + + return EXIT_SUCCESS; +} Added: AppleSGLX/trunk/tests/shared_mapping/server.c =================================================================== --- AppleSGLX/trunk/tests/shared_mapping/server.c (rev 0) +++ AppleSGLX/trunk/tests/shared_mapping/server.c 2009-02-22 23:06:59 UTC (rev 239) @@ -0,0 +1,63 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/types.h> +#include <sys/mman.h> +#include <fcntl.h> +#include <unistd.h> + +int main(int argc, char *argv[]) { + int fd; + size_t length; + void *buffer; + int b; + + shm_unlink("FOOBAR"); + + fd = shm_open("FOOBAR", O_RDWR | O_EXCL | O_CREAT, + S_IRUSR | S_IWUSR | S_IROTH | S_IWOTH); + + if(-1 == fd) { + perror("shm_open"); + return EXIT_FAILURE; + } + + + length = sysconf(_SC_PAGESIZE) * 2; + + if(-1 == ftruncate(fd, length)) { + perror("ftruncate"); + shm_unlink("FOOBAR"); + close(fd); + return EXIT_FAILURE; + } + + printf("length %zu\n", length); + + buffer = mmap(NULL, length, + PROT_READ | PROT_WRITE, + MAP_FILE | MAP_SHARED, fd, 0); + + if(MAP_FAILED == buffer) { + perror("mmap"); + shm_unlink("FOOBAR"); + close(fd); + return EXIT_FAILURE; + } + + b = 0; + while(1) { + printf("b %d\n", b); + + memset(buffer, b, length); + ++b; + + if(b > 255) + b = 0; + + sleep(1); + } + + + return EXIT_SUCCESS; +}

1 0

[238] trunk/pkg/README.2.4.0.txt
by source_changes＠macosforge.org 22 Feb '09

22 Feb '09

Revision: 238 http://trac.macosforge.org/projects/xquartz/changeset/238 Author: jeremyhu(a)freedesktop.org Date: 2009-02-22 12:10:29 -0800 (Sun, 22 Feb 2009) Log Message: ----------- More 2.4.0 related updates Modified Paths: -------------- trunk/pkg/README.2.4.0.txt Modified: trunk/pkg/README.2.4.0.txt =================================================================== --- trunk/pkg/README.2.4.0.txt 2009-02-22 19:56:58 UTC (rev 237) +++ trunk/pkg/README.2.4.0.txt 2009-02-22 20:10:29 UTC (rev 238) @@ -19,8 +19,11 @@ == Changes in 2.4.0 == * All changes in 2.3.2.1 plus: * apps: + * quartz-wm + * Properly re-enable the close widget when modal windows are destroyed + * Fixed a bug when the window was told to unmaximize when it was already not maximized. * xinput 1.4.0 - * xrandr 1.2.99.4] + * xrandr 1.2.99.4 * xterm 242 * proto: * dri2proto 1.99.3 @@ -29,22 +32,26 @@ * xcb-proto 1.4 * xf86rushproto 1.1.2 * lib: - * AppleSGLX 50 - * rewrite of libGL to support newer versions of the GLX protocol - * GLXPixmap - * GLXPbuffer + * AppleSGLX 51 + * rewrite of libGL now has support for GLX-1.4 + * GLXPixmap + * GLXPbuffer + * fontconfig + * Avoid rebuilding font caches when switching between archs * libICE 1.0.5 * libpng 1.2.34 * libxcb 1.2 * libX11 1.2 + * libXau + * Avoid lock failures with AFP home directories * libXext 1.0.5 * libXfont 1.4.0 * libXrandr 1.2.99.4 * pixman 0.14.0 * xtrans 1.2.3 * server: - * Xquartz fixes from xorg-server-1.5.3-apple2 - * xserver codebase updated to 1.5 branch + * Xquartz fixes from xorg-server-1.6.0-apple1 + * xserver codebase updated to 1.6 branch == Changes in 2.3.2.1 == * All changes in 2.3.2 plus:

1 0

[237] AppleSGLX/tags/AppleSGLX-51/
by source_changes＠macosforge.org 22 Feb '09

22 Feb '09

Revision: 237 http://trac.macosforge.org/projects/xquartz/changeset/237 Author: jeremyhu(a)freedesktop.org Date: 2009-02-22 11:56:58 -0800 (Sun, 22 Feb 2009) Log Message: ----------- Tagging AppleSGLX-51 Added Paths: ----------- AppleSGLX/tags/AppleSGLX-51/

1 0

[236] AppleSGLX/trunk/
by source_changes＠macosforge.org 22 Feb '09

22 Feb '09

Revision: 236 http://trac.macosforge.org/projects/xquartz/changeset/236 Author: jeremyhu(a)freedesktop.org Date: 2009-02-22 11:56:51 -0800 (Sun, 22 Feb 2009) Log Message: ----------- Updated svn:ignore Property Changed: ---------------- AppleSGLX/trunk/ Property changes on: AppleSGLX/trunk ___________________________________________________________________ Modified: svn:ignore - builds libGL.dylib libGL.1.2.dylib + builds testbuilds

1 0

[235] AppleSGLX/trunk/Makefile
by source_changes＠macosforge.org 22 Feb '09

22 Feb '09

Revision: 235 http://trac.macosforge.org/projects/xquartz/changeset/235 Author: jeremyhu(a)freedesktop.org Date: 2009-02-22 11:55:55 -0800 (Sun, 22 Feb 2009) Log Message: ----------- Don't install glxinfo and glxgears by default Modified Paths: -------------- AppleSGLX/trunk/Makefile Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-22 12:18:01 UTC (rev 234) +++ AppleSGLX/trunk/Makefile 2009-02-22 19:55:55 UTC (rev 235) @@ -95,7 +95,7 @@ $(RM) -f $(DESTDIR)$(INSTALL_DIR)/lib/libGL.1.dylib $(LN) -s libGL.1.2.dylib $(DESTDIR)$(INSTALL_DIR)/lib/libGL.1.dylib -install: install_headers install_libraries install_programs +install: install_headers install_libraries clean: rm -rf $(BUILD_DIR)

1 0

[234] AppleSGLX/trunk/tests
by source_changes＠macosforge.org 22 Feb '09

22 Feb '09

Revision: 234 http://trac.macosforge.org/projects/xquartz/changeset/234 Author: gstaplin(a)apple.com Date: 2009-02-22 04:18:01 -0800 (Sun, 22 Feb 2009) Log Message: ----------- Add a glthreads test with a compatible license, by Brian Paul. Try ./testbuilds/glthreads -n 20 It seems to work quite well on the systems here. I've been using it to test simple locking behavior for a while now. Modified Paths: -------------- AppleSGLX/trunk/tests/simple/simple.mk AppleSGLX/trunk/tests/tests.mk Added Paths: ----------- AppleSGLX/trunk/tests/simple/glthreads.c Added: AppleSGLX/trunk/tests/simple/glthreads.c =================================================================== --- AppleSGLX/trunk/tests/simple/glthreads.c (rev 0) +++ AppleSGLX/trunk/tests/simple/glthreads.c 2009-02-22 12:18:01 UTC (rev 234) @@ -0,0 +1,557 @@ +/* + * Copyright (C) 2000 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. + */ + + +/* + * This program tests GLX thread safety. + * Command line options: + * -p Open a display connection for each thread + * -l Enable application-side locking + * -n <num threads> Number of threads to create (default is 2) + * -display <display name> Specify X display (default is :0.0) + * + * Brian Paul 20 July 2000 + */ + + +#if defined(PTHREADS) /* defined by Mesa on Linux and other platforms */ + +#include <assert.h> +#include <GL/gl.h> +#include <GL/glx.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <unistd.h> +#include <pthread.h> + + +/* + * Each window/thread/context: + */ +struct winthread { + Display *Dpy; + int Index; + pthread_t Thread; + Window Win; + GLXContext Context; + float Angle; + int WinWidth, WinHeight; + GLboolean NewSize; +}; + + +#define MAX_WINTHREADS 100 +static struct winthread WinThreads[MAX_WINTHREADS]; +static int NumWinThreads = 0; +static volatile GLboolean ExitFlag = GL_FALSE; + +static GLboolean MultiDisplays = 0; +static GLboolean Locking = 0; + +static pthread_mutex_t Mutex; + + +static void +Error(const char *msg) +{ + fprintf(stderr, "Error: %s\n", msg); + exit(1); +} + + +/* draw a colored cube */ +static void +draw_object(void) +{ + glPushMatrix(); + glScalef(0.75, 0.75, 0.75); + + glColor3f(1, 0, 0); + glBegin(GL_POLYGON); + glVertex3f(1, -1, -1); + glVertex3f(1, 1, -1); + glVertex3f(1, 1, 1); + glVertex3f(1, -1, 1); + glEnd(); + + glColor3f(0, 1, 1); + glBegin(GL_POLYGON); + glVertex3f(-1, -1, -1); + glVertex3f(-1, 1, -1); + glVertex3f(-1, 1, 1); + glVertex3f(-1, -1, 1); + glEnd(); + + glColor3f(0, 1, 0); + glBegin(GL_POLYGON); + glVertex3f(-1, 1, -1); + glVertex3f( 1, 1, -1); + glVertex3f( 1, 1, 1); + glVertex3f(-1, 1, 1); + glEnd(); + + glColor3f(1, 0, 1); + glBegin(GL_POLYGON); + glVertex3f(-1, -1, -1); + glVertex3f( 1, -1, -1); + glVertex3f( 1, -1, 1); + glVertex3f(-1, -1, 1); + glEnd(); + + glColor3f(0, 0, 1); + glBegin(GL_POLYGON); + glVertex3f(-1, -1, 1); + glVertex3f( 1, -1, 1); + glVertex3f( 1, 1, 1); + glVertex3f(-1, 1, 1); + glEnd(); + + glColor3f(1, 1, 0); + glBegin(GL_POLYGON); + glVertex3f(-1, -1, -1); + glVertex3f( 1, -1, -1); + glVertex3f( 1, 1, -1); + glVertex3f(-1, 1, -1); + glEnd(); + glPopMatrix(); +} + + +/* signal resize of given window */ +static void +resize(struct winthread *wt, int w, int h) +{ + wt->NewSize = GL_TRUE; + wt->WinWidth = w; + wt->WinHeight = h; +} + + +/* + * We have an instance of this for each thread. + */ +static void +draw_loop(struct winthread *wt) +{ + GLboolean firstIter = GL_TRUE; + + while (!ExitFlag) { + + if (Locking) + pthread_mutex_lock(&Mutex); + + glXMakeCurrent(wt->Dpy, wt->Win, wt->Context); + if (firstIter) { + printf("glthreads: %d: GL_RENDERER = %s\n", wt->Index, + (char *) glGetString(GL_RENDERER)); + firstIter = GL_FALSE; + } + + if (Locking) + pthread_mutex_unlock(&Mutex); + + glEnable(GL_DEPTH_TEST); + + if (wt->NewSize) { + GLfloat w = (float) wt->WinWidth / (float) wt->WinHeight; + glViewport(0, 0, wt->WinWidth, wt->WinHeight); + glMatrixMode(GL_PROJECTION); + glLoadIdentity(); + glFrustum(-w, w, -1.0, 1.0, 1.5, 10); + glMatrixMode(GL_MODELVIEW); + glLoadIdentity(); + glTranslatef(0, 0, -2.5); + wt->NewSize = GL_FALSE; + } + + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + + glPushMatrix(); + glRotatef(wt->Angle, 0, 0, 1); + glRotatef(wt->Angle, 1, 0, 0); + glScalef(0.7, 0.7, 0.7); + draw_object(); + glPopMatrix(); + + if (Locking) + pthread_mutex_lock(&Mutex); + + glXSwapBuffers(wt->Dpy, wt->Win); + + if (Locking) + pthread_mutex_unlock(&Mutex); + + usleep(5000); + wt->Angle += 1.0; + } +} + + +/* + * The main process thread runs this loop. + * Single display connection for all threads. + */ +static void +event_loop(Display *dpy) +{ + XEvent event; + int i; + + assert(!MultiDisplays); + + while (!ExitFlag) { + + if (Locking) { + while (1) { + int k; + pthread_mutex_lock(&Mutex); + k = XPending(dpy); + if (k) { + XNextEvent(dpy, &event); + pthread_mutex_unlock(&Mutex); + break; + } + pthread_mutex_unlock(&Mutex); + usleep(5000); + } + } + else { + XNextEvent(dpy, &event); + } + + switch (event.type) { + case ConfigureNotify: + /* Find winthread for this event's window */ + for (i = 0; i < NumWinThreads; i++) { + struct winthread *wt = &WinThreads[i]; + if (event.xconfigure.window == wt->Win) { + resize(wt, event.xconfigure.width, + event.xconfigure.height); + break; + } + } + break; + case KeyPress: + /* tell all threads to exit */ + ExitFlag = GL_TRUE; + /*printf("exit draw_loop %d\n", wt->Index);*/ + return; + default: + /*no-op*/ ; + } + } +} + + +/* + * Separate display connection for each thread. + */ +static void +event_loop_multi(void) +{ + XEvent event; + int w = 0; + + assert(MultiDisplays); + + while (!ExitFlag) { + struct winthread *wt = &WinThreads[w]; + if (XPending(wt->Dpy)) { + XNextEvent(wt->Dpy, &event); + switch (event.type) { + case ConfigureNotify: + resize(wt, event.xconfigure.width, event.xconfigure.height); + break; + case KeyPress: + /* tell all threads to exit */ + ExitFlag = GL_TRUE; + /*printf("exit draw_loop %d\n", wt->Index);*/ + return; + default: + /*no-op*/ ; + } + } + w = (w + 1) % NumWinThreads; + usleep(5000); + } +} + + + +/* + * we'll call this once for each thread, before the threads are created. + */ +static void +create_window(struct winthread *wt) +{ + Window win; + GLXContext ctx; + int attrib[] = { GLX_RGBA, + GLX_RED_SIZE, 1, + GLX_GREEN_SIZE, 1, + GLX_BLUE_SIZE, 1, + GLX_DEPTH_SIZE, 1, + GLX_DOUBLEBUFFER, + None }; + int scrnum; + XSetWindowAttributes attr; + unsigned long mask; + Window root; + XVisualInfo *visinfo; + int width = 80, height = 80; + int xpos = (wt->Index % 10) * 90; + int ypos = (wt->Index / 10) * 100; + + scrnum = DefaultScreen(wt->Dpy); + root = RootWindow(wt->Dpy, scrnum); + + visinfo = glXChooseVisual(wt->Dpy, scrnum, attrib); + if (!visinfo) { + Error("Unable to find RGB, Z, double-buffered visual"); + } + + /* window attributes */ + attr.background_pixel = 0; + attr.border_pixel = 0; + attr.colormap = XCreateColormap(wt->Dpy, root, visinfo->visual, AllocNone); + attr.event_mask = StructureNotifyMask | ExposureMask | KeyPressMask; + mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; + + win = XCreateWindow(wt->Dpy, root, xpos, ypos, width, height, + 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 = width; + sizehints.height = height; + sizehints.flags = USSize | USPosition; + XSetNormalHints(wt->Dpy, win, &sizehints); + XSetStandardProperties(wt->Dpy, win, "glthreads", "glthreads", + None, (char **)NULL, 0, &sizehints); + } + + + ctx = glXCreateContext(wt->Dpy, visinfo, NULL, True); + if (!ctx) { + Error("Couldn't create GLX context"); + } + + XMapWindow(wt->Dpy, win); + XSync(wt->Dpy, 0); + + /* save the info for this window/context */ + wt->Win = win; + wt->Context = ctx; + wt->Angle = 0.0; + wt->WinWidth = width; + wt->WinHeight = height; + wt->NewSize = GL_TRUE; +} + + +/* + * Called by pthread_create() + */ +static void * +thread_function(void *p) +{ + struct winthread *wt = (struct winthread *) p; + draw_loop(wt); + return NULL; +} + + +/* + * called before exit to wait for all threads to finish + */ +static void +clean_up(void) +{ + int i; + + /* wait for threads to finish */ + for (i = 0; i < NumWinThreads; i++) { + pthread_join(WinThreads[i].Thread, NULL); + } + + for (i = 0; i < NumWinThreads; i++) { + glXDestroyContext(WinThreads[i].Dpy, WinThreads[i].Context); + XDestroyWindow(WinThreads[i].Dpy, WinThreads[i].Win); + } +} + + +static void +usage(void) +{ + printf("glthreads: test of GL thread safety (any key = exit)\n"); + printf("Usage:\n"); + printf(" glthreads [options]\n"); + printf("Options:\n"); + printf(" -display DISPLAYNAME Specify display string\n"); + printf(" -n NUMTHREADS Number of threads to create\n"); + printf(" -p Use a separate display connection for each thread\n"); + printf(" -l Use application-side locking\n"); +} + + +int +main(int argc, char *argv[]) +{ + char *displayName = ":0.0"; + int numThreads = 2; + Display *dpy = NULL; + int i; + Status threadStat; + + if (argc == 1) { + usage(); + } + else { + int i; + for (i = 1; i < argc; i++) { + if (strcmp(argv[i], "-display") == 0 && i + 1 < argc) { + displayName = argv[i + 1]; + i++; + } + else if (strcmp(argv[i], "-p") == 0) { + MultiDisplays = 1; + } + else if (strcmp(argv[i], "-l") == 0) { + Locking = 1; + } + else if (strcmp(argv[i], "-n") == 0 && i + 1 < argc) { + numThreads = atoi(argv[i + 1]); + if (numThreads < 1) + numThreads = 1; + else if (numThreads > MAX_WINTHREADS) + numThreads = MAX_WINTHREADS; + i++; + } + else { + usage(); + exit(1); + } + } + } + + if (Locking) + printf("glthreads: Using explicit locks around Xlib calls.\n"); + else + printf("glthreads: No explict locking.\n"); + + if (MultiDisplays) + printf("glthreads: Per-thread display connections.\n"); + else + printf("glthreads: Single display connection.\n"); + + /* + * VERY IMPORTANT: call XInitThreads() before any other Xlib functions. + */ + if (!MultiDisplays) { + if (!Locking) { + threadStat = XInitThreads(); + if (threadStat) { + printf("XInitThreads() returned %d (success)\n", (int) threadStat); + } + else { + printf("XInitThreads() returned 0 (failure- this program may fail)\n"); + } + } + + dpy = XOpenDisplay(displayName); + if (!dpy) { + fprintf(stderr, "Unable to open display %s\n", XDisplayName(displayName)); + return -1; + } + } + + if (Locking) { + pthread_mutex_init(&Mutex, NULL); + } + + printf("glthreads: creating windows\n"); + + NumWinThreads = numThreads; + + /* Create the GLX windows and contexts */ + for (i = 0; i < numThreads; i++) { + if (MultiDisplays) { + WinThreads[i].Dpy = XOpenDisplay(displayName); + assert(WinThreads[i].Dpy); + } + else { + WinThreads[i].Dpy = dpy; + } + WinThreads[i].Index = i; + create_window(&WinThreads[i]); + } + + printf("glthreads: creating threads\n"); + + /* Create the threads */ + for (i = 0; i < numThreads; i++) { + pthread_create(&WinThreads[i].Thread, NULL, thread_function, + (void*) &WinThreads[i]); + printf("glthreads: Created thread %p\n", (void *) WinThreads[i].Thread); + } + + if (MultiDisplays) + event_loop_multi(); + else + event_loop(dpy); + + clean_up(); + + if (MultiDisplays) { + for (i = 0; i < numThreads; i++) { + XCloseDisplay(WinThreads[i].Dpy); + } + } + else { + XCloseDisplay(dpy); + } + + return 0; +} + + +#else /* PTHREADS */ + + +#include <stdio.h> + +int +main(int argc, char *argv[]) +{ + printf("Sorry, this program wasn't compiled with PTHREADS defined.\n"); + return 0; +} + + +#endif /* PTHREADS */ Modified: AppleSGLX/trunk/tests/simple/simple.mk =================================================================== --- AppleSGLX/trunk/tests/simple/simple.mk 2009-02-22 12:01:28 UTC (rev 233) +++ AppleSGLX/trunk/tests/simple/simple.mk 2009-02-22 12:18:01 UTC (rev 234) @@ -10,3 +10,6 @@ $(TEST_BUILD_DIR)/multisample_glx: tests/simple/multisample_glx.c $(LIBGL) $(CC) tests/simple/multisample_glx.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/multisample_glx $(LINK_TEST) +$(TEST_BUILD_DIR)/glthreads: tests/simple/glthreads.c $(LIBGL) + $(CC) -DPTHREADS -pthread tests/simple/glthreads.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/glthreads $(LINK_TEST) + Modified: AppleSGLX/trunk/tests/tests.mk =================================================================== --- AppleSGLX/trunk/tests/tests.mk 2009-02-22 12:01:28 UTC (rev 233) +++ AppleSGLX/trunk/tests/tests.mk 2009-02-22 12:18:01 UTC (rev 234) @@ -30,5 +30,6 @@ $(TEST_BUILD_DIR)/sharedtex \ $(TEST_BUILD_DIR)/drawable_types \ $(TEST_BUILD_DIR)/glxpixmap_destroy_invalid \ - $(TEST_BUILD_DIR)/multisample_glx + $(TEST_BUILD_DIR)/multisample_glx \ + $(TEST_BUILD_DIR)/glthreads

1 0

[233] AppleSGLX/trunk/tests
by source_changes＠macosforge.org 22 Feb '09

22 Feb '09

Revision: 233 http://trac.macosforge.org/projects/xquartz/changeset/233 Author: gstaplin(a)apple.com Date: 2009-02-22 04:01:28 -0800 (Sun, 22 Feb 2009) Log Message: ----------- Add a multisampling test to the suite. Modified Paths: -------------- AppleSGLX/trunk/tests/simple/simple.mk AppleSGLX/trunk/tests/tests.mk Added Paths: ----------- AppleSGLX/trunk/tests/simple/multisample_glx.c Added: AppleSGLX/trunk/tests/simple/multisample_glx.c =================================================================== --- AppleSGLX/trunk/tests/simple/multisample_glx.c (rev 0) +++ AppleSGLX/trunk/tests/simple/multisample_glx.c 2009-02-22 12:01:28 UTC (rev 233) @@ -0,0 +1,206 @@ +#include <stdio.h> +#include <stdlib.h> +#include <X11/Xlib.h> +#include <GL/glx.h> + +GLuint tlist, checkerlist; + +void draw(Display *dpy, Window w) { + glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); + glLoadIdentity(); + glEnable(GL_MULTISAMPLE); + + glCallList(tlist); + glXSwapBuffers(dpy, w); +} + +void resize(Display *dpy, Window w, int width, int height) { + glViewport(0, 0, width, height); + draw(dpy, w); +} + +void create_lists(void) { + GLint sbufs, samples; + int i; + + tlist = glGenLists(1); + checkerlist = glGenLists(1); + + if(0 == tlist || 0 == checkerlist) { + fprintf(stderr, "unable to generate lists!\n"); + abort(); + } + + glClearColor(0.0f, 0.0f, 0.0f, 0.0f); + glGetIntegerv(GL_SAMPLE_BUFFERS, &sbufs); + glGetIntegerv(GL_SAMPLES, &samples); + + printf("sample buffers %d samples %d\n", sbufs, samples); + + glNewList(tlist, GL_COMPILE); + + for(i = 0; i < 20; ++i) { + glPushMatrix(); + glRotatef(360.0f * (float) i / 20, 0.0f, 0.0f, 1.0f); + glColor3f(1.0f, 0.5f, 0.5f); + glLineWidth(0.1); + glBegin(GL_LINES); + glVertex2f(0.1, 0.5); + glVertex2f(0.8, 0.4); + glEnd(); + + glColor3f(0.5f, 0.5f, 0.5f); + glBegin(GL_TRIANGLES); + glVertex2f(0.5, 0.0f); + glVertex2f(0.9, 0.9f); + glVertex2f(0.1, 0.9f); + glEnd(); + + glPopMatrix(); + } + + glEndList(); +} + +void event_loop(Display *dpy) { + XEvent event; + + while(1) { + XNextEvent(dpy, &event); + + switch(event.type) { + case Expose: + draw(dpy, event.xexpose.window); + break; + + case ConfigureNotify: + resize(dpy, event.xconfigure.window, event.xconfigure.width, + event.xconfigure.height); + break; + } + } +} + +int main() { + Display *dpy; + int fbattrib[] = { + GLX_DOUBLEBUFFER, True, + GLX_RED_SIZE, 8, + GLX_GREEN_SIZE, 8, + GLX_BLUE_SIZE, 8, + GLX_ALPHA_SIZE, 8, + None + }; + + int eventbase, errorbase; + int screen; + Window root, win; + XVisualInfo *visinfo; + XSetWindowAttributes attr; + GLXContext ctx; + GLXFBConfig *fbconfig; + int i, numfbconfig, maxsample = 0; + int bestfbi = 0, value; + + 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); + + fbconfig = glXChooseFBConfig(dpy, screen, fbattrib, &numfbconfig); + + if(NULL == fbconfig) { + fprintf(stderr, "error: choosing GLXFBConfig!\n"); + return EXIT_FAILURE; + } + + for(i = 0; i < numfbconfig; ++i) { + glXGetFBConfigAttrib(dpy, fbconfig[i], GLX_SAMPLES, &value); + + if(value > maxsample) { + bestfbi = i; + maxsample = value; + } + } + + glXGetFBConfigAttrib(dpy, fbconfig[bestfbi], GLX_SAMPLES, &value); + printf("peak GLX_SAMPLES %d\n", value); + + visinfo = glXGetVisualFromFBConfig(dpy, fbconfig[bestfbi]); + + if (!visinfo) { + fprintf(stderr, "error: couldn't get an RGBA, double-buffered visual!\n"); + return EXIT_FAILURE; + } + + printf("visinfo->visualid %lx\n", visinfo->visualid); + + attr.background_pixel = 0; + attr.border_pixel = 0; + attr.colormap = XCreateColormap(dpy, root, visinfo->visual, AllocNone); + attr.event_mask = StructureNotifyMask | ExposureMask; + + 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); + + if(!glXMakeCurrent(dpy, win, ctx)) { + fprintf(stderr, "error: making context current!\n"); + return EXIT_FAILURE; + } + + glEnable(GL_MULTISAMPLE); + + create_lists(); + + { + GLint alpha, red, green; + GLboolean dbuf; + + glGetIntegerv(GL_RED_BITS, &red); + printf("glGetIntegerv(GL_RED_BITS) %d\n", red); + + glGetIntegerv(GL_GREEN_BITS, &green); + printf("glGetIntegerv(GL_GREEN_BITS) %d\n", green); + + glGetIntegerv(GL_ALPHA_BITS, &alpha); + printf("glGetIntegerv(GL_ALPHA_BITS) %d\n", alpha); + + glGetBooleanv(GL_DOUBLEBUFFER, &dbuf); + printf("glGetBooleanv(GL_DOUBLEBUFFER) %d\n", dbuf); + + GLint aux; + glGetIntegerv(GL_AUX_BUFFERS, &aux); + printf("aux buffers %d\n", aux); + + GLint ared; + glGetIntegerv(GL_ACCUM_RED_BITS, &ared); + printf("accum red bits %d\n", ared); + } + + event_loop(dpy); + + return EXIT_SUCCESS; +} Modified: AppleSGLX/trunk/tests/simple/simple.mk =================================================================== --- AppleSGLX/trunk/tests/simple/simple.mk 2009-02-22 11:16:00 UTC (rev 232) +++ AppleSGLX/trunk/tests/simple/simple.mk 2009-02-22 12:01:28 UTC (rev 233) @@ -6,3 +6,7 @@ $(TEST_BUILD_DIR)/drawable_types: tests/simple/drawable_types.c $(LIBGL) $(CC) tests/simple/drawable_types.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/drawable_types $(LINK_TEST) + +$(TEST_BUILD_DIR)/multisample_glx: tests/simple/multisample_glx.c $(LIBGL) + $(CC) tests/simple/multisample_glx.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/multisample_glx $(LINK_TEST) + Modified: AppleSGLX/trunk/tests/tests.mk =================================================================== --- AppleSGLX/trunk/tests/tests.mk 2009-02-22 11:16:00 UTC (rev 232) +++ AppleSGLX/trunk/tests/tests.mk 2009-02-22 12:01:28 UTC (rev 233) @@ -29,5 +29,6 @@ $(TEST_BUILD_DIR)/glxpixmap_create_destroy \ $(TEST_BUILD_DIR)/sharedtex \ $(TEST_BUILD_DIR)/drawable_types \ - $(TEST_BUILD_DIR)/glxpixmap_destroy_invalid + $(TEST_BUILD_DIR)/glxpixmap_destroy_invalid \ + $(TEST_BUILD_DIR)/multisample_glx

1 0

[232] AppleSGLX/trunk/glcontextmodes.c
by source_changes＠macosforge.org 22 Feb '09

22 Feb '09

Revision: 232 http://trac.macosforge.org/projects/xquartz/changeset/232 Author: gstaplin(a)apple.com Date: 2009-02-22 03:16:00 -0800 (Sun, 22 Feb 2009) Log Message: ----------- Re-enable some more extension tags that were commented out. The multisampling in particular was missing. It uses the same values in GLX 1.4 that were used in the ARB and SGIS extension. Modified Paths: -------------- AppleSGLX/trunk/glcontextmodes.c Modified: AppleSGLX/trunk/glcontextmodes.c =================================================================== --- AppleSGLX/trunk/glcontextmodes.c 2009-02-22 07:25:36 UTC (rev 231) +++ AppleSGLX/trunk/glcontextmodes.c 2009-02-22 11:16:00 UTC (rev 232) @@ -314,7 +314,6 @@ case GLX_MAX_PBUFFER_PIXELS: *value_return = mode->maxPbufferPixels; return 0; -#if 0 case GLX_OPTIMAL_PBUFFER_WIDTH_SGIX: *value_return = mode->optimalPbufferWidth; return 0; @@ -351,7 +350,6 @@ * server. */ case GLX_VISUAL_SELECT_GROUP_SGIX: -#endif default: return GLX_BAD_ATTRIBUTE;

1 0

[231] AppleSGLX/trunk
by source_changes＠macosforge.org 22 Feb '09

22 Feb '09

Revision: 231 http://trac.macosforge.org/projects/xquartz/changeset/231 Author: gstaplin(a)apple.com Date: 2009-02-21 23:25:36 -0800 (Sat, 21 Feb 2009) Log Message: ----------- Complete the transition to __glXSendError in glxcmds.c. Modified Paths: -------------- AppleSGLX/trunk/apple_glx_context.c AppleSGLX/trunk/apple_glx_context.h AppleSGLX/trunk/glxcmds.c Modified: AppleSGLX/trunk/apple_glx_context.c =================================================================== --- AppleSGLX/trunk/apple_glx_context.c 2009-02-22 07:08:21 UTC (rev 230) +++ AppleSGLX/trunk/apple_glx_context.c 2009-02-22 07:25:36 UTC (rev 231) @@ -112,7 +112,7 @@ */ bool apple_glx_create_context(void **ptr, Display *dpy, int screen, const void *mode, void *sharedContext, - int *errorptr) { + int *errorptr, bool *x11errorptr) { struct apple_glx_context *ac; struct apple_glx_context *sharedac = sharedContext; CGLError error; @@ -123,11 +123,13 @@ if(NULL == ac) { *errorptr = BadAlloc; + *x11errorptr = true; return true; } if(sharedac && !is_context_valid(sharedac)) { *errorptr = GLXBadContext; + *x11errorptr = false; return true; } @@ -155,8 +157,10 @@ if(kCGLBadMatch == error) { *errorptr = BadMatch; + *x11errorptr = true; } else { *errorptr = GLXBadContext; + *x11errorptr = false; } if(getenv("LIBGL_DIAGNOSTIC")) @@ -299,8 +303,6 @@ } /* Return true if an error occured. */ -/* TODO handle the readable GLXDrawable...? STUDY */ - bool apple_glx_make_current_context(Display *dpy, void *oldptr, void *ptr, GLXDrawable drawable) { struct apple_glx_context *oldac = oldptr; @@ -498,7 +500,8 @@ } bool apple_glx_copy_context(void *currentptr, void *srcptr, void *destptr, - unsigned long mask, int *errorptr) { + unsigned long mask, int *errorptr, + bool *x11errorptr) { struct apple_glx_context *src, *dest; CGLError err; @@ -507,11 +510,13 @@ if(src->screen != dest->screen) { *errorptr = BadMatch; + *x11errorptr = true; return true; } if(dest == currentptr || dest->is_current) { *errorptr = BadAccess; + *x11errorptr = true; return true; } @@ -526,6 +531,7 @@ if(kCGLNoError != err) { *errorptr = GLXBadContext; + *x11errorptr = false; return true; } Modified: AppleSGLX/trunk/apple_glx_context.h =================================================================== --- AppleSGLX/trunk/apple_glx_context.h 2009-02-22 07:08:21 UTC (rev 230) +++ AppleSGLX/trunk/apple_glx_context.h 2009-02-22 07:25:36 UTC (rev 231) @@ -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 @@ -55,7 +55,7 @@ bool apple_glx_create_context(void **ptr, Display *dpy, int screen, const void *mode, void *sharedContext, - int *errorptr); + int *errorptr, bool *x11errorptr); void apple_glx_destroy_context(void **ptr, Display *dpy); bool apple_glx_make_current_context(Display *dpy, void *oldptr, void *ptr, GLXDrawable drawable); @@ -65,6 +65,7 @@ CGLContextObj *contextobj); bool apple_glx_copy_context(void *currentptr, void *srcptr, void *destptr, - unsigned long mask, int *errorptr); + unsigned long mask, int *errorptr, + bool *x11errorptr); #endif /*APPLE_GLX_CONTEXT_H*/ Modified: AppleSGLX/trunk/glxcmds.c =================================================================== --- AppleSGLX/trunk/glxcmds.c 2009-02-22 07:08:21 UTC (rev 230) +++ AppleSGLX/trunk/glxcmds.c 2009-02-22 07:25:36 UTC (rev 231) @@ -40,6 +40,7 @@ #include "apple_glx_context.h" #include "apple_glx.h" +#include "glx_error.h" static const char __glXGLXClientVendorName[] = "SGI"; static const char __glXGLXClientVersion[] = "1.4"; @@ -358,6 +359,7 @@ __GLXscreenConfigs *const psc = GetGLXScreenConfigs(dpy, screen); const __GLcontextModes *mode; int errorcode; + bool x11error; if ( dpy == NULL ) return NULL; @@ -379,20 +381,8 @@ mode = _gl_context_modes_find_visual(psc->visuals, vis->visualid); if(NULL == mode) { - xError error; - - LockDisplay(dpy); - - error.errorCode = BadValue; - error.resourceID = vis->visualid; - error.sequenceNumber = dpy->request; - error.type = X_Error; - error.majorCode = gc->majorOpcode; - error.minorCode = X_GLXCreateContext; - _XError(dpy, &error); - - UnlockDisplay(dpy); - + __glXSendError(dpy, BadValue, vis->visualid, X_GLXCreateContext, + true); __glXFreeContext(gc); return NULL; @@ -401,18 +391,8 @@ if(apple_glx_create_context(&gc->apple, dpy, screen, mode, shareList ? shareList->apple : NULL, - &errorcode)) { - xError error; - error.errorCode = errorcode; - error.resourceID = 0; - error.sequenceNumber = dpy->request; - error.type = X_Error; - error.majorCode = gc->majorOpcode; - error.minorCode = X_GLXCreateContext; - _XError(dpy, &error); - - UnlockDisplay(dpy); - + &errorcode, &x11error)) { + __glXSendError(dpy, errorcode, 0, X_GLXCreateContext, x11error); __glXFreeContext(gc); return NULL; @@ -573,24 +553,11 @@ { GLXContext gc = __glXGetCurrentContext(); int errorcode; + bool x11error; if(apple_glx_copy_context(gc->apple, source->apple, dest->apple, - mask, &errorcode)) { - xError error; - - LockDisplay(dpy); - - error.errorCode = errorcode; - error.resourceID = 0; - error.sequenceNumber = dpy->request; - error.type = X_Error; - error.majorCode = gc->majorOpcode; - error.minorCode = X_GLXCopyContext; - _XError(dpy, &error); - - UnlockDisplay(dpy); - - return; + mask, &errorcode, &x11error)) { + __glXSendError(dpy, errorcode, 0, X_GLXCopyContext, x11error); } } @@ -602,25 +569,12 @@ */ PUBLIC Bool glXIsDirect(Display *dpy, GLXContext gc) { - xError error; - + /* + * This isn't an ideal test. + * glXIsDirect should probably search a list of contexts. + */ if(NULL == gc) { - /* - * This isn't an ideal test. - * glXIsDirect should probably search a list of contexts. - */ - LockDisplay(dpy); - - error.errorCode = GLXBadContext; - error.resourceID = 0; - error.sequenceNumber = dpy->request; - error.type = X_Error; - error.majorCode = 0; //gc->majorOpcode; - error.minorCode = X_GLXIsDirect; - _XError(dpy, &error); - - UnlockDisplay(dpy); - + __glXSendError(dpy, GLXBadContext, 0, X_GLXIsDirect, false); return False; } @@ -647,7 +601,10 @@ */ PUBLIC void glXDestroyGLXPixmap(Display *dpy, GLXPixmap glxpixmap) { - apple_glx_pixmap_destroy(dpy, glxpixmap); + if(apple_glx_pixmap_destroy(dpy, glxpixmap)) + return; /*Success*/ + + __glXSendError(dpy, GLXBadPixmap, glxpixmap, X_GLXDestroyPixmap, false); } PUBLIC void glXSwapBuffers(Display *dpy, GLXDrawable drawable) { @@ -661,18 +618,7 @@ if(apple_glx_is_current_drawable(gc->apple, drawable)) { apple_glx_swap_buffers(gc->apple); } else { - LockDisplay(dpy); - - xError error; - error.errorCode = GLXBadCurrentWindow; - error.resourceID = 0; - error.sequenceNumber = dpy->request; - error.type = X_Error; - error.majorCode = gc->majorOpcode; - error.minorCode = X_GLXSwapBuffers; - _XError(dpy, &error); - - UnlockDisplay(dpy); + __glXSendError(dpy, GLXBadCurrentWindow, 0, X_GLXSwapBuffers, false); } }

1 0