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

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

22 Feb '09

Revision: 230 http://trac.macosforge.org/projects/xquartz/changeset/230 Author: gstaplin(a)apple.com Date: 2009-02-21 23:08:21 -0800 (Sat, 21 Feb 2009) Log Message: ----------- Add the glx_error code. Added Paths: ----------- AppleSGLX/trunk/glx_error.c AppleSGLX/trunk/glx_error.h Added: AppleSGLX/trunk/glx_error.c =================================================================== --- AppleSGLX/trunk/glx_error.c (rev 0) +++ AppleSGLX/trunk/glx_error.c 2009-02-22 07:08:21 UTC (rev 230) @@ -0,0 +1,62 @@ +/* + Copyright (c) 2009 Apple Inc. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT + HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + Except as contained in this notice, the name(s) of the above + copyright holders shall not be used in advertising or otherwise to + promote the sale, use or other dealings in this Software without + prior written authorization. +*/ +#include <stdbool.h> +#include <X11/Xlibint.h> +#include <X11/extensions/extutil.h> +#include <X11/extensions/Xext.h> +#include "glxclient.h" +#include "glx_error.h" + +extern XExtDisplayInfo *__glXFindDisplay(Display *dpy); + +void __glXSendError(Display *dpy, int errorCode, unsigned long resourceID, + unsigned long minorCode, bool coreX11error) { + XExtDisplayInfo *info = __glXFindDisplay(dpy); + GLXContext gc = __glXGetCurrentContext(); + xError error; + + LockDisplay(dpy); + + error.type = X_Error; + + if(coreX11error) { + error.errorCode = errorCode; + } else { + error.errorCode = info->codes->first_error + errorCode; + } + + error.sequenceNumber = dpy->request; + error.resourceID = resourceID; + error.minorCode = minorCode; + error.majorCode = gc ? gc->majorOpcode : 0; + + _XError(dpy, &error); + + UnlockDisplay(dpy); +} Added: AppleSGLX/trunk/glx_error.h =================================================================== --- AppleSGLX/trunk/glx_error.h (rev 0) +++ AppleSGLX/trunk/glx_error.h 2009-02-22 07:08:21 UTC (rev 230) @@ -0,0 +1,33 @@ +/* + Copyright (c) 2009 Apple Inc. + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated documentation files + (the "Software"), to deal in the Software without restriction, + including without limitation the rights to use, copy, modify, merge, + publish, distribute, sublicense, and/or sell copies of the Software, + and to permit persons to whom the Software is furnished to do so, + subject to the following conditions: + + The above copyright notice and this permission notice shall be + included in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND + NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT + HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + DEALINGS IN THE SOFTWARE. + + Except as contained in this notice, the name(s) of the above + copyright holders shall not be used in advertising or otherwise to + promote the sale, use or other dealings in this Software without + prior written authorization. +*/ +#include <stdbool.h> +#include <X11/Xlib.h> + +void __glXSendError(Display *dpy, int errorCode, unsigned long resourceID, + unsigned long minorCode, bool coreX11error);

1 0

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

22 Feb '09

