libX11 xserver mesa git update 20 June 2011

9 files changed, 1179 insertions, 1172 deletions

diff --git a/mesalib/src/gallium/auxiliary/util/u_debug.c b/mesalib/src/gallium/auxiliary/util/u_debug.c
index 79b1fb3c1..004df439f 100644
--- a/mesalib/src/gallium/auxiliary/util/u_debug.c
+++ b/mesalib/src/gallium/auxiliary/util/u_debug.c
@@ -1,744 +1,744 @@
-/**************************************************************************

- * 

- * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.

- * Copyright (c) 2008 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, sub license, 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 (including the

- * next paragraph) 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 NON-INFRINGEMENT.

- * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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 "pipe/p_config.h" 

-

-#include "pipe/p_compiler.h"

-#include "os/os_stream.h"

-#include "util/u_debug.h" 

-#include "pipe/p_format.h" 

-#include "pipe/p_state.h" 

-#include "util/u_inlines.h" 

-#include "util/u_format.h"

-#include "util/u_memory.h" 

-#include "util/u_string.h" 

-#include "util/u_math.h" 

-#include "util/u_tile.h" 

-#include "util/u_prim.h"

-#include "util/u_surface.h"

-

-#include <limits.h> /* CHAR_BIT */

-#include <ctype.h> /* isalnum */

-

-void _debug_vprintf(const char *format, va_list ap)

-{

-#if defined(PIPE_OS_WINDOWS) || defined(PIPE_OS_EMBEDDED)

-   /* We buffer until we find a newline. */

-   static char buf[4096] = {'\0'};

-   size_t len = strlen(buf);

-   int ret = util_vsnprintf(buf + len, sizeof(buf) - len, format, ap);

-   if(ret > (int)(sizeof(buf) - len - 1) || util_strchr(buf + len, '\n')) {

-      os_log_message(buf);

-      buf[0] = '\0';

-   }

-#else

-   /* Just print as-is to stderr */

-   vfprintf(stderr, format, ap);

-#endif

-}

-

-

-#ifdef DEBUG

-void debug_print_blob( const char *name,

-                       const void *blob,

-                       unsigned size )

-{

-   const unsigned *ublob = (const unsigned *)blob;

-   unsigned i;

-

-   debug_printf("%s (%d dwords%s)\n", name, size/4,

-                size%4 ? "... plus a few bytes" : "");

-

-   for (i = 0; i < size/4; i++) {

-      debug_printf("%d:\t%08x\n", i, ublob[i]);

-   }

-}

-#endif

-

-

-static boolean

-debug_get_option_should_print(void)

-{

-   static boolean first = TRUE;

-   static boolean value = FALSE;

-

-   if (!first)

-      return value;

-

-   /* Oh hey this will call into this function,

-    * but its cool since we set first to false

-    */

-   first = FALSE;

-   value = debug_get_bool_option("GALLIUM_PRINT_OPTIONS", FALSE);

-   /* XXX should we print this option? Currently it wont */

-   return value;

-}

-

-const char *

-debug_get_option(const char *name, const char *dfault)

-{

-   const char *result;

-

-   result = os_get_option(name);

-   if(!result)

-      result = dfault;

-

-   if (debug_get_option_should_print())

-      debug_printf("%s: %s = %s\n", __FUNCTION__, name, result ? result : "(null)");

-   

-   return result;

-}

-

-boolean

-debug_get_bool_option(const char *name, boolean dfault)

-{

-   const char *str = os_get_option(name);

-   boolean result;

-   

-   if(str == NULL)

-      result = dfault;

-   else if(!util_strcmp(str, "n"))

-      result = FALSE;

-   else if(!util_strcmp(str, "no"))

-      result = FALSE;

-   else if(!util_strcmp(str, "0"))

-      result = FALSE;

-   else if(!util_strcmp(str, "f"))

-      result = FALSE;

-   else if(!util_strcmp(str, "F"))

-      result = FALSE;

-   else if(!util_strcmp(str, "false"))

-      result = FALSE;

-   else if(!util_strcmp(str, "FALSE"))

-      result = FALSE;

-   else

-      result = TRUE;

-

-   if (debug_get_option_should_print())

-      debug_printf("%s: %s = %s\n", __FUNCTION__, name, result ? "TRUE" : "FALSE");

-   

-   return result;

-}

-

-

-long

-debug_get_num_option(const char *name, long dfault)

-{

-   long result;

-   const char *str;

-   

-   str = os_get_option(name);

-   if(!str)

-      result = dfault;

-   else {

-      long sign;

-      char c;

-      c = *str++;

-      if(c == '-') {

-	 sign = -1;

-	 c = *str++;

-      } 

-      else {

-	 sign = 1;

-      }

-      result = 0;

-      while('0' <= c && c <= '9') {

-	 result = result*10 + (c - '0');

-	 c = *str++;

-      }

-      result *= sign;

-   }

-

-   if (debug_get_option_should_print())

-      debug_printf("%s: %s = %li\n", __FUNCTION__, name, result);

-

-   return result;

-}

-

-static boolean str_has_option(const char *str, const char *name)

-{

-   /* Empty string. */

-   if (!*str) {

-      return FALSE;

-   }

-

-   /* OPTION=all */

-   if (!util_strcmp(str, "all")) {

-      return TRUE;

-   }

-

-   /* Find 'name' in 'str' surrounded by non-alphanumeric characters. */

-   {

-      const char *start = str;

-      unsigned name_len = strlen(name);

-

-      /* 'start' is the beginning of the currently-parsed word,

-       * we increment 'str' each iteration.

-       * if we find either the end of string or a non-alphanumeric character,

-       * we compare 'start' up to 'str-1' with 'name'. */

-

-      while (1) {

-         if (!*str || !isalnum(*str)) {

-            if (str-start == name_len &&

-                !memcmp(start, name, name_len)) {

-               return TRUE;

-            }

-

-            if (!*str) {

-               return FALSE;

-            }

-

-            start = str+1;

-         }

-

-         str++;

-      }

-   }

-

-   return FALSE;

-}

-

-unsigned long

-debug_get_flags_option(const char *name, 

-                       const struct debug_named_value *flags,

-                       unsigned long dfault)

-{

-   unsigned long result;

-   const char *str;

-   const struct debug_named_value *orig = flags;

-   int namealign = 0;

-   

-   str = os_get_option(name);

-   if(!str)

-      result = dfault;

-   else if (!util_strcmp(str, "help")) {

-      result = dfault;

-      _debug_printf("%s: help for %s:\n", __FUNCTION__, name);

-      for (; flags->name; ++flags)

-         namealign = MAX2(namealign, strlen(flags->name));

-      for (flags = orig; flags->name; ++flags)

-         _debug_printf("| %*s [0x%0*lx]%s%s\n", namealign, flags->name,

-                      (int)sizeof(unsigned long)*CHAR_BIT/4, flags->value,

-                      flags->desc ? " " : "", flags->desc ? flags->desc : "");

-   }

-   else {

-      result = 0;

-      while( flags->name ) {

-	 if (str_has_option(str, flags->name))

-	    result |= flags->value;

-	 ++flags;

-      }

-   }

-

-   if (debug_get_option_should_print()) {

-      if (str) {

-         debug_printf("%s: %s = 0x%lx (%s)\n", __FUNCTION__, name, result, str);

-      } else {

-         debug_printf("%s: %s = 0x%lx\n", __FUNCTION__, name, result);

-      }

-   }

-

-   return result;

-}

-

-

-void _debug_assert_fail(const char *expr, 

-                        const char *file, 

-                        unsigned line, 

-                        const char *function) 

-{

-   _debug_printf("%s:%u:%s: Assertion `%s' failed.\n", file, line, function, expr);

-#if defined(PIPE_OS_WINDOWS) && !defined(PIPE_SUBSYSTEM_WINDOWS_USER)

-   if (debug_get_bool_option("GALLIUM_ABORT_ON_ASSERT", FALSE))

-#else

-   if (debug_get_bool_option("GALLIUM_ABORT_ON_ASSERT", TRUE))

-#endif

-      os_abort();

-   else

-      _debug_printf("continuing...\n");

-}

-

-

-const char *

-debug_dump_enum(const struct debug_named_value *names, 

-                unsigned long value)

-{

-   static char rest[64];

-   

-   while(names->name) {

-      if(names->value == value)

-	 return names->name;

-      ++names;

-   }

-

-   util_snprintf(rest, sizeof(rest), "0x%08lx", value);

-   return rest;

-}

-

-

-const char *

-debug_dump_enum_noprefix(const struct debug_named_value *names, 

-                         const char *prefix,

-                         unsigned long value)

-{

-   static char rest[64];

-   

-   while(names->name) {

-      if(names->value == value) {

-         const char *name = names->name;

-         while (*name == *prefix) {

-            name++;

-            prefix++;

-         }

-         return name;

-      }

-      ++names;

-   }

-

-   

-

-   util_snprintf(rest, sizeof(rest), "0x%08lx", value);

-   return rest;

-}

-

-

-const char *

-debug_dump_flags(const struct debug_named_value *names, 

-                 unsigned long value)

-{

-   static char output[4096];

-   static char rest[256];

-   int first = 1;

-

-   output[0] = '\0';

-

-   while(names->name) {

-      if((names->value & value) == names->value) {

-	 if (!first)

-	    util_strncat(output, "|", sizeof(output));

-	 else

-	    first = 0;

-	 util_strncat(output, names->name, sizeof(output) - 1);

-	 output[sizeof(output) - 1] = '\0';

-	 value &= ~names->value;

-      }

-      ++names;

-   }

-   

-   if (value) {

-      if (!first)

-	 util_strncat(output, "|", sizeof(output));

-      else

-	 first = 0;

-      

-      util_snprintf(rest, sizeof(rest), "0x%08lx", value);

-      util_strncat(output, rest, sizeof(output) - 1);

-      output[sizeof(output) - 1] = '\0';

-   }

-   

-   if(first)

-      return "0";

-   

-   return output;

-}

-

-

-#ifdef DEBUG

-void debug_print_format(const char *msg, unsigned fmt )

-{

-   debug_printf("%s: %s\n", msg, util_format_name(fmt));

-}

