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

[250] AppleSGLX/trunk
by source_changes＠macosforge.org 24 Feb '09

24 Feb '09

Revision: 250 http://trac.macosforge.org/projects/xquartz/changeset/250 Author: gstaplin(a)apple.com Date: 2009-02-23 20:33:09 -0800 (Mon, 23 Feb 2009) Log Message: ----------- Add support for detecting the OpenGL framework support for features with nm -j -g. gen_funcs.tcl now lists the missing functions on both sides. There is one non-extension function (glSamplePass) that seems to have been removed from the OpenGL 3.0 spec (in PDF form). The gl.spec also doesn't list it. Modified Paths: -------------- AppleSGLX/trunk/GL_aliases AppleSGLX/trunk/GL_extensions AppleSGLX/trunk/gen_funcs.tcl Modified: AppleSGLX/trunk/GL_aliases =================================================================== --- AppleSGLX/trunk/GL_aliases 2009-02-24 02:07:37 UTC (rev 249) +++ AppleSGLX/trunk/GL_aliases 2009-02-24 04:33:09 UTC (rev 250) @@ -5,4 +5,3 @@ alias PrioritizeTexturesEXT PrioritizeTextures alias AreTexturesResidentEXT AreTexturesResident alias IsTextureEXT IsTexture - Modified: AppleSGLX/trunk/GL_extensions =================================================================== --- AppleSGLX/trunk/GL_extensions 2009-02-24 02:07:37 UTC (rev 249) +++ AppleSGLX/trunk/GL_extensions 2009-02-24 04:33:09 UTC (rev 250) @@ -92,3 +92,15 @@ #The OpenGL framework has moved this to the core OpenGL, and eliminated EXT_convolution listing. #extension EXT_convolution + +#Leopard supports these according to nm. +#Applications should use the GL_EXTENSIONS list to determine capabilities. +extension EXT_paletted_texture +extension APPLE_fence +extension NV_vertex_program4 +extension EXT_draw_buffers2 +extension EXT_gpu_shader4 +extension ATI_pn_triangles +extension NV_register_combiners +extension EXT_depth_bounds_test + Modified: AppleSGLX/trunk/gen_funcs.tcl =================================================================== --- AppleSGLX/trunk/gen_funcs.tcl 2009-02-24 02:07:37 UTC (rev 249) +++ AppleSGLX/trunk/gen_funcs.tcl 2009-02-24 04:33:09 UTC (rev 250) @@ -71,6 +71,7 @@ return [info exists extensions($name)] } +#This is going to need to be updated for OpenGL >= 2.1 in SnowLeopard. array set typemap { void void List GLuint @@ -224,7 +225,7 @@ VertexAttribPointerTypeARB GLenum ClampColorTargetARB unknown3.0 ClampColorModeARB unknown3.0 - VertexAttribEnum unknown3.0 + VertexAttribEnum GLenum DrawBufferName unknown3.0 WeightPointerTypeARB GLenum ProgramTargetARB GLenum @@ -520,7 +521,60 @@ set newapi($from) $d } + #Iterate the nm output and set each symbol in an associative array. + array set validapi {} + foreach line [split [exec nm -j -g /System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib] \n] { + set fn [string trim $line] + + #Only match the _gl functions. + if {[string match _gl* $fn]} { + set finalfn [string range $fn 3 end] + puts FINALFN:$finalfn + set validapi($finalfn) $finalfn + } + } + + puts "Correcting the API functions to match the OpenGL framework." + #parray validapi + + #Iterate the newapi and unset any members that the + #libGL.dylib doesn't support, assuming they aren't no-ops. + foreach fn [array names newapi] { + if {![info exists validapi($fn)]} { + puts "WARNING: libGL.dylib lacks support for: $fn" + + if {[dict exists $newapi($fn) noop] + && [dict get $newapi($fn) noop]} { + #This is no-op, so we should skip it. + continue + } + + #Is the function an alias for another in libGL? + if {[dict exists $newapi($fn) alias_for]} { + set alias [dict get $newapi($fn) alias_for] + + if {![info exists validapi($alias)]} { + puts "WARNING: alias function doesn't exist for $fn." + puts "The alias is $alias." + puts "unsetting $fn" + unset newapi($fn) + } + } else { + puts "unsetting $fn" + unset newapi($fn) + } + } + } + + + #Now print a warning about any symbols that libGL supports that we don't. + foreach fn [array names validapi] { + if {![info exists newapi($fn)]} { + puts "AppleSGLX is missing $fn" + } + } + puts "NOW GENERATING:[lindex $::argv 1]" set fd [open [lindex $::argv 1] w]

