Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 207 insertions, 197 deletions

diff --git a/xorg-server/glx/singlesize.c b/xorg-server/glx/singlesize.c
index 85fa9871c..4f564404a 100644
--- a/xorg-server/glx/singlesize.c
+++ b/xorg-server/glx/singlesize.c
@@ -1,197 +1,207 @@
-/*

- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

- * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and

- * either this permission notice or a reference to

- * http://oss.sgi.com/projects/FreeB/

- * 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

- * SILICON GRAPHICS, INC. 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 of Silicon Graphics, Inc.

- * shall not be used in advertising or otherwise to promote the sale, use or

- * other dealings in this Software without prior written authorization from

- * Silicon Graphics, Inc.

- */

-

-#ifdef HAVE_DIX_CONFIG_H

-#include <dix-config.h>

-#else

-

-#include "glheader.h"

-

-#endif

-

-#include <GL/gl.h>

-#include "glxserver.h"

-#include "singlesize.h"

-#include "indirect_size_get.h"

-#include "glapitable.h"

-#include "glapi.h"

-#include "glthread.h"

-#include "dispatch.h"

-

-/*

-** These routines compute the size of variable-size returned parameters.

-** Unlike the similar routines that do the same thing for variable-size

-** incoming parameters, the samplegl library itself doesn't use these routines.

-** Hence, they are located here, in the GLX extension library.

-*/

-

-GLint __glReadPixels_size(GLenum format, GLenum type, GLint w, GLint h)

-{

-    return __glXImageSize( format, type, 0, w, h, 1, 0, 0, 0, 0, 4 );

-}

-

-GLint __glGetMap_size(GLenum target, GLenum query)

-{

-    GLint k, order=0, majorMinor[2];

-

-    /*

-    ** Assume target and query are both valid.

-    */

-    switch (target) {

-      case GL_MAP1_COLOR_4:

-      case GL_MAP1_NORMAL:

-      case GL_MAP1_INDEX:

-      case GL_MAP1_TEXTURE_COORD_1:

-      case GL_MAP1_TEXTURE_COORD_2:

-      case GL_MAP1_TEXTURE_COORD_3:

-      case GL_MAP1_TEXTURE_COORD_4:

-      case GL_MAP1_VERTEX_3:

-      case GL_MAP1_VERTEX_4:

-	switch (query) {

-	  case GL_COEFF:

-	    k = __glMap1d_size(target);

-	    CALL_GetMapiv( GET_DISPATCH(), (target, GL_ORDER, &order) );

-	    /*

-	    ** The query above might fail, but then order will be zero anyway.

-	    */

-	    return order * k;

-	  case GL_DOMAIN:

-	    return 2;

-	  case GL_ORDER:

-	    return 1;

-	}

-	break;

-      case GL_MAP2_COLOR_4:

-      case GL_MAP2_NORMAL:

-      case GL_MAP2_INDEX:

-      case GL_MAP2_TEXTURE_COORD_1:

-      case GL_MAP2_TEXTURE_COORD_2:

-      case GL_MAP2_TEXTURE_COORD_3:

-      case GL_MAP2_TEXTURE_COORD_4:

-      case GL_MAP2_VERTEX_3:

-      case GL_MAP2_VERTEX_4:

-	switch (query) {

-	  case GL_COEFF:

-	    k = __glMap2d_size(target);

-	    majorMinor[0] = majorMinor[1] = 0;

-	    CALL_GetMapiv( GET_DISPATCH(), (target, GL_ORDER, majorMinor) );

-	    /*

-	    ** The query above might fail, but then majorMinor will be zeroes

-	    */

-	    return majorMinor[0] * majorMinor[1] * k;

-	  case GL_DOMAIN:

-	    return 4;

-	  case GL_ORDER:

-	    return 2;

-	}

-	break;

-    }

-    return -1;

-}

-

-GLint __glGetMapdv_size(GLenum target, GLenum query)

-{

-    return __glGetMap_size(target, query);

-}

-

-GLint __glGetMapfv_size(GLenum target, GLenum query)

-{

-    return __glGetMap_size(target, query);

-}

-

-GLint __glGetMapiv_size(GLenum target, GLenum query)

-{

-    return __glGetMap_size(target, query);

-}

-

-GLint __glGetPixelMap_size(GLenum map)

