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

[166] AppleSGLX/trunk/Makefile
by source_changes＠macosforge.org 18 Feb '09

18 Feb '09

Revision: 166 http://trac.macosforge.org/projects/xquartz/changeset/166 Author: jeremyhu(a)freedesktop.org Date: 2009-02-18 00:07:43 -0800 (Wed, 18 Feb 2009) Log Message: ----------- Order our includes before CFLAGS since that might pull in conflicting headers from glproto Modified Paths: -------------- AppleSGLX/trunk/Makefile Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-18 04:09:28 UTC (rev 165) +++ AppleSGLX/trunk/Makefile 2009-02-18 08:07:43 UTC (rev 166) @@ -11,7 +11,7 @@ RM=rm INCLUDE=-I. -Iinclude -Iinclude/internal -DGLX_ALIAS_UNSUPPORTED -Igl -F/System/Library/Frameworks/OpenGL.framework -I$(INSTALL_DIR)/include -COMPILE=$(CC) $(GL_CFLAGS) $(INCLUDE) -c +COMPILE=$(CC) $(INCLUDE) $(GL_CFLAGS) -c TEST_BUILD_DIR=builds

1 0

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

18 Feb '09

Revision: 165 http://trac.macosforge.org/projects/xquartz/changeset/165 Author: jeremyhu(a)freedesktop.org Date: 2009-02-17 20:09:28 -0800 (Tue, 17 Feb 2009) Log Message: ----------- AppleSGLX 50 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-18 04:05:10 UTC (rev 164) +++ trunk/pkg/README.2.4.0.txt 2009-02-18 04:09:28 UTC (rev 165) @@ -29,8 +29,10 @@ * xcb-proto 1.4 * xf86rushproto 1.1.2 * lib: - * libGL + * AppleSGLX 50 * rewrite of libGL to support newer versions of the GLX protocol + * GLXPixmap + * GLXPbuffer * libICE 1.0.5 * libpng 1.2.34 * libxcb 1.2

1 0

[164] AppleSGLX/tags/AppleSGLX-50/
by source_changes＠macosforge.org 18 Feb '09

18 Feb '09

Revision: 164 http://trac.macosforge.org/projects/xquartz/changeset/164 Author: jeremyhu(a)freedesktop.org Date: 2009-02-17 20:05:10 -0800 (Tue, 17 Feb 2009) Log Message: ----------- Tagging AppleSGLX-50 Added Paths: ----------- AppleSGLX/tags/AppleSGLX-50/

1 0

[163] AppleSGLX/trunk/
by source_changes＠macosforge.org 18 Feb '09

18 Feb '09

Revision: 163 http://trac.macosforge.org/projects/xquartz/changeset/163 Author: jeremyhu(a)freedesktop.org Date: 2009-02-17 20:04:57 -0800 (Tue, 17 Feb 2009) Log Message: ----------- Updated ignore Property Changed: ---------------- AppleSGLX/trunk/ Property changes on: AppleSGLX/trunk ___________________________________________________________________ Added: svn:ignore + builds libGL.dylib libGL.1.2.dylib

1 0

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

17 Feb '09

Revision: 162 http://trac.macosforge.org/projects/xquartz/changeset/162 Author: jeremyhu(a)freedesktop.org Date: 2009-02-17 14:50:04 -0800 (Tue, 17 Feb 2009) Log Message: ----------- Bump README for new libX11 and libxcb 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-17 06:28:07 UTC (rev 161) +++ trunk/pkg/README.2.4.0.txt 2009-02-17 22:50:04 UTC (rev 162) @@ -21,19 +21,20 @@ * apps: * xinput 1.4.0 * xrandr 1.2.99.4] - * xterm 241 + * xterm 242 * proto: * dri2proto 1.99.3 * randrproto 1.2.99.3 * xextproto 7.0.5 + * xcb-proto 1.4 * xf86rushproto 1.1.2 * lib: * libGL * rewrite of libGL to support newer versions of the GLX protocol * libICE 1.0.5 * libpng 1.2.34 - * libxcb 1.1.93 - * libX11 1.1.99.2 + * libxcb 1.2 + * libX11 1.2 * libXext 1.0.5 * libXrandr 1.2.99.4 * pixman 0.14.0

1 0

[161] AppleSGLX/trunk/TODO
by source_changes＠macosforge.org 17 Feb '09

17 Feb '09