1 0

[249] AppleSGLX/trunk/tests/triangle/triangle.m
by source_changes＠macosforge.org 24 Feb '09

24 Feb '09

Revision: 249 http://trac.macosforge.org/projects/xquartz/changeset/249 Author: jeremyhu(a)freedesktop.org Date: 2009-02-23 18:07:37 -0800 (Mon, 23 Feb 2009) Log Message: ----------- Tiger compatible #includes Modified Paths: -------------- AppleSGLX/trunk/tests/triangle/triangle.m Modified: AppleSGLX/trunk/tests/triangle/triangle.m =================================================================== --- AppleSGLX/trunk/tests/triangle/triangle.m 2009-02-24 02:05:07 UTC (rev 248) +++ AppleSGLX/trunk/tests/triangle/triangle.m 2009-02-24 02:07:37 UTC (rev 249) @@ -1,8 +1,7 @@ #include <stdio.h> #include <stdlib.h> -#include <GL/glut.h> -#include <GL/glext.h> -#include <GL/gl.h> +#include <GLUT/GLUT.h> +#include <OpenGL/OpenGL.h> void initialize(void) { glEnable(GL_DEPTH_TEST);

1 0

[248] AppleSGLX/trunk/tests/triangle
by source_changes＠macosforge.org 24 Feb '09

24 Feb '09

Revision: 248 http://trac.macosforge.org/projects/xquartz/changeset/248 Author: jeremyhu(a)freedesktop.org Date: 2009-02-23 18:05:07 -0800 (Mon, 23 Feb 2009) Log Message: ----------- Added some debugging output to our pure OpenGL.framework test Modified Paths: -------------- AppleSGLX/trunk/tests/triangle/triangle.m AppleSGLX/trunk/tests/triangle/triangle.mk Modified: AppleSGLX/trunk/tests/triangle/triangle.m =================================================================== --- AppleSGLX/trunk/tests/triangle/triangle.m 2009-02-23 21:06:28 UTC (rev 247) +++ AppleSGLX/trunk/tests/triangle/triangle.m 2009-02-24 02:05:07 UTC (rev 248) @@ -36,6 +36,11 @@ glutReshapeFunc(reshape); glutDisplayFunc(display); + printf( "GL_RENDERER = %s\n", (char *) glGetString( GL_RENDERER ) ); + printf( "GL_VERSION = %s\n", (char *) glGetString( GL_VERSION ) ); + printf( "GL_VENDOR = %s\n", (char *) glGetString( GL_VENDOR ) ) ; + printf( "GL_EXTENSIONS = %s\n", (char *) glGetString( GL_EXTENSIONS ) ); + glutMainLoop(); return EXIT_FAILURE; Modified: AppleSGLX/trunk/tests/triangle/triangle.mk =================================================================== --- AppleSGLX/trunk/tests/triangle/triangle.mk 2009-02-23 21:06:28 UTC (rev 247) +++ AppleSGLX/trunk/tests/triangle/triangle.mk 2009-02-24 02:05:07 UTC (rev 248) @@ -1,3 +1,2 @@ triangle: tests/triangle/triangle.m libgl.a libglx.a - $(CC) tests/triangle/triangle.m $(INCLUDE) -L$(INSTALL_DIR)/lib -L$(X11_DIR)/lib -lglut libgl.a libglx.a -o triangle \ --F/System/Library/Frameworks/OpenGL.framework /System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib + $(CC) tests/triangle/triangle.m -framework GLUT -framework OpenGL -o triangle