Revision: 229 http://trac.macosforge.org/projects/xquartz/changeset/229 Author: gstaplin(a)apple.com Date: 2009-02-21 23:07:27 -0800 (Sat, 21 Feb 2009) Log Message: ----------- Convert glx_pbuffer.c to use the new __glXSendError. Modified Paths: -------------- AppleSGLX/trunk/glx_pbuffer.c Modified: AppleSGLX/trunk/glx_pbuffer.c =================================================================== --- AppleSGLX/trunk/glx_pbuffer.c 2009-02-22 06:55:32 UTC (rev 228) +++ AppleSGLX/trunk/glx_pbuffer.c 2009-02-22 07:07:27 UTC (rev 229) @@ -50,7 +50,6 @@ */ PUBLIC GLXPbuffer glXCreatePbuffer(Display *dpy, GLXFBConfig config, const int *attrib_list) { - GLXContext gc = __glXGetCurrentContext(); int i, width, height; GLXPbuffer result; int errorcode; @@ -85,20 +84,12 @@ if(apple_glx_pbuffer_create(dpy, config, width, height, &errorcode, &result)) { - xError error; + /* + * apple_glx_pbuffer_create only sets the errorcode to core X11 + * errors. + */ + __glXSendError(dpy, errorcode, 0, X_GLXCreatePbuffer, true); - LockDisplay(dpy); - - error.errorCode = errorcode; - error.resourceID = 0; - error.sequenceNumber = dpy->request; - error.type = X_Error; - error.majorCode = gc->majorOpcode; - error.minorCode = X_GLXCreatePbuffer; - _XError(dpy, &error); - - UnlockDisplay(dpy); - return None; } @@ -122,13 +113,10 @@ PUBLIC void glXQueryDrawable(Display *dpy, GLXDrawable drawable, int attribute, unsigned int *value) { - GLXContext gc = __glXGetCurrentContext(); Window root; int x, y; unsigned int width, height, bd, depth; - xError error; - if(apple_glx_pixmap_query(drawable, attribute, value)) return; /*done*/ @@ -147,18 +135,10 @@ } /*FALL THROUGH*/ } - - LockDisplay(dpy); - - error.errorCode = GLXBadDrawable; - error.resourceID = 0; - error.sequenceNumber = dpy->request; - error.type = X_Error; - error.majorCode = gc->majorOpcode; - error.minorCode = X_GLXGetDrawableAttributes; - _XError(dpy, &error); - - UnlockDisplay(dpy); + + + __glXSendError(dpy, GLXBadDrawable, drawable, X_GLXGetDrawableAttributes, + false); } @@ -168,8 +148,6 @@ PUBLIC void glXSelectEvent(Display *dpy, GLXDrawable drawable, unsigned long mask) { - GLXContext gc = __glXGetCurrentContext(); - xError error; XWindowAttributes xwattr; if(apple_glx_pbuffer_set_event_mask(drawable, mask)) @@ -184,17 +162,8 @@ /* The drawable seems to be invalid. Report an error. */ - LockDisplay(dpy); - - error.errorCode = GLXBadDrawable; - error.resourceID = 0; - error.sequenceNumber = dpy->request; - error.type = X_Error; - error.majorCode = (gc) ? gc->majorOpcode : 0; - error.minorCode = X_GLXChangeDrawableAttributes; - _XError(dpy, &error); - - UnlockDisplay(dpy); + __glXSendError(dpy, GLXBadDrawable, drawable, + X_GLXChangeDrawableAttributes, false); } @@ -204,8 +173,6 @@ PUBLIC void glXGetSelectedEvent(Display *dpy, GLXDrawable drawable, unsigned long *mask) { - GLXContext gc = __glXGetCurrentContext(); - xError error; XWindowAttributes xwattr; if(apple_glx_pbuffer_get_event_mask(drawable, mask)) @@ -223,17 +190,8 @@ /* The drawable seems to be invalid. Report an error. */ - LockDisplay(dpy); - - error.errorCode = GLXBadDrawable; - error.resourceID = 0; - error.sequenceNumber = dpy->request; - error.type = X_Error; - error.majorCode = (gc) ? gc->majorOpcode : 0; - error.minorCode = X_GLXGetDrawableAttributes; - _XError(dpy, &error); - - UnlockDisplay(dpy); + __glXSendError(dpy, GLXBadDrawable, drawable, X_GLXGetDrawableAttributes, + true); } @@ -264,40 +222,12 @@ visinfo = glXGetVisualFromFBConfig(dpy, config); if(NULL == visinfo) { - xError error; - - LockDisplay(dpy); - - error.errorCode = GLXBadFBConfig; - error.resourceID = 0; - error.sequenceNumber = dpy->request; - error.type = X_Error; - error.majorCode = 0; - error.minorCode = X_GLXCreateWindow; - _XError(dpy, &error); - - UnlockDisplay(dpy); - + __glXSendError(dpy, GLXBadFBConfig, 0, X_GLXCreateWindow, false); return None; } if(visinfo->visualid != XVisualIDFromVisual(xwattr.visual)) { - xError error; - - XFree(visinfo); - - LockDisplay(dpy); - - error.errorCode = BadMatch; - error.resourceID = 0; - error.sequenceNumber = dpy->request; - error.type = X_Error; - error.majorCode = 0; - error.minorCode = X_GLXCreateWindow; - _XError(dpy, &error); - - UnlockDisplay(dpy); - + __glXSendError(dpy, BadMatch, 0, X_GLXCreateWindow, true); return None; } @@ -310,14 +240,10 @@ PUBLIC void glXDestroyPixmap(Display *dpy, GLXPixmap pixmap) { - - xError error; - GLXContext gc = __glXGetCurrentContext(); - if(apple_glx_pixmap_destroy(dpy, pixmap)) return; /* The pixmap existed and we successfully destroyed it. */ - __glXSendError(dpy, GLXBadPixmap, pixmap, X_GLXDestroyPixmap); + __glXSendError(dpy, GLXBadPixmap, pixmap, X_GLXDestroyPixmap, false); }

