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

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

22 Feb '09

Revision: 219 http://trac.macosforge.org/projects/xquartz/changeset/219 Author: gstaplin(a)apple.com Date: 2009-02-21 17:12:06 -0800 (Sat, 21 Feb 2009) Log Message: ----------- Fix an error that caused a mkdir to fail due to the directory existing. This occurred when a source file was changed and the libGL targets were rebuilt. Modified Paths: -------------- AppleSGLX/trunk/Makefile Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-21 09:50:25 UTC (rev 218) +++ AppleSGLX/trunk/Makefile 2009-02-22 01:12:06 UTC (rev 219) @@ -35,11 +35,11 @@ #This is used for building the tests. #The tests don't require installation. $(TEST_BUILD_DIR)/libGL.dylib: $(OBJECTS) - $(MKDIR) $(TEST_BUILD_DIR) + -if ! test -d $(TEST_BUILD_DIR); then $(MKDIR) $(TEST_BUILD_DIR); fi $(CC) -o $@ -dynamiclib -lXplugin -framework ApplicationServices -framework CoreFoundation -L$(X11_DIR)/lib -lX11 -lXext -Wl,-exported_symbols_list,exports.list $(OBJECTS) $(BUILD_DIR)/libGL.1.2.dylib: $(OBJECTS) - $(MKDIR) $(BUILD_DIR) + -if ! test -d $(BUILD_DIR); then $(MKDIR) $(BUILD_DIR); fi $(CC) $(GL_CFLAGS) -o $@ -dynamiclib -install_name $(INSTALL_DIR)/lib/libGL.1.2.dylib -compatibility_version 1.2 -current_version 1.2 -lXplugin -framework ApplicationServices -framework CoreFoundation $(GL_LDFLAGS) -lXext -lX11 -Wl,-exported_symbols_list,exports.list $(OBJECTS) .c.o:

1 0

[218] AppleSGLX/trunk/glxcmds.c
by source_changes＠macosforge.org 21 Feb '09

21 Feb '09

Revision: 218 http://trac.macosforge.org/projects/xquartz/changeset/218 Author: gstaplin(a)apple.com Date: 2009-02-21 01:50:25 -0800 (Sat, 21 Feb 2009) Log Message: ----------- Avoid a fault when creating the XError for the case of a NULL GLXContext in glXIsDirect. Modified Paths: -------------- AppleSGLX/trunk/glxcmds.c Modified: AppleSGLX/trunk/glxcmds.c =================================================================== --- AppleSGLX/trunk/glxcmds.c 2009-02-21 00:17:45 UTC (rev 217) +++ AppleSGLX/trunk/glxcmds.c 2009-02-21 09:50:25 UTC (rev 218) @@ -605,13 +605,17 @@ xError error; 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 = gc->majorOpcode; + error.majorCode = 0; //gc->majorOpcode; error.minorCode = X_GLXIsDirect; _XError(dpy, &error);

1 0

[217] AppleSGLX/trunk/Makefile
by source_changes＠macosforge.org 21 Feb '09

21 Feb '09

Revision: 217 http://trac.macosforge.org/projects/xquartz/changeset/217 Author: jeremyhu(a)freedesktop.org Date: 2009-02-20 16:17:45 -0800 (Fri, 20 Feb 2009) Log Message: ----------- Fix programs install Modified Paths: -------------- AppleSGLX/trunk/Makefile Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-21 00:15:30 UTC (rev 216) +++ AppleSGLX/trunk/Makefile 2009-02-21 00:17:45 UTC (rev 217) @@ -19,8 +19,10 @@ #The directory with binaries that can tested without an install. TEST_BUILD_DIR=testbuilds +PROGRAMS=$(BUILD_DIR)/glxinfo $(BUILD_DIR)/glxgears + all: programs tests -programs: $(BUILD_DIR)/glxinfo $(BUILD_DIR)/glxgears +programs: $(PROGRAMS) include tests/tests.mk

1 0

[216] AppleSGLX/trunk/Makefile
by source_changes＠macosforge.org 21 Feb '09

21 Feb '09