-#endif

-

-

-

-static const struct debug_named_value pipe_prim_names[] = {

-#ifdef DEBUG

-   DEBUG_NAMED_VALUE(PIPE_PRIM_POINTS),

-   DEBUG_NAMED_VALUE(PIPE_PRIM_LINES),

-   DEBUG_NAMED_VALUE(PIPE_PRIM_LINE_LOOP),

-   DEBUG_NAMED_VALUE(PIPE_PRIM_LINE_STRIP),

-   DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLES),

-   DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLE_STRIP),

-   DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLE_FAN),

-   DEBUG_NAMED_VALUE(PIPE_PRIM_QUADS),

-   DEBUG_NAMED_VALUE(PIPE_PRIM_QUAD_STRIP),

-   DEBUG_NAMED_VALUE(PIPE_PRIM_POLYGON),

-#endif

-   DEBUG_NAMED_VALUE_END

-};

-

-

-const char *u_prim_name( unsigned prim )

-{

-   return debug_dump_enum(pipe_prim_names, prim);

-}

-

-

-

-#ifdef DEBUG

-int fl_indent = 0;

-const char* fl_function[1024];

-

-int debug_funclog_enter(const char* f, const int line, const char* file)

-{

-   int i;

-

-   for (i = 0; i < fl_indent; i++)

-      debug_printf("  ");

-   debug_printf("%s\n", f);

-

-   assert(fl_indent < 1023);

-   fl_function[fl_indent++] = f;

-

-   return 0;

-}

-

-void debug_funclog_exit(const char* f, const int line, const char* file)

-{

-   --fl_indent;

-   assert(fl_indent >= 0);

-   assert(fl_function[fl_indent] == f);

-}

-

-void debug_funclog_enter_exit(const char* f, const int line, const char* file)

-{

-   int i;

-   for (i = 0; i < fl_indent; i++)

-      debug_printf("  ");

-   debug_printf("%s\n", f);

-}

-#endif

-

-

-

-#ifdef DEBUG

-/**

- * Dump an image to a .raw or .ppm file (depends on OS).

- * \param format  PIPE_FORMAT_x

- * \param cpp  bytes per pixel

- * \param width  width in pixels

- * \param height height in pixels

- * \param stride  row stride in bytes

- */

-void debug_dump_image(const char *prefix,

-                      unsigned format, unsigned cpp,

-                      unsigned width, unsigned height,

-                      unsigned stride,

-                      const void *data)     

-{

-#ifdef PIPE_SUBSYSTEM_WINDOWS_DISPLAY

-   static unsigned no = 0; 

-   char filename[256];

-   WCHAR wfilename[sizeof(filename)];

-   ULONG_PTR iFile = 0;

-   struct {

-      unsigned format;

-      unsigned cpp;

-      unsigned width;

-      unsigned height;

-   } header;

-   unsigned char *pMap = NULL;

-   unsigned i;

-

-   util_snprintf(filename, sizeof(filename), "\\??\\c:\\%03u%s.raw", ++no, prefix);

-   for(i = 0; i < sizeof(filename); ++i)

-      wfilename[i] = (WCHAR)filename[i];

-   

-   pMap = (unsigned char *)EngMapFile(wfilename, sizeof(header) + height*width*cpp, &iFile);

-   if(!pMap)

-      return;

-   

-   header.format = format;

-   header.cpp = cpp;

-   header.width = width;

-   header.height = height;

-   memcpy(pMap, &header, sizeof(header));

-   pMap += sizeof(header);

-   

-   for(i = 0; i < height; ++i) {

-      memcpy(pMap, (unsigned char *)data + stride*i, cpp*width);

-      pMap += cpp*width;

-   }

-      

-   EngUnmapFile(iFile);

-#elif defined(PIPE_OS_UNIX)

-   /* write a ppm file */

-   char filename[256];

-   FILE *f;

-

-   util_snprintf(filename, sizeof(filename), "%s.ppm", prefix);

-

-   f = fopen(filename, "w");

-   if (f) {

-      int i, x, y;

-      int r, g, b;

-      const uint8_t *ptr = (uint8_t *) data;

-

-      /* XXX this is a hack */

-      switch (format) {

-      case PIPE_FORMAT_B8G8R8A8_UNORM:

-         r = 2;

-         g = 1;

-         b = 0;

-         break;

-      default:

-         r = 0;

-         g = 1;

-         b = 1;

-      }

-

-      fprintf(f, "P6\n");

-      fprintf(f, "# ppm-file created by osdemo.c\n");

-      fprintf(f, "%i %i\n", width, height);

-      fprintf(f, "255\n");

-      fclose(f);

-

-      f = fopen(filename, "ab");  /* reopen in binary append mode */

-      for (y = 0; y < height; y++) {

-         for (x = 0; x < width; x++) {

-            i = y * stride + x * cpp;

-            fputc(ptr[i + r], f); /* write red */

-            fputc(ptr[i + g], f); /* write green */

-            fputc(ptr[i + b], f); /* write blue */

-         }

-      }

-      fclose(f);

-   }

-   else {

-      fprintf(stderr, "Can't open %s for writing\n", filename);

-   }

-#endif

-}

-

-/* FIXME: dump resources, not surfaces... */

-void debug_dump_surface(struct pipe_context *pipe,

-                        const char *prefix,

-                        struct pipe_surface *surface)

-{

-   struct pipe_resource *texture;

-   struct pipe_transfer *transfer;

-   void *data;

-

-   if (!surface)

-      return;

-

-   /* XXX: this doesn't necessarily work, as the driver may be using

-    * temporary storage for the surface which hasn't been propagated

-    * back into the texture.  Need to nail down the semantics of views

-    * and transfers a bit better before we can say if extra work needs

-    * to be done here:

-    */

-   texture = surface->texture;

-

-   transfer = pipe_get_transfer(pipe, texture, surface->u.tex.level,

-                                surface->u.tex.first_layer,

-                                PIPE_TRANSFER_READ,

-                                0, 0, surface->width, surface->height);

-

-   data = pipe->transfer_map(pipe, transfer);

-   if(!data)

-      goto error;

-

-   debug_dump_image(prefix,

-                    texture->format,

-                    util_format_get_blocksize(texture->format),

-                    util_format_get_nblocksx(texture->format, surface->width),

-                    util_format_get_nblocksy(texture->format, surface->height),

-                    transfer->stride,

-                    data);

-

-   pipe->transfer_unmap(pipe, transfer);

-error:

-   pipe->transfer_destroy(pipe, transfer);

-}

-

-

-void debug_dump_texture(struct pipe_context *pipe,

-                        const char *prefix,

-                        struct pipe_resource *texture)

-{

-   struct pipe_surface *surface, surf_tmpl;

-

-   if (!texture)

-      return;

-

-   /* XXX for now, just dump image for layer=0, level=0 */

-   memset(&surf_tmpl, 0, sizeof(surf_tmpl));

-   u_surface_default_template(&surf_tmpl, texture, 0 /* no bind flag - not a surface */);

-   surface = pipe->create_surface(pipe, texture, &surf_tmpl);

-   if (surface) {

-      debug_dump_surface(pipe, prefix, surface);

-      pipe->surface_destroy(pipe, surface);

-   }

-}

-

-

-#pragma pack(push,2)

-struct bmp_file_header {

-   uint16_t bfType;

-   uint32_t bfSize;

-   uint16_t bfReserved1;

-   uint16_t bfReserved2;

-   uint32_t bfOffBits;

-};

-#pragma pack(pop)

-

-struct bmp_info_header {

-   uint32_t biSize;

-   int32_t biWidth;

-   int32_t biHeight;

-   uint16_t biPlanes;

-   uint16_t biBitCount;

-   uint32_t biCompression;

-   uint32_t biSizeImage;

-   int32_t biXPelsPerMeter;

-   int32_t biYPelsPerMeter;

-   uint32_t biClrUsed;

-   uint32_t biClrImportant;

-};

-

-struct bmp_rgb_quad {

-   uint8_t rgbBlue;

-   uint8_t rgbGreen;

-   uint8_t rgbRed;

-   uint8_t rgbAlpha;

-};

-

-void

-debug_dump_surface_bmp(struct pipe_context *pipe,

-                       const char *filename,

-                       struct pipe_surface *surface)

-{

-#ifndef PIPE_SUBSYSTEM_WINDOWS_MINIPORT

-   struct pipe_transfer *transfer;

-   struct pipe_resource *texture = surface->texture;

-

-   transfer = pipe_get_transfer(pipe, texture, surface->u.tex.level,

-                                surface->u.tex.first_layer, PIPE_TRANSFER_READ,

-                                0, 0, surface->width, surface->height);

-

-   debug_dump_transfer_bmp(pipe, filename, transfer);

-

-   pipe->transfer_destroy(pipe, transfer);

-#endif

-}

-

-void

-debug_dump_transfer_bmp(struct pipe_context *pipe,

-                        const char *filename,

-                        struct pipe_transfer *transfer)

-{

-#ifndef PIPE_SUBSYSTEM_WINDOWS_MINIPORT

-   float *rgba;

-

-   if (!transfer)

-      goto error1;

-

-   rgba = MALLOC(transfer->box.width *

-		 transfer->box.height *

-		 transfer->box.depth *

-		 4*sizeof(float));

-   if(!rgba)

-      goto error1;

-

-   pipe_get_tile_rgba(pipe, transfer, 0, 0,

-                      transfer->box.width, transfer->box.height,

-                      rgba);

-

-   debug_dump_float_rgba_bmp(filename,

-                             transfer->box.width, transfer->box.height,

-                             rgba, transfer->box.width);

-

-   FREE(rgba);

-error1:

-   ;

-#endif

-}

-

-void

-debug_dump_float_rgba_bmp(const char *filename,

-                          unsigned width, unsigned height,

-                          float *rgba, unsigned stride)