1 0

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

22 Feb '09

Revision: 228 http://trac.macosforge.org/projects/xquartz/changeset/228 Author: gstaplin(a)apple.com Date: 2009-02-21 22:55:32 -0800 (Sat, 21 Feb 2009) Log Message: ----------- Improve error messages for the GLXPixmap code. It seems we will need to redo some of the _XError calls to call __glXSendError (a new thing I wrote) which properly works with XGetErrorDatabaseText. There is a difference in XError handling when using _XError, because most of the _XError calls I added didn't account for the extension error base. Some will be ok that are common X11 error codes like BadDrawable. Others will need some modifications. Modified Paths: -------------- AppleSGLX/trunk/Makefile AppleSGLX/trunk/apple_glx_pixmap.c AppleSGLX/trunk/apple_glx_pixmap.h AppleSGLX/trunk/glx_pbuffer.c AppleSGLX/trunk/glxext.c Modified: AppleSGLX/trunk/Makefile =================================================================== --- AppleSGLX/trunk/Makefile 2009-02-22 05:19:26 UTC (rev 227) +++ AppleSGLX/trunk/Makefile 2009-02-22 06:55:32 UTC (rev 228) @@ -30,7 +30,7 @@ appledri.o apple_glx_context.o apple_glx.o pixel.o \ compsize.o apple_visual.o apple_cgl.o glxreply.o glcontextmodes.o \ 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 + apple_glx_pixmap.o apple_xgl_api_read.o glx_empty.o glx_error.o #This is used for building the tests. #The tests don't require installation. @@ -53,6 +53,7 @@ glxreply.o: glxreply.c glxcmds.o: glxcmds.c apple_glx_context.h glx_pbuffer.o: glx_pbuffer.c +glx_error.o: glx_error.c glx_query.o: glx_query.c glxcurrent.o: glxcurrent.c glxextensions.o: glxextensions.h glxextensions.c Modified: AppleSGLX/trunk/apple_glx_pixmap.c =================================================================== --- AppleSGLX/trunk/apple_glx_pixmap.c 2009-02-22 05:19:26 UTC (rev 227) +++ AppleSGLX/trunk/apple_glx_pixmap.c 2009-02-22 06:55:32 UTC (rev 228) @@ -171,9 +171,10 @@ return false; } -void apple_glx_pixmap_destroy(Display *dpy, GLXPixmap pixmap) { +bool apple_glx_pixmap_destroy(Display *dpy, GLXPixmap pixmap) { struct apple_glx_pixmap *p; - + bool result = false; + lock_pixmap_list(); if(find_pixmap(pixmap, &p)) { @@ -206,9 +207,13 @@ p->next->previous = p->previous; free(p); + + result = true; } unlock_pixmap_list(); + + return result; } bool apple_glx_is_pixmap(Display *dpy, GLXDrawable drawable) { Modified: AppleSGLX/trunk/apple_glx_pixmap.h =================================================================== --- AppleSGLX/trunk/apple_glx_pixmap.h 2009-02-22 05:19:26 UTC (rev 227) +++ AppleSGLX/trunk/apple_glx_pixmap.h 2009-02-22 06:55:32 UTC (rev 228) @@ -38,7 +38,8 @@ bool apple_glx_pixmap_create(Display *dpy, int screen, Pixmap pixmap, const void *mode); -void apple_glx_pixmap_destroy(Display *dpy, Pixmap pixmap); +/* Returns true if the pixmap was successfully destroyed. */ +bool apple_glx_pixmap_destroy(Display *dpy, Pixmap pixmap); bool apple_glx_is_pixmap(Display *dpy, GLXDrawable drawable); Modified: AppleSGLX/trunk/glx_pbuffer.c =================================================================== --- AppleSGLX/trunk/glx_pbuffer.c 2009-02-22 05:19:26 UTC (rev 227) +++ AppleSGLX/trunk/glx_pbuffer.c 2009-02-22 06:55:32 UTC (rev 228) @@ -43,6 +43,7 @@ #include "apple_glx_pbuffer.h" #include "apple_glx_pixmap.h" +#include "glx_error.h" /** * Create a new pbuffer. @@ -309,7 +310,14 @@ PUBLIC void glXDestroyPixmap(Display *dpy, GLXPixmap pixmap) { - apple_glx_pixmap_destroy(dpy, pixmap); + + xError error; + GLXContext gc = __glXGetCurrentContext(); + + if(apple_glx_pixmap_destroy(dpy, pixmap)) + return; /* The pixmap existed and we successfully destroyed it. */ + + __glXSendError(dpy, GLXBadPixmap, pixmap, X_GLXDestroyPixmap); } Modified: AppleSGLX/trunk/glxext.c =================================================================== --- AppleSGLX/trunk/glxext.c 2009-02-22 05:19:26 UTC (rev 227) +++ AppleSGLX/trunk/glxext.c 2009-02-22 06:55:32 UTC (rev 228) @@ -83,8 +83,10 @@ /* Extension required boiler plate */ static char *__glXExtensionName = GLX_EXTENSION_NAME; -XExtensionInfo *__glXExtensionInfo = NULL; +static XExtensionInfo glxext_info_data; +static XExtensionInfo *glXExtensionInfo = &glxext_info_data; + static /* const */ char *error_list[] = { "GLXBadContext", "GLXBadContextState", @@ -111,13 +113,12 @@ __glXFreeContext(gc); } - return XextRemoveDisplay(__glXExtensionInfo, dpy); + return XextRemoveDisplay(glXExtensionInfo, dpy); } +static char *__glXErrorString(Display *dpy, int code, XExtCodes *codes, + char *buf, int n); -static XEXT_GENERATE_ERROR_STRING(__glXErrorString, __glXExtensionName, - __GLX_NUMBER_ERRORS, error_list) - static /* const */ XExtensionHooks __glXExtensionHooks = { NULL, /* create_gc */ NULL, /* copy_gc */ @@ -132,11 +133,17 @@ __glXErrorString, /* error_string */ }; -static -XEXT_GENERATE_FIND_DISPLAY(__glXFindDisplay, __glXExtensionInfo, + +XEXT_GENERATE_FIND_DISPLAY(__glXFindDisplay, glXExtensionInfo, __glXExtensionName, &__glXExtensionHooks, __GLX_NUMBER_EVENTS, NULL) +static XEXT_GENERATE_ERROR_STRING(__glXErrorString, __glXExtensionName, + __GLX_NUMBER_ERRORS, error_list) + + + + /************************************************************************/ /* @@ -634,7 +641,8 @@ #ifdef GLX_DIRECT_RENDERING Bool glx_direct, glx_accel; #endif - + + #if defined(USE_XTHREADS) { static int firstCall = 1;

