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

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

20 Feb '09

Revision: 209 http://trac.macosforge.org/projects/xquartz/changeset/209 Author: jeremyhu(a)freedesktop.org Date: 2009-02-20 14:24:59 -0800 (Fri, 20 Feb 2009) Log Message: ----------- Makefile cleanup Modified Paths: -------------- AppleSGLX/trunk/Makefile AppleSGLX/trunk/tests/tests.mk Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-20 22:18:49 UTC (rev 208) +++ AppleSGLX/trunk/Makefile 2009-02-20 22:24:59 UTC (rev 209) @@ -21,13 +21,10 @@ PROGRAMS=$(BUILD_DIR)/glxinfo $(BUILD_DIR)/glxgears -#The final resulting library to be created upon install. -DEST_LIBGL=$(DESTDIR)$(INSTALL_DIR)/lib/libGL.1.2.dylib - -all: $(TEST_BUILD_DIR) Makefile $(BUILD_DIR)/libGL.1.2.dylib libGL.dylib 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 \ @@ -43,8 +40,8 @@ #This is used for building the tests. #The tests don't require installation. -libGL.dylib: $(OBJECTS) - $(CC) -o libGL.dylib -dynamiclib -lXplugin -framework ApplicationServices -framework CoreFoundation -L$(X11_DIR)/lib -lX11 -lXext -Wl,-exported_symbols_list,exports.list $(OBJECTS) +$(TEST_BUILD_DIR)/libGL.dylib: $(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) $(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) @@ -124,19 +121,15 @@ glx_empty.o: glx_empty.c $(COMPILE) glx_empty.c -$(BUILD_DIR)/glxinfo: tests/glxinfo/glxinfo.c $(DEST_LIBGL) - $(CC) tests/glxinfo/glxinfo.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(DESTDIR)$(INSTALL_DIR)/lib -lX11 -lGL \ - -o $(BUILD_DIR)/glxinfo +$(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 -$(BUILD_DIR)/glxgears: tests/glxgears/glxgears.c $(DEST_LIBGL) - $(CC) tests/glxgears/glxgears.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(DESTDIR)$(INSTALL_DIR)/lib -lX11 -lGL \ - -o $(BUILD_DIR)/glxgears +$(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 install_headers: $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL - $(INSTALL) -m 444 include/GL/gl.h include/GL/glext.h $(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 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_programs: $(PROGRAMS) $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/bin Modified: AppleSGLX/trunk/tests/tests.mk =================================================================== --- AppleSGLX/trunk/tests/tests.mk 2009-02-20 22:18:49 UTC (rev 208) +++ AppleSGLX/trunk/tests/tests.mk 2009-02-20 22:24:59 UTC (rev 209) @@ -1,6 +1,6 @@ .PHONY : tests -LIBGL=./libGL.dylib +LIBGL=$(TEST_BUILD_DIR)/libGL.dylib LINK_TEST=-L/usr/X11/lib ./libGL.dylib -lX11 -lXext -lXplugin -lpthread include tests/triangle/triangle.mk @@ -17,8 +17,7 @@ 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 \ +tests: $(TEST_BUILD_DIR)/libGL.dylib $(TEST_BUILD_DIR) $(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

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

20 Feb '09

Revision: 208 http://trac.macosforge.org/projects/xquartz/changeset/208 Author: gstaplin(a)apple.com Date: 2009-02-20 14:18:49 -0800 (Fri, 20 Feb 2009) Log Message: ----------- Add one more TODO item to the list for GLXWindows. Modified Paths: -------------- AppleSGLX/trunk/TODO Modified: AppleSGLX/trunk/TODO =================================================================== --- AppleSGLX/trunk/TODO 2009-02-20 22:14:07 UTC (rev 207) +++ AppleSGLX/trunk/TODO 2009-02-20 22:18:49 UTC (rev 208) @@ -1,3 +1,7 @@ +-- Feb 20, 2009 + +Fix glXCreateWindow and glXDestroyWindow. + -- Feb 16, 2009 DONE glXMakeContextCurrent's readable drawable needs to be set as the current

1 0

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

20 Feb '09