-{

-    GLint size;

-    GLenum query;

-

-    switch (map) {

-      case GL_PIXEL_MAP_I_TO_I:

-	query = GL_PIXEL_MAP_I_TO_I_SIZE;

-	break;

-      case GL_PIXEL_MAP_S_TO_S:

-	query = GL_PIXEL_MAP_S_TO_S_SIZE;

-	break;

-      case GL_PIXEL_MAP_I_TO_R:

-	query = GL_PIXEL_MAP_I_TO_R_SIZE;

-	break;

-      case GL_PIXEL_MAP_I_TO_G:

-	query = GL_PIXEL_MAP_I_TO_G_SIZE;

-	break;

-      case GL_PIXEL_MAP_I_TO_B:

-	query = GL_PIXEL_MAP_I_TO_B_SIZE;

-	break;

-      case GL_PIXEL_MAP_I_TO_A:

-	query = GL_PIXEL_MAP_I_TO_A_SIZE;

-	break;

-      case GL_PIXEL_MAP_R_TO_R:

-	query = GL_PIXEL_MAP_R_TO_R_SIZE;

-	break;

-      case GL_PIXEL_MAP_G_TO_G:

-	query = GL_PIXEL_MAP_G_TO_G_SIZE;

-	break;

-      case GL_PIXEL_MAP_B_TO_B:

-	query = GL_PIXEL_MAP_B_TO_B_SIZE;

-	break;

-      case GL_PIXEL_MAP_A_TO_A:

-	query = GL_PIXEL_MAP_A_TO_A_SIZE;

-	break;

-      default:

-	return -1;

-    }

-    CALL_GetIntegerv( GET_DISPATCH(), (query, &size) );

-    return size;

-}

-

-GLint __glGetPixelMapfv_size(GLenum map)

-{

-    return __glGetPixelMap_size(map);

-}

-

-GLint __glGetPixelMapuiv_size(GLenum map)

-{

-    return __glGetPixelMap_size(map);

-}

-

-GLint __glGetPixelMapusv_size(GLenum map)

-{

-    return __glGetPixelMap_size(map);

-}

-

-GLint __glGetTexImage_size(GLenum target, GLint level, GLenum format,

-			   GLenum type, GLint width, GLint height, GLint depth)

-{

-    return __glXImageSize( format, type, target, width, height, depth,

-			   0, 0, 0, 0, 4 );

-}