1 0

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

22 Feb '09

Revision: 227 http://trac.macosforge.org/projects/xquartz/changeset/227 Author: gstaplin(a)apple.com Date: 2009-02-21 21:19:26 -0800 (Sat, 21 Feb 2009) Log Message: ----------- Add a test program that according to the CGL documentation provides the maximum size of a Pbuffer. This is used for getting a value for the xserver's hw/xquartz/GL/indirect.c We may at some point want to create a context, and probe at runtime, but I'm not sure what will be involved with doing that in the X server. Added Paths: ----------- AppleSGLX/trunk/apple_GL_pbuffer_max.c Added: AppleSGLX/trunk/apple_GL_pbuffer_max.c =================================================================== --- AppleSGLX/trunk/apple_GL_pbuffer_max.c (rev 0) +++ AppleSGLX/trunk/apple_GL_pbuffer_max.c 2009-02-22 05:19:26 UTC (rev 227) @@ -0,0 +1,42 @@ +#include <stdio.h> +#include <stdlib.h> +#include <OpenGL/OpenGL.h> + +int main() { + CGLPixelFormatAttribute attribs[] = { + kCGLPFAAccelerated, + kCGLPFADoubleBuffer, + kCGLPFAColorSize, 24, + 0 + }; + + CGLPixelFormatObj pixobj; + GLint npix; + CGLError err; + CGLContextObj context; + GLint maxview[2]; + + err = CGLChoosePixelFormat(attribs, &pixobj, &npix); + + if(err != kCGLNoError) { + fprintf(stderr, "choose pixel format error!\n"); + return EXIT_FAILURE; + } + + err = CGLCreateContext(pixobj, NULL, &context); + + if(err != kCGLNoError) { + fprintf(stderr, "create context error!\n"); + return EXIT_FAILURE; + } + + CGLSetCurrentContext(context); + + maxview[0] = 0; + maxview[1] = 0; + glGetIntegerv(GL_MAX_VIEWPORT_DIMS, maxview); + + printf("max pbuffer width %d heigth %d\n", maxview[0], maxview[1]); + + return EXIT_SUCCESS; +}