-{

-#ifndef PIPE_SUBSYSTEM_WINDOWS_MINIPORT

-   struct os_stream *stream;

-   struct bmp_file_header bmfh;

-   struct bmp_info_header bmih;

-   unsigned x, y;

-

-   if(!rgba)

-      goto error1;

-

-   bmfh.bfType = 0x4d42;

-   bmfh.bfSize = 14 + 40 + height*width*4;

-   bmfh.bfReserved1 = 0;

-   bmfh.bfReserved2 = 0;

-   bmfh.bfOffBits = 14 + 40;

-

-   bmih.biSize = 40;

-   bmih.biWidth = width;

-   bmih.biHeight = height;

-   bmih.biPlanes = 1;

-   bmih.biBitCount = 32;

-   bmih.biCompression = 0;

-   bmih.biSizeImage = height*width*4;

-   bmih.biXPelsPerMeter = 0;

-   bmih.biYPelsPerMeter = 0;

-   bmih.biClrUsed = 0;

-   bmih.biClrImportant = 0;

-

-   stream = os_file_stream_create(filename);

-   if(!stream)

-      goto error1;

-

-   os_stream_write(stream, &bmfh, 14);

-   os_stream_write(stream, &bmih, 40);

-

-   y = height;

-   while(y--) {

-      float *ptr = rgba + (stride * y * 4);

-      for(x = 0; x < width; ++x)

-      {

-         struct bmp_rgb_quad pixel;

-         pixel.rgbRed   = float_to_ubyte(ptr[x*4 + 0]);

-         pixel.rgbGreen = float_to_ubyte(ptr[x*4 + 1]);

-         pixel.rgbBlue  = float_to_ubyte(ptr[x*4 + 2]);

-         pixel.rgbAlpha = 255;

-         os_stream_write(stream, &pixel, 4);

-      }

-   }

-

-   os_stream_close(stream);

-error1:

-   ;

-#endif

-}

-

-#endif

