6, 7, and 13 look good to me, but I haven't tested them yet.
Reviewed-by: Jeremy Huddleston <jerem...@apple.com>
On Dec 16, 2011, at 11:55 AM, Ian Romanick wrote:
> From: Ian Romanick <ian.d.roman...@intel.com>
>
> Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
> Cc: Jeremy Huddleston <jerem...@apple.com>
> ---
> src/glx/Makefile | 1 +
> src/glx/apple/Makefile | 2 +-
> src/glx/apple/glx_error.c | 67 ---------------------------------------------
> src/glx/apple/glx_error.h | 33 ----------------------
> src/glx/glx_error.c | 67 +++++++++++++++++++++++++++++++++++++++++++++
> src/glx/glx_error.h | 33 ++++++++++++++++++++++
> 6 files changed, 102 insertions(+), 101 deletions(-)
> delete mode 100644 src/glx/apple/glx_error.c
> delete mode 100644 src/glx/apple/glx_error.h
> create mode 100644 src/glx/glx_error.c
> create mode 100644 src/glx/glx_error.h
>
> diff --git a/src/glx/Makefile b/src/glx/Makefile
> index dd96973..183ffb1 100644
> --- a/src/glx/Makefile
> +++ b/src/glx/Makefile
> @@ -15,6 +15,7 @@ SOURCES = \
> glxconfig.c \
> glxcmds.c \
> glxcurrent.c \
> + glx_error.c \
> glxext.c \
> glxextensions.c \
> indirect_glx.c \
> diff --git a/src/glx/apple/Makefile b/src/glx/apple/Makefile
> index 6868d28..66e6658 100644
> --- a/src/glx/apple/Makefile
> +++ b/src/glx/apple/Makefile
> @@ -39,7 +39,7 @@ SOURCES = \
> ../compsize.c \
> ../glxconfig.c \
> glx_empty.c \
> - glx_error.c \
> + ../glx_error.c \
> ../glx_pbuffer.c \
> ../glx_query.c \
> ../glxcmds.c \
> diff --git a/src/glx/apple/glx_error.c b/src/glx/apple/glx_error.c
> deleted file mode 100644
> index d44a80c..0000000
> --- a/src/glx/apple/glx_error.c
> +++ /dev/null
> @@ -1,67 +0,0 @@
> -/*
> - 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 <assert.h>
> -#include <X11/Xlibint.h>
> -#include <X11/extensions/extutil.h>
> -#include <X11/extensions/Xext.h>
> -#include "glxclient.h"
> -#include "glx_error.h"
> -
> -void
> -__glXSendError(Display * dpy, int errorCode, unsigned long resourceID,
> - unsigned long minorCode, bool coreX11error)
> -{
> - struct glx_display *glx_dpy = __glXInitialize(dpy);
> - struct glx_context *gc = __glXGetCurrentContext();
> - xError error;
> -
> - assert(glx_dpy);
> - assert(gc);
> -
> - LockDisplay(dpy);
> -
> - error.type = X_Error;
> -
> - if (coreX11error) {
> - error.errorCode = errorCode;
> - }
> - else {
> - error.errorCode = glx_dpy->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);
> -}
> diff --git a/src/glx/apple/glx_error.h b/src/glx/apple/glx_error.h
> deleted file mode 100644
> index 6ba2f85..0000000
> --- a/src/glx/apple/glx_error.h
> +++ /dev/null
> @@ -1,33 +0,0 @@
> -/*
> - 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);
> diff --git a/src/glx/glx_error.c b/src/glx/glx_error.c
> new file mode 100644
> index 0000000..d44a80c
> --- /dev/null
> +++ b/src/glx/glx_error.c
> @@ -0,0 +1,67 @@
> +/*
> + 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 <assert.h>
> +#include <X11/Xlibint.h>
> +#include <X11/extensions/extutil.h>
> +#include <X11/extensions/Xext.h>
> +#include "glxclient.h"
> +#include "glx_error.h"
> +
> +void
> +__glXSendError(Display * dpy, int errorCode, unsigned long resourceID,
> + unsigned long minorCode, bool coreX11error)
> +{
> + struct glx_display *glx_dpy = __glXInitialize(dpy);
> + struct glx_context *gc = __glXGetCurrentContext();
> + xError error;
> +
> + assert(glx_dpy);
> + assert(gc);
> +
> + LockDisplay(dpy);
> +
> + error.type = X_Error;
> +
> + if (coreX11error) {
> + error.errorCode = errorCode;
> + }
> + else {
> + error.errorCode = glx_dpy->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);
> +}
> diff --git a/src/glx/glx_error.h b/src/glx/glx_error.h
> new file mode 100644
> index 0000000..6ba2f85
> --- /dev/null
> +++ b/src/glx/glx_error.h
> @@ -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.7.6.4
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