Revision: 216 http://trac.macosforge.org/projects/xquartz/changeset/216 Author: jeremyhu(a)freedesktop.org Date: 2009-02-20 16:15:30 -0800 (Fri, 20 Feb 2009) Log Message: ----------- Fix cycle in dependencies (kinda... the dir got updated when the programs were built... causing the lib to rebuild) Modified Paths: -------------- AppleSGLX/trunk/Makefile Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-20 23:43:09 UTC (rev 215) +++ AppleSGLX/trunk/Makefile 2009-02-21 00:15:30 UTC (rev 216) @@ -19,10 +19,9 @@ #The directory with binaries that can tested without an install. TEST_BUILD_DIR=testbuilds -PROGRAMS=$(BUILD_DIR)/glxinfo $(BUILD_DIR)/glxgears +all: programs tests +programs: $(BUILD_DIR)/glxinfo $(BUILD_DIR)/glxgears -all: $(PROGRAMS) tests - include tests/tests.mk OBJECTS=glxext.o glxcmds.o glx_pbuffer.o glx_query.o glxcurrent.o glxextensions.o \ @@ -31,19 +30,14 @@ apple_xgl_api.o apple_glx_drawable.o xfont.o apple_glx_pbuffer.o \ apple_glx_pixmap.o apple_xgl_api_read.o glx_empty.o -#This target is used for the tests. -$(TEST_BUILD_DIR): - $(MKDIR) $(TEST_BUILD_DIR) - -$(BUILD_DIR): - $(MKDIR) $(BUILD_DIR) - #This is used for building the tests. #The tests don't require installation. -$(TEST_BUILD_DIR)/libGL.dylib: $(TEST_BUILD_DIR) $(OBJECTS) +$(TEST_BUILD_DIR)/libGL.dylib: $(OBJECTS) + $(MKDIR) $(TEST_BUILD_DIR) $(CC) -o $@ -dynamiclib -lXplugin -framework ApplicationServices -framework CoreFoundation -L$(X11_DIR)/lib -lX11 -lXext -Wl,-exported_symbols_list,exports.list $(OBJECTS) -$(BUILD_DIR)/libGL.1.2.dylib: $(BUILD_DIR) $(OBJECTS) +$(BUILD_DIR)/libGL.1.2.dylib: $(OBJECTS) + $(MKDIR) $(BUILD_DIR) $(CC) $(GL_CFLAGS) -o $@ -dynamiclib -install_name $(INSTALL_DIR)/lib/libGL.1.2.dylib -compatibility_version 1.2 -current_version 1.2 -lXplugin -framework ApplicationServices -framework CoreFoundation $(GL_LDFLAGS) -lXext -lX11 -Wl,-exported_symbols_list,exports.list $(OBJECTS) .c.o: @@ -76,17 +70,17 @@ glx_empty.o: glx_empty.c $(BUILD_DIR)/glxinfo: tests/glxinfo/glxinfo.c $(BUILD_DIR)/libGL.1.2.dylib - $(CC) tests/glxinfo/glxinfo.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(BUILD_DIR) -L$(X11_DIR)/lib -lX11 -lGL -o $@ + $(CC) tests/glxinfo/glxinfo.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(X11_DIR)/lib -lX11 $(BUILD_DIR)/libGL.1.2.dylib -o $@ $(BUILD_DIR)/glxgears: tests/glxgears/glxgears.c $(BUILD_DIR)/libGL.1.2.dylib - $(CC) tests/glxgears/glxgears.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(BUILD_DIR) -L$(X11_DIR)/lib -lX11 -lGL -o $@ + $(CC) tests/glxgears/glxgears.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(X11_DIR)/lib -lX11 $(BUILD_DIR)/libGL.1.2.dylib -o $@ install_headers: $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL $(INSTALL) -m 644 include/GL/gl.h include/GL/glext.h include/GL/glx.h include/GL/glxext.h \ include/GL/glxint.h include/GL/glxmd.h include/GL/glxproto.h $(DESTDIR)$(INSTALL_DIR)/include/GL -install_programs: $(PROGRAMS) +install_programs: programs $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/bin $(INSTALL) -m 755 $(PROGRAMS) $(DESTDIR)$(INSTALL_DIR)/bin