+/**************************************************************************
+ * 
+ * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * Copyright (c) 2008 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, sub license, 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 (including the
+ * next paragraph) 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 NON-INFRINGEMENT.
+ * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS 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 "pipe/p_config.h" 
+
+#include "pipe/p_compiler.h"
+#include "os/os_stream.h"
+#include "util/u_debug.h" 
+#include "pipe/p_format.h" 
+#include "pipe/p_state.h" 
+#include "util/u_inlines.h" 
+#include "util/u_format.h"
+#include "util/u_memory.h" 
+#include "util/u_string.h" 
+#include "util/u_math.h" 
+#include "util/u_tile.h" 
+#include "util/u_prim.h"
+#include "util/u_surface.h"
+
+#include <limits.h> /* CHAR_BIT */
+#include <ctype.h> /* isalnum */
+
+void _debug_vprintf(const char *format, va_list ap)
+{
+#if defined(PIPE_OS_WINDOWS) || defined(PIPE_SUBSYSTEM_EMBEDDED)
+   /* We buffer until we find a newline. */
+   static char buf[4096] = {'\0'};
+   size_t len = strlen(buf);
+   int ret = util_vsnprintf(buf + len, sizeof(buf) - len, format, ap);
+   if(ret > (int)(sizeof(buf) - len - 1) || util_strchr(buf + len, '\n')) {
+      os_log_message(buf);
+      buf[0] = '\0';
+   }
+#else
+   /* Just print as-is to stderr */
+   vfprintf(stderr, format, ap);
+#endif
+}
+
+
+#ifdef DEBUG
+void debug_print_blob( const char *name,
+                       const void *blob,
+                       unsigned size )
+{
+   const unsigned *ublob = (const unsigned *)blob;
+   unsigned i;
+
+   debug_printf("%s (%d dwords%s)\n", name, size/4,
+                size%4 ? "... plus a few bytes" : "");
+
+   for (i = 0; i < size/4; i++) {
+      debug_printf("%d:\t%08x\n", i, ublob[i]);
+   }
+}
+#endif
+
+
+static boolean
+debug_get_option_should_print(void)
+{
+   static boolean first = TRUE;
+   static boolean value = FALSE;
+
+   if (!first)
+      return value;
+
+   /* Oh hey this will call into this function,
+    * but its cool since we set first to false
+    */
+   first = FALSE;
+   value = debug_get_bool_option("GALLIUM_PRINT_OPTIONS", FALSE);
+   /* XXX should we print this option? Currently it wont */
+   return value;
+}
+
+const char *
+debug_get_option(const char *name, const char *dfault)
+{
+   const char *result;
+
+   result = os_get_option(name);
+   if(!result)
+      result = dfault;
+
+   if (debug_get_option_should_print())
+      debug_printf("%s: %s = %s\n", __FUNCTION__, name, result ? result : "(null)");
+   
+   return result;
+}
+
+boolean
+debug_get_bool_option(const char *name, boolean dfault)
+{
+   const char *str = os_get_option(name);
+   boolean result;
+   
+   if(str == NULL)
+      result = dfault;
+   else if(!util_strcmp(str, "n"))
+      result = FALSE;
+   else if(!util_strcmp(str, "no"))
+      result = FALSE;
+   else if(!util_strcmp(str, "0"))
+      result = FALSE;
+   else if(!util_strcmp(str, "f"))
+      result = FALSE;
+   else if(!util_strcmp(str, "F"))
+      result = FALSE;
+   else if(!util_strcmp(str, "false"))
+      result = FALSE;
+   else if(!util_strcmp(str, "FALSE"))
+      result = FALSE;
+   else
+      result = TRUE;
+
+   if (debug_get_option_should_print())
+      debug_printf("%s: %s = %s\n", __FUNCTION__, name, result ? "TRUE" : "FALSE");
+   
+   return result;
+}
+
+
+long
+debug_get_num_option(const char *name, long dfault)
+{
+   long result;
+   const char *str;
+   
+   str = os_get_option(name);
+   if(!str)
+      result = dfault;
+   else {
+      long sign;
+      char c;
+      c = *str++;
+      if(c == '-') {
+	 sign = -1;
+	 c = *str++;
+      } 
+      else {
+	 sign = 1;
+      }
+      result = 0;
+      while('0' <= c && c <= '9') {
+	 result = result*10 + (c - '0');
+	 c = *str++;
+      }
+      result *= sign;
+   }
+
+   if (debug_get_option_should_print())
+      debug_printf("%s: %s = %li\n", __FUNCTION__, name, result);
+
+   return result;
+}
+
+static boolean str_has_option(const char *str, const char *name)
+{
+   /* Empty string. */
+   if (!*str) {
+      return FALSE;
+   }
+
+   /* OPTION=all */
+   if (!util_strcmp(str, "all")) {
+      return TRUE;
+   }
+
+   /* Find 'name' in 'str' surrounded by non-alphanumeric characters. */
+   {
+      const char *start = str;
+      unsigned name_len = strlen(name);
+
+      /* 'start' is the beginning of the currently-parsed word,
+       * we increment 'str' each iteration.
+       * if we find either the end of string or a non-alphanumeric character,
+       * we compare 'start' up to 'str-1' with 'name'. */
+
+      while (1) {
+         if (!*str || !isalnum(*str)) {
+            if (str-start == name_len &&
+                !memcmp(start, name, name_len)) {
+               return TRUE;
+            }
+
+            if (!*str) {
+               return FALSE;
+            }
+
+            start = str+1;
+         }
+
+         str++;
+      }
+   }
+
+   return FALSE;
+}
+
+unsigned long
+debug_get_flags_option(const char *name, 
+                       const struct debug_named_value *flags,
+                       unsigned long dfault)
+{
+   unsigned long result;
+   const char *str;
+   const struct debug_named_value *orig = flags;
+   int namealign = 0;
+   
+   str = os_get_option(name);
+   if(!str)
+      result = dfault;
+   else if (!util_strcmp(str, "help")) {
+      result = dfault;
+      _debug_printf("%s: help for %s:\n", __FUNCTION__, name);
+      for (; flags->name; ++flags)
+         namealign = MAX2(namealign, strlen(flags->name));
+      for (flags = orig; flags->name; ++flags)
+         _debug_printf("| %*s [0x%0*lx]%s%s\n", namealign, flags->name,
+                      (int)sizeof(unsigned long)*CHAR_BIT/4, flags->value,
+                      flags->desc ? " " : "", flags->desc ? flags->desc : "");
+   }
+   else {
+      result = 0;
+      while( flags->name ) {
+	 if (str_has_option(str, flags->name))
+	    result |= flags->value;
+	 ++flags;
+      }
+   }
+
+   if (debug_get_option_should_print()) {
+      if (str) {
+         debug_printf("%s: %s = 0x%lx (%s)\n", __FUNCTION__, name, result, str);
+      } else {
+         debug_printf("%s: %s = 0x%lx\n", __FUNCTION__, name, result);
+      }
+   }
+
+   return result;
+}
+
+
+void _debug_assert_fail(const char *expr, 
+                        const char *file, 
+                        unsigned line, 
+                        const char *function) 
+{
+   _debug_printf("%s:%u:%s: Assertion `%s' failed.\n", file, line, function, expr);
+#if defined(PIPE_OS_WINDOWS) && !defined(PIPE_SUBSYSTEM_WINDOWS_USER)
+   if (debug_get_bool_option("GALLIUM_ABORT_ON_ASSERT", FALSE))
+#else
+   if (debug_get_bool_option("GALLIUM_ABORT_ON_ASSERT", TRUE))
+#endif
+      os_abort();
+   else
+      _debug_printf("continuing...\n");
+}
+
+
+const char *
+debug_dump_enum(const struct debug_named_value *names, 
+                unsigned long value)
+{
+   static char rest[64];
+   
+   while(names->name) {
+      if(names->value == value)
+	 return names->name;
+      ++names;
+   }
+
+   util_snprintf(rest, sizeof(rest), "0x%08lx", value);
+   return rest;
+}
+
+
+const char *
+debug_dump_enum_noprefix(const struct debug_named_value *names, 
+                         const char *prefix,
+                         unsigned long value)
+{
+   static char rest[64];
+   
+   while(names->name) {
+      if(names->value == value) {
+         const char *name = names->name;
+         while (*name == *prefix) {
+            name++;
+            prefix++;
+         }
+         return name;
+      }
+      ++names;
+   }
+
+   
+
+   util_snprintf(rest, sizeof(rest), "0x%08lx", value);
+   return rest;
+}
+
+
+const char *
+debug_dump_flags(const struct debug_named_value *names, 
+                 unsigned long value)
+{
+   static char output[4096];
+   static char rest[256];
+   int first = 1;
+
+   output[0] = '\0';
+
+   while(names->name) {
+      if((names->value & value) == names->value) {
+	 if (!first)
+	    util_strncat(output, "|", sizeof(output));
+	 else
+	    first = 0;
+	 util_strncat(output, names->name, sizeof(output) - 1);
+	 output[sizeof(output) - 1] = '\0';
+	 value &= ~names->value;
+      }
+      ++names;
+   }
+   
+   if (value) {
+      if (!first)
+	 util_strncat(output, "|", sizeof(output));
+      else
+	 first = 0;
+      
+      util_snprintf(rest, sizeof(rest), "0x%08lx", value);
+      util_strncat(output, rest, sizeof(output) - 1);
+      output[sizeof(output) - 1] = '\0';
+   }
+   
+   if(first)
+      return "0";
+   
+   return output;
+}
+
+
+#ifdef DEBUG
+void debug_print_format(const char *msg, unsigned fmt )
+{
+   debug_printf("%s: %s\n", msg, util_format_name(fmt));
+}
+#endif
+
+
+
+static const struct debug_named_value pipe_prim_names[] = {
+#ifdef DEBUG
+   DEBUG_NAMED_VALUE(PIPE_PRIM_POINTS),
+   DEBUG_NAMED_VALUE(PIPE_PRIM_LINES),
+   DEBUG_NAMED_VALUE(PIPE_PRIM_LINE_LOOP),
+   DEBUG_NAMED_VALUE(PIPE_PRIM_LINE_STRIP),
+   DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLES),
+   DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLE_STRIP),
+   DEBUG_NAMED_VALUE(PIPE_PRIM_TRIANGLE_FAN),
+   DEBUG_NAMED_VALUE(PIPE_PRIM_QUADS),
+   DEBUG_NAMED_VALUE(PIPE_PRIM_QUAD_STRIP),
+   DEBUG_NAMED_VALUE(PIPE_PRIM_POLYGON),
+#endif
+   DEBUG_NAMED_VALUE_END
+};
+
+
+const char *u_prim_name( unsigned prim )
+{
+   return debug_dump_enum(pipe_prim_names, prim);
+}
+
+
+
+#ifdef DEBUG
+int fl_indent = 0;
+const char* fl_function[1024];
+
+int debug_funclog_enter(const char* f, const int line, const char* file)
+{
+   int i;
+
+   for (i = 0; i < fl_indent; i++)
+      debug_printf("  ");
+   debug_printf("%s\n", f);
+
+   assert(fl_indent < 1023);
+   fl_function[fl_indent++] = f;
+
+   return 0;
+}
+
+void debug_funclog_exit(const char* f, const int line, const char* file)
+{
+   --fl_indent;
+   assert(fl_indent >= 0);
+   assert(fl_function[fl_indent] == f);
+}
+
+void debug_funclog_enter_exit(const char* f, const int line, const char* file)
+{
+   int i;
+   for (i = 0; i < fl_indent; i++)
+      debug_printf("  ");
+   debug_printf("%s\n", f);
+}
+#endif
+
+
+
+#ifdef DEBUG
+/**
+ * Dump an image to a .raw or .ppm file (depends on OS).
+ * \param format  PIPE_FORMAT_x
+ * \param cpp  bytes per pixel
+ * \param width  width in pixels
+ * \param height height in pixels
+ * \param stride  row stride in bytes
+ */
+void debug_dump_image(const char *prefix,
+                      unsigned format, unsigned cpp,
+                      unsigned width, unsigned height,
+                      unsigned stride,
+                      const void *data)     
+{
+#ifdef PIPE_SUBSYSTEM_WINDOWS_DISPLAY
+   static unsigned no = 0; 
+   char filename[256];
+   WCHAR wfilename[sizeof(filename)];
+   ULONG_PTR iFile = 0;
+   struct {
+      unsigned format;
+      unsigned cpp;
+      unsigned width;
+      unsigned height;
+   } header;
+   unsigned char *pMap = NULL;
+   unsigned i;
+
+   util_snprintf(filename, sizeof(filename), "\\??\\c:\\%03u%s.raw", ++no, prefix);
+   for(i = 0; i < sizeof(filename); ++i)
+      wfilename[i] = (WCHAR)filename[i];
+   
+   pMap = (unsigned char *)EngMapFile(wfilename, sizeof(header) + height*width*cpp, &iFile);
+   if(!pMap)
+      return;
+   
+   header.format = format;
+   header.cpp = cpp;
+   header.width = width;
+   header.height = height;
+   memcpy(pMap, &header, sizeof(header));
+   pMap += sizeof(header);
+   
+   for(i = 0; i < height; ++i) {
+      memcpy(pMap, (unsigned char *)data + stride*i, cpp*width);
+      pMap += cpp*width;
+   }
+      
+   EngUnmapFile(iFile);
+#elif defined(PIPE_OS_UNIX)
+   /* write a ppm file */
+   char filename[256];
+   FILE *f;
+
+   util_snprintf(filename, sizeof(filename), "%s.ppm", prefix);
+
+   f = fopen(filename, "w");
+   if (f) {
+      int i, x, y;
+      int r, g, b;
+      const uint8_t *ptr = (uint8_t *) data;
+
+      /* XXX this is a hack */
+      switch (format) {
+      case PIPE_FORMAT_B8G8R8A8_UNORM:
+         r = 2;
+         g = 1;
+         b = 0;
+         break;
+      default:
+         r = 0;
+         g = 1;
+         b = 1;
+      }
+
+      fprintf(f, "P6\n");
+      fprintf(f, "# ppm-file created by osdemo.c\n");
+      fprintf(f, "%i %i\n", width, height);
+      fprintf(f, "255\n");
+      fclose(f);
+
+      f = fopen(filename, "ab");  /* reopen in binary append mode */
+      for (y = 0; y < height; y++) {
+         for (x = 0; x < width; x++) {
+            i = y * stride + x * cpp;
+            fputc(ptr[i + r], f); /* write red */
+            fputc(ptr[i + g], f); /* write green */
+            fputc(ptr[i + b], f); /* write blue */
+         }
+      }
+      fclose(f);
+   }
+   else {
+      fprintf(stderr, "Can't open %s for writing\n", filename);
+   }
+#endif
+}
+
+/* FIXME: dump resources, not surfaces... */
+void debug_dump_surface(struct pipe_context *pipe,
+                        const char *prefix,
+                        struct pipe_surface *surface)
+{
+   struct pipe_resource *texture;
+   struct pipe_transfer *transfer;
+   void *data;
+
+   if (!surface)
+      return;
+
+   /* XXX: this doesn't necessarily work, as the driver may be using
+    * temporary storage for the surface which hasn't been propagated
+    * back into the texture.  Need to nail down the semantics of views
+    * and transfers a bit better before we can say if extra work needs
+    * to be done here:
+    */
+   texture = surface->texture;
+
+   transfer = pipe_get_transfer(pipe, texture, surface->u.tex.level,
+                                surface->u.tex.first_layer,
+                                PIPE_TRANSFER_READ,
+                                0, 0, surface->width, surface->height);
+
+   data = pipe->transfer_map(pipe, transfer);
+   if(!data)
+      goto error;
+
+   debug_dump_image(prefix,
+                    texture->format,
+                    util_format_get_blocksize(texture->format),
+                    util_format_get_nblocksx(texture->format, surface->width),
+                    util_format_get_nblocksy(texture->format, surface->height),
+                    transfer->stride,
+                    data);
+
+   pipe->transfer_unmap(pipe, transfer);
+error:
+   pipe->transfer_destroy(pipe, transfer);
+}
+
+
+void debug_dump_texture(struct pipe_context *pipe,
+                        const char *prefix,
+                        struct pipe_resource *texture)
+{
+   struct pipe_surface *surface, surf_tmpl;
+
+   if (!texture)
+      return;
+
+   /* XXX for now, just dump image for layer=0, level=0 */
+   memset(&surf_tmpl, 0, sizeof(surf_tmpl));
+   u_surface_default_template(&surf_tmpl, texture, 0 /* no bind flag - not a surface */);
+   surface = pipe->create_surface(pipe, texture, &surf_tmpl);
+   if (surface) {
+      debug_dump_surface(pipe, prefix, surface);
+      pipe->surface_destroy(pipe, surface);
+   }
+}
+
+
+#pragma pack(push,2)
+struct bmp_file_header {
+   uint16_t bfType;
+   uint32_t bfSize;
+   uint16_t bfReserved1;
+   uint16_t bfReserved2;
+   uint32_t bfOffBits;
+};
+#pragma pack(pop)
+
+struct bmp_info_header {
+   uint32_t biSize;
+   int32_t biWidth;
+   int32_t biHeight;
+   uint16_t biPlanes;
+   uint16_t biBitCount;
+   uint32_t biCompression;
+   uint32_t biSizeImage;
+   int32_t biXPelsPerMeter;
+   int32_t biYPelsPerMeter;
+   uint32_t biClrUsed;
+   uint32_t biClrImportant;
+};
+
+struct bmp_rgb_quad {
+   uint8_t rgbBlue;
+   uint8_t rgbGreen;
+   uint8_t rgbRed;
+   uint8_t rgbAlpha;
+};
+
+void
+debug_dump_surface_bmp(struct pipe_context *pipe,
+                       const char *filename,
+                       struct pipe_surface *surface)
+{
+#ifndef PIPE_SUBSYSTEM_WINDOWS_MINIPORT
+   struct pipe_transfer *transfer;
+   struct pipe_resource *texture = surface->texture;
+
+   transfer = pipe_get_transfer(pipe, texture, surface->u.tex.level,
+                                surface->u.tex.first_layer, PIPE_TRANSFER_READ,
+                                0, 0, surface->width, surface->height);
+
+   debug_dump_transfer_bmp(pipe, filename, transfer);
+
+   pipe->transfer_destroy(pipe, transfer);
+#endif
+}
+
+void
+debug_dump_transfer_bmp(struct pipe_context *pipe,
+                        const char *filename,
+                        struct pipe_transfer *transfer)
+{
+#ifndef PIPE_SUBSYSTEM_WINDOWS_MINIPORT
+   float *rgba;
+
+   if (!transfer)
+      goto error1;
+
+   rgba = MALLOC(transfer->box.width *
+		 transfer->box.height *
+		 transfer->box.depth *
+		 4*sizeof(float));
+   if(!rgba)
+      goto error1;
+
+   pipe_get_tile_rgba(pipe, transfer, 0, 0,
+                      transfer->box.width, transfer->box.height,
+                      rgba);
+
+   debug_dump_float_rgba_bmp(filename,
+                             transfer->box.width, transfer->box.height,
+                             rgba, transfer->box.width);
+
+   FREE(rgba);
+error1:
+   ;
+#endif
+}
+
+void
+debug_dump_float_rgba_bmp(const char *filename,
+                          unsigned width, unsigned height,
+                          float *rgba, unsigned stride)
+{
+#ifndef PIPE_SUBSYSTEM_WINDOWS_MINIPORT
+   struct os_stream *stream;
+   struct bmp_file_header bmfh;
+   struct bmp_info_header bmih;
+   unsigned x, y;
+
+   if(!rgba)
+      goto error1;
+
+   bmfh.bfType = 0x4d42;
+   bmfh.bfSize = 14 + 40 + height*width*4;
+   bmfh.bfReserved1 = 0;
+   bmfh.bfReserved2 = 0;
+   bmfh.bfOffBits = 14 + 40;
+
+   bmih.biSize = 40;
+   bmih.biWidth = width;
+   bmih.biHeight = height;
+   bmih.biPlanes = 1;
+   bmih.biBitCount = 32;
+   bmih.biCompression = 0;
+   bmih.biSizeImage = height*width*4;
+   bmih.biXPelsPerMeter = 0;
+   bmih.biYPelsPerMeter = 0;
+   bmih.biClrUsed = 0;
+   bmih.biClrImportant = 0;
+
+   stream = os_file_stream_create(filename);
+   if(!stream)
+      goto error1;
+
+   os_stream_write(stream, &bmfh, 14);
+   os_stream_write(stream, &bmih, 40);
+
+   y = height;
+   while(y--) {
+      float *ptr = rgba + (stride * y * 4);
+      for(x = 0; x < width; ++x)
+      {
+         struct bmp_rgb_quad pixel;
+         pixel.rgbRed   = float_to_ubyte(ptr[x*4 + 0]);
+         pixel.rgbGreen = float_to_ubyte(ptr[x*4 + 1]);
+         pixel.rgbBlue  = float_to_ubyte(ptr[x*4 + 2]);
+         pixel.rgbAlpha = 255;
+         os_stream_write(stream, &pixel, 4);
+      }
+   }
+
+   os_stream_close(stream);
+error1:
+   ;
+#endif
+}
+
+#endif
diff --git a/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c b/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
index 04149525e..374fc336b 100644
--- a/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
+++ b/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
@@ -152,9 +152,9 @@ void u_vbuf_mgr_destroy(struct u_vbuf_mgr *mgrb)
 }
 
 