1 0

[226] AppleSGLX/trunk/include/GL/gl.h
by source_changes＠macosforge.org 22 Feb '09

22 Feb '09

Revision: 226 http://trac.macosforge.org/projects/xquartz/changeset/226 Author: gstaplin(a)apple.com Date: 2009-02-21 21:00:16 -0800 (Sat, 21 Feb 2009) Log Message: ----------- Update the gl.h. This allows building the X server from scratch with the AppleSGLX headers, thanks in part to the updated glext.h. Modified Paths: -------------- AppleSGLX/trunk/include/GL/gl.h Modified: AppleSGLX/trunk/include/GL/gl.h =================================================================== --- AppleSGLX/trunk/include/GL/gl.h 2009-02-22 04:59:21 UTC (rev 225) +++ AppleSGLX/trunk/include/GL/gl.h 2009-02-22 05:00:16 UTC (rev 226) @@ -1,2 +1,61 @@ +/* + * 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 + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included + * in all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN + * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +#ifndef __X_GL_H +#define __X_GL_H + +#ifdef GL_GLEXT_LEGACY +/* The user has requested the exclusion of glext.h. */ #include "/System/Library/Frameworks/OpenGL.framework/Headers/gl.h" +#else +#define GL_GLEXT_LEGACY 1 +#include "/System/Library/Frameworks/OpenGL.framework/Headers/gl.h" +#undef GL_GLEXT_LEGACY +/* Our glext.h is based on a version from the registry that is newer. */ +#include <GL/glext.h> +#endif +/* + * This is needed for building apple_glx_pbuffer.c, the latest + * glext.h from the registry lacks it, so it's from the Leopard glext.h: + */ +#ifndef GL_TEXTURE_RECTANGLE_EXT +#define GL_TEXTURE_RECTANGLE_EXT 0x84F5 +#endif + +/* This is needed for building the X server: */ +/* + * GL_MESA_packed_depth_stencil + */ +#ifndef GL_MESA_packed_depth_stencil +#define GL_MESA_packed_depth_stencil 1 + +#define GL_DEPTH_STENCIL_MESA 0x8750 +#define GL_UNSIGNED_INT_24_8_MESA 0x8751 +#define GL_UNSIGNED_INT_8_24_REV_MESA 0x8752 +#define GL_UNSIGNED_SHORT_15_1_MESA 0x8753 +#define GL_UNSIGNED_SHORT_1_15_REV_MESA 0x8754 + +#endif /* GL_MESA_packed_depth_stencil */ + + +#endif /*__X_GL_H*/

1 0

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

22 Feb '09