Revision: 207 http://trac.macosforge.org/projects/xquartz/changeset/207 Author: gstaplin(a)apple.com Date: 2009-02-20 14:14:07 -0800 (Fri, 20 Feb 2009) Log Message: ----------- Mark a few more TODO times DONE. Modified Paths: -------------- AppleSGLX/trunk/TODO Modified: AppleSGLX/trunk/TODO =================================================================== --- AppleSGLX/trunk/TODO 2009-02-20 22:11:46 UTC (rev 206) +++ AppleSGLX/trunk/TODO 2009-02-20 22:14:07 UTC (rev 207) @@ -78,20 +78,20 @@ Use CGLGetVersion to assert ABI major version compatibility with the OpenGL framework. -Work out the include/GL/gl.h problems (with the ARB functions). +DONE Work out the include/GL/gl.h problems (with the ARB functions). -Install the new headers with the install target. +DONE Install the new headers with the install target. -- Dec 28, 2008 -Fix the missing #define for glxinfo IIRC or one of the glx-based programs from Mesa. We need to define the necessary functions and features for the relevant GL and GLX extensions. I also need to find a good indication of what extensions to enable on the server side for telling clients what we support. +DONE Fix the missing #define for glxinfo IIRC or one of the glx-based programs from Mesa. We need to define the necessary functions and features for the relevant GL and GLX extensions. I also need to find a good indication of what extensions to enable on the server side for telling clients what we support. -- Dec 12 2008 Generate include/GL/gl.h as needed. -TEST Shared contexts may work now, test them. +DONE TEST Shared contexts may work now, test them. DONE DestroyContext needs some work perhaps for the drawable destruction.

1 0

[206] AppleSGLX/trunk/include/GL/glxext.h
by source_changes＠macosforge.org 20 Feb '09

20 Feb '09