1 0

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

23 Feb '09

Revision: 247 http://trac.macosforge.org/projects/xquartz/changeset/247 Author: jeremyhu(a)freedesktop.org Date: 2009-02-23 13:06:28 -0800 (Mon, 23 Feb 2009) Log Message: ----------- Notes for 2.4.0_beta1 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-23 19:32:46 UTC (rev 246) +++ trunk/pkg/README.2.4.0.txt 2009-02-23 21:06:28 UTC (rev 247) @@ -33,9 +33,13 @@ * xf86rushproto 1.1.2 * lib: * AppleSGLX 51 + * Support the same version of OpenGL as OpenGL.framework (2.1) + * GLSL and other features now supported + * Many extensions from OpenGL.framework are now available * rewrite of libGL now has support for GLX-1.4 * GLXPixmap * GLXPbuffer + * Threading support should be more stable * fontconfig * Avoid rebuilding font caches when switching between archs * libICE 1.0.5

1 0

[246] AppleSGLX/trunk
by source_changes＠macosforge.org 23 Feb '09

23 Feb '09

Revision: 246 http://trac.macosforge.org/projects/xquartz/changeset/246 Author: jeremyhu(a)freedesktop.org Date: 2009-02-23 11:32:46 -0800 (Mon, 23 Feb 2009) Log Message: ----------- Compilation fixes in the Makefiles for Tiger Modified Paths: -------------- AppleSGLX/trunk/Makefile AppleSGLX/trunk/tests/engine/engine.mk AppleSGLX/trunk/tests/fbconfigs/fbconfigs.mk AppleSGLX/trunk/tests/glxinfo/glxinfo.mk AppleSGLX/trunk/tests/glxpixmap/glxpixmap.mk AppleSGLX/trunk/tests/shared/shared.mk AppleSGLX/trunk/tests/simple/simple.mk AppleSGLX/trunk/tests/tests.mk AppleSGLX/trunk/tests/texenv/texenv.mk AppleSGLX/trunk/tests/triangle/triangle.mk Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/Makefile 2009-02-23 19:32:46 UTC (rev 246) @@ -3,14 +3,14 @@ CC=gcc GL_CFLAGS=-Wall -ggdb3 -Os -DPTHREADS -D_REENTRANT -DPUBLIC="" $(RC_CFLAGS) $(CFLAGS) -GL_LDFLAGS=-L$(X11_DIR)/lib $(LDFLAGS) +GL_LDFLAGS=-L$(X11_DIR)/lib $(LDFLAGS) -Wl,-single_module MKDIR=mkdir INSTALL=install LN=ln RM=rm -INCLUDE=-I. -Iinclude -Iinclude/internal -DGLX_ALIAS_UNSUPPORTED -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 -I$(X11_DIR)/include COMPILE=$(CC) $(INCLUDE) $(GL_CFLAGS) -c #The directory with the final binaries. @@ -36,7 +36,7 @@ #The tests don't require installation. $(TEST_BUILD_DIR)/libGL.dylib: $(OBJECTS) -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) + $(CC) -O0 -ggdb3 -o $@ -dynamiclib -lXplugin -framework ApplicationServices -framework CoreFoundation -L$(X11_DIR)/lib -lX11 -lXext -Wl,-exported_symbols_list,exports.list -Wl,-single_module $(OBJECTS) $(BUILD_DIR)/libGL.1.2.dylib: $(OBJECTS) -if ! test -d $(BUILD_DIR); then $(MKDIR) $(BUILD_DIR); fi @@ -73,10 +73,10 @@ 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$(X11_DIR)/lib -lX11 $(BUILD_DIR)/libGL.1.2.dylib -o $@ + $(CC) tests/glxinfo/glxinfo.c $(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$(X11_DIR)/lib -lX11 $(BUILD_DIR)/libGL.1.2.dylib -o $@ + $(CC) tests/glxgears/glxgears.c $(INCLUDE) -L$(X11_DIR)/lib -lX11 $(BUILD_DIR)/libGL.1.2.dylib -o $@ install_headers: $(INSTALL) -d $(DESTDIR)$(INSTALL_DIR)/include/GL Modified: AppleSGLX/trunk/tests/engine/engine.mk =================================================================== --- AppleSGLX/trunk/tests/engine/engine.mk 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/tests/engine/engine.mk 2009-02-23 19:32:46 UTC (rev 246) @@ -1,2 +1,2 @@ $(TEST_BUILD_DIR)/engine: tests/engine/engine.c $(LIBGL) libglut.a - $(CC) tests/engine/engine.c tests/engine/readtex.c tests/engine/trackball.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/engine $(LINK_TEST) libglut.a -L/usr/X11/lib -lXmu -lGLU + $(CC) tests/engine/engine.c tests/engine/readtex.c tests/engine/trackball.c $(INCLUDE) -o $(TEST_BUILD_DIR)/engine $(LINK_TEST) libglut.a -L$(INSTALL_DIR)/lib -L$(X11_DIR)/lib -lXmu -lGLU Modified: AppleSGLX/trunk/tests/fbconfigs/fbconfigs.mk =================================================================== --- AppleSGLX/trunk/tests/fbconfigs/fbconfigs.mk 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/tests/fbconfigs/fbconfigs.mk 2009-02-23 19:32:46 UTC (rev 246) @@ -1,2 +1,2 @@ $(TEST_BUILD_DIR)/fbconfigs: tests/fbconfigs/fbconfigs.c $(LIBGL) - $(CC) tests/fbconfigs/fbconfigs.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/fbconfigs $(LINK_TEST) + $(CC) tests/fbconfigs/fbconfigs.c $(INCLUDE) -o $(TEST_BUILD_DIR)/fbconfigs $(LINK_TEST) Modified: AppleSGLX/trunk/tests/glxinfo/glxinfo.mk =================================================================== --- AppleSGLX/trunk/tests/glxinfo/glxinfo.mk 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/tests/glxinfo/glxinfo.mk 2009-02-23 19:32:46 UTC (rev 246) @@ -1,2 +1,2 @@ $(TEST_BUILD_DIR)/glxinfo: tests/glxinfo/glxinfo.c $(LIBGL) - $(CC) tests/glxinfo/glxinfo.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/glxinfo $(LINK_TEST) + $(CC) tests/glxinfo/glxinfo.c $(INCLUDE) -o $(TEST_BUILD_DIR)/glxinfo $(LINK_TEST) Modified: AppleSGLX/trunk/tests/glxpixmap/glxpixmap.mk =================================================================== --- AppleSGLX/trunk/tests/glxpixmap/glxpixmap.mk 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/tests/glxpixmap/glxpixmap.mk 2009-02-23 19:32:46 UTC (rev 246) @@ -1,8 +1,8 @@ $(TEST_BUILD_DIR)/glxpixmap: tests/glxpixmap/glxpixmap.c $(LIBGL) - $(CC) tests/glxpixmap/glxpixmap.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/glxpixmap $(LINK_TEST) + $(CC) tests/glxpixmap/glxpixmap.c $(INCLUDE) -o $(TEST_BUILD_DIR)/glxpixmap $(LINK_TEST) $(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) + $(CC) tests/glxpixmap/glxpixmap_create_destroy.c $(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) + $(CC) tests/glxpixmap/glxpixmap_destroy_invalid.c $(INCLUDE) -o $(TEST_BUILD_DIR)/glxpixmap_destroy_invalid $(LINK_TEST) Modified: AppleSGLX/trunk/tests/shared/shared.mk =================================================================== --- AppleSGLX/trunk/tests/shared/shared.mk 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/tests/shared/shared.mk 2009-02-23 19:32:46 UTC (rev 246) @@ -1,3 +1,3 @@ $(TEST_BUILD_DIR)/sharedtex: tests/shared/sharedtex.c $(LIBGL) - $(CC) tests/shared/sharedtex.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/sharedtex $(LINK_TEST) + $(CC) tests/shared/sharedtex.c $(INCLUDE) -o $(TEST_BUILD_DIR)/sharedtex $(LINK_TEST) Modified: AppleSGLX/trunk/tests/simple/simple.mk =================================================================== --- AppleSGLX/trunk/tests/simple/simple.mk 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/tests/simple/simple.mk 2009-02-23 19:32:46 UTC (rev 246) @@ -1,15 +1,15 @@ $(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) + $(CC) tests/simple/simple.c $(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) + $(CC) tests/simple/render_types.c $(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) + $(CC) tests/simple/drawable_types.c $(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) + $(CC) tests/simple/multisample_glx.c $(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) + $(CC) -DPTHREADS -pthread tests/simple/glthreads.c $(INCLUDE) -o $(TEST_BUILD_DIR)/glthreads $(LINK_TEST) Modified: AppleSGLX/trunk/tests/tests.mk =================================================================== --- AppleSGLX/trunk/tests/tests.mk 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/tests/tests.mk 2009-02-23 19:32:46 UTC (rev 246) @@ -1,7 +1,7 @@ .PHONY : tests LIBGL=$(TEST_BUILD_DIR)/libGL.dylib -LINK_TEST=-L/usr/X11/lib $(LIBGL) -lX11 -lXext -lXplugin -lpthread +LINK_TEST=-L$(INSTALL_DIR)/lib -L$(X11_DIR)/lib $(LIBGL) -lX11 -lXext -lXplugin -lpthread include tests/triangle/triangle.mk include tests/simple/simple.mk Modified: AppleSGLX/trunk/tests/texenv/texenv.mk =================================================================== --- AppleSGLX/trunk/tests/texenv/texenv.mk 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/tests/texenv/texenv.mk 2009-02-23 19:32:46 UTC (rev 246) @@ -1,2 +1,2 @@ $(TEST_BUILD_DIR)/texenv: tests/texenv/texenv.c $(LIBGL) - $(CC) tests/texenv/texenv.c -Iinclude -I/usr/X11/include -o $(TEST_BUILD_DIR)/texenv -L/usr/X11/lib -lXmu -lglu libglut.a $(LINK_TEST) + $(CC) tests/texenv/texenv.c $(INCLUDE) -o $(TEST_BUILD_DIR)/texenv -L$(INSTALL_DIR)/lib -L$(X11_DIR)/lib -lXmu -lglu libglut.a $(LINK_TEST) Modified: AppleSGLX/trunk/tests/triangle/triangle.mk =================================================================== --- AppleSGLX/trunk/tests/triangle/triangle.mk 2009-02-23 19:11:45 UTC (rev 245) +++ AppleSGLX/trunk/tests/triangle/triangle.mk 2009-02-23 19:32:46 UTC (rev 246) @@ -1,3 +1,3 @@ triangle: tests/triangle/triangle.m libgl.a libglx.a - $(CC) tests/triangle/triangle.m -Iinclude -I/usr/X11/include -L/usr/X11/lib -lglut libgl.a libglx.a -o triangle \ + $(CC) tests/triangle/triangle.m $(INCLUDE) -L$(INSTALL_DIR)/lib -L$(X11_DIR)/lib -lglut libgl.a libglx.a -o triangle \ -F/System/Library/Frameworks/OpenGL.framework /System/Library/Frameworks/OpenGL.framework/Libraries/libGL.dylib

