svn merge ^/branches/released .

7 files changed, 18 insertions, 127 deletions

diff --git a/X11/Xlibint.h b/X11/Xlibint.h
index 2bd83a357..78d459e6d 100644
--- a/X11/Xlibint.h
+++ b/X11/Xlibint.h
@@ -336,7 +336,7 @@ extern LockInfoPtr _Xglobal_lock;
  * define MALLOC_0_RETURNS_NULL.  This is necessary because some

  * Xlib code expects malloc(0) to return a valid pointer to storage.

  */

-#ifdef MALLOC_0_RETURNS_NULL

+#if defined(MALLOC_0_RETURNS_NULL) || defined(__clang_analyzer__)

 

 # define Xmalloc(size) malloc(((size) == 0 ? 1 : (size)))

 # define Xrealloc(ptr, size) realloc((ptr), ((size) == 0 ? 1 : (size)))

diff --git a/gl/configure.ac b/gl/configure.ac
index d88e6dff8..d2b574371 100644
--- a/gl/configure.ac
+++ b/gl/configure.ac
@@ -1,13 +1,13 @@
-AC_PREREQ([2.60])
-AC_INIT([GLProto], [1.4.12], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
-
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION],
-          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
-XORG_DEFAULT_OPTIONS
-
-AC_OUTPUT([Makefile
-           glproto.pc])
+AC_PREREQ([2.60])

+AC_INIT([GLProto], [1.4.13], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])

+AM_INIT_AUTOMAKE([foreign dist-bzip2])

+AM_MAINTAINER_MODE

+

+# Require xorg-macros: XORG_DEFAULT_OPTIONS

+m4_ifndef([XORG_MACROS_VERSION],

+          [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])

+XORG_MACROS_VERSION(1.3)

+XORG_DEFAULT_OPTIONS

+

+AC_OUTPUT([Makefile

+           glproto.pc])

diff --git a/gl/glxproto.h b/gl/glxproto.h
index ee8f2c258..06678c335 100644
--- a/gl/glxproto.h
+++ b/gl/glxproto.h
@@ -1375,13 +1375,13 @@ typedef struct {
     BYTE pad;

     CARD16 sequenceNumber B16;

     CARD16 event_type B16;

+    CARD16 pad2;

     CARD32 drawable;

     CARD32 ust_hi B32;

     CARD32 ust_lo B32;

     CARD32 msc_hi B32;

     CARD32 msc_lo B32;

-    CARD32 sbc_hi B32;

-    CARD32 sbc_lo B32;

+    CARD32 sbc B32;

 } xGLXBufferSwapComplete;

 

 /************************************************************************/

diff --git a/libX11/include/X11/Xlibint.h b/libX11/include/X11/Xlibint.h
index 2bd83a357..78d459e6d 100644
--- a/libX11/include/X11/Xlibint.h
+++ b/libX11/include/X11/Xlibint.h
@@ -336,7 +336,7 @@ extern LockInfoPtr _Xglobal_lock;
  * define MALLOC_0_RETURNS_NULL.  This is necessary because some

  * Xlib code expects malloc(0) to return a valid pointer to storage.

  */

-#ifdef MALLOC_0_RETURNS_NULL

+#if defined(MALLOC_0_RETURNS_NULL) || defined(__clang_analyzer__)

 

 # define Xmalloc(size) malloc(((size) == 0 ? 1 : (size)))

 # define Xrealloc(ptr, size) realloc((ptr), ((size) == 0 ? 1 : (size)))

diff --git a/mesalib/src/glsl/ast_function.cpp b/mesalib/src/glsl/ast_function.cpp
index 4ac9dbbe5..fbda41294 100644
--- a/mesalib/src/glsl/ast_function.cpp
+++ b/mesalib/src/glsl/ast_function.cpp
@@ -238,7 +238,7 @@ match_function_by_name(exec_list *instructions, const char *name,
 	    ir_function_signature *sig = (ir_function_signature *) node;

 

 	    str = prototype_string(sig->return_type, f->name, &sig->parameters);

-	    _mesa_glsl_error(loc, state, "%s%s\n", prefix, str);

+	    _mesa_glsl_error(loc, state, "%s%s", prefix, str);

 	    ralloc_free(str);

 

 	    prefix = "                ";

diff --git a/mesalib/src/mesa/main/restart.c b/mesalib/src/mesa/main/restart.c
deleted file mode 100644
index ff366496f..000000000
--- a/mesalib/src/mesa/main/restart.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.9
- *
- * Copyright (C) 2010  VMware, 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 THE AUTHORS OR COPYRIGHT
- * HOLDERS 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.
- */
-
-
-#include "glheader.h"
-#include "imports.h"
-#include "context.h"
-#include "restart.h"
-
-
-/**
- */
-void GLAPIENTRY
-_mesa_PrimitiveRestart(void)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glPrimitiveRestart()");
-      return;
-   }
-
-   /* XXX call into vbo module */
-}
-
-
-
-/**
- */
-void GLAPIENTRY
-_mesa_PrimitiveRestartIndex(GLuint index)
-{
-   GET_CURRENT_CONTEXT(ctx);
-
-   if (ctx->VersionMajor * 10 + ctx->VersionMinor < 31) {
-      _mesa_error(ctx, GL_INVALID_OPERATION, "glPrimitiveRestartIndex()");
-      return;
-   }
-
-   ASSERT_OUTSIDE_BEGIN_END_AND_FLUSH(ctx);
-
-   FLUSH_VERTICES(ctx, _NEW_TRANSFORM);
-
-   ctx->Array.RestartIndex = index;
-}
diff --git a/mesalib/src/mesa/main/restart.h b/mesalib/src/mesa/main/restart.h
deleted file mode 100644
index 25f58f24c..000000000
--- a/mesalib/src/mesa/main/restart.h
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Mesa 3-D graphics library
- * Version:  7.9
- *
- * Copyright (C) 2010  VMware, 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 THE AUTHORS OR COPYRIGHT
- * HOLDERS 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 RESTART_H
-#define RESTART_H
-
-#include "glheader.h"
-
-extern void GLAPIENTRY
-_mesa_PrimitiveRestart(void);
-
-
-extern void GLAPIENTRY
-_mesa_PrimitiveRestartIndex(GLuint index);
-
-
-#endif