Revision: 161 http://trac.macosforge.org/projects/xquartz/changeset/161 Author: gstaplin(a)apple.com Date: 2009-02-16 22:28:07 -0800 (Mon, 16 Feb 2009) Log Message: ----------- More TODO items based on another read of the GLX 1.4 spec. Modified Paths: -------------- AppleSGLX/trunk/TODO Modified: AppleSGLX/trunk/TODO =================================================================== --- AppleSGLX/trunk/TODO 2009-02-17 06:14:26 UTC (rev 160) +++ AppleSGLX/trunk/TODO 2009-02-17 06:28:07 UTC (rev 161) @@ -1,5 +1,17 @@ -- Feb 16, 2009 +glXMakeContextCurrent's readable drawable needs to be set as the current +surface/pbuffer/pixmap if it's different than the normal drawable in the +following routines: +glReadPixels, glCopyPixels, glCopyColorTable + +The old surface/pbuffer/pixmap needs to be restored after that. + +glXGetCurrentReadDrawable should also report the read drawable. It appears correct. + +Test glXGetCurrentDisplay(). It appears correct. +-- + Improve the glX symbol compatibility with the old libGL. Work out something for the GLXFBConfig optimal width/height. These types

1 0

[160] AppleSGLX/trunk/TODO
by source_changes＠macosforge.org 17 Feb '09

17 Feb '09

Revision: 160 http://trac.macosforge.org/projects/xquartz/changeset/160 Author: gstaplin(a)apple.com Date: 2009-02-16 22:14:26 -0800 (Mon, 16 Feb 2009) Log Message: ----------- More items for the TODO. Modified Paths: -------------- AppleSGLX/trunk/TODO Modified: AppleSGLX/trunk/TODO =================================================================== --- AppleSGLX/trunk/TODO 2009-02-17 06:08:47 UTC (rev 159) +++ AppleSGLX/trunk/TODO 2009-02-17 06:14:26 UTC (rev 160) @@ -1,5 +1,10 @@ -- Feb 16, 2009 +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. + Verify the XError behavior of GLXPixmap support functions. Test GLXPixmap support with various pixmap depths. @@ -9,12 +14,14 @@ Make apple_visual_create_pfobj not use OffScreen always. I suspect we can add a bool that indicates whether or not to create such an object. We can also recreate the context, or possibly reconfigure it. +Perhaps we could store the CGL attributes used for the pixel format object, and +append the OFfScreen attribute when using GLXPixmaps. -Finish glXDestroyGLXPixmap(). +DONE Finish glXDestroyGLXPixmap(). Test glXDestroyGLXPixmap(). -Add support for the newer GLX glXCreatePixmap. +Add support for the newer glXCreatePixmap (from 1.4). We have glXCreateGLXPixmap working. -- Feb 10, 2009

1 0

[159] AppleSGLX/trunk/tests
by source_changes＠macosforge.org 17 Feb '09

17 Feb '09