1 0

[245] AppleSGLX/trunk/include/GL/glx.h
by source_changes＠macosforge.org 23 Feb '09

23 Feb '09

Revision: 245 http://trac.macosforge.org/projects/xquartz/changeset/245 Author: jeremyhu(a)freedesktop.org Date: 2009-02-23 11:11:45 -0800 (Mon, 23 Feb 2009) Log Message: ----------- Fixed type consistency between glx.h and glx_empty.c Modified Paths: -------------- AppleSGLX/trunk/include/GL/glx.h Modified: AppleSGLX/trunk/include/GL/glx.h =================================================================== --- AppleSGLX/trunk/include/GL/glx.h 2009-02-23 00:35:28 UTC (rev 244) +++ AppleSGLX/trunk/include/GL/glx.h 2009-02-23 19:11:45 UTC (rev 245) @@ -386,10 +386,10 @@ #ifndef GLX_MESA_swap_frame_usage #define GLX_MESA_swap_frame_usage 1 -extern int glXGetFrameUsageMESA(Display *dpy, GLXDrawable drawable, float *usage); -extern int glXBeginFrameTrackingMESA(Display *dpy, GLXDrawable drawable); -extern int glXEndFrameTrackingMESA(Display *dpy, GLXDrawable drawable); -extern int glXQueryFrameTrackingMESA(Display *dpy, GLXDrawable drawable, int64_t *swapCount, int64_t *missedFrames, float *lastMissedUsage); +extern GLint glXGetFrameUsageMESA(Display *dpy, GLXDrawable drawable, float *usage); +extern GLint glXBeginFrameTrackingMESA(Display *dpy, GLXDrawable drawable); +extern GLint glXEndFrameTrackingMESA(Display *dpy, GLXDrawable drawable); +extern GLint glXQueryFrameTrackingMESA(Display *dpy, GLXDrawable drawable, int64_t *swapCount, int64_t *missedFrames, float *lastMissedUsage); typedef int (*PFNGLXGETFRAMEUSAGEMESAPROC) (Display *dpy, GLXDrawable drawable, float *usage); typedef int (*PFNGLXBEGINFRAMETRACKINGMESAPROC)(Display *dpy, GLXDrawable drawable);