1 0

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

20 Feb '09

Revision: 215 http://trac.macosforge.org/projects/xquartz/changeset/215 Author: jeremyhu(a)freedesktop.org Date: 2009-02-20 15:43:09 -0800 (Fri, 20 Feb 2009) Log Message: ----------- Fix parallel build of tests Modified Paths: -------------- AppleSGLX/trunk/tests/create_destroy_context/create_destroy_context.mk AppleSGLX/trunk/tests/tests.mk Modified: AppleSGLX/trunk/tests/create_destroy_context/create_destroy_context.mk =================================================================== --- AppleSGLX/trunk/tests/create_destroy_context/create_destroy_context.mk 2009-02-20 22:49:49 UTC (rev 214) +++ AppleSGLX/trunk/tests/create_destroy_context/create_destroy_context.mk 2009-02-20 23:43:09 UTC (rev 215) @@ -1,16 +1,16 @@ -$(TEST_BUILD_DIR)/create_destroy_context: tests/create_destroy_context/create_destroy_context.c +$(TEST_BUILD_DIR)/create_destroy_context: tests/create_destroy_context/create_destroy_context.c $(LIBGL) $(CC) tests/create_destroy_context/create_destroy_context.c -Iinclude \ -o $(TEST_BUILD_DIR)/create_destroy_context $(LINK_TEST) -$(TEST_BUILD_DIR)/create_destroy_context_alone: tests/create_destroy_context/create_destroy_context_alone.c +$(TEST_BUILD_DIR)/create_destroy_context_alone: tests/create_destroy_context/create_destroy_context_alone.c $(LIBGL) $(CC) tests/create_destroy_context/create_destroy_context_alone.c -Iinclude \ -o $(TEST_BUILD_DIR)/create_destroy_context_alone $(LINK_TEST) -$(TEST_BUILD_DIR)/create_destroy_context_with_drawable: tests/create_destroy_context/create_destroy_context_with_drawable.c +$(TEST_BUILD_DIR)/create_destroy_context_with_drawable: tests/create_destroy_context/create_destroy_context_with_drawable.c $(LIBGL) $(CC) tests/create_destroy_context/create_destroy_context_with_drawable.c -Iinclude \ -o $(TEST_BUILD_DIR)/create_destroy_context_with_drawable $(LINK_TEST) -$(TEST_BUILD_DIR)/create_destroy_context_with_drawable_2: tests/create_destroy_context/create_destroy_context_with_drawable_2.c +$(TEST_BUILD_DIR)/create_destroy_context_with_drawable_2: tests/create_destroy_context/create_destroy_context_with_drawable_2.c $(LIBGL) $(CC) tests/create_destroy_context/create_destroy_context_with_drawable_2.c -Iinclude \ -o $(TEST_BUILD_DIR)/create_destroy_context_with_drawable_2 $(LINK_TEST) Modified: AppleSGLX/trunk/tests/tests.mk =================================================================== --- AppleSGLX/trunk/tests/tests.mk 2009-02-20 22:49:49 UTC (rev 214) +++ AppleSGLX/trunk/tests/tests.mk 2009-02-20 23:43:09 UTC (rev 215) @@ -17,7 +17,7 @@ include tests/triangle_glx_single/triangle_glx.mk include tests/shared/shared.mk -tests: $(TEST_BUILD_DIR)/libGL.dylib $(TEST_BUILD_DIR) $(TEST_BUILD_DIR)/simple $(TEST_BUILD_DIR)/fbconfigs $(TEST_BUILD_DIR)/triangle_glx \ +tests: $(TEST_BUILD_DIR)/simple $(TEST_BUILD_DIR)/fbconfigs $(TEST_BUILD_DIR)/triangle_glx \ $(TEST_BUILD_DIR)/create_destroy_context $(TEST_BUILD_DIR)/glxgears $(TEST_BUILD_DIR)/glxinfo \ $(TEST_BUILD_DIR)/pbuffer $(TEST_BUILD_DIR)/pbuffer_destroy \ $(TEST_BUILD_DIR)/glxpixmap \