Revision: 206 http://trac.macosforge.org/projects/xquartz/changeset/206 Author: gstaplin(a)apple.com Date: 2009-02-20 14:11:46 -0800 (Fri, 20 Feb 2009) Log Message: ----------- Update the glxext.h to the latest from the OpenGL registry. I seems I was wrong to disable these type of patterns for unsupported extensions: #ifndef GLX_SOME_EXT #define GLX_SOME_EXT 1 ... #endif See: http://www.opengl.org/registry/ABI/#5 This brings in more features, and the build seems to work alright still. It seems that the design is such that you're allowed to build with all extensions, but the symbols may not actually exist, so that's where glXGetProcAddress and friends come in. Modified Paths: -------------- AppleSGLX/trunk/include/GL/glxext.h Modified: AppleSGLX/trunk/include/GL/glxext.h =================================================================== --- AppleSGLX/trunk/include/GL/glxext.h 2009-02-20 22:04:12 UTC (rev 205) +++ AppleSGLX/trunk/include/GL/glxext.h 2009-02-20 22:11:46 UTC (rev 206) @@ -46,9 +46,9 @@ /*************************************************************/ /* Header file version number, required by OpenGL ABI for Linux */ -/* glxext.h last updated 2008/08/10 */ +/* glxext.h last updated 2008/10/22 */ /* Current version at http://www.opengl.org/registry/ */ -#define GLX_GLXEXT_VERSION 20 +#define GLX_GLXEXT_VERSION 21 #ifndef GLX_VERSION_1_3 #define GLX_WINDOW_BIT 0x00000001 @@ -127,6 +127,14 @@ #define GLX_RGBA_FLOAT_BIT_ARB 0x00000004 #endif +#ifndef GLX_ARB_create_context +#define GLX_CONTEXT_DEBUG_BIT_ARB 0x00000001 +#define GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x00000002 +#define GLX_CONTEXT_MAJOR_VERSION_ARB 0x2091 +#define GLX_CONTEXT_MINOR_VERSION_ARB 0x2092 +#define GLX_CONTEXT_FLAGS_ARB 0x2094 +#endif + #ifndef GLX_SGIS_multisample #define GLX_SAMPLE_BUFFERS_SGIS 100000 #define GLX_SAMPLES_SGIS 100001 @@ -151,7 +159,6 @@ #define GLX_TRANSPARENT_INDEX_EXT 0x8009 #endif -#if 0 /*disabled in AppleSGLX*/ #ifndef GLX_SGI_swap_control #endif @@ -163,7 +170,6 @@ #ifndef GLX_SGIX_video_source #endif -#endif /*0*/ #ifndef GLX_EXT_visual_rating #define GLX_VISUAL_CAVEAT_EXT 0x20 @@ -172,13 +178,11 @@ /* reuse GLX_NONE_EXT */ #endif -#if 0 /*disabled in AppleSGLX*/ #ifndef GLX_EXT_import_context #define GLX_SHARE_CONTEXT_EXT 0x800A #define GLX_VISUAL_ID_EXT 0x800B #define GLX_SCREEN_EXT 0x800C #endif -#endif /*0*/ #ifndef GLX_SGIX_fbconfig #define GLX_WINDOW_BIT_SGIX 0x00000001 @@ -194,7 +198,6 @@ /* reuse GLX_SCREEN_EXT */ #endif -#if 0 /*disabled in AppleSGLX*/ #ifndef GLX_SGIX_pbuffer #define GLX_PBUFFER_BIT_SGIX 0x00000004 #define GLX_BUFFER_CLOBBER_MASK_SGIX 0x08000000 @@ -222,7 +225,6 @@ #define GLX_WINDOW_SGIX 0x8022 #define GLX_PBUFFER_SGIX 0x8023 #endif -#endif /*0*/ #ifndef GLX_SGI_cushion #endif @@ -353,20 +355,20 @@ #endif #ifndef GLX_NV_present_video -#define GLX_GLX_NUM_VIDEO_SLOTS_NV 0x20F0 +#define GLX_NUM_VIDEO_SLOTS_NV 0x20F0 #endif #ifndef GLX_NV_video_out -#define GLX_GLX_VIDEO_OUT_COLOR_NV 0x20C3 -#define GLX_GLX_VIDEO_OUT_ALPHA_NV 0x20C4 -#define GLX_GLX_VIDEO_OUT_DEPTH_NV 0x20C5 -#define GLX_GLX_VIDEO_OUT_COLOR_AND_ALPHA_NV 0x20C6 -#define GLX_GLX_VIDEO_OUT_COLOR_AND_DEPTH_NV 0x20C7 -#define GLX_GLX_VIDEO_OUT_FRAME_NV 0x20C8 -#define GLX_GLX_VIDEO_OUT_FIELD_1_NV 0x20C9 -#define GLX_GLX_VIDEO_OUT_FIELD_2_NV 0x20CA -#define GLX_GLX_VIDEO_OUT_STACKED_FIELDS_1_2_NV 0x20CB -#define GLX_GLX_VIDEO_OUT_STACKED_FIELDS_2_1_NV 0x20CC +#define GLX_VIDEO_OUT_COLOR_NV 0x20C3 +#define GLX_VIDEO_OUT_ALPHA_NV 0x20C4 +#define GLX_VIDEO_OUT_DEPTH_NV 0x20C5 +#define GLX_VIDEO_OUT_COLOR_AND_ALPHA_NV 0x20C6 +#define GLX_VIDEO_OUT_COLOR_AND_DEPTH_NV 0x20C7 +#define GLX_VIDEO_OUT_FRAME_NV 0x20C8 +#define GLX_VIDEO_OUT_FIELD_1_NV 0x20C9 +#define GLX_VIDEO_OUT_FIELD_2_NV 0x20CA +#define GLX_VIDEO_OUT_STACKED_FIELDS_1_2_NV 0x20CB +#define GLX_VIDEO_OUT_STACKED_FIELDS_2_1_NV 0x20CC #endif #ifndef GLX_NV_swap_group @@ -379,18 +381,15 @@ typedef void (*__GLXextFuncPtr)(void); #endif -#if 0 #ifndef GLX_SGIX_video_source typedef XID GLXVideoSourceSGIX; #endif -#endif /*0*/ #ifndef GLX_SGIX_fbconfig typedef XID GLXFBConfigIDSGIX; typedef struct __GLXFBConfigRec *GLXFBConfigSGIX; #endif -#if 0 #ifndef GLX_SGIX_pbuffer typedef XID GLXPbufferSGIX; typedef struct { @@ -407,7 +406,6 @@ int count; /* if nonzero, at least this many more */ } GLXBufferClobberEventSGIX; #endif -#endif #ifndef GLEXT_64_TYPES_DEFINED /* This code block is duplicated in glext.h, so must be protected */ @@ -504,7 +502,6 @@ typedef __GLXextFuncPtr ( * PFNGLXGETPROCADDRESSARBPROC) (const GLubyte *procName); #endif -#if 0 /*disabled in AppleSGLX*/ #ifndef GLX_ARB_multisample #define GLX_ARB_multisample 1 #endif @@ -513,6 +510,14 @@ #define GLX_ARB_fbconfig_float 1 #endif +#ifndef GLX_ARB_create_context +#define GLX_ARB_create_context 1 +#ifdef GLX_GLXEXT_PROTOTYPES +extern GLXContext glXCreateContextAttribsARB (Display *, GLXFBConfig, GLXContext, Bool, const int *); +#endif /* GLX_GLXEXT_PROTOTYPES */ +typedef GLXContext ( * PFNGLXCREATECONTEXTATTRIBSARBPROC) (Display *dpy, GLXFBConfig config, GLXContext share_context, Bool direct, const int *attrib_list); +#endif + #ifndef GLX_SGIS_multisample #define GLX_SGIS_multisample 1 #endif @@ -538,10 +543,7 @@ typedef int ( * PFNGLXGETVIDEOSYNCSGIPROC) (unsigned int *count); typedef int ( * PFNGLXWAITVIDEOSYNCSGIPROC) (int divisor, int remainder, unsigned int *count); #endif -#endif /*0*/ - -#if 0 /*disabled in AppleSGLX*/ #ifndef GLX_SGI_make_current_read #define GLX_SGI_make_current_read 1 #ifdef GLX_GLXEXT_PROTOTYPES @@ -551,9 +553,7 @@ typedef Bool ( * PFNGLXMAKECURRENTREADSGIPROC) (Display *dpy, GLXDrawable draw, GLXDrawable read, GLXContext ctx); typedef GLXDrawable ( * PFNGLXGETCURRENTREADDRAWABLESGIPROC) (void); #endif -#endif /*0*/ -#if 0 /*disabled in AppleSGLX*/ #ifndef GLX_SGIX_video_source #define GLX_SGIX_video_source 1 #ifdef _VL_H @@ -565,15 +565,11 @@ typedef void ( * PFNGLXDESTROYGLXVIDEOSOURCESGIXPROC) (Display *dpy, GLXVideoSourceSGIX glxvideosource); #endif /* _VL_H */ #endif -#endif /*0*/ -#if 0 /*disabled in AppleSGLX*/ #ifndef GLX_EXT_visual_rating #define GLX_EXT_visual_rating 1 #endif -#endif /*0*/ -#if 0 /*disabled in AppleSGLX*/ #ifndef GLX_EXT_import_context #define GLX_EXT_import_context 1 #ifdef GLX_GLXEXT_PROTOTYPES @@ -589,7 +585,6 @@ typedef GLXContext ( * PFNGLXIMPORTCONTEXTEXTPROC) (Display *dpy, GLXContextID contextID); typedef void ( * PFNGLXFREECONTEXTEXTPROC) (Display *dpy, GLXContext context); #endif -#endif /*0*/ #ifndef GLX_SGIX_fbconfig #define GLX_SGIX_fbconfig 1 @@ -609,7 +604,6 @@ typedef GLXFBConfigSGIX ( * PFNGLXGETFBCONFIGFROMVISUALSGIXPROC) (Display *dpy, XVisualInfo *vis); #endif -#if 0 /* disabled in AppleSGLX. */ #ifndef GLX_SGIX_pbuffer #define GLX_SGIX_pbuffer 1 #ifdef GLX_GLXEXT_PROTOTYPES @@ -625,9 +619,7 @@ typedef void ( * PFNGLXSELECTEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long mask); typedef void ( * PFNGLXGETSELECTEDEVENTSGIXPROC) (Display *dpy, GLXDrawable drawable, unsigned long *mask); #endif -#endif /*0*/ -#if 0 /*disabled in AppleSGLX*/ #ifndef GLX_SGI_cushion #define GLX_SGI_cushion 1 #ifdef GLX_GLXEXT_PROTOTYPES @@ -635,7 +627,6 @@ #endif /* GLX_GLXEXT_PROTOTYPES */ typedef void ( * PFNGLXCUSHIONSGIPROC) (Display *dpy, Window window, float cushion); #endif -#endif /*0*/ #ifndef GLX_SGIX_video_resize #define GLX_SGIX_video_resize 1 @@ -689,8 +680,6 @@ typedef Status ( * PFNGLXGETTRANSPARENTINDEXSUNPROC) (Display *dpy, Window overlay, Window underlay, long *pTransparentIndex); #endif -#if 0 /*disabled in AppleSGLX*/ - #ifndef GLX_MESA_copy_sub_buffer #define GLX_MESA_copy_sub_buffer 1 #ifdef GLX_GLXEXT_PROTOTYPES @@ -698,9 +687,7 @@ #endif /* GLX_GLXEXT_PROTOTYPES */ typedef void ( * PFNGLXCOPYSUBBUFFERMESAPROC) (Display *dpy, GLXDrawable drawable, int x, int y, int width, int height); #endif -#endif /*0*/ -#if 0 /*disabled in AppleSGLX. */ #ifndef GLX_MESA_pixmap_colormap #define GLX_MESA_pixmap_colormap 1 #ifdef GLX_GLXEXT_PROTOTYPES @@ -708,11 +695,7 @@ #endif /* GLX_GLXEXT_PROTOTYPES */ typedef GLXPixmap ( * PFNGLXCREATEGLXPIXMAPMESAPROC) (Display *dpy, XVisualInfo *visual, Pixmap pixmap, Colormap cmap); #endif -#endif /*0*/ - -#if 0 /*disabled in AppleSGLX*/ - #ifndef GLX_MESA_release_buffers #define GLX_MESA_release_buffers 1 #ifdef GLX_GLXEXT_PROTOTYPES @@ -804,9 +787,6 @@ typedef int ( * PFNGLXQUERYHYPERPIPEATTRIBSGIXPROC) (Display *dpy, int timeSlice, int attrib, int size, void *returnAttribList); #endif -#endif /*0*/ - -#if 0 /*disabled in AppleSGLX*/ #ifndef GLX_MESA_agp_offset #define GLX_MESA_agp_offset 1 #ifdef GLX_GLXEXT_PROTOTYPES @@ -822,9 +802,7 @@ #ifndef GLX_EXT_framebuffer_sRGB #define GLX_EXT_framebuffer_sRGB 1 #endif -#endif /*0*/ -#if 0 /*disabled in AppleSGLX*/ #ifndef GLX_EXT_texture_from_pixmap #define GLX_EXT_texture_from_pixmap 1 #ifdef GLX_GLXEXT_PROTOTYPES @@ -834,9 +812,7 @@ typedef void ( * PFNGLXBINDTEXIMAGEEXTPROC) (Display *dpy, GLXDrawable drawable, int buffer, const int *attrib_list); typedef void ( * PFNGLXRELEASETEXIMAGEEXTPROC) (Display *dpy, GLXDrawable drawable, int buffer); #endif -#endif /*0*/ -#if 0 #ifndef GLX_NV_present_video #define GLX_NV_present_video 1 #endif @@ -848,8 +824,8 @@ #ifndef GLX_NV_swap_group #define GLX_NV_swap_group 1 #endif -#endif /*0*/ + #ifdef __cplusplus } #endif