1 0

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

23 Feb '09

Revision: 244 http://trac.macosforge.org/projects/xquartz/changeset/244 Author: gstaplin(a)apple.com Date: 2009-02-22 16:35:28 -0800 (Sun, 22 Feb 2009) Log Message: ----------- Fix a bug in the CreateContext path that glXCreateNewContext calls. The fbconfig path was wrong due to a lack of testing of glXCreateNewContext. Also remove some LockDisplay/UnlockDisplay that were leftover from the old XError handling code. Modified Paths: -------------- AppleSGLX/trunk/glxcmds.c Modified: AppleSGLX/trunk/glxcmds.c =================================================================== --- AppleSGLX/trunk/glxcmds.c 2009-02-23 00:33:30 UTC (rev 243) +++ AppleSGLX/trunk/glxcmds.c 2009-02-23 00:35:28 UTC (rev 244) @@ -377,9 +377,13 @@ gc->xid = contextID; gc->imported = GL_FALSE; - LockDisplay(dpy); - mode = _gl_context_modes_find_visual(psc->visuals, vis->visualid); - + if(vis) { + mode = _gl_context_modes_find_visual(psc->visuals, vis->visualid); + } else { + mode = _gl_context_modes_find_fbconfig(psc->configs, + fbconfig->fbconfigID); + } + if(NULL == mode) { __glXSendError(dpy, BadValue, vis->visualid, X_GLXCreateContext, true); @@ -402,8 +406,6 @@ gc->mode = mode; gc->isDirect = allowDirect; - UnlockDisplay(dpy); - return gc; }