1 0

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

20 Feb '09

Revision: 214 http://trac.macosforge.org/projects/xquartz/changeset/214 Author: gstaplin(a)apple.com Date: 2009-02-20 14:49:49 -0800 (Fri, 20 Feb 2009) Log Message: ----------- Add an item about the CGL API major version testing we need. Modified Paths: -------------- AppleSGLX/trunk/TODO Modified: AppleSGLX/trunk/TODO =================================================================== --- AppleSGLX/trunk/TODO 2009-02-20 22:45:02 UTC (rev 213) +++ AppleSGLX/trunk/TODO 2009-02-20 22:49:49 UTC (rev 214) @@ -2,6 +2,9 @@ Fix glXCreateWindow and glXDestroyWindow. +Add API major version testing to the apple_cgl layer. This way we can avoid +future API fiascos. Jordan suggested this a while ago. + -- Feb 16, 2009 DONE glXMakeContextCurrent's readable drawable needs to be set as the current

1 0

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

20 Feb '09

Revision: 213 http://trac.macosforge.org/projects/xquartz/changeset/213 Author: jeremyhu(a)freedesktop.org Date: 2009-02-20 14:45:02 -0800 (Fri, 20 Feb 2009) Log Message: ----------- Simplified dependencies in the Makefile Modified Paths: -------------- AppleSGLX/trunk/Makefile Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-20 22:33:46 UTC (rev 212) +++ AppleSGLX/trunk/Makefile 2009-02-20 22:45:02 UTC (rev 213) @@ -41,99 +41,54 @@ #This is used for building the tests. #The tests don't require installation. $(TEST_BUILD_DIR)/libGL.dylib: $(TEST_BUILD_DIR) $(OBJECTS) - $(CC) -o $(TEST_BUILD_DIR)/libGL.dylib -dynamiclib -lXplugin -framework ApplicationServices -framework CoreFoundation -L$(X11_DIR)/lib -lX11 -lXext -Wl,-exported_symbols_list,exports.list $(OBJECTS) + $(CC) -o $@ -dynamiclib -lXplugin -framework ApplicationServices -framework CoreFoundation -L$(X11_DIR)/lib -lX11 -lXext -Wl,-exported_symbols_list,exports.list $(OBJECTS) $(BUILD_DIR)/libGL.1.2.dylib: $(BUILD_DIR) $(OBJECTS) - $(CC) $(GL_CFLAGS) -o $(BUILD_DIR)/libGL.1.2.dylib -dynamiclib -install_name $(INSTALL_DIR)/lib/libGL.1.2.dylib -compatibility_version 1.2 -current_version 1.2 -lXplugin -framework ApplicationServices -framework CoreFoundation $(GL_LDFLAGS) -lXext -lX11 -Wl,-exported_symbols_list,exports.list $(OBJECTS) + $(CC) $(GL_CFLAGS) -o $@ -dynamiclib -install_name $(INSTALL_DIR)/lib/libGL.1.2.dylib -compatibility_version 1.2 -current_version 1.2 -lXplugin -framework ApplicationServices -framework CoreFoundation $(GL_LDFLAGS) -lXext -lX11 -Wl,-exported_symbols_list,exports.list $(OBJECTS) -apple_glx_drawable.o: apple_glx_drawable.h apple_glx_drawable.c apple_glx_pixmap.h apple_glx_pbuffer.h - $(COMPILE) apple_glx_drawable.c +.c.o: + $(COMPILE) $< +apple_glx_drawable.o: apple_glx_drawable.h apple_glx_drawable.c apple_glx_pixmap.h apple_glx_pbuffer.h apple_xgl_api.o: apple_xgl_api.h apple_xgl_api.c apple_xgl_api_stereo.c - $(COMPILE) apple_xgl_api.c - apple_xgl_api_read.o: apple_xgl_api_read.h apple_xgl_api_read.c apple_xgl_api.h - $(COMPILE) apple_xgl_api_read.c - glcontextmodes.o: glcontextmodes.c glcontextmodes.h - $(COMPILE) glcontextmodes.c - glxext.o: glxext.c - $(COMPILE) glxext.c - glxreply.o: glxreply.c - $(COMPILE) glxreply.c - glxcmds.o: glxcmds.c apple_glx_context.h - $(COMPILE) glxcmds.c - glx_pbuffer.o: glx_pbuffer.c - $(COMPILE) glx_pbuffer.c - glx_query.o: glx_query.c - $(COMPILE) glx_query.c - glxcurrent.o: glxcurrent.c - $(COMPILE) glxcurrent.c - glxextensions.o: glxextensions.h glxextensions.c - $(COMPILE) glxextensions.c - glxhash.o: glxhash.h glxhash.c - $(COMPILE) glxhash.c - appledri.o: appledri.h appledristr.h appledri.c - $(COMPILE) appledri.c - apple_glx_context.o: apple_glx_context.c apple_glx_context.h apple_glx_context.h - $(COMPILE) apple_glx_context.c - apple_glx.o: apple_glx.h apple_glx.c - $(COMPILE) apple_glx.c - apple_visual.o: apple_visual.h apple_visual.c - $(COMPILE) apple_visual.c - apple_cgl.o: apple_cgl.h apple_cgl.c - $(COMPILE) apple_cgl.c - apple_glx_pbuffer.o: apple_glx_pbuffer.h apple_glx_pbuffer.c - $(COMPILE) apple_glx_pbuffer.c - apple_glx_pixmap.o: apple_glx_pixmap.h apple_glx_pixmap.c appledri.h - $(COMPILE) apple_glx_pixmap.c - xfont.o: xfont.c glxclient.h - $(COMPILE) xfont.c - compsize.o: compsize.c - $(COMPILE) $? - renderpix.o: renderpix.c - $(COMPILE) $? - singlepix.o: singlepix.c - $(COMPILE) $? - pixel.o: pixel.c - $(COMPILE) $? - glx_empty.o: glx_empty.c - $(COMPILE) glx_empty.c $(BUILD_DIR)/glxinfo: tests/glxinfo/glxinfo.c $(BUILD_DIR)/libGL.1.2.dylib - $(CC) tests/glxinfo/glxinfo.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(BUILD_DIR) -L$(X11_DIR)/lib -lX11 -lGL -o $(BUILD_DIR)/glxinfo + $(CC) tests/glxinfo/glxinfo.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(BUILD_DIR) -L$(X11_DIR)/lib -lX11 -lGL -o $@ $(BUILD_DIR)/glxgears: tests/glxgears/glxgears.c $(BUILD_DIR)/libGL.1.2.dylib - $(CC) tests/glxgears/glxgears.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(BUILD_DIR) -L$(X11_DIR)/lib -lX11 -lGL -o $(BUILD_DIR)/glxgears + $(CC) tests/glxgears/glxgears.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(BUILD_DIR) -L$(X11_DIR)/lib -lX11 -lGL -o $@ install_headers: $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL - $(INSTALL) -m 444 include/GL/glx.h include/GL/glxext.h include/GL/glxint.h include/GL/glxmd.h include/GL/glxproto.h $(DESTDIR)$(INSTALL_DIR)/include/GL + $(INSTALL) -m 644 include/GL/gl.h include/GL/glext.h include/GL/glx.h include/GL/glxext.h \ + include/GL/glxint.h include/GL/glxmd.h include/GL/glxproto.h $(DESTDIR)$(INSTALL_DIR)/include/GL install_programs: $(PROGRAMS) $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/bin - $(INSTALL) -m 555 $(PROGRAMS) $(DESTDIR)$(INSTALL_DIR)/bin + $(INSTALL) -m 755 $(PROGRAMS) $(DESTDIR)$(INSTALL_DIR)/bin install_libraries: $(BUILD_DIR)/libGL.1.2.dylib $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/lib