Revision: 225 http://trac.macosforge.org/projects/xquartz/changeset/225 Author: gstaplin(a)apple.com Date: 2009-02-21 20:59:21 -0800 (Sat, 21 Feb 2009) Log Message: ----------- Update the API frontend functions (from re-running gen_code.tcl). Modified Paths: -------------- AppleSGLX/trunk/apple_xgl_api.c AppleSGLX/trunk/apple_xgl_api.h Modified: AppleSGLX/trunk/apple_xgl_api.c =================================================================== --- AppleSGLX/trunk/apple_xgl_api.c 2009-02-22 04:53:42 UTC (rev 224) +++ AppleSGLX/trunk/apple_xgl_api.c 2009-02-22 04:59:21 UTC (rev 225) @@ -147,19 +147,19 @@ void glBlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter) { __gl_api.BlitFramebufferEXT(srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); } -void glBufferData(GLenum target, GLsizeiptrARB size, const const GLvoid * data, GLenum usage) { +void glBufferData(GLenum target, GLsizeiptr size, const const GLvoid * data, GLenum usage) { __gl_api.BufferData(target, size, data, usage); } -void glBufferDataARB(GLenum target, GLsizeiptr size, const const GLvoid * data, GLenum usage) { +void glBufferDataARB(GLenum target, GLsizeiptrARB size, const const GLvoid * data, GLenum usage) { __gl_api.BufferDataARB(target, size, data, usage); } void glBufferParameteriAPPLE(GLenum target, GLenum pname, GLint param) { __gl_api.BufferParameteriAPPLE(target, pname, param); } -void glBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const const GLvoid * data) { +void glBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, const const GLvoid * data) { __gl_api.BufferSubData(target, offset, size, data); } -void glBufferSubDataARB(GLenum target, GLintptr offset, GLsizeiptr size, const const GLvoid * data) { +void glBufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const const GLvoid * data) { __gl_api.BufferSubDataARB(target, offset, size, data); } void glCallList(GLuint list) { @@ -666,7 +666,7 @@ void glFlush(void) { __gl_api.Flush(); } -void glFlushMappedBufferRangeAPPLE(GLenum target, GLintptrARB offset, GLsizeiptrARB size) { +void glFlushMappedBufferRangeAPPLE(GLenum target, GLintptr offset, GLsizeiptr size) { __gl_api.FlushMappedBufferRangeAPPLE(target, offset, size); } void glFlushRasterSGIX(void) { @@ -852,10 +852,10 @@ void glGetBufferPointervARB(GLenum target, GLenum pname, void * * params) { __gl_api.GetBufferPointervARB(target, pname, params); } -void glGetBufferSubData(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data) { +void glGetBufferSubData(GLenum target, GLintptr offset, GLsizeiptr size, void * data) { __gl_api.GetBufferSubData(target, offset, size, data); } -void glGetBufferSubDataARB(GLenum target, GLintptr offset, GLsizeiptr size, void * data) { +void glGetBufferSubDataARB(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data) { __gl_api.GetBufferSubDataARB(target, offset, size, data); } void glGetClipPlane(GLenum plane, GLdouble * equation) { Modified: AppleSGLX/trunk/apple_xgl_api.h =================================================================== --- AppleSGLX/trunk/apple_xgl_api.h 2009-02-22 04:53:42 UTC (rev 224) +++ AppleSGLX/trunk/apple_xgl_api.h 2009-02-22 04:59:21 UTC (rev 225) @@ -66,11 +66,11 @@ void (*BlendFuncSeparate)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); void (*BlendFuncSeparateEXT)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); void (*BlitFramebufferEXT)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); - void (*BufferData)(GLenum target, GLsizeiptrARB size, const const GLvoid * data, GLenum usage); - void (*BufferDataARB)(GLenum target, GLsizeiptr size, const const GLvoid * data, GLenum usage); + void (*BufferData)(GLenum target, GLsizeiptr size, const const GLvoid * data, GLenum usage); + void (*BufferDataARB)(GLenum target, GLsizeiptrARB size, const const GLvoid * data, GLenum usage); void (*BufferParameteriAPPLE)(GLenum target, GLenum pname, GLint param); - void (*BufferSubData)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const const GLvoid * data); - void (*BufferSubDataARB)(GLenum target, GLintptr offset, GLsizeiptr size, const const GLvoid * data); + void (*BufferSubData)(GLenum target, GLintptr offset, GLsizeiptr size, const const GLvoid * data); + void (*BufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const const GLvoid * data); void (*CallList)(GLuint list); void (*CallLists)(GLsizei n, GLenum type, const void * lists); GLenum (*CheckFramebufferStatusEXT)(GLenum target); @@ -216,7 +216,7 @@ void (*FeedbackBuffer)(GLsizei size, GLenum type, GLfloat * buffer); void (*Finish)(); void (*Flush)(); - void (*FlushMappedBufferRangeAPPLE)(GLenum target, GLintptrARB offset, GLsizeiptrARB size); + void (*FlushMappedBufferRangeAPPLE)(GLenum target, GLintptr offset, GLsizeiptr size); void (*FogCoordd)(GLdouble coord); void (*FogCoorddEXT)(GLdouble coord); void (*FogCoorddv)(const GLdouble * coord); @@ -261,8 +261,8 @@ void (*GetBufferParameterivARB)(GLenum target, GLenum pname, GLint * params); void (*GetBufferPointerv)(GLenum target, GLenum pname, void * * params); void (*GetBufferPointervARB)(GLenum target, GLenum pname, void * * params); - void (*GetBufferSubData)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data); - void (*GetBufferSubDataARB)(GLenum target, GLintptr offset, GLsizeiptr size, void * data); + void (*GetBufferSubData)(GLenum target, GLintptr offset, GLsizeiptr size, void * data); + void (*GetBufferSubDataARB)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, void * data); void (*GetClipPlane)(GLenum plane, GLdouble * equation); void (*GetColorTable)(GLenum target, GLenum format, GLenum type, void * table); void (*GetColorTableParameterfv)(GLenum target, GLenum pname, GLfloat * params);