+/*
+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
+ * Copyright (C) 1991-2000 Silicon Graphics, 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 including the dates of first publication and
+ * either this permission notice or a reference to
+ * http://oss.sgi.com/projects/FreeB/
+ * 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
+ * SILICON GRAPHICS, INC. 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 of Silicon Graphics, Inc.
+ * shall not be used in advertising or otherwise to promote the sale, use or
+ * other dealings in this Software without prior written authorization from
+ * Silicon Graphics, Inc.
+ */
+
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#else
+
+#include "glheader.h"
+
+#endif
+
+#include <GL/gl.h>
+#include "glxserver.h"
+#include "singlesize.h"
+#include "indirect_size_get.h"
+#include "glapitable.h"
+#include "glapi.h"
+#include "glthread.h"
+#include "dispatch.h"
+
+/*
+** These routines compute the size of variable-size returned parameters.
+** Unlike the similar routines that do the same thing for variable-size
+** incoming parameters, the samplegl library itself doesn't use these routines.
+** Hence, they are located here, in the GLX extension library.
+*/
+
+GLint
+__glReadPixels_size(GLenum format, GLenum type, GLint w, GLint h)
+{
+    return __glXImageSize(format, type, 0, w, h, 1, 0, 0, 0, 0, 4);
+}
+
+GLint
+__glGetMap_size(GLenum target, GLenum query)
+{
+    GLint k, order = 0, majorMinor[2];
+
+    /*
+     ** Assume target and query are both valid.
+     */
+    switch (target) {
+    case GL_MAP1_COLOR_4:
+    case GL_MAP1_NORMAL:
+    case GL_MAP1_INDEX:
+    case GL_MAP1_TEXTURE_COORD_1:
+    case GL_MAP1_TEXTURE_COORD_2:
+    case GL_MAP1_TEXTURE_COORD_3:
+    case GL_MAP1_TEXTURE_COORD_4:
+    case GL_MAP1_VERTEX_3:
+    case GL_MAP1_VERTEX_4:
+        switch (query) {
+        case GL_COEFF:
+            k = __glMap1d_size(target);
+            CALL_GetMapiv(GET_DISPATCH(), (target, GL_ORDER, &order));
+            /*
+             ** The query above might fail, but then order will be zero anyway.
+             */
+            return order * k;
+        case GL_DOMAIN:
+            return 2;
+        case GL_ORDER:
+            return 1;
+        }
+        break;
+    case GL_MAP2_COLOR_4:
+    case GL_MAP2_NORMAL:
+    case GL_MAP2_INDEX:
+    case GL_MAP2_TEXTURE_COORD_1:
+    case GL_MAP2_TEXTURE_COORD_2:
+    case GL_MAP2_TEXTURE_COORD_3:
+    case GL_MAP2_TEXTURE_COORD_4:
+    case GL_MAP2_VERTEX_3:
+    case GL_MAP2_VERTEX_4:
+        switch (query) {
+        case GL_COEFF:
+            k = __glMap2d_size(target);
+            majorMinor[0] = majorMinor[1] = 0;
+            CALL_GetMapiv(GET_DISPATCH(), (target, GL_ORDER, majorMinor));
+            /*
+             ** The query above might fail, but then majorMinor will be zeroes
+             */
+            return majorMinor[0] * majorMinor[1] * k;
+        case GL_DOMAIN:
+            return 4;
+        case GL_ORDER:
+            return 2;
+        }
+        break;
+    }
+    return -1;
+}
+
+GLint
+__glGetMapdv_size(GLenum target, GLenum query)
+{
+    return __glGetMap_size(target, query);
+}
+
+GLint
+__glGetMapfv_size(GLenum target, GLenum query)
+{
+    return __glGetMap_size(target, query);
+}
+
+GLint
+__glGetMapiv_size(GLenum target, GLenum query)
+{
+    return __glGetMap_size(target, query);
+}
+
+GLint
+__glGetPixelMap_size(GLenum map)
+{
+    GLint size;
+    GLenum query;
+
+    switch (map) {
+    case GL_PIXEL_MAP_I_TO_I:
+        query = GL_PIXEL_MAP_I_TO_I_SIZE;
+        break;
+    case GL_PIXEL_MAP_S_TO_S:
+        query = GL_PIXEL_MAP_S_TO_S_SIZE;
+        break;
+    case GL_PIXEL_MAP_I_TO_R:
+        query = GL_PIXEL_MAP_I_TO_R_SIZE;
+        break;
+    case GL_PIXEL_MAP_I_TO_G:
+        query = GL_PIXEL_MAP_I_TO_G_SIZE;
+        break;
+    case GL_PIXEL_MAP_I_TO_B:
+        query = GL_PIXEL_MAP_I_TO_B_SIZE;
+        break;
+    case GL_PIXEL_MAP_I_TO_A:
+        query = GL_PIXEL_MAP_I_TO_A_SIZE;
+        break;
+    case GL_PIXEL_MAP_R_TO_R:
+        query = GL_PIXEL_MAP_R_TO_R_SIZE;
+        break;
+    case GL_PIXEL_MAP_G_TO_G:
+        query = GL_PIXEL_MAP_G_TO_G_SIZE;
+        break;
+    case GL_PIXEL_MAP_B_TO_B:
+        query = GL_PIXEL_MAP_B_TO_B_SIZE;
+        break;
+    case GL_PIXEL_MAP_A_TO_A:
+        query = GL_PIXEL_MAP_A_TO_A_SIZE;
+        break;
+    default:
+        return -1;
+    }
+    CALL_GetIntegerv(GET_DISPATCH(), (query, &size));
+    return size;
+}
+
+GLint
+__glGetPixelMapfv_size(GLenum map)
+{
+    return __glGetPixelMap_size(map);
+}
+
+GLint
+__glGetPixelMapuiv_size(GLenum map)
+{
+    return __glGetPixelMap_size(map);
+}
+
+GLint
+__glGetPixelMapusv_size(GLenum map)
+{
+    return __glGetPixelMap_size(map);
+}
+
+GLint
+__glGetTexImage_size(GLenum target, GLint level, GLenum format,
+                     GLenum type, GLint width, GLint height, GLint depth)
+{
+    return __glXImageSize(format, type, target, width, height, depth,
+                          0, 0, 0, 0, 4);
+}