1 0

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

20 Feb '09

Revision: 212 http://trac.macosforge.org/projects/xquartz/changeset/212 Author: gstaplin(a)apple.com Date: 2009-02-20 14:33:46 -0800 (Fri, 20 Feb 2009) Log Message: ----------- Add the glxpixmap_destroy_invalid to tests.mk. Modified Paths: -------------- AppleSGLX/trunk/tests/tests.mk Modified: AppleSGLX/trunk/tests/tests.mk =================================================================== --- AppleSGLX/trunk/tests/tests.mk 2009-02-20 22:32:03 UTC (rev 211) +++ AppleSGLX/trunk/tests/tests.mk 2009-02-20 22:33:46 UTC (rev 212) @@ -28,5 +28,6 @@ $(TEST_BUILD_DIR)/render_types \ $(TEST_BUILD_DIR)/glxpixmap_create_destroy \ $(TEST_BUILD_DIR)/sharedtex \ - $(TEST_BUILD_DIR)/drawable_types + $(TEST_BUILD_DIR)/drawable_types \ + $(TEST_BUILD_DIR)/glxpixmap_destroy_invalid

1 0

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

20 Feb '09

Revision: 211 http://trac.macosforge.org/projects/xquartz/changeset/211 Author: gstaplin(a)apple.com Date: 2009-02-20 14:32:03 -0800 (Fri, 20 Feb 2009) Log Message: ----------- Add a test for the GLXPixmap code that destroys an invalid GLXPixmap id. It doesn't pass at the moment. I think I will fix it in the future by making apple_glx_pixmap_destroy return a bool and using the XError pattern based on that. Modified Paths: -------------- AppleSGLX/trunk/tests/glxpixmap/glxpixmap.mk Added Paths: ----------- AppleSGLX/trunk/tests/glxpixmap/glxpixmap_destroy_invalid.c Modified: AppleSGLX/trunk/tests/glxpixmap/glxpixmap.mk =================================================================== --- AppleSGLX/trunk/tests/glxpixmap/glxpixmap.mk 2009-02-20 22:27:37 UTC (rev 210) +++ AppleSGLX/trunk/tests/glxpixmap/glxpixmap.mk 2009-02-20 22:32:03 UTC (rev 211) @@ -4,3 +4,5 @@ $(TEST_BUILD_DIR)/glxpixmap_create_destroy: tests/glxpixmap/glxpixmap_create_destroy.c $(LIBGL) $(CC) tests/glxpixmap/glxpixmap_create_destroy.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/glxpixmap_create_destroy $(LINK_TEST) +$(TEST_BUILD_DIR)/glxpixmap_destroy_invalid: tests/glxpixmap/glxpixmap_destroy_invalid.c $(LIBGL) + $(CC) tests/glxpixmap/glxpixmap_destroy_invalid.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/glxpixmap_destroy_invalid $(LINK_TEST) Added: AppleSGLX/trunk/tests/glxpixmap/glxpixmap_destroy_invalid.c =================================================================== --- AppleSGLX/trunk/tests/glxpixmap/glxpixmap_destroy_invalid.c (rev 0) +++ AppleSGLX/trunk/tests/glxpixmap/glxpixmap_destroy_invalid.c 2009-02-20 22:32:03 UTC (rev 211) @@ -0,0 +1,111 @@ + + +/* + * A demonstration of using the GLXPixmap functions. This program is in + * the public domain. + * + * Brian Paul + */ + + +#include <GL/gl.h> +#include <GL/glx.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + + +static GLXContext ctx; +static XVisualInfo *visinfo; +static GC gc; + + + +static Window make_rgb_window( Display *dpy, + unsigned int width, unsigned int height ) +{ + const int sbAttrib[] = { GLX_RGBA, + GLX_RED_SIZE, 1, + GLX_GREEN_SIZE, 1, + GLX_BLUE_SIZE, 1, + None }; + const int dbAttrib[] = { 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; + Window win; + + scrnum = DefaultScreen( dpy ); + root = RootWindow( dpy, scrnum ); + + visinfo = glXChooseVisual( dpy, scrnum, (int *) sbAttrib ); + if (!visinfo) { + visinfo = glXChooseVisual( dpy, scrnum, (int *) dbAttrib ); + if (!visinfo) { + printf("Error: couldn't get an RGB visual\n"); + exit(1); + } + } + + /* window attributes */ + attr.background_pixel = 0; + attr.border_pixel = 0; + /* TODO: share root colormap if possible */ + attr.colormap = XCreateColormap( dpy, root, visinfo->visual, AllocNone); + attr.event_mask = StructureNotifyMask | ExposureMask; + mask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask; + + win = XCreateWindow( dpy, root, 0, 0, width, height, + 0, visinfo->depth, InputOutput, + visinfo->visual, mask, &attr ); + + /* make an X GC so we can do XCopyArea later */ + gc = XCreateGC( dpy, win, 0, NULL ); + + /* need indirect context */ + ctx = glXCreateContext( dpy, visinfo, NULL, False ); + if (!ctx) { + printf("Error: glXCreateContext failed\n"); + exit(-1); + } + + printf("Direct rendering: %s\n", glXIsDirect(dpy, ctx) ? "Yes" : "No"); + + return win; +} + +int main( int argc, char *argv[] ) +{ + Display *dpy; + Window win; + Pixmap pm; + GLXPixmap glxpm; + int eventbase, errorbase; + + dpy = XOpenDisplay(NULL); + + if(NULL == dpy) { + fprintf(stderr, "error: opening display\n"); + return EXIT_FAILURE; + } + + if(!glXQueryExtension(dpy, &eventbase, &errorbase)) { + fprintf(stderr, "GLX is not available!\n"); + return EXIT_FAILURE; + } + + + win = make_rgb_window( dpy, 300, 300 ); + + fprintf(stderr, "This test should produce a GLXBadPixmap error.\n"); + + glXDestroyPixmap(dpy, /*intentional*/ win); + + return 0; +}