1 0

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

20 Feb '09

Revision: 205 http://trac.macosforge.org/projects/xquartz/changeset/205 Author: gstaplin(a)apple.com Date: 2009-02-20 14:04:12 -0800 (Fri, 20 Feb 2009) Log Message: ----------- Restructure the Makefile so that we generate a testbuilds directory, and a builds directory. Install the header files that are appropriate. Upon install build glxinfo and glxgears after the $(DEST_LIGBL), by linking with the $(DEST_LIGBL). I think this follows the patterns that Jeremy started, and it should be an improvement. Modified Paths: -------------- AppleSGLX/trunk/Makefile Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-20 11:10:49 UTC (rev 204) +++ AppleSGLX/trunk/Makefile 2009-02-20 22:04:12 UTC (rev 205) @@ -13,10 +13,19 @@ INCLUDE=-I. -Iinclude -Iinclude/internal -DGLX_ALIAS_UNSUPPORTED -F/System/Library/Frameworks/OpenGL.framework -I$(INSTALL_DIR)/include COMPILE=$(CC) $(INCLUDE) $(GL_CFLAGS) -c -TEST_BUILD_DIR=builds +#The directory with the final binaries. +BUILD_DIR=builds -all: $(TEST_BUILD_DIR) Makefile libGL.1.2.dylib libGL.dylib tests +#The directory with binaries that can tested without an install. +TEST_BUILD_DIR=testbuilds +PROGRAMS=$(BUILD_DIR)/glxinfo $(BUILD_DIR)/glxgears + +#The final resulting library to be created upon install. +DEST_LIBGL=$(DESTDIR)$(INSTALL_DIR)/lib/libGL.1.2.dylib + +all: $(TEST_BUILD_DIR) Makefile $(BUILD_DIR)/libGL.1.2.dylib libGL.dylib tests + include tests/tests.mk OBJECTS=glxext.o glxcmds.o glx_pbuffer.o glx_query.o glxcurrent.o glxextensions.o \ @@ -26,15 +35,19 @@ 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. libGL.dylib: $(OBJECTS) $(CC) -o libGL.dylib -dynamiclib -lXplugin -framework ApplicationServices -framework CoreFoundation -L$(X11_DIR)/lib -lX11 -lXext -Wl,-exported_symbols_list,exports.list $(OBJECTS) -libGL.1.2.dylib: $(OBJECTS) - $(CC) $(GL_CFLAGS) -o 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) +$(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) 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 @@ -84,9 +97,6 @@ apple_visual.o: apple_visual.h apple_visual.c $(COMPILE) apple_visual.c -#apple_api.o: apple_api.h apple_api.c -# $(COMPILE) apple_api.c - apple_cgl.o: apple_cgl.h apple_cgl.c $(COMPILE) apple_cgl.c @@ -114,15 +124,36 @@ glx_empty.o: glx_empty.c $(COMPILE) glx_empty.c -install: libGL.1.2.dylib +$(BUILD_DIR)/glxinfo: tests/glxinfo/glxinfo.c $(DEST_LIBGL) + $(CC) tests/glxinfo/glxinfo.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(DESTDIR)$(INSTALL_DIR)/lib -lX11 -lGL \ + -o $(BUILD_DIR)/glxinfo + +$(BUILD_DIR)/glxgears: tests/glxgears/glxgears.c $(DEST_LIBGL) + $(CC) tests/glxgears/glxgears.c -I$(DESTDIR)$(INSTALL_DIR)/include -L$(DESTDIR)$(INSTALL_DIR)/lib -lX11 -lGL \ + -o $(BUILD_DIR)/glxgears + +install_headers: + $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL + $(INSTALL) -m 444 include/GL/gl.h include/GL/glext.h $(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_programs: $(PROGRAMS) + $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/bin + $(INSTALL) -m 555 $(PROGRAMS) $(DESTDIR)$(INSTALL_DIR)/bin + +install_libraries: $(BUILD_DIR)/libGL.1.2.dylib $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/lib - $(INSTALL) -m 755 libGL.1.2.dylib $(DESTDIR)$(INSTALL_DIR)/lib + $(INSTALL) -m 755 $(BUILD_DIR)/libGL.1.2.dylib $(DESTDIR)$(INSTALL_DIR)/lib $(RM) -f $(DESTDIR)$(INSTALL_DIR)/lib/libGL.dylib $(LN) -s libGL.1.2.dylib $(DESTDIR)$(INSTALL_DIR)/lib/libGL.dylib $(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 + clean: + rm -rf $(BUILD_DIR) rm -rf $(TEST_BUILD_DIR) rm -f *.o *.a rm -f *.c~ *.h~

