Merge remote-tracking branch 'origin/released'

Conflicts:
	X11/extensions/configure.ac
	X11/xtrans/configure.ac
	X11/xtrans/doc/Makefile.am
	libX11/configure.ac
	libX11/docbook.am
	libXdmcp/configure.ac
	libXdmcp/doc/Makefile.am
	libXext/configure.ac
	libXext/docbook.am
	libXmu/configure.ac
	libXmu/doc/Makefile.am
	mesalib/src/mapi/glapi/gen/Makefile
	mesalib/src/mapi/glapi/glapi.h
	mesalib/src/mesa/state_tracker/st_draw.c
	xorg-server/xkeyboard-config/rules/base.extras.xml.in
	xorg-server/xkeyboard-config/rules/compat/variantsMapping.lst
	xorg-server/xkeyboard-config/symbols/de

1 files changed, 181 insertions, 177 deletions

diff --git a/mesalib/src/mapi/glapi/glapi.h b/mesalib/src/mapi/glapi/glapi.h
index 746692692..1dc2ba7df 100644
--- a/mesalib/src/mapi/glapi/glapi.h
+++ b/mesalib/src/mapi/glapi/glapi.h
@@ -1,177 +1,181 @@
-/*

- * Mesa 3-D graphics library

- * Version:  7.1

- *

- * Copyright (C) 1999-2008  Brian Paul   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.

- */

-

-

-/**

- * \mainpage Mesa GL API Module

- *

- * \section GLAPIIntroduction Introduction

- *

- * The Mesa GL API module is responsible for dispatching all the

- * gl*() functions.  All GL functions are dispatched by jumping through

- * the current dispatch table (basically a struct full of function

- * pointers.)

- *

- * A per-thread current dispatch table and per-thread current context

- * pointer are managed by this module too.

- *

- * This module is intended to be non-Mesa-specific so it can be used

- * with the X/DRI libGL also.

- */

-

-

-#ifndef _GLAPI_H

-#define _GLAPI_H

-

-#ifdef _GLAPI_NO_EXPORTS

-#  define _GLAPI_EXPORT

-#else /* _GLAPI_NO_EXPORTS */

-#  ifdef _WIN32

-#    ifdef _GLAPI_DLL_EXPORTS

-#      define _GLAPI_EXPORT __declspec(dllexport)

-#    else

-#      define _GLAPI_EXPORT __declspec(dllimport)

-#    endif

-#  elif defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))

-#    define _GLAPI_EXPORT __attribute__((visibility("default")))

-#  else

-#    define _GLAPI_EXPORT

-#  endif

-#endif /* _GLAPI_NO_EXPORTS */

-

-#include "GL/gl.h"

-#include "GL/glext.h"

-#include "glthread.h"

-

-

-struct _glapi_table;

-

-typedef void (*_glapi_proc)(void); /* generic function pointer */

-

-typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);

-

-

-#if defined(USE_MGL_NAMESPACE)

-#define _glapi_set_dispatch _mglapi_set_dispatch

-#define _glapi_get_dispatch _mglapi_get_dispatch

-#define _glapi_set_context _mglapi_set_context

-#define _glapi_get_context _mglapi_get_context

-#define _glapi_Context _mglapi_Context

-#define _glapi_Dispatch _mglapi_Dispatch

-#endif

-

-

-/*

- * Number of extension functions which we can dynamically add at runtime.

- */

-#define MAX_EXTENSION_FUNCS 300

-

-

-/**

- ** Define the GET_CURRENT_CONTEXT() macro.

- ** \param C local variable which will hold the current context.

- **/

-#if defined (GLX_USE_TLS)

-

-_GLAPI_EXPORT extern __thread struct _glapi_table * _glapi_tls_Dispatch;

-

-_GLAPI_EXPORT extern const void *_glapi_Context;

-_GLAPI_EXPORT extern const struct _glapi_table *_glapi_Dispatch;

-

-_GLAPI_EXPORT extern __thread void * _glapi_tls_Context;

-

-# define GET_DISPATCH() _glapi_tls_Dispatch

-# define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) _glapi_tls_Context

-

-#else

-

-#ifdef INSERVER

-#define SERVEXTERN _declspec(dllimport)

-#else

-#define SERVEXTERN _declspec(dllexport)

-#endif

-

-SERVEXTERN void *_glapi_Context;

-SERVEXTERN struct _glapi_table *_glapi_Dispatch;

-

-# ifdef THREADS

-

-#  define GET_DISPATCH() \

-     (likely(_glapi_Dispatch) ? _glapi_Dispatch : _glapi_get_dispatch())

-

-

-#  define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) \

-     (likely(_glapi_Context) ? _glapi_Context : _glapi_get_context())

-# else

-#  define GET_DISPATCH() _glapi_Dispatch

-#  define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) _glapi_Context

-# endif

-

-#endif /* defined (GLX_USE_TLS) */

-

-

-/**

- ** GL API public functions

- **/

-

-SERVEXTERN void

-_glapi_check_multithread(void);

-

-

-SERVEXTERN void

-_glapi_set_context(void *context);

-

-

-SERVEXTERN void *

-_glapi_get_context(void);

-

-

-SERVEXTERN void

-_glapi_set_dispatch(struct _glapi_table *dispatch);

-

-

-SERVEXTERN struct _glapi_table *

-_glapi_get_dispatch(void);

-

-SERVEXTERN int

-_glapi_begin_dispatch_override(struct _glapi_table *override);

-

-SERVEXTERN void

-_glapi_end_dispatch_override(int layer);

-

-struct _glapi_table *