-static void u_vbuf_translate_begin(struct u_vbuf_mgr_priv *mgr,
-                                   int min_index, int max_index,
-                                   boolean *upload_flushed)
+static enum u_vbuf_return_flags
+u_vbuf_translate_begin(struct u_vbuf_mgr_priv *mgr,
+                       int min_index, int max_index)
 {
    struct translate_key key;
    struct translate_element *te;
@@ -166,6 +166,7 @@ static void u_vbuf_translate_begin(struct u_vbuf_mgr_priv *mgr,
    struct pipe_resource *out_buffer = NULL;
    unsigned i, num_verts, out_offset;
    struct pipe_vertex_element new_velems[PIPE_MAX_ATTRIBS];
+   boolean upload_flushed = FALSE;
 
    memset(&key, 0, sizeof(key));
    memset(tr_elem_index, 0xff, sizeof(tr_elem_index));
@@ -248,7 +249,7 @@ static void u_vbuf_translate_begin(struct u_vbuf_mgr_priv *mgr,
    u_upload_alloc(mgr->b.uploader,
                   key.output_stride * min_index,
                   key.output_stride * num_verts,
-                  &out_offset, &out_buffer, upload_flushed,
+                  &out_offset, &out_buffer, &upload_flushed,
                   (void**)&out_map);
 
    out_offset -= key.output_stride * min_index;
@@ -308,6 +309,8 @@ static void u_vbuf_translate_begin(struct u_vbuf_mgr_priv *mgr,
    }
 
    pipe_resource_reference(&out_buffer, NULL);
+
+   return upload_flushed ? U_VBUF_UPLOAD_FLUSHED : 0;
 }
 
 static void u_vbuf_translate_end(struct u_vbuf_mgr_priv *mgr)
@@ -510,14 +513,15 @@ void u_vbuf_mgr_set_vertex_buffers(struct u_vbuf_mgr *mgrb,
    mgr->b.nr_real_vertex_buffers = count;
 }
 
-static void u_vbuf_upload_buffers(struct u_vbuf_mgr_priv *mgr,
-                                  int min_index, int max_index,
-                                  unsigned instance_count,
-                                  boolean *upload_flushed)
+static enum u_vbuf_return_flags
+u_vbuf_upload_buffers(struct u_vbuf_mgr_priv *mgr,
+                      int min_index, int max_index,
+                      unsigned instance_count)
 {
    unsigned i, nr = mgr->ve->count;
    unsigned count = max_index + 1 - min_index;
    boolean uploaded[PIPE_MAX_ATTRIBS] = {0};
+   enum u_vbuf_return_flags retval = 0;
 
    for (i = 0; i < nr; i++) {
       unsigned index = mgr->ve->ve[i].vertex_buffer_index;
@@ -537,6 +541,11 @@ static void u_vbuf_upload_buffers(struct u_vbuf_mgr_priv *mgr,
          } else if (vb->stride) {
             first = vb->stride * min_index;
             size = vb->stride * count;
+
+            /* Unusual case when stride is smaller than the format size.
+             * XXX This won't work with interleaved arrays. */
+            if (mgr->ve->native_format_size[i] > vb->stride)
+               size += mgr->ve->native_format_size[i] - vb->stride;
          } else {
             first = 0;
             size = mgr->ve->native_format_size[i];
@@ -551,11 +560,14 @@ static void u_vbuf_upload_buffers(struct u_vbuf_mgr_priv *mgr,
          vb->buffer_offset -= first;
 
          uploaded[index] = TRUE;
-         *upload_flushed = *upload_flushed || flushed;
+         if (flushed)
+            retval |= U_VBUF_UPLOAD_FLUSHED;
       } else {
          assert(mgr->b.real_vertex_buffer[index]);
       }
    }
+
+   return retval;
 }
 
 static void u_vbuf_mgr_compute_max_index(struct u_vbuf_mgr_priv *mgr)
@@ -597,14 +609,13 @@ static void u_vbuf_mgr_compute_max_index(struct u_vbuf_mgr_priv *mgr)
    }
 }
 
-void u_vbuf_mgr_draw_begin(struct u_vbuf_mgr *mgrb,
-                           const struct pipe_draw_info *info,
-                           boolean *buffers_updated,
-                           boolean *uploader_flushed)
+enum u_vbuf_return_flags
+u_vbuf_mgr_draw_begin(struct u_vbuf_mgr *mgrb,
+                      const struct pipe_draw_info *info)
 {
    struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb;
-   boolean bufs_updated = FALSE, upload_flushed = FALSE;
    int min_index, max_index;
+   enum u_vbuf_return_flags retval = 0;
 
    u_vbuf_mgr_compute_max_index(mgr);
 
@@ -617,27 +628,20 @@ void u_vbuf_mgr_draw_begin(struct u_vbuf_mgr *mgrb,
 
    /* Translate vertices with non-native layouts or formats. */
    if (mgr->incompatible_vb_layout || mgr->ve->incompatible_layout) {
-      u_vbuf_translate_begin(mgr, min_index, max_index, &upload_flushed);
+      retval |= u_vbuf_translate_begin(mgr, min_index, max_index);
 
       if (mgr->fallback_ve) {
-         bufs_updated = TRUE;
+         retval |= U_VBUF_BUFFERS_UPDATED;
       }
    }
 
    /* Upload user buffers. */
    if (mgr->any_user_vbs) {
-      u_vbuf_upload_buffers(mgr, min_index, max_index, info->instance_count,
-                            &upload_flushed);
-      bufs_updated = TRUE;
-   }
-
-   /* Set the return values. */
-   if (buffers_updated) {
-      *buffers_updated = bufs_updated;
-   }
-   if (uploader_flushed) {
-      *uploader_flushed = upload_flushed;
+      retval |= u_vbuf_upload_buffers(mgr, min_index, max_index,
+                                      info->instance_count);
+      retval |= U_VBUF_BUFFERS_UPDATED;
    }
+   return retval;
 }
 
 void u_vbuf_mgr_draw_end(struct u_vbuf_mgr *mgrb)
diff --git a/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.h b/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.h
index 0ef27744c..4e6372435 100644
--- a/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.h
+++ b/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.h
@@ -1,121 +1,125 @@
-/**************************************************************************

- *

- * Copyright 2011 Marek Olšák <maraeo@gmail.com>

- * 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, sub license, 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 (including the

- * next paragraph) 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 NON-INFRINGEMENT.

- * IN NO EVENT SHALL AUTHORS AND/OR ITS SUPPLIERS 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 U_VBUF_MGR_H

-#define U_VBUF_MGR_H

-

-/* This module builds upon u_upload_mgr and translate_cache and takes care of

- * user buffer uploads and vertex format fallbacks. It's designed

- * for the drivers which don't always use the Draw module. (e.g. for HWTCL)

- */

-

-#include "pipe/p_context.h"

-#include "pipe/p_state.h"

-#include "util/u_transfer.h"

-

-/* The manager.

- * This structure should also be used to access vertex buffers

- * from a driver. */

-struct u_vbuf_mgr {

-   /* This is what was set in set_vertex_buffers.

-    * May contain user buffers. */

-   struct pipe_vertex_buffer vertex_buffer[PIPE_MAX_ATTRIBS];

-   unsigned nr_vertex_buffers;

-

-   /* Contains only real vertex buffers.

-    * Hardware drivers should use real_vertex_buffers[i]

-    * instead of vertex_buffers[i].buffer. */

-   struct pipe_resource *real_vertex_buffer[PIPE_MAX_ATTRIBS];

-   int nr_real_vertex_buffers;

-

-   /* Precomputed max_index for hardware vertex buffers. */

-   unsigned max_index;

-

-   /* This uploader can optionally be used by the driver.

-    *

-    * Allowed functions:

-    * - u_upload_alloc

-    * - u_upload_data

-    * - u_upload_buffer

-    * - u_upload_flush */

-   struct u_upload_mgr *uploader;

-};

-

-struct u_vbuf_resource {

-   struct u_resource b;

-   uint8_t *user_ptr;

-};

-

-/* Opaque type containing information about vertex elements for the manager. */

-struct u_vbuf_mgr_elements;

-

-enum u_fetch_alignment {

-   U_VERTEX_FETCH_BYTE_ALIGNED,

-   U_VERTEX_FETCH_DWORD_ALIGNED

-};

-

-

-struct u_vbuf_mgr *

-u_vbuf_mgr_create(struct pipe_context *pipe,

-                  unsigned upload_buffer_size,

-                  unsigned upload_buffer_alignment,

-                  unsigned upload_buffer_bind,

-                  enum u_fetch_alignment fetch_alignment);

-

-void u_vbuf_mgr_destroy(struct u_vbuf_mgr *mgr);

-

-struct u_vbuf_mgr_elements *

-u_vbuf_mgr_create_vertex_elements(struct u_vbuf_mgr *mgr,

-                                  unsigned count,

-                                  const struct pipe_vertex_element *attrs,

-                                  struct pipe_vertex_element *native_attrs);

-

-void u_vbuf_mgr_bind_vertex_elements(struct u_vbuf_mgr *mgr,

-                                     void *cso,

-                                     struct u_vbuf_mgr_elements *ve);

-

-void u_vbuf_mgr_destroy_vertex_elements(struct u_vbuf_mgr *mgr,

-                                        struct u_vbuf_mgr_elements *ve);

-

-void u_vbuf_mgr_set_vertex_buffers(struct u_vbuf_mgr *mgr,

-                                   unsigned count,

-                                   const struct pipe_vertex_buffer *bufs);

-

-void u_vbuf_mgr_draw_begin(struct u_vbuf_mgr *mgr,

-                           const struct pipe_draw_info *info,

-                           boolean *buffers_updated,

-                           boolean *uploader_flushed);

-

-void u_vbuf_mgr_draw_end(struct u_vbuf_mgr *mgr);

-

-

-static INLINE struct u_vbuf_resource *u_vbuf_resource(struct pipe_resource *r)

-{

-   return (struct u_vbuf_resource*)r;

-}

-

-#endif

+/**************************************************************************
+ *
+ * Copyright 2011 Marek Olšák <maraeo@gmail.com>
+ * 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, sub license, 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 (including the
+ * next paragraph) 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 NON-INFRINGEMENT.
+ * IN NO EVENT SHALL AUTHORS AND/OR ITS SUPPLIERS 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 U_VBUF_MGR_H
+#define U_VBUF_MGR_H
+
+/* This module builds upon u_upload_mgr and translate_cache and takes care of
+ * user buffer uploads and vertex format fallbacks. It's designed
+ * for the drivers which don't always use the Draw module. (e.g. for HWTCL)
+ */
+
+#include "pipe/p_context.h"
+#include "pipe/p_state.h"
+#include "util/u_transfer.h"
+
+/* The manager.
+ * This structure should also be used to access vertex buffers
+ * from a driver. */
+struct u_vbuf_mgr {
+   /* This is what was set in set_vertex_buffers.
+    * May contain user buffers. */
+   struct pipe_vertex_buffer vertex_buffer[PIPE_MAX_ATTRIBS];
+   unsigned nr_vertex_buffers;
+
+   /* Contains only real vertex buffers.
+    * Hardware drivers should use real_vertex_buffers[i]
+    * instead of vertex_buffers[i].buffer. */
+   struct pipe_resource *real_vertex_buffer[PIPE_MAX_ATTRIBS];
+   int nr_real_vertex_buffers;
+
+   /* Precomputed max_index for hardware vertex buffers. */
+   unsigned max_index;
+
+   /* This uploader can optionally be used by the driver.
+    *
+    * Allowed functions:
+    * - u_upload_alloc
+    * - u_upload_data
+    * - u_upload_buffer
+    * - u_upload_flush */
+   struct u_upload_mgr *uploader;
+};
+
+struct u_vbuf_resource {
+   struct u_resource b;
+   uint8_t *user_ptr;
+};
+
+/* Opaque type containing information about vertex elements for the manager. */
+struct u_vbuf_mgr_elements;
+
+enum u_fetch_alignment {
+   U_VERTEX_FETCH_BYTE_ALIGNED,
+   U_VERTEX_FETCH_DWORD_ALIGNED
+};
+
+enum u_vbuf_return_flags {
+   U_VBUF_BUFFERS_UPDATED = 1,
+   U_VBUF_UPLOAD_FLUSHED = 2
+};
+
+
+struct u_vbuf_mgr *
+u_vbuf_mgr_create(struct pipe_context *pipe,
+                  unsigned upload_buffer_size,
+                  unsigned upload_buffer_alignment,
+                  unsigned upload_buffer_bind,
+                  enum u_fetch_alignment fetch_alignment);
+
+void u_vbuf_mgr_destroy(struct u_vbuf_mgr *mgr);
+
+struct u_vbuf_mgr_elements *
+u_vbuf_mgr_create_vertex_elements(struct u_vbuf_mgr *mgr,
+                                  unsigned count,
+                                  const struct pipe_vertex_element *attrs,
+                                  struct pipe_vertex_element *native_attrs);
+
+void u_vbuf_mgr_bind_vertex_elements(struct u_vbuf_mgr *mgr,
+                                     void *cso,
+                                     struct u_vbuf_mgr_elements *ve);
+
+void u_vbuf_mgr_destroy_vertex_elements(struct u_vbuf_mgr *mgr,
+                                        struct u_vbuf_mgr_elements *ve);
+
+void u_vbuf_mgr_set_vertex_buffers(struct u_vbuf_mgr *mgr,
+                                   unsigned count,
+                                   const struct pipe_vertex_buffer *bufs);
+
+enum u_vbuf_return_flags
+u_vbuf_mgr_draw_begin(struct u_vbuf_mgr *mgr,
+                      const struct pipe_draw_info *info);
+
+void u_vbuf_mgr_draw_end(struct u_vbuf_mgr *mgr);
+
+
+static INLINE struct u_vbuf_resource *u_vbuf_resource(struct pipe_resource *r)
+{
+   return (struct u_vbuf_resource*)r;
+}
+
+#endif
diff --git a/mesalib/src/glsl/SConscript b/mesalib/src/glsl/SConscript
index 5d97756e1..1441cc74b 100644
--- a/mesalib/src/glsl/SConscript
+++ b/mesalib/src/glsl/SConscript
@@ -1,181 +1,181 @@
-import common

-

-Import('*')

-

-from sys import executable as python_cmd

-

-env = env.Clone()

-

-env.Prepend(CPPPATH = [

-    '#include',

-    '#src/mapi',

-    '#src/mesa',

-    '#src/glsl',

-    '#src/glsl/glcpp',

-])

-

-# Make glcpp/glcpp-parse.h and glsl_parser.h reacheable from the include path

-env.Append(CPPPATH = [Dir('.').abspath])

-

-env.Append(YACCFLAGS = '-d')

-

-parser_env = env.Clone()

-parser_env.Append(YACCFLAGS = [

-    '--defines=%s' % File('glsl_parser.h').abspath,

-    '-p', '_mesa_glsl_',

-])

-

-glcpp_lexer = env.CFile('glcpp/glcpp-lex.c', 'glcpp/glcpp-lex.l')

-glcpp_parser = env.CFile('glcpp/glcpp-parse.c', 'glcpp/glcpp-parse.y')

-glsl_lexer = parser_env.CXXFile('glsl_lexer.cpp', 'glsl_lexer.ll')

-glsl_parser = parser_env.CXXFile('glsl_parser.cpp', 'glsl_parser.yy')

-

-glsl_sources = [

-    glcpp_lexer,

-    glcpp_parser[0],

-    'glcpp/pp.c',

-    'ast_expr.cpp',

-    'ast_function.cpp',

-    'ast_to_hir.cpp',

-    'ast_type.cpp',

-    glsl_lexer,

-    glsl_parser[0],

-    'glsl_parser_extras.cpp',

-    'glsl_types.cpp',

-    'glsl_symbol_table.cpp',

-    'hir_field_selection.cpp',

-    'ir_basic_block.cpp',

-    'ir_clone.cpp',

-    'ir_constant_expression.cpp',

-    'ir.cpp',

-    'ir_expression_flattening.cpp',

-    'ir_function_can_inline.cpp',

-    'ir_function.cpp',

-    'ir_hierarchical_visitor.cpp',

-    'ir_hv_accept.cpp',

-    'ir_import_prototypes.cpp',

-    'ir_print_visitor.cpp',

-    'ir_reader.cpp',

-    'ir_rvalue_visitor.cpp',

-    'ir_set_program_inouts.cpp',

-    'ir_validate.cpp',

-    'ir_variable.cpp',

-    'ir_variable_refcount.cpp',

-    'linker.cpp',

-    'link_functions.cpp',

-    'loop_analysis.cpp',

-    'loop_controls.cpp',

-    'loop_unroll.cpp',

-    'lower_discard.cpp',

-    'lower_if_to_cond_assign.cpp',

-    'lower_instructions.cpp',

-    'lower_jumps.cpp',

-    'lower_mat_op_to_vec.cpp',

-    'lower_noise.cpp',

-    'lower_variable_index_to_cond_assign.cpp',

-    'lower_vec_index_to_cond_assign.cpp',

-    'lower_vec_index_to_swizzle.cpp',

-    'lower_vector.cpp',

-    'opt_algebraic.cpp',

-    'opt_constant_folding.cpp',

-    'opt_constant_propagation.cpp',

-    'opt_constant_variable.cpp',

-    'opt_copy_propagation.cpp',

-    'opt_copy_propagation_elements.cpp',

-    'opt_dead_code.cpp',

-    'opt_dead_code_local.cpp',

-    'opt_dead_functions.cpp',

-    'opt_discard_simplification.cpp',

-    'opt_function_inlining.cpp',

-    'opt_if_simplification.cpp',

-    'opt_noop_swizzle.cpp',

-    'opt_redundant_jumps.cpp',

-    'opt_structure_splitting.cpp',

-    'opt_swizzle_swizzle.cpp',

-    'opt_tree_grafting.cpp',

-    'ralloc.c',

-    's_expression.cpp',

-    'strtod.c',

-] 

-

-if env['msvc']:

-    env.Prepend(CPPPATH = ['#/src/getopt'])

-    env.PrependUnique(LIBS = [getopt])

-

-if env['crosscompile'] and env['platform'] != 'embedded':

-    Import('builtin_glsl_function')

-else:

-    # Copy these files to avoid generation object files into src/mesa/program

-    env.Prepend(CPPPATH = ['#src/mesa/program'])

-    env.Command('hash_table.c', '#src/mesa/program/hash_table.c', Copy('$TARGET', '$SOURCE'))

-    env.Command('symbol_table.c', '#src/mesa/program/symbol_table.c', Copy('$TARGET', '$SOURCE'))

-

-    main_obj = env.StaticObject('main.cpp')

-

-    mesa_objs = env.StaticObject([

-        'hash_table.c',

-        'symbol_table.c',

-    ])

-

-    builtin_compiler = env.Program(

-        target = 'builtin_compiler',

-        source = main_obj + glsl_sources + ['builtin_stubs.cpp'] + mesa_objs,

-    )

-

-    # SCons builtin dependency scanner doesn't detect that glsl_lexer.ll

-    # depends on glsl_parser.h

-    env.Depends(builtin_compiler, glsl_parser)

-

-    builtin_glsl_function = env.CodeGenerate(

-        target = 'builtin_function.cpp',

-        script = 'builtins/tools/generate_builtins.py',

-        source = builtin_compiler,

-        command = python_cmd + ' $SCRIPT $SOURCE > $TARGET'

-    )

-

-    env.Depends(builtin_glsl_function, ['builtins/tools/generate_builtins.py', 'builtins/tools/texture_builtins.py'] + Glob('builtins/ir/*'))

-

-    Export('builtin_glsl_function')

-

-    if env['hostonly']:

-        Return()

-

-

-glsl_sources += builtin_glsl_function

-

-glsl = env.ConvenienceLibrary(

-    target = 'glsl',

-    source = glsl_sources,

-)

-

-# SCons builtin dependency scanner doesn't detect that glsl_lexer.ll depends on

-# glsl_parser.h

-env.Depends(glsl, glsl_parser)

-

-Export('glsl')

-

-# Skip building these programs as they will cause SCons error "Two environments

-# with different actions were specified for the same target"

-if env['crosscompile'] or env['platform'] == 'embedded':

-    Return()

-

-env = env.Clone()

-

-if env['platform'] == 'windows':

-    env.PrependUnique(LIBS = [

-        'user32',

-    ])

-

-env.Prepend(LIBS = [glsl])

-

-glsl2 = env.Program(

-    target = 'glsl2',

-    source = main_obj + mesa_objs,

-)

-env.Alias('glsl2', glsl2)

-

-glcpp = env.Program(

-    target = 'glcpp/glcpp',

-    source = ['glcpp/glcpp.c'] + mesa_objs,

-)

-env.Alias('glcpp', glcpp)

+import common
+
+Import('*')
+
+from sys import executable as python_cmd
+
+env = env.Clone()
+
+env.Prepend(CPPPATH = [
+    '#include',
+    '#src/mapi',
+    '#src/mesa',
+    '#src/glsl',
+    '#src/glsl/glcpp',
+])
+
+# Make glcpp/glcpp-parse.h and glsl_parser.h reacheable from the include path
+env.Append(CPPPATH = [Dir('.').abspath])
+
+env.Append(YACCFLAGS = '-d')
+
+parser_env = env.Clone()
+parser_env.Append(YACCFLAGS = [
+    '--defines=%s' % File('glsl_parser.h').abspath,
+    '-p', '_mesa_glsl_',
+])
+
+glcpp_lexer = env.CFile('glcpp/glcpp-lex.c', 'glcpp/glcpp-lex.l')
+glcpp_parser = env.CFile('glcpp/glcpp-parse.c', 'glcpp/glcpp-parse.y')
+glsl_lexer = parser_env.CXXFile('glsl_lexer.cpp', 'glsl_lexer.ll')
+glsl_parser = parser_env.CXXFile('glsl_parser.cpp', 'glsl_parser.yy')
+
+glsl_sources = [
+    glcpp_lexer,
+    glcpp_parser[0],
+    'glcpp/pp.c',
+    'ast_expr.cpp',
+    'ast_function.cpp',
+    'ast_to_hir.cpp',
+    'ast_type.cpp',
+    glsl_lexer,
+    glsl_parser[0],
+    'glsl_parser_extras.cpp',
+    'glsl_types.cpp',
+    'glsl_symbol_table.cpp',
+    'hir_field_selection.cpp',
+    'ir_basic_block.cpp',
+    'ir_clone.cpp',
+    'ir_constant_expression.cpp',
+    'ir.cpp',
+    'ir_expression_flattening.cpp',
+    'ir_function_can_inline.cpp',
+    'ir_function.cpp',
+    'ir_hierarchical_visitor.cpp',
+    'ir_hv_accept.cpp',
+    'ir_import_prototypes.cpp',
+    'ir_print_visitor.cpp',
+    'ir_reader.cpp',
+    'ir_rvalue_visitor.cpp',
+    'ir_set_program_inouts.cpp',
+    'ir_validate.cpp',
+    'ir_variable.cpp',
+    'ir_variable_refcount.cpp',
+    'linker.cpp',
+    'link_functions.cpp',
+    'loop_analysis.cpp',
+    'loop_controls.cpp',
+    'loop_unroll.cpp',
+    'lower_discard.cpp',
+    'lower_if_to_cond_assign.cpp',
+    'lower_instructions.cpp',
+    'lower_jumps.cpp',
+    'lower_mat_op_to_vec.cpp',
+    'lower_noise.cpp',
+    'lower_variable_index_to_cond_assign.cpp',
+    'lower_vec_index_to_cond_assign.cpp',
+    'lower_vec_index_to_swizzle.cpp',
+    'lower_vector.cpp',
+    'opt_algebraic.cpp',
+    'opt_constant_folding.cpp',
+    'opt_constant_propagation.cpp',
+    'opt_constant_variable.cpp',
+    'opt_copy_propagation.cpp',
+    'opt_copy_propagation_elements.cpp',
+    'opt_dead_code.cpp',
+    'opt_dead_code_local.cpp',
+    'opt_dead_functions.cpp',
+    'opt_discard_simplification.cpp',
+    'opt_function_inlining.cpp',
+    'opt_if_simplification.cpp',
+    'opt_noop_swizzle.cpp',
+    'opt_redundant_jumps.cpp',
+    'opt_structure_splitting.cpp',
+    'opt_swizzle_swizzle.cpp',
+    'opt_tree_grafting.cpp',
+    'ralloc.c',
+    's_expression.cpp',
+    'strtod.c',
+] 
+
+if env['msvc']:
+    env.Prepend(CPPPATH = ['#/src/getopt'])
+    env.PrependUnique(LIBS = [getopt])
+
+if env['crosscompile'] and not env['embedded']:
+    Import('builtin_glsl_function')
+else:
+    # Copy these files to avoid generation object files into src/mesa/program
+    env.Prepend(CPPPATH = ['#src/mesa/program'])
+    env.Command('hash_table.c', '#src/mesa/program/hash_table.c', Copy('$TARGET', '$SOURCE'))
+    env.Command('symbol_table.c', '#src/mesa/program/symbol_table.c', Copy('$TARGET', '$SOURCE'))
+
+    main_obj = env.StaticObject('main.cpp')
+
+    mesa_objs = env.StaticObject([
+        'hash_table.c',
+        'symbol_table.c',
+    ])
+
+    builtin_compiler = env.Program(
+        target = 'builtin_compiler',
+        source = main_obj + glsl_sources + ['builtin_stubs.cpp'] + mesa_objs,
+    )
+
+    # SCons builtin dependency scanner doesn't detect that glsl_lexer.ll
+    # depends on glsl_parser.h
+    env.Depends(builtin_compiler, glsl_parser)
+
+    builtin_glsl_function = env.CodeGenerate(
+        target = 'builtin_function.cpp',
+        script = 'builtins/tools/generate_builtins.py',
+        source = builtin_compiler,
+        command = python_cmd + ' $SCRIPT $SOURCE > $TARGET'
+    )
+
+    env.Depends(builtin_glsl_function, ['builtins/tools/generate_builtins.py', 'builtins/tools/texture_builtins.py'] + Glob('builtins/ir/*'))
+
+    Export('builtin_glsl_function')
+
+    if env['hostonly']:
+        Return()
+
+
+glsl_sources += builtin_glsl_function
+
+glsl = env.ConvenienceLibrary(
+    target = 'glsl',
+    source = glsl_sources,
+)
+
+# SCons builtin dependency scanner doesn't detect that glsl_lexer.ll depends on
+# glsl_parser.h
+env.Depends(glsl, glsl_parser)
+
+Export('glsl')
+
+# Skip building these programs as they will cause SCons error "Two environments
+# with different actions were specified for the same target"
+if env['crosscompile'] or env['embedded']:
+    Return()
+
+env = env.Clone()
+
+if env['platform'] == 'windows':
+    env.PrependUnique(LIBS = [
+        'user32',
+    ])
+
+env.Prepend(LIBS = [glsl])
+
+glsl2 = env.Program(
+    target = 'glsl2',
+    source = main_obj + mesa_objs,
+)
+env.Alias('glsl2', glsl2)
+
+glcpp = env.Program(
+    target = 'glcpp/glcpp',
+    source = ['glcpp/glcpp.c'] + mesa_objs,
+)
+env.Alias('glcpp', glcpp)
diff --git a/mesalib/src/mapi/glapi/SConscript b/mesalib/src/mapi/glapi/SConscript
index d2bc3bafc..a7764745e 100644
--- a/mesalib/src/mapi/glapi/SConscript
+++ b/mesalib/src/mapi/glapi/SConscript
@@ -1,88 +1,81 @@
-#######################################################################

-# SConscript for glapi

-

-

-Import('*')

-

-if env['platform'] != 'winddk':

-

-    env = env.Clone()

-    

-    env.Append(CPPDEFINES = [

-        'MAPI_MODE_UTIL',

-    ])

-

-    if env['platform'] == 'windows':

-        env.Append(CPPDEFINES = [

-            '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers

-            'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers

-        ])

-        if env['gles']:

-            env.Append(CPPDEFINES = ['_GLAPI_DLL_EXPORTS'])

-        else:

-            # prevent _glapi_* from being declared __declspec(dllimport)

-            env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])