1 0

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

20 Feb '09

Revision: 204 http://trac.macosforge.org/projects/xquartz/changeset/204 Author: gstaplin(a)apple.com Date: 2009-02-20 03:10:49 -0800 (Fri, 20 Feb 2009) Log Message: ----------- Make the client side libGL set the GLX_PIXMAP_BIT and GLX_PBUFFER_BIT for all GLXFBConfigs. (The GLX_WINDOW_BIT was previously always set, and remains so still.) Modified Paths: -------------- AppleSGLX/trunk/glxext.c Modified: AppleSGLX/trunk/glxext.c =================================================================== --- AppleSGLX/trunk/glxext.c 2009-02-20 11:07:33 UTC (rev 203) +++ AppleSGLX/trunk/glxext.c 2009-02-20 11:10:49 UTC (rev 204) @@ -280,6 +280,9 @@ config->numAuxBuffers = *bp++; config->level = *bp++; + /* AppleSGLX supports pixmap and pbuffers with all config. */ + config->drawableType = GLX_WINDOW_BIT | GLX_PIXMAP_BIT | GLX_PBUFFER_BIT; + count -= __GLX_MIN_CONFIG_PROPS; } @@ -371,6 +374,10 @@ break; case GLX_DRAWABLE_TYPE: config->drawableType = *bp++; + + /* AppleSGLX supports pixmap and pbuffers with all config. */ + config->drawableType |= GLX_WINDOW_BIT | GLX_PIXMAP_BIT + | GLX_PBUFFER_BIT; break; case GLX_RENDER_TYPE: config->renderType = *bp++; @@ -481,8 +488,16 @@ m = modes; for (i = 0; i < nvisuals; i++) { _XRead(dpy, (char *)props, prop_size); - /* Older X servers don't send this so we default it here. */ - m->drawableType = GLX_WINDOW_BIT; + + /* + * The XQuartz 2.3.2.1 X server doesn't set this properly, so + * set the proper bits here. + * AppleSGLX supports windows, pixmaps, and pbuffers with all config. + * The xorg-server-1.6-apple branch supports pixmaps, but we those + * will fail at runtime with XQuartz 2.3.2.1. + */ + m->drawableType = GLX_WINDOW_BIT | GLX_PIXMAP_BIT | GLX_PBUFFER_BIT; + __glXInitializeVisualConfigFromTags(m, nprops, props, tagged_only, GL_TRUE); m->screen = screen;