1 0

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

23 Feb '09

Revision: 243 http://trac.macosforge.org/projects/xquartz/changeset/243 Author: gstaplin(a)apple.com Date: 2009-02-22 16:33:30 -0800 (Sun, 22 Feb 2009) Log Message: ----------- Fix a bug with some untested glXPbuffer attributes that a Mesa test brought out. Modified Paths: -------------- AppleSGLX/trunk/glx_pbuffer.c Modified: AppleSGLX/trunk/glx_pbuffer.c =================================================================== --- AppleSGLX/trunk/glx_pbuffer.c 2009-02-23 00:14:29 UTC (rev 242) +++ AppleSGLX/trunk/glx_pbuffer.c 2009-02-23 00:33:30 UTC (rev 243) @@ -71,10 +71,12 @@ case GLX_LARGEST_PBUFFER: /* This is a hint we should probably handle, but how? */ + ++i; break; case GLX_PRESERVED_CONTENTS: /* The contents are always preserved with AppleSGLX with CGL. */ + ++i; break; default:

1 0

[242] AppleSGLX/trunk/apple_xgl_api_read.c
by source_changes＠macosforge.org 23 Feb '09

23 Feb '09

Revision: 242 http://trac.macosforge.org/projects/xquartz/changeset/242 Author: gstaplin(a)apple.com Date: 2009-02-22 16:14:29 -0800 (Sun, 22 Feb 2009) Log Message: ----------- Fix some bugs in apple_xgl_api_read.c that one Mesa demo brought out. The struct apple_glx_context * wasn't being passed, instead the GLXContext was being passed as the void *. Modified Paths: -------------- AppleSGLX/trunk/apple_xgl_api_read.c Modified: AppleSGLX/trunk/apple_xgl_api_read.c =================================================================== --- AppleSGLX/trunk/apple_xgl_api_read.c 2009-02-23 00:06:03 UTC (rev 241) +++ AppleSGLX/trunk/apple_xgl_api_read.c 2009-02-23 00:14:29 UTC (rev 242) @@ -65,9 +65,11 @@ saved->swapped = true; - if(apple_glx_make_current_context(dpy, gc, gc, gc->currentReadable)) { + if(apple_glx_make_current_context(dpy, gc->apple, gc->apple, + gc->currentReadable)) { /* An error occurred, so try to restore the old context state. */ - (void)apple_glx_make_current_context(dpy, gc, gc, gc->currentDrawable); + (void)apple_glx_make_current_context(dpy, gc->apple, gc->apple, + gc->currentDrawable); saved->swapped = false; } } @@ -78,7 +80,8 @@ GLXContext gc = __glXGetCurrentContext(); Display *dpy = glXGetCurrentDisplay(); - if(apple_glx_make_current_context(dpy, gc, gc, gc->currentDrawable)) { + if(apple_glx_make_current_context(dpy, gc->apple, gc->apple, + gc->currentDrawable)) { /* * An error occurred restoring the drawable. * It's unclear what to do about that.