1 0

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

20 Feb '09

Revision: 210 http://trac.macosforge.org/projects/xquartz/changeset/210 Author: jeremyhu(a)freedesktop.org Date: 2009-02-20 14:27:37 -0800 (Fri, 20 Feb 2009) Log Message: ----------- More Makefile cleanup Modified Paths: -------------- AppleSGLX/trunk/Makefile AppleSGLX/trunk/tests/tests.mk Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-20 22:24:59 UTC (rev 209) +++ AppleSGLX/trunk/Makefile 2009-02-20 22:27:37 UTC (rev 210) @@ -21,10 +21,10 @@ PROGRAMS=$(BUILD_DIR)/glxinfo $(BUILD_DIR)/glxgears +all: $(PROGRAMS) tests + include tests/tests.mk -all: $(PROGRAMS) tests - OBJECTS=glxext.o glxcmds.o glx_pbuffer.o glx_query.o glxcurrent.o glxextensions.o \ appledri.o apple_glx_context.o apple_glx.o pixel.o \ compsize.o apple_visual.o apple_cgl.o glxreply.o glcontextmodes.o \ @@ -40,7 +40,7 @@ #This is used for building the tests. #The tests don't require installation. -$(TEST_BUILD_DIR)/libGL.dylib: $(OBJECTS) +$(TEST_BUILD_DIR)/libGL.dylib: $(TEST_BUILD_DIR) $(OBJECTS) $(CC) -o $(TEST_BUILD_DIR)/libGL.dylib -dynamiclib -lXplugin -framework ApplicationServices -framework CoreFoundation -L$(X11_DIR)/lib -lX11 -lXext -Wl,-exported_symbols_list,exports.list $(OBJECTS) $(BUILD_DIR)/libGL.1.2.dylib: $(BUILD_DIR) $(OBJECTS) Modified: AppleSGLX/trunk/tests/tests.mk =================================================================== --- AppleSGLX/trunk/tests/tests.mk 2009-02-20 22:24:59 UTC (rev 209) +++ AppleSGLX/trunk/tests/tests.mk 2009-02-20 22:27:37 UTC (rev 210) @@ -1,7 +1,7 @@ .PHONY : tests LIBGL=$(TEST_BUILD_DIR)/libGL.dylib -LINK_TEST=-L/usr/X11/lib ./libGL.dylib -lX11 -lXext -lXplugin -lpthread +LINK_TEST=-L/usr/X11/lib $(LIBGL) -lX11 -lXext -lXplugin -lpthread include tests/triangle/triangle.mk include tests/simple/simple.mk

1 0