1 0

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

20 Feb '09

Revision: 203 http://trac.macosforge.org/projects/xquartz/changeset/203 Author: gstaplin(a)apple.com Date: 2009-02-20 03:07:33 -0800 (Fri, 20 Feb 2009) Log Message: ----------- Add a drawable_types test. It's used to test for GLX_WINDOW_BIT, GLX_PIXMAP_BIT, and GLX_PBUFFER_BIT. It iterates the GLXFBConfigs and produces output indicating which bits are set. (Note: I previously intended for render_types to do that. I was mixing up names.) Modified Paths: -------------- AppleSGLX/trunk/tests/simple/render_types.c AppleSGLX/trunk/tests/simple/simple.mk AppleSGLX/trunk/tests/tests.mk Added Paths: ----------- AppleSGLX/trunk/tests/simple/drawable_types.c Added: AppleSGLX/trunk/tests/simple/drawable_types.c =================================================================== --- AppleSGLX/trunk/tests/simple/drawable_types.c (rev 0) +++ AppleSGLX/trunk/tests/simple/drawable_types.c 2009-02-20 11:07:33 UTC (rev 203) @@ -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_DRAWABLE_TYPE, &value); + + printf("fbconfigs[%d] GLX_DRAWABLE_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/render_types.c =================================================================== --- AppleSGLX/trunk/tests/simple/render_types.c 2009-02-20 10:25:53 UTC (rev 202) +++ AppleSGLX/trunk/tests/simple/render_types.c 2009-02-20 11:07:33 UTC (rev 203) @@ -43,11 +43,8 @@ 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" : ""); + printf("fbconfigs[%d] GLX_RENDER_TYPE is %x supporting %s\n", + i, value, (value == GLX_RGBA_BIT) ? "GLX_RGBA" : "GLX_COLOR_INDEX_BIT"); } return EXIT_SUCCESS; Modified: AppleSGLX/trunk/tests/simple/simple.mk =================================================================== --- AppleSGLX/trunk/tests/simple/simple.mk 2009-02-20 10:25:53 UTC (rev 202) +++ AppleSGLX/trunk/tests/simple/simple.mk 2009-02-20 11:07:33 UTC (rev 203) @@ -4,3 +4,5 @@ $(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) +$(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) Modified: AppleSGLX/trunk/tests/tests.mk =================================================================== --- AppleSGLX/trunk/tests/tests.mk 2009-02-20 10:25:53 UTC (rev 202) +++ AppleSGLX/trunk/tests/tests.mk 2009-02-20 11:07:33 UTC (rev 203) @@ -28,4 +28,6 @@ $(TEST_BUILD_DIR)/create_destroy_context_with_drawable_2 \ $(TEST_BUILD_DIR)/render_types \ $(TEST_BUILD_DIR)/glxpixmap_create_destroy \ - $(TEST_BUILD_DIR)/sharedtex + $(TEST_BUILD_DIR)/sharedtex \ + $(TEST_BUILD_DIR)/drawable_types +