1 0

[223] AppleSGLX/trunk/gen_funcs.tcl
by source_changes＠macosforge.org 22 Feb '09

22 Feb '09

Revision: 223 http://trac.macosforge.org/projects/xquartz/changeset/223 Author: gstaplin(a)apple.com Date: 2009-02-21 20:52:53 -0800 (Sat, 21 Feb 2009) Log Message: ----------- Fix some gen_funcs.tcl typemap mistakes with the ARB suffix. After updating the glext.h to the latest registry version these mistake showed up when building the apple_xgl_api.c. Modified Paths: -------------- AppleSGLX/trunk/gen_funcs.tcl Modified: AppleSGLX/trunk/gen_funcs.tcl =================================================================== --- AppleSGLX/trunk/gen_funcs.tcl 2009-02-22 04:17:17 UTC (rev 222) +++ AppleSGLX/trunk/gen_funcs.tcl 2009-02-22 04:52:53 UTC (rev 223) @@ -207,10 +207,10 @@ GLenum GLenum BufferTargetARB GLenum ConstUInt32 "const GLuint" - BufferSize GLsizeiptrARB + BufferSize GLsizeiptr ConstVoid "const GLvoid" BufferUsageARB GLenum - BufferOffset GLintptrARB + BufferOffset GLintptr BufferAccessARB GLenum BufferPNameARB GLenum BufferPointerNameARB GLenum @@ -230,8 +230,8 @@ ProgramTargetARB GLenum ProgramFormatARB GLenum ProgramStringPropertyARB GLenum - BufferSizeARB GLsizeiptr - BufferOffsetARB GLintptr + BufferSizeARB GLsizeiptrARB + BufferOffsetARB GLintptrARB handleARB GLhandleARB charPointerARB "GLcharARB *" charARB GLcharARB

1 0

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

22 Feb '09

Revision: 222 http://trac.macosforge.org/projects/xquartz/changeset/222 Author: gstaplin(a)apple.com Date: 2009-02-21 20:17:17 -0800 (Sat, 21 Feb 2009) Log Message: ----------- Remove an #if 0 around some glxext.c visual tags. The #if 0 was added during the glxext.h changes which were later reverted during an upgrade of glxext.h on purpose. Modified Paths: -------------- AppleSGLX/trunk/glxext.c Modified: AppleSGLX/trunk/glxext.c =================================================================== --- AppleSGLX/trunk/glxext.c 2009-02-22 03:19:02 UTC (rev 221) +++ AppleSGLX/trunk/glxext.c 2009-02-22 04:17:17 UTC (rev 222) @@ -397,14 +397,13 @@ case GLX_MAX_PBUFFER_PIXELS: config->maxPbufferPixels = *bp++; break; -#if 0 case GLX_OPTIMAL_PBUFFER_WIDTH_SGIX: config->optimalPbufferWidth = *bp++; break; case GLX_OPTIMAL_PBUFFER_HEIGHT_SGIX: config->optimalPbufferHeight = *bp++; break; - case GLX_VISUAL_SELECT_GROUP_SGIX: + case GLX_VISUAL_SELECT_GROUP_SGIX: config->visualSelectGroup = *bp++; break; case GLX_SWAP_METHOD_OML: @@ -414,28 +413,27 @@ config->sampleBuffers = *bp++; break; case GLX_SAMPLES_SGIS: - config->samples = *bp++; + config->samples = *bp++; break; -#endif - case GLX_BIND_TO_TEXTURE_RGB_EXT: + case GLX_BIND_TO_TEXTURE_RGB_EXT: config->bindToTextureRgb = *bp++; break; - case GLX_BIND_TO_TEXTURE_RGBA_EXT: + case GLX_BIND_TO_TEXTURE_RGBA_EXT: config->bindToTextureRgba = *bp++; break; - case GLX_BIND_TO_MIPMAP_TEXTURE_EXT: + case GLX_BIND_TO_MIPMAP_TEXTURE_EXT: config->bindToMipmapTexture = *bp++; break; - case GLX_BIND_TO_TEXTURE_TARGETS_EXT: + case GLX_BIND_TO_TEXTURE_TARGETS_EXT: config->bindToTextureTargets = *bp++; break; - case GLX_Y_INVERTED_EXT: + case GLX_Y_INVERTED_EXT: config->yInverted = *bp++; break; - case None: + case None: i = count; break; - default: + default: if(getenv("LIBGL_DIAGNOSTIC")) { long int tag = *bp; fprintf(stderr, "WARNING: unknown GLX tag from server: %ld\n",