-

-    env.Append(CPPPATH = [

-        '#/src/mapi',

-        '#/src/mesa',

-    ])

-    

-    glapi_sources = [

-        'glapi_dispatch.c',

-        'glapi_entrypoint.c',

-        'glapi_getproc.c',

-        'glapi_nop.c',

-        'glthread.c',

-        'glapi.c',

-    ]

-    

-    mapi_sources = [

-        'u_current.c',

-        'u_execmem.c',

-        'u_thread.c',

-    ]

-    for s in mapi_sources:

-        o = env.SharedObject(s[:-2], '../mapi/' + s)

-        glapi_sources.append(o)

-

-    #

-    # Assembly sources

-    #

-    if env['gcc'] and env['platform'] != 'windows':

-        if env['machine'] == 'x86':

-            env.Append(CPPDEFINES = [

-                'USE_X86_ASM', 

-                'USE_MMX_ASM',

-                'USE_3DNOW_ASM',

-                'USE_SSE_ASM',

-            ])

-            glapi_sources += [

-                'glapi_x86.S',

-            ]

-        elif env['machine'] == 'x86_64':

-            env.Append(CPPDEFINES = [

-                'USE_X86_64_ASM', 

-            ])

-            glapi_sources += [

-                'glapi_x86-64.S'

-            ]