1 0

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

20 Feb '09

Revision: 202 http://trac.macosforge.org/projects/xquartz/changeset/202 Author: gstaplin(a)apple.com Date: 2009-02-20 02:25:53 -0800 (Fri, 20 Feb 2009) Log Message: ----------- Remove the -Igl from the Makefile. It hasn't been needed since the gl directory was removed before the svn import. Modified Paths: -------------- AppleSGLX/trunk/Makefile Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-20 10:24:00 UTC (rev 201) +++ AppleSGLX/trunk/Makefile 2009-02-20 10:25:53 UTC (rev 202) @@ -10,7 +10,7 @@ LN=ln RM=rm -INCLUDE=-I. -Iinclude -Iinclude/internal -DGLX_ALIAS_UNSUPPORTED -Igl -F/System/Library/Frameworks/OpenGL.framework -I$(INSTALL_DIR)/include +INCLUDE=-I. -Iinclude -Iinclude/internal -DGLX_ALIAS_UNSUPPORTED -F/System/Library/Frameworks/OpenGL.framework -I$(INSTALL_DIR)/include COMPILE=$(CC) $(INCLUDE) $(GL_CFLAGS) -c TEST_BUILD_DIR=builds

1 0

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

20 Feb '09

Revision: 200 http://trac.macosforge.org/projects/xquartz/changeset/200 Author: gstaplin(a)apple.com Date: 2009-02-20 01:18:35 -0800 (Fri, 20 Feb 2009) Log Message: ----------- Fix a bug in the glxinfo.c sources that is due to gl.h header differences. glxinfo was assuming that a function pointer type existed (assuming Mesa headers). Remove the #undef of some important extensions that broke glxinfo.c: GL_ARB_vertex_program and GL_ARB_fragment_program Modified Paths: -------------- AppleSGLX/trunk/include/GL/gl.h AppleSGLX/trunk/tests/glxinfo/glxinfo.c Modified: AppleSGLX/trunk/include/GL/gl.h =================================================================== --- AppleSGLX/trunk/include/GL/gl.h 2009-02-20 09:04:20 UTC (rev 199) +++ AppleSGLX/trunk/include/GL/gl.h 2009-02-20 09:18:35 UTC (rev 200) @@ -1,5 +1,2 @@ #include "/System/Library/Frameworks/OpenGL.framework/Headers/gl.h" -/* These cause problems with glxinfo: */ -#undef GL_ARB_vertex_program -#undef GL_ARB_fragment_program Modified: AppleSGLX/trunk/tests/glxinfo/glxinfo.c =================================================================== --- AppleSGLX/trunk/tests/glxinfo/glxinfo.c 2009-02-20 09:04:20 UTC (rev 199) +++ AppleSGLX/trunk/tests/glxinfo/glxinfo.c 2009-02-20 09:18:35 UTC (rev 200) @@ -1,6 +1,7 @@ /* * Copyright (C) 1999-2006 Brian Paul All Rights Reserved. - * + * Copyright (C) 2009 Apple Inc. 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 @@ -192,8 +193,11 @@ { GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB, "GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB" }, { (GLenum) 0, NULL } }; - PFNGLGETPROGRAMIVARBPROC GetProgramivARB_func = (PFNGLGETPROGRAMIVARBPROC) - glXGetProcAddressARB((GLubyte *) "glGetProgramivARB"); + + void (*GetProgramivARB_func)(GLenum, GLenum, GLvoid *); + + GetProgramivARB_func = (void (*)(GLenum, GLenum, GLvoid *)) + glXGetProcAddressARB((GLubyte *) "glGetProgramivARB"); GLint max[1]; int i;

1 0

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

20 Feb '09