1 0

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

22 Feb '09

Revision: 221 http://trac.macosforge.org/projects/xquartz/changeset/221 Author: gstaplin(a)apple.com Date: 2009-02-21 19:19:02 -0800 (Sat, 21 Feb 2009) Log Message: ----------- When reporting an error in the glXGetSelectedEvent path use X_GLXGetDrawableAttributes in the minorCode. This prevents confusing it with the glXSelectEvent path a bit. Modified Paths: -------------- AppleSGLX/trunk/glx_pbuffer.c Modified: AppleSGLX/trunk/glx_pbuffer.c =================================================================== --- AppleSGLX/trunk/glx_pbuffer.c 2009-02-22 01:12:49 UTC (rev 220) +++ AppleSGLX/trunk/glx_pbuffer.c 2009-02-22 03:19:02 UTC (rev 221) @@ -229,7 +229,7 @@ error.sequenceNumber = dpy->request; error.type = X_Error; error.majorCode = (gc) ? gc->majorOpcode : 0; - error.minorCode = X_GLXChangeDrawableAttributes; + error.minorCode = X_GLXGetDrawableAttributes; _XError(dpy, &error); UnlockDisplay(dpy);

1 0

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

22 Feb '09

Revision: 220 http://trac.macosforge.org/projects/xquartz/changeset/220 Author: gstaplin(a)apple.com Date: 2009-02-21 17:12:49 -0800 (Sat, 21 Feb 2009) Log Message: ----------- Add some support code for glXCreateWindow and glXDestroyWindow. They should work now. Modified Paths: -------------- AppleSGLX/trunk/glx_pbuffer.c Modified: AppleSGLX/trunk/glx_pbuffer.c =================================================================== --- AppleSGLX/trunk/glx_pbuffer.c 2009-02-22 01:12:06 UTC (rev 219) +++ AppleSGLX/trunk/glx_pbuffer.c 2009-02-22 01:12:49 UTC (rev 220) @@ -253,8 +253,56 @@ glXCreateWindow( Display *dpy, GLXFBConfig config, Window win, const int *attrib_list ) { - fprintf(stderr, "%s FIXME", __func__); - abort(); + XWindowAttributes xwattr; + XVisualInfo *visinfo; + + (void)attrib_list; /*unused according to GLX 1.4*/ + + XGetWindowAttributes(dpy, win, &xwattr); + + visinfo = glXGetVisualFromFBConfig(dpy, config); + + if(NULL == visinfo) { + xError error; + + LockDisplay(dpy); + + error.errorCode = GLXBadFBConfig; + error.resourceID = 0; + error.sequenceNumber = dpy->request; + error.type = X_Error; + error.majorCode = 0; + error.minorCode = X_GLXCreateWindow; + _XError(dpy, &error); + + UnlockDisplay(dpy); + + return None; + } + + if(visinfo->visualid != XVisualIDFromVisual(xwattr.visual)) { + xError error; + + XFree(visinfo); + + LockDisplay(dpy); + + error.errorCode = BadMatch; + error.resourceID = 0; + error.sequenceNumber = dpy->request; + error.type = X_Error; + error.majorCode = 0; + error.minorCode = X_GLXCreateWindow; + _XError(dpy, &error); + + UnlockDisplay(dpy); + + return None; + } + + XFree(visinfo); + + return win; } @@ -268,7 +316,5 @@ PUBLIC void glXDestroyWindow(Display *dpy, GLXWindow win) { - fprintf(stderr, "%s FIXME\n", __func__); - abort(); + /* no-op */ } -

1 0