-        elif env['machine'] == 'ppc':

-            env.Append(CPPDEFINES = [

-                'USE_PPC_ASM', 

-                'USE_VMX_ASM', 

-            ])

-            glapi_sources += [

-            ]

-        elif env['machine'] == 'sparc':

-            glapi_sources += [

-                'glapi_sparc.S'

-            ]

-        else:

-            pass

-    

-    glapi = env.ConvenienceLibrary(

-        target = 'glapi',

-        source = glapi_sources,

-    )

-    Export('glapi')

+#######################################################################
+# SConscript for glapi
+
+
+Import('*')
+
+if env['platform'] != 'winddk':
+
+    env = env.Clone()
+    
+    env.Append(CPPDEFINES = [
+        'MAPI_MODE_UTIL',
+    ])
+
+    if env['platform'] == 'windows':
+        env.Append(CPPDEFINES = [
+            '_GDI32_', # prevent gl* being declared __declspec(dllimport) in MS headers
+            'BUILD_GL32', # declare gl* as __declspec(dllexport) in Mesa headers
+        ])
+        if env['gles']:
+            env.Append(CPPDEFINES = ['_GLAPI_DLL_EXPORTS'])
+        else:
+            # prevent _glapi_* from being declared __declspec(dllimport)
+            env.Append(CPPDEFINES = ['_GLAPI_NO_EXPORTS'])
+
+    env.Append(CPPPATH = [
+        '#/src/mapi',
+        '#/src/mesa',
+    ])
+    
+    glapi_sources = [
+        'glapi_dispatch.c',
+        'glapi_entrypoint.c',
+        'glapi_getproc.c',
+        'glapi_nop.c',
+        'glthread.c',
+        'glapi.c',
+    ]
+    
+    mapi_sources = [
+        'u_current.c',
+        'u_execmem.c',
+        'u_thread.c',
+    ]
+    for s in mapi_sources:
+        o = env.SharedObject(s[:-2], '../mapi/' + s)
+        glapi_sources.append(o)
+
+    #
+    # Assembly sources
+    #
+    if env['gcc'] and env['platform'] != 'windows':
+        if env['machine'] == 'x86':
+            env.Append(CPPDEFINES = [
+                'USE_X86_ASM',
+            ])
+            glapi_sources += [
+                'glapi_x86.S',
+            ]
+        elif env['machine'] == 'x86_64':
+            env.Append(CPPDEFINES = [
+                'USE_X86_64_ASM',
+            ])
+            glapi_sources += [
+                'glapi_x86-64.S'
+            ]
+        elif env['machine'] == 'sparc':
+            env.Append(CPPDEFINES = [
+                'USE_SPARC_ASM',
+            ])
+            glapi_sources += [
+                'glapi_sparc.S'
+            ]
+        else:
+            pass
+    
+    glapi = env.ConvenienceLibrary(
+        target = 'glapi',
+        source = glapi_sources,
+    )
+    Export('glapi')
diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c
index 07853e03c..8cc3fd49a 100644
--- a/mesalib/src/mesa/main/fbobject.c
+++ b/mesalib/src/mesa/main/fbobject.c
@@ -1556,7 +1556,7 @@ check_begin_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)
    GLuint i;
    ASSERT(ctx->Driver.RenderTexture);
 