Revision: 197 http://trac.macosforge.org/projects/xquartz/changeset/197 Author: gstaplin(a)apple.com Date: 2009-02-20 00:57:27 -0800 (Fri, 20 Feb 2009) Log Message: ----------- Add more empty functions to the exports list and glx_empty.c. Modified Paths: -------------- AppleSGLX/trunk/exports.list AppleSGLX/trunk/gen_exports.tcl AppleSGLX/trunk/glx_empty.c Modified: AppleSGLX/trunk/exports.list =================================================================== --- AppleSGLX/trunk/exports.list 2009-02-20 08:42:43 UTC (rev 196) +++ AppleSGLX/trunk/exports.list 2009-02-20 08:57:27 UTC (rev 197) @@ -1015,20 +1015,29 @@ _glWindowPos3sv _glWindowPos3svARB _glWindowPos3svMESA +_glXAllocateMemoryMESA +_glXBeginFrameTrackingMESA +_glXBindSwapBarrierSGIX _glXChooseFBConfig _glXChooseVisual _glXCopyContext +_glXCopySubBufferMESA _glXCreateContext +_glXCreateGLXPbufferSGIX _glXCreateGLXPixmap +_glXCreateGLXPixmapMESA _glXCreateNewContext _glXCreatePbuffer _glXCreatePixmap _glXCreateWindow _glXDestroyContext +_glXDestroyGLXPbufferSGIX _glXDestroyGLXPixmap _glXDestroyPbuffer _glXDestroyPixmap _glXDestroyWindow +_glXEndFrameTrackingMESA +_glXFreeMemoryMESA _glXGetClientString _glXGetConfig _glXGetCurrentContext @@ -1037,21 +1046,39 @@ _glXGetCurrentReadDrawable _glXGetFBConfigAttrib _glXGetFBConfigs +_glXGetFrameUsageMESA +_glXGetMemoryOffsetMESA _glXGetProcAddress _glXGetProcAddressARB _glXGetSelectedEvent +_glXGetSelectedEventSGIX +_glXGetSwapIntervalMESA +_glXGetSyncValuesOML +_glXGetVideoSyncSGI _glXGetVisualFromFBConfig _glXIsDirect +_glXJoinSwapGroupSGIX _glXMakeContextCurrent _glXMakeCurrent _glXQueryContext _glXQueryDrawable _glXQueryExtension _glXQueryExtensionsString +_glXQueryFrameTrackingMESA +_glXQueryGLXPbufferSGIX +_glXQueryMaxSwapBarriersSGIX _glXQueryServerString _glXQueryVersion +_glXReleaseBuffersMESA _glXSelectEvent +_glXSelectEventSGIX _glXSwapBuffers +_glXSwapBuffersMscOML +_glXSwapIntervalMESA +_glXSwapIntervalSGI _glXUseXFont +_glXWaitForMscOML +_glXWaitForSbcOML _glXWaitGL +_glXWaitVideoSyncSGI _glXWaitX Modified: AppleSGLX/trunk/gen_exports.tcl =================================================================== --- AppleSGLX/trunk/gen_exports.tcl 2009-02-20 08:42:43 UTC (rev 196) +++ AppleSGLX/trunk/gen_exports.tcl 2009-02-20 08:57:27 UTC (rev 197) @@ -84,7 +84,10 @@ glXWaitForMscOML glXWaitForSbcOML \ glXAllocateMemoryMESA glXFreeMemoryMESA \ glXGetMemoryOffsetMESA glXReleaseBuffersMESA \ - glXCreateGLXPixmapMESA glXCopySubBufferMESA + glXCreateGLXPixmapMESA glXCopySubBufferMESA \ + glXQueryGLXPbufferSGIX glXCreateGLXPbufferSGIX \ + glXDestroyGLXPbufferSGIX glXSelectEventSGIX \ + glXGetSelectedEventSGIX set fd [open [lindex $argv 1] w] Modified: AppleSGLX/trunk/glx_empty.c =================================================================== --- AppleSGLX/trunk/glx_empty.c 2009-02-20 08:42:43 UTC (rev 196) +++ AppleSGLX/trunk/glx_empty.c 2009-02-20 08:57:27 UTC (rev 197) @@ -255,3 +255,40 @@ (void) width; (void) height; } + + +PUBLIC int glXQueryGLXPbufferSGIX(Display *dpy, GLXDrawable drawable, + int attribute, unsigned int *value) +{ + (void) dpy; + (void) drawable; + (void) attribute; + (void) value; + return 0; +} + +PUBLIC GLXDrawable glXCreateGLXPbufferSGIX(Display *dpy, GLXFBConfig config, + unsigned int width, unsigned int height, + int *attrib_list) { + (void) dpy; + (void) config; + (void) width; + (void) height; + (void) attrib_list; + return None; +} + +PUBLIC GLX_ALIAS_VOID(glXDestroyGLXPbufferSGIX, + (Display *dpy, GLXDrawable pbuf), + (dpy, pbuf), + glXDestroyPbuffer) + +PUBLIC GLX_ALIAS_VOID(glXSelectEventSGIX, + (Display *dpy, GLXDrawable drawable, unsigned long mask), + (dpy, drawable, mask), + glXSelectEvent) + +PUBLIC GLX_ALIAS_VOID(glXGetSelectedEventSGIX, + (Display *dpy, GLXDrawable drawable, unsigned long *mask), + (dpy, drawable, mask), + glXGetSelectedEvent)

1 0