1 0

[241] AppleSGLX/trunk/apple_xgl_api_read.c
by source_changes＠macosforge.org 23 Feb '09

23 Feb '09

Revision: 241 http://trac.macosforge.org/projects/xquartz/changeset/241 Author: gstaplin(a)apple.com Date: 2009-02-22 16:06:03 -0800 (Sun, 22 Feb 2009) Log Message: ----------- Correct the currentReadable usage with the apple_xgl_api_read.c code. The glCopyPixels may not be right in the case of a readable drawable specified to glXMakeContextCurrent. I think it needs more testing. Modified Paths: -------------- AppleSGLX/trunk/apple_xgl_api_read.c Modified: AppleSGLX/trunk/apple_xgl_api_read.c =================================================================== --- AppleSGLX/trunk/apple_xgl_api_read.c 2009-02-22 23:39:12 UTC (rev 240) +++ AppleSGLX/trunk/apple_xgl_api_read.c 2009-02-23 00:06:03 UTC (rev 241) @@ -59,7 +59,8 @@ * the user has requested a readable drawable with glXMakeContextCurrent(). * We emulate this behavior by switching the current drawable. */ - if(gc->currentReadable != gc->currentDrawable) { + if(None != gc->currentReadable + && gc->currentReadable != gc->currentDrawable) { Display *dpy = glXGetCurrentDisplay(); saved->swapped = true;

1 0