-   if (is_winsys_fbo(fb));
+   if (is_winsys_fbo(fb))
       return; /* can't render to texture with winsys framebuffers */
 
    for (i = 0; i < BUFFER_COUNT; i++) {
@@ -1576,7 +1576,7 @@ check_begin_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)
 static void
 check_end_texture_render(struct gl_context *ctx, struct gl_framebuffer *fb)
 {
-   if (is_winsys_fbo(fb));
+   if (is_winsys_fbo(fb))
       return; /* can't render to texture with winsys framebuffers */
 
    if (ctx->Driver.FinishRenderTexture) {
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index 0827cb883..40398a8af 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -1685,11 +1685,15 @@ texture_error_check( struct gl_context *ctx,
 
    /* additional checks for depth textures */
    if (_mesa_base_tex_format(ctx, internalFormat) == GL_DEPTH_COMPONENT) {
-      /* Only 1D, 2D and rectangular textures supported, not 3D or cubes */
+      /* Only 1D, 2D, rect and array textures supported, not 3D or cubes */
       if (target != GL_TEXTURE_1D &&
           target != GL_PROXY_TEXTURE_1D &&
           target != GL_TEXTURE_2D &&
           target != GL_PROXY_TEXTURE_2D &&
+          target != GL_TEXTURE_1D_ARRAY &&
+          target != GL_PROXY_TEXTURE_1D_ARRAY &&
+          target != GL_TEXTURE_2D_ARRAY &&
+          target != GL_PROXY_TEXTURE_2D_ARRAY &&
           target != GL_TEXTURE_RECTANGLE_ARB &&
           target != GL_PROXY_TEXTURE_RECTANGLE_ARB) {
          if (!isProxy)
diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c
index fdf12817c..565a3a2d8 100644
--- a/mesalib/src/mesa/main/texobj.c
+++ b/mesalib/src/mesa/main/texobj.c
@@ -879,6 +879,8 @@ unbind_texobj_from_fbo(struct gl_context *ctx,
          for (j = 0; j < BUFFER_COUNT; j++) {
             if (fb->Attachment[j].Type == GL_TEXTURE &&
                 fb->Attachment[j].Texture == texObj) {
+	       /* Vertices are already flushed by _mesa_DeleteTextures */
+	       ctx->NewState |= _NEW_BUFFERS;
                _mesa_remove_attachment(ctx, fb->Attachment + j);         
             }
          }
diff --git a/mesalib/src/mesa/state_tracker/st_format.c b/mesalib/src/mesa/state_tracker/st_format.c
index 358357125..45e476671 100644
--- a/mesalib/src/mesa/state_tracker/st_format.c
+++ b/mesalib/src/mesa/state_tracker/st_format.c
@@ -1108,7 +1108,7 @@ static struct format_mapping format_map[] = {
  * Return first supported format from the given list.
  */
 static enum pipe_format
-find_supported_format(struct pipe_screen *screen, 
+find_supported_format(struct pipe_screen *screen,
                       const enum pipe_format formats[],
                       enum pipe_texture_target target,
                       unsigned sample_count,
@@ -1188,9 +1188,6 @@ st_choose_renderbuffer_format(struct pipe_screen *screen,
 }
 
 
-/**
- * Called via ctx->Driver.chooseTextureFormat().
- */
 gl_format
 st_ChooseTextureFormat_renderable(struct gl_context *ctx, GLint internalFormat,
 				  GLenum format, GLenum type, GLboolean renderable)
@@ -1206,11 +1203,10 @@ st_ChooseTextureFormat_renderable(struct gl_context *ctx, GLint internalFormat,
     * that in advance.  Specify potential render target flags now.
     */
    bindings = PIPE_BIND_SAMPLER_VIEW;
-   if (renderable == GL_TRUE) {
-      if (_mesa_is_depth_format(internalFormat) ||
-	  _mesa_is_depth_or_stencil_format(internalFormat))
+   if (renderable) {
+      if (_mesa_is_depth_or_stencil_format(internalFormat))
 	 bindings |= PIPE_BIND_DEPTH_STENCIL;
-      else 
+      else
 	 bindings |= PIPE_BIND_RENDER_TARGET;
    }
 
@@ -1231,6 +1227,10 @@ st_ChooseTextureFormat_renderable(struct gl_context *ctx, GLint internalFormat,
    return st_pipe_format_to_mesa_format(pFormat);
 }
 
+
+/**
+ * Called via ctx->Driver.ChooseTextureFormat().
+ */
 gl_format
 st_ChooseTextureFormat(struct gl_context *ctx, GLint internalFormat,
                        GLenum format, GLenum type)