Revision: 159 http://trac.macosforge.org/projects/xquartz/changeset/159 Author: gstaplin(a)apple.com Date: 2009-02-16 22:08:47 -0800 (Mon, 16 Feb 2009) Log Message: ----------- Add a render_types test to the test suite. This is used to determine what our GLXFBConfigs are reporting is available. All GLXFBConfig currently say GLX_WINDOW_BIT. We need these to support GLX_WINDOW_BIT, GLX_PIXMAP_BIT, and GLX_PBUFFER_BIT now. This will require indirect.c changes in the 1.6 branch, unless we modify the pairs from the X server in libGL. In hindsight it might make more sense to just support Pbuffers and Pixmaps on the client side, because the server side indirect implementation lacks those at the moment. Modified Paths: -------------- AppleSGLX/trunk/tests/simple/simple.mk AppleSGLX/trunk/tests/tests.mk Added Paths: ----------- AppleSGLX/trunk/tests/simple/render_types.c Added: AppleSGLX/trunk/tests/simple/render_types.c =================================================================== --- AppleSGLX/trunk/tests/simple/render_types.c (rev 0) +++ AppleSGLX/trunk/tests/simple/render_types.c 2009-02-17 06:08:47 UTC (rev 159) @@ -0,0 +1,54 @@ +#include <stdio.h> +#include <stdlib.h> +#include <X11/Xlib.h> +#include <GL/glx.h> + +int main(int argc, char *argv[]) { + Display *dpy; + int eventbase, errorbase; + int major, minor; + GLXFBConfig *fbconfigs; + int i, numfbconfigs; + + 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; + } + + printf("GLX eventbase %d errorbase %d\n", eventbase, errorbase); + + if(!glXQueryVersion(dpy, &major, &minor)) { + fprintf(stderr, "GLX version query error!\n"); + return EXIT_FAILURE; + } + + printf("GLX version: %d.%d\n", major, minor); + + fbconfigs = glXGetFBConfigs(dpy, DefaultScreen(dpy), &numfbconfigs); + + if(NULL == fbconfigs) { + fprintf(stderr, "%s: failed to get GLXFBConfigs!\n", __func__); + return EXIT_FAILURE; + } + + for(i = 0; i < numfbconfigs; ++i) { + int r, value; + + r = glXGetFBConfigAttrib(dpy, fbconfigs[i], GLX_RENDER_TYPE, &value); + + printf("fbconfigs[%d] GLX_RENDER_TYPE is %x supporting: %s %s %s\n", + i, value, + value & GLX_WINDOW_BIT ? "GLX_WINDOW_BIT" : "", + value & GLX_PIXMAP_BIT ? "GLX_PIXMAP_BIT" : "", + value & GLX_PBUFFER_BIT ? "GLX_PBUFFER_BIT" : ""); + } + + return EXIT_SUCCESS; +} Modified: AppleSGLX/trunk/tests/simple/simple.mk =================================================================== --- AppleSGLX/trunk/tests/simple/simple.mk 2009-02-16 23:58:49 UTC (rev 158) +++ AppleSGLX/trunk/tests/simple/simple.mk 2009-02-17 06:08:47 UTC (rev 159) @@ -1,2 +1,6 @@ $(TEST_BUILD_DIR)/simple: tests/simple/simple.c $(LIBGL) $(CC) tests/simple/simple.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/simple $(LINK_TEST) + +$(TEST_BUILD_DIR)/render_types: tests/simple/render_types.c $(LIBGL) + $(CC) tests/simple/render_types.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/render_types $(LINK_TEST) + Modified: AppleSGLX/trunk/tests/tests.mk =================================================================== --- AppleSGLX/trunk/tests/tests.mk 2009-02-16 23:58:49 UTC (rev 158) +++ AppleSGLX/trunk/tests/tests.mk 2009-02-17 06:08:47 UTC (rev 159) @@ -16,6 +16,7 @@ include tests/glxpixmap/glxpixmap.mk include tests/triangle_glx_single/triangle_glx.mk + 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 \ @@ -23,4 +24,5 @@ $(TEST_BUILD_DIR)/triangle_glx_single \ $(TEST_BUILD_DIR)/create_destroy_context_alone \ $(TEST_BUILD_DIR)/create_destroy_context_with_drawable \ - $(TEST_BUILD_DIR)/create_destroy_context_with_drawable_2 + $(TEST_BUILD_DIR)/create_destroy_context_with_drawable_2 \ + $(TEST_BUILD_DIR)/render_types

1 0

[158] AppleSGLX/trunk/TODO
by source_changes＠macosforge.org 16 Feb '09

16 Feb '09

Revision: 158 http://trac.macosforge.org/projects/xquartz/changeset/158 Author: gstaplin(a)apple.com Date: 2009-02-16 15:58:49 -0800 (Mon, 16 Feb 2009) Log Message: ----------- 3 new items for the TODO regarding GLXPixmap code. Modified Paths: -------------- AppleSGLX/trunk/TODO Modified: AppleSGLX/trunk/TODO =================================================================== --- AppleSGLX/trunk/TODO 2009-02-16 23:58:10 UTC (rev 157) +++ AppleSGLX/trunk/TODO 2009-02-16 23:58:49 UTC (rev 158) @@ -1,5 +1,11 @@ -- Feb 16, 2009 +Verify the XError behavior of GLXPixmap support functions. + +Test GLXPixmap support with various pixmap depths. + +Test GLXPixmap support with invalid pixmaps (to stress the protocol code). + Make apple_visual_create_pfobj not use OffScreen always. I suspect we can add a bool that indicates whether or not to create such an object. We can also recreate the context, or possibly reconfigure it.

1 0

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

16 Feb '09

Revision: 157 http://trac.macosforge.org/projects/xquartz/changeset/157 Author: gstaplin(a)apple.com Date: 2009-02-16 15:58:10 -0800 (Mon, 16 Feb 2009) Log Message: ----------- Add a call to the destructor in the glXDestroyGLXPixmap function. Modified Paths: -------------- AppleSGLX/trunk/glxcmds.c Modified: AppleSGLX/trunk/glxcmds.c =================================================================== --- AppleSGLX/trunk/glxcmds.c 2009-02-16 23:57:14 UTC (rev 156) +++ AppleSGLX/trunk/glxcmds.c 2009-02-16 23:58:10 UTC (rev 157) @@ -717,6 +717,9 @@ */ PUBLIC void glXDestroyGLXPixmap(Display *dpy, GLXPixmap glxpixmap) { + apple_glx_pixmap_destroy(dpy, glxpixmap); + +#if 0 xGLXDestroyGLXPixmapReq *req; CARD8 opcode; @@ -733,6 +736,7 @@ req->glxpixmap = glxpixmap; UnlockDisplay(dpy); SyncHandle(); +#endif } PUBLIC void glXSwapBuffers(Display *dpy, GLXDrawable drawable) {

1 0