-_glapi_get_override_dispatch(int layer);

-

-SERVEXTERN GLuint

-_glapi_get_dispatch_table_size(void);

-

-

-SERVEXTERN int

-_glapi_add_dispatch( const char * const * function_names,

-		     const char * parameter_signature );

-

-_GLAPI_EXPORT _glapi_proc

-_glapi_get_proc_address(const char *funcName);

-

-#endif

+/*
+ * Mesa 3-D graphics library
+ * Version:  7.1
+ *
+ * Copyright (C) 1999-2008  Brian Paul   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.
+ */
+
+
+/**
+ * \mainpage Mesa GL API Module
+ *
+ * \section GLAPIIntroduction Introduction
+ *
+ * The Mesa GL API module is responsible for dispatching all the
+ * gl*() functions.  All GL functions are dispatched by jumping through
+ * the current dispatch table (basically a struct full of function
+ * pointers.)
+ *
+ * A per-thread current dispatch table and per-thread current context
+ * pointer are managed by this module too.
+ *
+ * This module is intended to be non-Mesa-specific so it can be used
+ * with the X/DRI libGL also.
+ */
+
+
+#ifndef _GLAPI_H
+#define _GLAPI_H
+
+#ifdef _GLAPI_NO_EXPORTS
+#  define _GLAPI_EXPORT
+#else /* _GLAPI_NO_EXPORTS */
+#  ifdef _WIN32
+#    ifdef _GLAPI_DLL_EXPORTS
+#      define _GLAPI_EXPORT __declspec(dllexport)
+#    else
+#      define _GLAPI_EXPORT __declspec(dllimport)
+#    endif
+#  elif defined(__GNUC__) || (defined(__SUNPRO_C) && (__SUNPRO_C >= 0x590))
+#    define _GLAPI_EXPORT __attribute__((visibility("default")))
+#  else
+#    define _GLAPI_EXPORT
+#  endif
+#endif /* _GLAPI_NO_EXPORTS */
+
+#include "GL/gl.h"
+#include "GL/glext.h"
+#include "glthread.h"
+
+
+struct _glapi_table;
+
+typedef void (*_glapi_proc)(void); /* generic function pointer */
+
+typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
+
+
+#if defined(USE_MGL_NAMESPACE)
+#define _glapi_set_dispatch _mglapi_set_dispatch
+#define _glapi_get_dispatch _mglapi_get_dispatch
+#define _glapi_set_context _mglapi_set_context
+#define _glapi_get_context _mglapi_get_context
+#define _glapi_Context _mglapi_Context
+#define _glapi_Dispatch _mglapi_Dispatch
+#endif
+
+
+/*
+ * Number of extension functions which we can dynamically add at runtime.
+ */
+#define MAX_EXTENSION_FUNCS 300
+
+
+/**
+ ** Define the GET_CURRENT_CONTEXT() macro.
+ ** \param C local variable which will hold the current context.
+ **/
+#if defined (GLX_USE_TLS)
+
+_GLAPI_EXPORT extern __thread struct _glapi_table * _glapi_tls_Dispatch;
+
+_GLAPI_EXPORT extern const void *_glapi_Context;
+_GLAPI_EXPORT extern const struct _glapi_table *_glapi_Dispatch;
+
+_GLAPI_EXPORT extern __thread void * _glapi_tls_Context;
+
+# define GET_DISPATCH() _glapi_tls_Dispatch
+# define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) _glapi_tls_Context
+
+#else
+
+#ifdef INSERVER
+#define SERVEXTERN _declspec(dllimport)
+#else
+#define SERVEXTERN _declspec(dllexport)
+#endif
+
+SERVEXTERN void *_glapi_Context;
+SERVEXTERN struct _glapi_table *_glapi_Dispatch;
+
+# ifdef THREADS
+
+#  define GET_DISPATCH() \
+     (likely(_glapi_Dispatch) ? _glapi_Dispatch : _glapi_get_dispatch())
+
+
+#  define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) \
+     (likely(_glapi_Context) ? _glapi_Context : _glapi_get_context())
+# else
+#  define GET_DISPATCH() _glapi_Dispatch
+#  define GET_CURRENT_CONTEXT(C)  struct gl_context *C = (struct gl_context *) _glapi_Context
+# endif
+
+#endif /* defined (GLX_USE_TLS) */
+
+
+/**
+ ** GL API public functions
+ **/
+
+SERVEXTERN void
+_glapi_check_multithread(void);
+
+
+SERVEXTERN void
+_glapi_set_context(void *context);
+
+
+SERVEXTERN void *
+_glapi_get_context(void);
+
+
+SERVEXTERN void
+_glapi_set_dispatch(struct _glapi_table *dispatch);
+
+
+SERVEXTERN struct _glapi_table *
+_glapi_get_dispatch(void);
+
+SERVEXTERN int
+_glapi_begin_dispatch_override(struct _glapi_table *override);
+
+SERVEXTERN void
+_glapi_end_dispatch_override(int layer);
+
+struct _glapi_table *
+_glapi_get_override_dispatch(int layer);
+
+SERVEXTERN GLuint
+_glapi_get_dispatch_table_size(void);
+
+
+SERVEXTERN int
+_glapi_add_dispatch( const char * const * function_names,
+		     const char * parameter_signature );
+
+_GLAPI_EXPORT _glapi_proc
+_glapi_get_proc_address(const char *funcName);
+
+#endif
+_GLAPI_EXPORT struct _glapi_table *
+_glapi_create_table_from_handle(void *handle, const char *symbol_prefix);
+
+