xserver xkeyboar-config mesa git update 16 May 2011

8 files changed, 1798 insertions, 1706 deletions

diff --git a/mesalib/src/gallium/auxiliary/util/u_math.h b/mesalib/src/gallium/auxiliary/util/u_math.h
index 16a9eab6d..2ecade5f7 100644
--- a/mesalib/src/gallium/auxiliary/util/u_math.h
+++ b/mesalib/src/gallium/auxiliary/util/u_math.h
@@ -1,660 +1,644 @@
-/**************************************************************************

- * 

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

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

- * 

- **************************************************************************/

-

-

-/**

- * Math utilities and approximations for common math functions.

- * Reduced precision is usually acceptable in shaders...

- *

- * "fast" is used in the names of functions which are low-precision,

- * or at least lower-precision than the normal C lib functions.

- */

-

-

-#ifndef U_MATH_H

-#define U_MATH_H

-

-

-#include "pipe/p_compiler.h"

-#include "util/u_debug.h"

-

-

-#ifdef __cplusplus

-extern "C" {

-#endif

-

-

-#if defined(PIPE_SUBSYSTEM_WINDOWS_MINIPORT)

-__inline double ceil(double val)

-{

-   double ceil_val;

-

-   if ((val - (long) val) == 0) {

-      ceil_val = val;

-   }

-   else {

-      if (val > 0) {

-         ceil_val = (long) val + 1;

-      }

-      else {

-         ceil_val = (long) val;

-      }

-   }

-

-   return ceil_val;

-}

-

-#ifndef PIPE_SUBSYSTEM_WINDOWS_CE_OGL

-__inline double floor(double val)

-{

-   double floor_val;

-

-   if ((val - (long) val) == 0) {

-      floor_val = val;

-   }

-   else {

-      if (val > 0) {

-         floor_val = (long) val;

-      }

-      else {

-         floor_val = (long) val - 1;

-      }

-   }

-

-   return floor_val;

-}

-#endif

-

-#pragma function(pow)

-__inline double __cdecl pow(double val, double exponent)

-{

-   /* XXX */

-   assert(0);

-   return 0;

-}

-

-#pragma function(log)

-__inline double __cdecl log(double val)

-{

-   /* XXX */

-   assert(0);

-   return 0;

-}

-

-#pragma function(atan2)

-__inline double __cdecl atan2(double val)

-{

-   /* XXX */

-   assert(0);

-   return 0;

-}

-#else

-#include <math.h>

-#include <stdarg.h>

-#endif

-

-

-#ifndef M_SQRT2

-#define M_SQRT2 1.41421356237309504880

-#endif

-

-

-#if defined(_MSC_VER) 

-

-#if _MSC_VER < 1400 && !defined(__cplusplus) || defined(PIPE_SUBSYSTEM_WINDOWS_CE)

- 

-static INLINE float cosf( float f ) 

-{

-   return (float) cos( (double) f );

-}

-

-static INLINE float sinf( float f ) 

-{

-   return (float) sin( (double) f );

-}

-

-static INLINE float ceilf( float f ) 

-{

-   return (float) ceil( (double) f );

-}

-

-static INLINE float floorf( float f ) 

-{

-   return (float) floor( (double) f );

-}

-

-static INLINE float powf( float f, float g ) 

-{

-   return (float) pow( (double) f, (double) g );

-}

-

-static INLINE float sqrtf( float f ) 

-{

-   return (float) sqrt( (double) f );

-}

-

-static INLINE float fabsf( float f ) 

-{

-   return (float) fabs( (double) f );

-}

-

-static INLINE float logf( float f ) 

-{

-   return (float) log( (double) f );

-}

-

-#else

-/* Work-around an extra semi-colon in VS 2005 logf definition */

-#ifdef logf

-#undef logf

-#define logf(x) ((float)log((double)(x)))

-#endif /* logf */

-

-#define isfinite(x) _finite((double)(x))

-#define isnan(x) _isnan((double)(x))

-#endif /* _MSC_VER < 1400 && !defined(__cplusplus) */

-

-static INLINE double log2( double x )

-{

-   const double invln2 = 1.442695041;

-   return log( x ) * invln2;

-}

-

-static INLINE double

-round(double x)

-{

-   return x >= 0.0 ? floor(x + 0.5) : ceil(x - 0.5);

-}

-

-static INLINE float

-roundf(float x)

-{

-   return x >= 0.0f ? floorf(x + 0.5f) : ceilf(x - 0.5f);

-}

-

-#endif /* _MSC_VER */

-

-

-

-

-

-#define POW2_TABLE_SIZE_LOG2 9

-#define POW2_TABLE_SIZE (1 << POW2_TABLE_SIZE_LOG2)

-#define POW2_TABLE_OFFSET (POW2_TABLE_SIZE/2)

-#define POW2_TABLE_SCALE ((float)(POW2_TABLE_SIZE/2))

-extern float pow2_table[POW2_TABLE_SIZE];

-

-

-/**

- * Initialize math module.  This should be called before using any

- * other functions in this module.

- */

-extern void

-util_init_math(void);

-

-

-union fi {

-   float f;

-   int32_t i;

-   uint32_t ui;

-};

-

-

-/**

- * Fast version of 2^x

- * Identity: exp2(a + b) = exp2(a) * exp2(b)

- * Let ipart = int(x)

- * Let fpart = x - ipart;

- * So, exp2(x) = exp2(ipart) * exp2(fpart)

- * Compute exp2(ipart) with i << ipart

- * Compute exp2(fpart) with lookup table.

- */

-static INLINE float

-util_fast_exp2(float x)

-{

-   int32_t ipart;

-   float fpart, mpart;

-   union fi epart;

-

-   if(x > 129.00000f)

-      return 3.402823466e+38f;

-

-   if (x < -126.99999f)

-      return 0.0f;

-

-   ipart = (int32_t) x;

-   fpart = x - (float) ipart;

-

-   /* same as

-    *   epart.f = (float) (1 << ipart)

-    * but faster and without integer overflow for ipart > 31

-    */

-   epart.i = (ipart + 127 ) << 23;

-

-   mpart = pow2_table[POW2_TABLE_OFFSET + (int)(fpart * POW2_TABLE_SCALE)];

-

-   return epart.f * mpart;

-}

-

-

-/**

- * Fast approximation to exp(x).

- */

-static INLINE float

-util_fast_exp(float x)

-{

-   const float k = 1.44269f; /* = log2(e) */

-   return util_fast_exp2(k * x);

-}

-

-

-#define LOG2_TABLE_SIZE_LOG2 16

-#define LOG2_TABLE_SCALE (1 << LOG2_TABLE_SIZE_LOG2)

-#define LOG2_TABLE_SIZE (LOG2_TABLE_SCALE + 1)

-extern float log2_table[LOG2_TABLE_SIZE];

-

-

-/**

- * Fast approximation to log2(x).

- */

-static INLINE float

-util_fast_log2(float x)

-{

-   union fi num;

-   float epart, mpart;

-   num.f = x;

-   epart = (float)(((num.i & 0x7f800000) >> 23) - 127);

-   /* mpart = log2_table[mantissa*LOG2_TABLE_SCALE + 0.5] */

-   mpart = log2_table[((num.i & 0x007fffff) + (1 << (22 - LOG2_TABLE_SIZE_LOG2))) >> (23 - LOG2_TABLE_SIZE_LOG2)];

-   return epart + mpart;

-}

-

-

-/**

- * Fast approximation to x^y.

- */

-static INLINE float

-util_fast_pow(float x, float y)

-{

-   return util_fast_exp2(util_fast_log2(x) * y);

-}

-

-/* Note that this counts zero as a power of two.

- */

-static INLINE boolean

-util_is_power_of_two( unsigned v )

-{

-   return (v & (v-1)) == 0;

-}

-

-

-/**

- * Floor(x), returned as int.

- */

-static INLINE int

-util_ifloor(float f)

-{

-   int ai, bi;

-   double af, bf;

-   union fi u;

-   af = (3 << 22) + 0.5 + (double) f;

-   bf = (3 << 22) + 0.5 - (double) f;

-   u.f = (float) af;  ai = u.i;

-   u.f = (float) bf;  bi = u.i;

-   return (ai - bi) >> 1;

-}

-

-

-/**

- * Round float to nearest int.

- */

-static INLINE int

-util_iround(float f)

-{

-#if defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86) 

-   int r;

-   __asm__ ("fistpl %0" : "=m" (r) : "t" (f) : "st");

-   return r;

-#elif defined(PIPE_CC_MSVC) && defined(PIPE_ARCH_X86)

-   int r;

-   _asm {

-      fld f

-      fistp r

-   }

-   return r;

-#else

-   if (f >= 0.0f)

-      return (int) (f + 0.5f);

-   else

-      return (int) (f - 0.5f);

-#endif

-}

-

-

-/**

- * Approximate floating point comparison

- */

-static INLINE boolean

-util_is_approx(float a, float b, float tol)

-{

-   return fabs(b - a) <= tol;

-}

-

-

-/**

- * Test if x is NaN or +/- infinity.

- */

-static INLINE boolean

-util_is_inf_or_nan(float x)

-{

-   union fi tmp;

-   tmp.f = x;

-   return !(int)((unsigned int)((tmp.i & 0x7fffffff)-0x7f800000) >> 31);

-}

-

-

-/**

- * Find first bit set in word.  Least significant bit is 1.

- * Return 0 if no bits set.

- */

-#if defined(_MSC_VER) && _MSC_VER >= 1300 && (_M_IX86 || _M_AMD64 || _M_IA64)

-unsigned char _BitScanForward(unsigned long* Index, unsigned long Mask);

-#pragma intrinsic(_BitScanForward)

-static INLINE

-unsigned long ffs( unsigned long u )

-{

-   unsigned long i;

-   if (_BitScanForward(&i, u))

-      return i + 1;

-   else

-      return 0;

-}

-#elif defined(PIPE_CC_MSVC) && defined(PIPE_ARCH_X86)

-static INLINE

-unsigned ffs( unsigned u )

-{

-   unsigned i;

-

-   if (u == 0) {

-      return 0;

-   }

-

-   __asm bsf eax, [u]

-   __asm inc eax

-   __asm mov [i], eax

-

-   return i;

-}

-#elif defined(__MINGW32__)

-#define ffs __builtin_ffs

-#endif

-

-#ifdef __MINGW32__

-#define ffs __builtin_ffs

-#endif

-

-

-/* Could also binary search for the highest bit.

- */

-static INLINE unsigned

-util_unsigned_logbase2(unsigned n)

-{

-   unsigned log2 = 0;

-   while (n >>= 1)

-      ++log2;

-   return log2;

-}

-

-

-/**

- * Return float bits.

- */

-static INLINE unsigned

-fui( float f )

-{

-   union fi fi;

-   fi.f = f;

-   return fi.ui;

-}

-

-

-/**

- * Convert ubyte to float in [0, 1].

- * XXX a 256-entry lookup table would be slightly faster.

- */

-static INLINE float

-ubyte_to_float(ubyte ub)

-{

-   return (float) ub * (1.0f / 255.0f);

-}

-

-

-/**

- * Convert float in [0,1] to ubyte in [0,255] with clamping.

- */

-static INLINE ubyte

-float_to_ubyte(float f)

-{

-   const int ieee_0996 = 0x3f7f0000;   /* 0.996 or so */

-   union fi tmp;

-

-   tmp.f = f;

-   if (tmp.i < 0) {

-      return (ubyte) 0;

-   }

-   else if (tmp.i >= ieee_0996) {

-      return (ubyte) 255;

-   }

-   else {

-      tmp.f = tmp.f * (255.0f/256.0f) + 32768.0f;

-      return (ubyte) tmp.i;

-   }

-}

-

-static INLINE float

-byte_to_float_tex(int8_t b)

-{

-   return (b == -128) ? -1.0F : b * 1.0F / 127.0F;

-}

-

-static INLINE int8_t

-float_to_byte_tex(float f)

-{

-   return (int8_t) (127.0F * f);

-}

-

-/**

- * Calc log base 2

- */

-static INLINE unsigned

-util_logbase2(unsigned n)

-{

-   unsigned log2 = 0;

-   while (n >>= 1)

-      ++log2;

-   return log2;

-}

-

-

-/**

- * Returns the smallest power of two >= x

- */

-static INLINE unsigned

-util_next_power_of_two(unsigned x)

-{

-   unsigned i;

-

-   if (x == 0)

-      return 1;

-

-   --x;

-

-   for (i = 1; i < sizeof(unsigned) * 8; i <<= 1)

-      x |= x >> i;

-

-   return x + 1;

-}

-

-

-/**

- * Return number of bits set in n.

- */

-static INLINE unsigned

-util_bitcount(unsigned n)

-{

-#if defined(PIPE_CC_GCC)

-   return __builtin_popcount(n);

-#else

-   /* K&R classic bitcount.

-    *

-    * For each iteration, clear the LSB from the bitfield.

-    * Requires only one iteration per set bit, instead of

-    * one iteration per bit less than highest set bit.

-    */

-   unsigned bits = 0;

-   for (bits; n; bits++) {

-      n &= n - 1;

-   }

-   return bits;

-#endif

-}

-

-

-/**

- * Reverse byte order of a 32 bit word.

- */

-static INLINE uint32_t

-util_bswap32(uint32_t n)

-{

-#if defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 403)

-   return __builtin_bswap32(n);

-#else

-   return (n >> 24) |

-          ((n >> 8) & 0x0000ff00) |

-          ((n << 8) & 0x00ff0000) |

-          (n << 24);

-#endif

-}

-

-

-/**

- * Reverse byte order of a 16 bit word.

- */

-static INLINE uint16_t

-util_bswap16(uint16_t n)

-{

-   return (n >> 8) |

-          (n << 8);

-}

-

-

-/**

- * Clamp X to [MIN, MAX].

- * This is a macro to allow float, int, uint, etc. types.

- */

-#define CLAMP( X, MIN, MAX )  ( (X)<(MIN) ? (MIN) : ((X)>(MAX) ? (MAX) : (X)) )

-

-#define MIN2( A, B )   ( (A)<(B) ? (A) : (B) )

-#define MAX2( A, B )   ( (A)>(B) ? (A) : (B) )

-

-#define MIN3( A, B, C ) ((A) < (B) ? MIN2(A, C) : MIN2(B, C))

-#define MAX3( A, B, C ) ((A) > (B) ? MAX2(A, C) : MAX2(B, C))

-

-#define MIN4( A, B, C, D ) ((A) < (B) ? MIN3(A, C, D) : MIN3(B, C, D))

-#define MAX4( A, B, C, D ) ((A) > (B) ? MAX3(A, C, D) : MAX3(B, C, D))

-

-

-/**

- * Align a value, only works pot alignemnts.

- */

-static INLINE int

-align(int value, int alignment)

-{

-   return (value + alignment - 1) & ~(alignment - 1);

-}

-

-/**

- * Works like align but on npot alignments.

- */

-static INLINE size_t

-util_align_npot(size_t value, size_t alignment)

-{

-   if (value % alignment)

-      return value + (alignment - (value % alignment));

-   return value;

-}

-

-static INLINE unsigned

-u_minify(unsigned value, unsigned levels)

-{

-    return MAX2(1, value >> levels);

-}

-

-#ifndef COPY_4V

-#define COPY_4V( DST, SRC )         \

-do {                                \

-   (DST)[0] = (SRC)[0];             \

-   (DST)[1] = (SRC)[1];             \

-   (DST)[2] = (SRC)[2];             \

-   (DST)[3] = (SRC)[3];             \

-} while (0)

-#endif

-

-

-#ifndef COPY_4FV

-#define COPY_4FV( DST, SRC )  COPY_4V(DST, SRC)

-#endif

-

-

-#ifndef ASSIGN_4V

-#define ASSIGN_4V( DST, V0, V1, V2, V3 ) \

-do {                                     \

-   (DST)[0] = (V0);                      \

-   (DST)[1] = (V1);                      \

-   (DST)[2] = (V2);                      \

-   (DST)[3] = (V3);                      \

-} while (0)

-#endif

-

-

-static INLINE uint32_t util_unsigned_fixed(float value, unsigned frac_bits)

-{

-   return value < 0 ? 0 : (uint32_t)(value * (1<<frac_bits));

-}

-

-static INLINE int32_t util_signed_fixed(float value, unsigned frac_bits)

-{

-   return (int32_t)(value * (1<<frac_bits));

-}

-

-

-

-#ifdef __cplusplus

-}

-#endif

-

-#endif /* U_MATH_H */

+/**************************************************************************
+ * 
+ * Copyright 2008 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * 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.
+ * 
+ **************************************************************************/
+
+
+/**
+ * Math utilities and approximations for common math functions.
+ * Reduced precision is usually acceptable in shaders...
+ *
+ * "fast" is used in the names of functions which are low-precision,
+ * or at least lower-precision than the normal C lib functions.
+ */
+
+
+#ifndef U_MATH_H
+#define U_MATH_H
+
+
+#include "pipe/p_compiler.h"
+#include "util/u_debug.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#if defined(PIPE_SUBSYSTEM_WINDOWS_MINIPORT)
+__inline double ceil(double val)
+{
+   double ceil_val;
+
+   if ((val - (long) val) == 0) {
+      ceil_val = val;
+   }
+   else {
+      if (val > 0) {
+         ceil_val = (long) val + 1;
+      }
+      else {
+         ceil_val = (long) val;
+      }
+   }
+
+   return ceil_val;
+}
+
+#ifndef PIPE_SUBSYSTEM_WINDOWS_CE_OGL
+__inline double floor(double val)
+{
+   double floor_val;
+
+   if ((val - (long) val) == 0) {
+      floor_val = val;
+   }
+   else {
+      if (val > 0) {
+         floor_val = (long) val;
+      }
+      else {
+         floor_val = (long) val - 1;
+      }
+   }
+
+   return floor_val;
+}
+#endif
+
+#pragma function(pow)
+__inline double __cdecl pow(double val, double exponent)
+{
+   /* XXX */
+   assert(0);
+   return 0;
+}
+
+#pragma function(log)
+__inline double __cdecl log(double val)
+{
+   /* XXX */
+   assert(0);
+   return 0;
+}
+
+#pragma function(atan2)
+__inline double __cdecl atan2(double val)
+{
+   /* XXX */
+   assert(0);
+   return 0;
+}
+#else
+#include <math.h>
+#include <stdarg.h>
+#endif
+
+
+#ifndef M_SQRT2
+#define M_SQRT2 1.41421356237309504880
+#endif
+
+
+#if defined(_MSC_VER) 
+
+#if _MSC_VER < 1400 && !defined(__cplusplus) || defined(PIPE_SUBSYSTEM_WINDOWS_CE)
+ 
+static INLINE float cosf( float f ) 
+{
+   return (float) cos( (double) f );
+}
+
+static INLINE float sinf( float f ) 
+{
+   return (float) sin( (double) f );
+}
+
+static INLINE float ceilf( float f ) 
+{
+   return (float) ceil( (double) f );
+}
+
+static INLINE float floorf( float f ) 
+{
+   return (float) floor( (double) f );
+}
+
+static INLINE float powf( float f, float g ) 
+{
+   return (float) pow( (double) f, (double) g );
+}
+
+static INLINE float sqrtf( float f ) 
+{
+   return (float) sqrt( (double) f );
+}
+
+static INLINE float fabsf( float f ) 
+{
+   return (float) fabs( (double) f );
+}
+
+static INLINE float logf( float f ) 
+{
+   return (float) log( (double) f );
+}
+
+#else
+/* Work-around an extra semi-colon in VS 2005 logf definition */
+#ifdef logf
+#undef logf
+#define logf(x) ((float)log((double)(x)))
+#endif /* logf */
+
+#define isfinite(x) _finite((double)(x))
+#define isnan(x) _isnan((double)(x))
+#endif /* _MSC_VER < 1400 && !defined(__cplusplus) */
+
+static INLINE double log2( double x )
+{
+   const double invln2 = 1.442695041;
+   return log( x ) * invln2;
+}
+
+static INLINE double
+round(double x)
+{
+   return x >= 0.0 ? floor(x + 0.5) : ceil(x - 0.5);
+}
+
+static INLINE float
+roundf(float x)
+{
+   return x >= 0.0f ? floorf(x + 0.5f) : ceilf(x - 0.5f);
+}
+
+#endif /* _MSC_VER */
+
+
+
+
+
+#define POW2_TABLE_SIZE_LOG2 9
+#define POW2_TABLE_SIZE (1 << POW2_TABLE_SIZE_LOG2)
+#define POW2_TABLE_OFFSET (POW2_TABLE_SIZE/2)
+#define POW2_TABLE_SCALE ((float)(POW2_TABLE_SIZE/2))
+extern float pow2_table[POW2_TABLE_SIZE];
+
+
+/**
+ * Initialize math module.  This should be called before using any
+ * other functions in this module.
+ */
+extern void
+util_init_math(void);
+
+
+union fi {
+   float f;
+   int32_t i;
+   uint32_t ui;
+};
+
+
+/**
+ * Fast version of 2^x
+ * Identity: exp2(a + b) = exp2(a) * exp2(b)
+ * Let ipart = int(x)
+ * Let fpart = x - ipart;
+ * So, exp2(x) = exp2(ipart) * exp2(fpart)
+ * Compute exp2(ipart) with i << ipart
+ * Compute exp2(fpart) with lookup table.
+ */
+static INLINE float
+util_fast_exp2(float x)
+{
+   int32_t ipart;
+   float fpart, mpart;
+   union fi epart;
+
+   if(x > 129.00000f)
+      return 3.402823466e+38f;
+
+   if (x < -126.99999f)
+      return 0.0f;
+
+   ipart = (int32_t) x;
+   fpart = x - (float) ipart;
+
+   /* same as
+    *   epart.f = (float) (1 << ipart)
+    * but faster and without integer overflow for ipart > 31
+    */
+   epart.i = (ipart + 127 ) << 23;
+
+   mpart = pow2_table[POW2_TABLE_OFFSET + (int)(fpart * POW2_TABLE_SCALE)];
+
+   return epart.f * mpart;
+}
+
+
+/**
+ * Fast approximation to exp(x).
+ */
+static INLINE float
+util_fast_exp(float x)
+{
+   const float k = 1.44269f; /* = log2(e) */
+   return util_fast_exp2(k * x);
+}
+
+
+#define LOG2_TABLE_SIZE_LOG2 16
+#define LOG2_TABLE_SCALE (1 << LOG2_TABLE_SIZE_LOG2)
+#define LOG2_TABLE_SIZE (LOG2_TABLE_SCALE + 1)
+extern float log2_table[LOG2_TABLE_SIZE];
+
+
+/**
+ * Fast approximation to log2(x).
+ */
+static INLINE float
+util_fast_log2(float x)
+{
+   union fi num;
+   float epart, mpart;
+   num.f = x;
+   epart = (float)(((num.i & 0x7f800000) >> 23) - 127);
+   /* mpart = log2_table[mantissa*LOG2_TABLE_SCALE + 0.5] */
+   mpart = log2_table[((num.i & 0x007fffff) + (1 << (22 - LOG2_TABLE_SIZE_LOG2))) >> (23 - LOG2_TABLE_SIZE_LOG2)];
+   return epart + mpart;
+}
+
+
+/**
+ * Fast approximation to x^y.
+ */
+static INLINE float
+util_fast_pow(float x, float y)
+{
+   return util_fast_exp2(util_fast_log2(x) * y);
+}
+
+/* Note that this counts zero as a power of two.
+ */
+static INLINE boolean
+util_is_power_of_two( unsigned v )
+{
+   return (v & (v-1)) == 0;
+}
+
+
+/**
+ * Floor(x), returned as int.
+ */
+static INLINE int
+util_ifloor(float f)
+{
+   int ai, bi;
+   double af, bf;
+   union fi u;
+   af = (3 << 22) + 0.5 + (double) f;
+   bf = (3 << 22) + 0.5 - (double) f;
+   u.f = (float) af;  ai = u.i;
+   u.f = (float) bf;  bi = u.i;
+   return (ai - bi) >> 1;
+}
+
+
+/**
+ * Round float to nearest int.
+ */
+static INLINE int
+util_iround(float f)
+{
+#if defined(PIPE_CC_GCC) && defined(PIPE_ARCH_X86) 
+   int r;
+   __asm__ ("fistpl %0" : "=m" (r) : "t" (f) : "st");
+   return r;
+#elif defined(PIPE_CC_MSVC) && defined(PIPE_ARCH_X86)
+   int r;
+   _asm {
+      fld f
+      fistp r
+   }
+   return r;
+#else
+   if (f >= 0.0f)
+      return (int) (f + 0.5f);
+   else
+      return (int) (f - 0.5f);
+#endif
+}
+
+
+/**
+ * Approximate floating point comparison
+ */
+static INLINE boolean
+util_is_approx(float a, float b, float tol)
+{
+   return fabs(b - a) <= tol;
+}
+
+
+/**
+ * Test if x is NaN or +/- infinity.
+ */
+static INLINE boolean
+util_is_inf_or_nan(float x)
+{
+   union fi tmp;
+   tmp.f = x;
+   return !(int)((unsigned int)((tmp.i & 0x7fffffff)-0x7f800000) >> 31);
+}
+
+
+/**
+ * Find first bit set in word.  Least significant bit is 1.
+ * Return 0 if no bits set.
+ */
+#if defined(_MSC_VER) && _MSC_VER >= 1300 && (_M_IX86 || _M_AMD64 || _M_IA64)
+unsigned char _BitScanForward(unsigned long* Index, unsigned long Mask);
+#pragma intrinsic(_BitScanForward)
+static INLINE
+unsigned long ffs( unsigned long u )
+{
+   unsigned long i;
+   if (_BitScanForward(&i, u))
+      return i + 1;
+   else
+      return 0;
+}
+#elif defined(PIPE_CC_MSVC) && defined(PIPE_ARCH_X86)
+static INLINE
+unsigned ffs( unsigned u )
+{
+   unsigned i;
+
+   if (u == 0) {
+      return 0;
+   }
+
+   __asm bsf eax, [u]
+   __asm inc eax
+   __asm mov [i], eax
+
+   return i;
+}
+#elif defined(__MINGW32__)
+#define ffs __builtin_ffs
+#endif
+
+
+/**
+ * Return float bits.
+ */
+static INLINE unsigned
+fui( float f )
+{
+   union fi fi;
+   fi.f = f;
+   return fi.ui;
+}
+
+
+/**
+ * Convert ubyte to float in [0, 1].
+ * XXX a 256-entry lookup table would be slightly faster.
+ */
+static INLINE float
+ubyte_to_float(ubyte ub)
+{
+   return (float) ub * (1.0f / 255.0f);
+}
+
+
+/**
+ * Convert float in [0,1] to ubyte in [0,255] with clamping.
+ */
+static INLINE ubyte
+float_to_ubyte(float f)
+{
+   const int ieee_0996 = 0x3f7f0000;   /* 0.996 or so */
+   union fi tmp;
+
+   tmp.f = f;
+   if (tmp.i < 0) {
+      return (ubyte) 0;
+   }
+   else if (tmp.i >= ieee_0996) {
+      return (ubyte) 255;
+   }
+   else {
+      tmp.f = tmp.f * (255.0f/256.0f) + 32768.0f;
+      return (ubyte) tmp.i;
+   }
+}
+
+static INLINE float
+byte_to_float_tex(int8_t b)
+{
+   return (b == -128) ? -1.0F : b * 1.0F / 127.0F;
+}
+
+static INLINE int8_t
+float_to_byte_tex(float f)
+{
+   return (int8_t) (127.0F * f);
+}
+
+/**
+ * Calc log base 2
+ */
+static INLINE unsigned
+util_logbase2(unsigned n)
+{
+   unsigned log2 = 0;
+   while (n >>= 1)
+      ++log2;
+   return log2;
+}
+
+
+/**
+ * Returns the smallest power of two >= x
+ */
+static INLINE unsigned
+util_next_power_of_two(unsigned x)
+{
+   unsigned i;
+
+   if (x == 0)
+      return 1;
+
+   --x;
+
+   for (i = 1; i < sizeof(unsigned) * 8; i <<= 1)
+      x |= x >> i;
+
+   return x + 1;
+}
+
+
+/**
+ * Return number of bits set in n.
+ */
+static INLINE unsigned
+util_bitcount(unsigned n)
+{
+#if defined(PIPE_CC_GCC)
+   return __builtin_popcount(n);
+#else
+   /* K&R classic bitcount.
+    *
+    * For each iteration, clear the LSB from the bitfield.
+    * Requires only one iteration per set bit, instead of
+    * one iteration per bit less than highest set bit.
+    */
+   unsigned bits = 0;
+   for (bits; n; bits++) {
+      n &= n - 1;
+   }
+   return bits;
+#endif
+}
+
+
+/**
+ * Reverse byte order of a 32 bit word.
+ */
+static INLINE uint32_t
+util_bswap32(uint32_t n)
+{
+#if defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION >= 403)
+   return __builtin_bswap32(n);
+#else
+   return (n >> 24) |
+          ((n >> 8) & 0x0000ff00) |
+          ((n << 8) & 0x00ff0000) |
+          (n << 24);
+#endif
+}
+
+
+/**
+ * Reverse byte order of a 16 bit word.
+ */
+static INLINE uint16_t
+util_bswap16(uint16_t n)
+{
+   return (n >> 8) |
+          (n << 8);
+}
+
+
+/**
+ * Clamp X to [MIN, MAX].
+ * This is a macro to allow float, int, uint, etc. types.
+ */
+#define CLAMP( X, MIN, MAX )  ( (X)<(MIN) ? (MIN) : ((X)>(MAX) ? (MAX) : (X)) )
+
+#define MIN2( A, B )   ( (A)<(B) ? (A) : (B) )
+#define MAX2( A, B )   ( (A)>(B) ? (A) : (B) )
+
+#define MIN3( A, B, C ) ((A) < (B) ? MIN2(A, C) : MIN2(B, C))
+#define MAX3( A, B, C ) ((A) > (B) ? MAX2(A, C) : MAX2(B, C))
+
+#define MIN4( A, B, C, D ) ((A) < (B) ? MIN3(A, C, D) : MIN3(B, C, D))
+#define MAX4( A, B, C, D ) ((A) > (B) ? MAX3(A, C, D) : MAX3(B, C, D))
+
+
+/**
+ * Align a value, only works pot alignemnts.
+ */
+static INLINE int
+align(int value, int alignment)
+{
+   return (value + alignment - 1) & ~(alignment - 1);
+}
+
+/**
+ * Works like align but on npot alignments.
+ */
+static INLINE size_t
+util_align_npot(size_t value, size_t alignment)
+{
+   if (value % alignment)
+      return value + (alignment - (value % alignment));
+   return value;
+}
+
+static INLINE unsigned
+u_minify(unsigned value, unsigned levels)
+{
+    return MAX2(1, value >> levels);
+}
+
+#ifndef COPY_4V
+#define COPY_4V( DST, SRC )         \
+do {                                \
+   (DST)[0] = (SRC)[0];             \
+   (DST)[1] = (SRC)[1];             \
+   (DST)[2] = (SRC)[2];             \
+   (DST)[3] = (SRC)[3];             \
+} while (0)
+#endif
+
+
+#ifndef COPY_4FV
+#define COPY_4FV( DST, SRC )  COPY_4V(DST, SRC)
+#endif
+
+
+#ifndef ASSIGN_4V
+#define ASSIGN_4V( DST, V0, V1, V2, V3 ) \
+do {                                     \
+   (DST)[0] = (V0);                      \
+   (DST)[1] = (V1);                      \
+   (DST)[2] = (V2);                      \
+   (DST)[3] = (V3);                      \
+} while (0)
+#endif
+
+
+static INLINE uint32_t util_unsigned_fixed(float value, unsigned frac_bits)
+{
+   return value < 0 ? 0 : (uint32_t)(value * (1<<frac_bits));
+}
+
+static INLINE int32_t util_signed_fixed(float value, unsigned frac_bits)
+{
+   return (int32_t)(value * (1<<frac_bits));
+}
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* U_MATH_H */
diff --git a/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c b/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
index 9306fcd5c..a034483ee 100644
--- a/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
+++ b/mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
@@ -1,613 +1,645 @@
-/**************************************************************************

- *

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

- *

- **************************************************************************/

-

-#include "util/u_vbuf_mgr.h"

-

-#include "util/u_format.h"

-#include "util/u_inlines.h"

-#include "util/u_memory.h"

-#include "util/u_upload_mgr.h"

-#include "translate/translate.h"

-#include "translate/translate_cache.h"

-

-/* Hardware vertex fetcher limitations can be described by this structure. */

-struct u_vbuf_caps {

-   /* Vertex format CAPs. */

-   /* TRUE if hardware supports it. */

-   unsigned format_fixed32:1;    /* PIPE_FORMAT_*32*_FIXED */

-   unsigned format_float16:1;    /* PIPE_FORMAT_*16*_FLOAT */

-   unsigned format_float64:1;    /* PIPE_FORMAT_*64*_FLOAT */

-   unsigned format_norm32:1;     /* PIPE_FORMAT_*32*NORM */

-   unsigned format_scaled32:1;   /* PIPE_FORMAT_*32*SCALED */

-

-   /* Whether vertex fetches don't have to be dword-aligned. */

-   /* TRUE if hardware supports it. */

-   unsigned fetch_dword_unaligned:1;

-};

-

-struct u_vbuf_mgr_elements {

-   unsigned count;

-   struct pipe_vertex_element ve[PIPE_MAX_ATTRIBS];

-

-   /* If (velem[i].src_format != real_format[i]), the vertex buffer

-    * referenced by the vertex element cannot be used for rendering and

-    * its vertex data must be translated to real_format[i]. */

-   enum pipe_format native_format[PIPE_MAX_ATTRIBS];

-   unsigned native_format_size[PIPE_MAX_ATTRIBS];

-

-   /* This might mean two things:

-    * - src_format != native_format, as discussed above.

-    * - src_offset % 4 != 0 (if the caps don't allow such an offset). */

-   boolean incompatible_layout;

-};

-

-struct u_vbuf_mgr_priv {

-   struct u_vbuf_mgr b;

-   struct u_vbuf_caps caps;

-   struct pipe_context *pipe;

-

-   struct translate_cache *translate_cache;

-   unsigned translate_vb_slot;

-

-   struct u_vbuf_mgr_elements *ve;

-   void *saved_ve, *fallback_ve;

-   boolean ve_binding_lock;

-

-   boolean any_user_vbs;

-   boolean incompatible_vb_layout;

-};

-

-static void u_vbuf_mgr_init_format_caps(struct u_vbuf_mgr_priv *mgr)

-{

-   struct pipe_screen *screen = mgr->pipe->screen;

-

-   mgr->caps.format_fixed32 =

-      screen->is_format_supported(screen, PIPE_FORMAT_R32_FIXED, PIPE_BUFFER,

-                                  0, PIPE_BIND_VERTEX_BUFFER);

-

-   mgr->caps.format_float16 =

-      screen->is_format_supported(screen, PIPE_FORMAT_R16_FLOAT, PIPE_BUFFER,

-                                  0, PIPE_BIND_VERTEX_BUFFER);

-

-   mgr->caps.format_float64 =

-      screen->is_format_supported(screen, PIPE_FORMAT_R64_FLOAT, PIPE_BUFFER,

-                                  0, PIPE_BIND_VERTEX_BUFFER);

-

-   mgr->caps.format_norm32 =

-      screen->is_format_supported(screen, PIPE_FORMAT_R32_UNORM, PIPE_BUFFER,

-                                  0, PIPE_BIND_VERTEX_BUFFER) &&

-      screen->is_format_supported(screen, PIPE_FORMAT_R32_SNORM, PIPE_BUFFER,

-                                  0, PIPE_BIND_VERTEX_BUFFER);

-

-   mgr->caps.format_scaled32 =

-      screen->is_format_supported(screen, PIPE_FORMAT_R32_USCALED, PIPE_BUFFER,

-                                  0, PIPE_BIND_VERTEX_BUFFER) &&

-      screen->is_format_supported(screen, PIPE_FORMAT_R32_SSCALED, PIPE_BUFFER,

-                                  0, PIPE_BIND_VERTEX_BUFFER);

-}

-

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

-{

-   struct u_vbuf_mgr_priv *mgr = CALLOC_STRUCT(u_vbuf_mgr_priv);

-

-   mgr->pipe = pipe;

-   mgr->translate_cache = translate_cache_create();

-

-   mgr->b.uploader = u_upload_create(pipe, upload_buffer_size,

-                                     upload_buffer_alignment,

-                                     upload_buffer_bind);

-

-   mgr->caps.fetch_dword_unaligned =

-         fetch_alignment == U_VERTEX_FETCH_BYTE_ALIGNED;

-

-   u_vbuf_mgr_init_format_caps(mgr);

-

-   return &mgr->b;

-}

-

-void u_vbuf_mgr_destroy(struct u_vbuf_mgr *mgrb)

-{

-   struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb;

-   unsigned i;

-

-   for (i = 0; i < mgr->b.nr_real_vertex_buffers; i++) {

-      pipe_resource_reference(&mgr->b.vertex_buffer[i].buffer, NULL);

-      pipe_resource_reference(&mgr->b.real_vertex_buffer[i], NULL);

-   }

-

-   translate_cache_destroy(mgr->translate_cache);

-   u_upload_destroy(mgr->b.uploader);

-   FREE(mgr);

-}

-

-

-static void u_vbuf_translate_begin(struct u_vbuf_mgr_priv *mgr,

-                                   int min_index, int max_index,

-                                   boolean *upload_flushed)

-{

-   struct translate_key key;

-   struct translate_element *te;

-   unsigned tr_elem_index[PIPE_MAX_ATTRIBS];

-   struct translate *tr;

-   boolean vb_translated[PIPE_MAX_ATTRIBS] = {0};

-   uint8_t *vb_map[PIPE_MAX_ATTRIBS] = {0}, *out_map;

-   struct pipe_transfer *vb_transfer[PIPE_MAX_ATTRIBS] = {0};

-   struct pipe_resource *out_buffer = NULL;

-   unsigned i, num_verts, out_offset;

-   struct pipe_vertex_element new_velems[PIPE_MAX_ATTRIBS];

-

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

-   memset(tr_elem_index, 0xff, sizeof(tr_elem_index));

-

-   /* Initialize the translate key, i.e. the recipe how vertices should be

-     * translated. */

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

-   for (i = 0; i < mgr->ve->count; i++) {

-      struct pipe_vertex_buffer *vb =

-            &mgr->b.vertex_buffer[mgr->ve->ve[i].vertex_buffer_index];

-      enum pipe_format output_format = mgr->ve->native_format[i];

-      unsigned output_format_size = mgr->ve->native_format_size[i];

-

-      /* Check for support. */

-      if (mgr->ve->ve[i].src_format == mgr->ve->native_format[i] &&

-          (mgr->caps.fetch_dword_unaligned ||

-           (vb->buffer_offset % 4 == 0 &&

-            vb->stride % 4 == 0 &&

-            mgr->ve->ve[i].src_offset % 4 == 0))) {

-         continue;

-      }

-

-      /* Workaround for translate: output floats instead of halfs. */

-      switch (output_format) {

-      case PIPE_FORMAT_R16_FLOAT:

-         output_format = PIPE_FORMAT_R32_FLOAT;

-         output_format_size = 4;

-         break;

-      case PIPE_FORMAT_R16G16_FLOAT:

-         output_format = PIPE_FORMAT_R32G32_FLOAT;

-         output_format_size = 8;

-         break;

-      case PIPE_FORMAT_R16G16B16_FLOAT:

-         output_format = PIPE_FORMAT_R32G32B32_FLOAT;

-         output_format_size = 12;

-         break;

-      case PIPE_FORMAT_R16G16B16A16_FLOAT:

-         output_format = PIPE_FORMAT_R32G32B32A32_FLOAT;

-         output_format_size = 16;

-         break;

-      default:;

-      }

-

-      /* Add this vertex element. */

-      te = &key.element[key.nr_elements];

-      /*te->type;

-        te->instance_divisor;*/

-      te->input_buffer = mgr->ve->ve[i].vertex_buffer_index;

-      te->input_format = mgr->ve->ve[i].src_format;

-      te->input_offset = mgr->ve->ve[i].src_offset;

-      te->output_format = output_format;

-      te->output_offset = key.output_stride;

-

-      key.output_stride += output_format_size;

-      vb_translated[mgr->ve->ve[i].vertex_buffer_index] = TRUE;

-      tr_elem_index[i] = key.nr_elements;

-      key.nr_elements++;

-   }

-

-   /* Get a translate object. */

-   tr = translate_cache_find(mgr->translate_cache, &key);

-

-   /* Map buffers we want to translate. */

-   for (i = 0; i < mgr->b.nr_vertex_buffers; i++) {

-      if (vb_translated[i]) {

-         struct pipe_vertex_buffer *vb = &mgr->b.vertex_buffer[i];

-

-         vb_map[i] = pipe_buffer_map(mgr->pipe, vb->buffer,

-                                     PIPE_TRANSFER_READ, &vb_transfer[i]);

-

-         tr->set_buffer(tr, i,

-                        vb_map[i] + vb->buffer_offset + vb->stride * min_index,

-                        vb->stride, ~0);

-      }

-   }

-

-   /* Create and map the output buffer. */

-   num_verts = max_index + 1 - min_index;

-

-   u_upload_alloc(mgr->b.uploader,

-                  key.output_stride * min_index,

-                  key.output_stride * num_verts,

-                  &out_offset, &out_buffer, upload_flushed,

-                  (void**)&out_map);

-

-   out_offset -= key.output_stride * min_index;

-

-   /* Translate. */

-   tr->run(tr, 0, num_verts, 0, out_map);

-

-   /* Unmap all buffers. */

-   for (i = 0; i < mgr->b.nr_vertex_buffers; i++) {

-      if (vb_translated[i]) {

-         pipe_buffer_unmap(mgr->pipe, vb_transfer[i]);

-      }

-   }

-

-   /* Setup the new vertex buffer in the first free slot. */

-   mgr->translate_vb_slot = ~0;

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

-      if (!mgr->b.vertex_buffer[i].buffer) {

-         mgr->translate_vb_slot = i;

-

-         if (i >= mgr->b.nr_vertex_buffers) {

-            mgr->b.nr_real_vertex_buffers = i+1;

-         }

-         break;

-      }

-   }

-

-   if (mgr->translate_vb_slot != ~0) {

-      /* Setup the new vertex buffer. */

-      pipe_resource_reference(

-            &mgr->b.real_vertex_buffer[mgr->translate_vb_slot], out_buffer);

-      mgr->b.vertex_buffer[mgr->translate_vb_slot].buffer_offset = out_offset;

-      mgr->b.vertex_buffer[mgr->translate_vb_slot].stride = key.output_stride;

-

-      /* Setup new vertex elements. */

-      for (i = 0; i < mgr->ve->count; i++) {

-         if (tr_elem_index[i] < key.nr_elements) {

-            te = &key.element[tr_elem_index[i]];

-            new_velems[i].instance_divisor = mgr->ve->ve[i].instance_divisor;

-            new_velems[i].src_format = te->output_format;

-            new_velems[i].src_offset = te->output_offset;

-            new_velems[i].vertex_buffer_index = mgr->translate_vb_slot;

-         } else {

-            memcpy(&new_velems[i], &mgr->ve->ve[i],

-                   sizeof(struct pipe_vertex_element));

-         }

-      }

-

-      mgr->fallback_ve =

-            mgr->pipe->create_vertex_elements_state(mgr->pipe, mgr->ve->count,

-                                                    new_velems);

-

-      /* Preserve saved_ve. */

-      mgr->ve_binding_lock = TRUE;

-      mgr->pipe->bind_vertex_elements_state(mgr->pipe, mgr->fallback_ve);

-      mgr->ve_binding_lock = FALSE;

-   }

-

-   pipe_resource_reference(&out_buffer, NULL);

-}

-

-static void u_vbuf_translate_end(struct u_vbuf_mgr_priv *mgr)

-{

-   if (mgr->fallback_ve == NULL) {

-      return;

-   }

-

-   /* Restore vertex elements. */

-   /* Note that saved_ve will be overwritten in bind_vertex_elements_state. */

-   mgr->pipe->bind_vertex_elements_state(mgr->pipe, mgr->saved_ve);

-   mgr->pipe->delete_vertex_elements_state(mgr->pipe, mgr->fallback_ve);

-   mgr->fallback_ve = NULL;

-

-   /* Delete the now-unused VBO. */

-   pipe_resource_reference(&mgr->b.real_vertex_buffer[mgr->translate_vb_slot],

-                           NULL);

-   mgr->b.nr_real_vertex_buffers = mgr->b.nr_vertex_buffers;

-}

-

-#define FORMAT_REPLACE(what, withwhat) \

-    case PIPE_FORMAT_##what: format = PIPE_FORMAT_##withwhat; break

-

-struct u_vbuf_mgr_elements *

-u_vbuf_mgr_create_vertex_elements(struct u_vbuf_mgr *mgrb,

-                                  unsigned count,

-                                  const struct pipe_vertex_element *attribs,

-                                  struct pipe_vertex_element *native_attribs)

-{

-   struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb;

-   unsigned i;

-   struct u_vbuf_mgr_elements *ve = CALLOC_STRUCT(u_vbuf_mgr_elements);

-

-   ve->count = count;

-

-   if (!count) {

-      return ve;

-   }

-

-   memcpy(ve->ve, attribs, sizeof(struct pipe_vertex_element) * count);

-   memcpy(native_attribs, attribs, sizeof(struct pipe_vertex_element) * count);

-

-   /* Set the best native format in case the original format is not

-    * supported. */

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

-      enum pipe_format format = ve->ve[i].src_format;

-

-      /* Choose a native format.

-       * For now we don't care about the alignment, that's going to

-       * be sorted out later. */

-      if (!mgr->caps.format_fixed32) {

-         switch (format) {

-            FORMAT_REPLACE(R32_FIXED,           R32_FLOAT);

-            FORMAT_REPLACE(R32G32_FIXED,        R32G32_FLOAT);

-            FORMAT_REPLACE(R32G32B32_FIXED,     R32G32B32_FLOAT);

-            FORMAT_REPLACE(R32G32B32A32_FIXED,  R32G32B32A32_FLOAT);

-            default:;

-         }

-      }

-      if (!mgr->caps.format_float16) {

-         switch (format) {

-            FORMAT_REPLACE(R16_FLOAT,           R32_FLOAT);

-            FORMAT_REPLACE(R16G16_FLOAT,        R32G32_FLOAT);

-            FORMAT_REPLACE(R16G16B16_FLOAT,     R32G32B32_FLOAT);

-            FORMAT_REPLACE(R16G16B16A16_FLOAT,  R32G32B32A32_FLOAT);

-            default:;

-         }

-      }

-      if (!mgr->caps.format_float64) {

-         switch (format) {

-            FORMAT_REPLACE(R64_FLOAT,           R32_FLOAT);

-            FORMAT_REPLACE(R64G64_FLOAT,        R32G32_FLOAT);

-            FORMAT_REPLACE(R64G64B64_FLOAT,     R32G32B32_FLOAT);

-            FORMAT_REPLACE(R64G64B64A64_FLOAT,  R32G32B32A32_FLOAT);

-            default:;

-         }

-      }

-      if (!mgr->caps.format_norm32) {

-         switch (format) {

-            FORMAT_REPLACE(R32_UNORM,           R32_FLOAT);

-            FORMAT_REPLACE(R32G32_UNORM,        R32G32_FLOAT);

-            FORMAT_REPLACE(R32G32B32_UNORM,     R32G32B32_FLOAT);

-            FORMAT_REPLACE(R32G32B32A32_UNORM,  R32G32B32A32_FLOAT);

-            FORMAT_REPLACE(R32_SNORM,           R32_FLOAT);

-            FORMAT_REPLACE(R32G32_SNORM,        R32G32_FLOAT);

-            FORMAT_REPLACE(R32G32B32_SNORM,     R32G32B32_FLOAT);

-            FORMAT_REPLACE(R32G32B32A32_SNORM,  R32G32B32A32_FLOAT);

-            default:;

-         }

-      }

-      if (!mgr->caps.format_scaled32) {

-         switch (format) {

-            FORMAT_REPLACE(R32_USCALED,         R32_FLOAT);

-            FORMAT_REPLACE(R32G32_USCALED,      R32G32_FLOAT);

-            FORMAT_REPLACE(R32G32B32_USCALED,   R32G32B32_FLOAT);

-            FORMAT_REPLACE(R32G32B32A32_USCALED,R32G32B32A32_FLOAT);

-            FORMAT_REPLACE(R32_SSCALED,         R32_FLOAT);

-            FORMAT_REPLACE(R32G32_SSCALED,      R32G32_FLOAT);

-            FORMAT_REPLACE(R32G32B32_SSCALED,   R32G32B32_FLOAT);

-            FORMAT_REPLACE(R32G32B32A32_SSCALED,R32G32B32A32_FLOAT);

-            default:;

-         }

-      }

-

-      native_attribs[i].src_format = format;

-      ve->native_format[i] = format;

-      ve->native_format_size[i] =

-            util_format_get_blocksize(ve->native_format[i]);

-

-      ve->incompatible_layout =

-            ve->incompatible_layout ||

-            ve->ve[i].src_format != ve->native_format[i] ||

-            (!mgr->caps.fetch_dword_unaligned && ve->ve[i].src_offset % 4 != 0);

-   }

-

-   /* Align the formats to the size of DWORD if needed. */

-   if (!mgr->caps.fetch_dword_unaligned) {

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

-         ve->native_format_size[i] = align(ve->native_format_size[i], 4);

-      }

-   }

-

-   return ve;

-}

-

-void u_vbuf_mgr_bind_vertex_elements(struct u_vbuf_mgr *mgrb,

-                                     void *cso,

-                                     struct u_vbuf_mgr_elements *ve)

-{

-   struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb;

-

-   if (!cso) {

-      return;

-   }

-

-   if (!mgr->ve_binding_lock) {

-      mgr->saved_ve = cso;

-      mgr->ve = ve;

-   }

-}

-

-void u_vbuf_mgr_destroy_vertex_elements(struct u_vbuf_mgr *mgr,

-                                        struct u_vbuf_mgr_elements *ve)

-{

-   FREE(ve);

-}

-

-void u_vbuf_mgr_set_vertex_buffers(struct u_vbuf_mgr *mgrb,

-                                   unsigned count,

-                                   const struct pipe_vertex_buffer *bufs)

-{

-   struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb;

-   unsigned i;

-

-   mgr->b.max_index = ~0;

-   mgr->any_user_vbs = FALSE;

-   mgr->incompatible_vb_layout = FALSE;

-

-   if (!mgr->caps.fetch_dword_unaligned) {

-      /* Check if the strides and offsets are aligned to the size of DWORD. */

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

-         if (bufs[i].buffer) {

-            if (bufs[i].stride % 4 != 0 ||

-                bufs[i].buffer_offset % 4 != 0) {

-               mgr->incompatible_vb_layout = TRUE;

-               break;

-            }

-         }

-      }

-   }

-

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

-      const struct pipe_vertex_buffer *vb = &bufs[i];

-

-      pipe_resource_reference(&mgr->b.vertex_buffer[i].buffer, vb->buffer);

-      pipe_resource_reference(&mgr->b.real_vertex_buffer[i], NULL);

-

-      if (u_vbuf_resource(vb->buffer)->user_ptr) {

-         mgr->any_user_vbs = TRUE;

-         continue;

-      }

-

-      pipe_resource_reference(&mgr->b.real_vertex_buffer[i], vb->buffer);

-

-      /* The stride of zero means we will be fetching only the first

-       * vertex, so don't care about max_index. */

-      if (!vb->stride) {

-         continue;

-      }

-

-      /* Update the maximum index. */

-      mgr->b.max_index =

-            MIN2(mgr->b.max_index,

-                 (vb->buffer->width0 - vb->buffer_offset) / vb->stride - 1);

-   }

-

-   for (; i < mgr->b.nr_real_vertex_buffers; i++) {

-      pipe_resource_reference(&mgr->b.vertex_buffer[i].buffer, NULL);

-      pipe_resource_reference(&mgr->b.real_vertex_buffer[i], NULL);

-   }

-

-   memcpy(mgr->b.vertex_buffer, bufs,

-          sizeof(struct pipe_vertex_buffer) * count);

-

-   mgr->b.nr_vertex_buffers = count;

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

-{

-   int i, nr = mgr->ve->count;

-   unsigned count = max_index + 1 - min_index;

-   boolean uploaded[PIPE_MAX_ATTRIBS] = {0};

-

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

-      unsigned index = mgr->ve->ve[i].vertex_buffer_index;

-      struct pipe_vertex_buffer *vb = &mgr->b.vertex_buffer[index];

-

-      if (vb->buffer &&

-          u_vbuf_resource(vb->buffer)->user_ptr &&

-          !uploaded[index]) {

-         unsigned first, size;

-         boolean flushed;

-         unsigned instance_div = mgr->ve->ve[i].instance_divisor;

-

-         if (instance_div) {

-            first = 0;

-            size = vb->stride *

-                   ((instance_count + instance_div - 1) / instance_div);

-         } else if (vb->stride) {

-            first = vb->stride * min_index;

-            size = vb->stride * count;

-         } else {

-            first = 0;

-            size = mgr->ve->native_format_size[i];

-         }

-

-         u_upload_data(mgr->b.uploader, first, size,

-                       u_vbuf_resource(vb->buffer)->user_ptr + first,

-                       &vb->buffer_offset,

-                       &mgr->b.real_vertex_buffer[index],

-                       &flushed);

-

-         vb->buffer_offset -= first;

-

-         uploaded[index] = TRUE;

-         *upload_flushed = *upload_flushed || flushed;

-      } else {

-         assert(mgr->b.real_vertex_buffer[index]);

-      }

-   }

-}

-

-void u_vbuf_mgr_draw_begin(struct u_vbuf_mgr *mgrb,

-                           const struct pipe_draw_info *info,

-                           boolean *buffers_updated,

-                           boolean *uploader_flushed)

-{

-   struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb;

-   boolean bufs_updated = FALSE, upload_flushed = FALSE;

-   int min_index, max_index;

-

-   min_index = info->min_index - info->index_bias;

-   if (info->max_index == ~0) {

-      max_index = mgr->b.max_index;

-   } else {

-      max_index = MIN2(info->max_index - info->index_bias, mgr->b.max_index);

-   }

-

-   /* 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);

-

-      if (mgr->fallback_ve) {

-         bufs_updated = TRUE;

-      }

-   }

-

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

-   }

-}

-

-void u_vbuf_mgr_draw_end(struct u_vbuf_mgr *mgrb)

-{

-   struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb;

-

-   if (mgr->fallback_ve) {

-      u_vbuf_translate_end(mgr);

-   }

-}

+/**************************************************************************
+ *
+ * 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.
+ *
+ **************************************************************************/
+
+#include "util/u_vbuf_mgr.h"
+
+#include "util/u_format.h"
+#include "util/u_inlines.h"
+#include "util/u_memory.h"
+#include "util/u_upload_mgr.h"
+#include "translate/translate.h"
+#include "translate/translate_cache.h"
+
+/* Hardware vertex fetcher limitations can be described by this structure. */
+struct u_vbuf_caps {
+   /* Vertex format CAPs. */
+   /* TRUE if hardware supports it. */
+   unsigned format_fixed32:1;    /* PIPE_FORMAT_*32*_FIXED */
+   unsigned format_float16:1;    /* PIPE_FORMAT_*16*_FLOAT */
+   unsigned format_float64:1;    /* PIPE_FORMAT_*64*_FLOAT */
+   unsigned format_norm32:1;     /* PIPE_FORMAT_*32*NORM */
+   unsigned format_scaled32:1;   /* PIPE_FORMAT_*32*SCALED */
+
+   /* Whether vertex fetches don't have to be dword-aligned. */
+   /* TRUE if hardware supports it. */
+   unsigned fetch_dword_unaligned:1;
+};
+
+struct u_vbuf_mgr_elements {
+   unsigned count;
+   struct pipe_vertex_element ve[PIPE_MAX_ATTRIBS];
+
+   unsigned src_format_size[PIPE_MAX_ATTRIBS];
+
+   /* If (velem[i].src_format != native_format[i]), the vertex buffer
+    * referenced by the vertex element cannot be used for rendering and
+    * its vertex data must be translated to native_format[i]. */
+   enum pipe_format native_format[PIPE_MAX_ATTRIBS];
+   unsigned native_format_size[PIPE_MAX_ATTRIBS];
+
+   /* This might mean two things:
+    * - src_format != native_format, as discussed above.
+    * - src_offset % 4 != 0 (if the caps don't allow such an offset). */
+   boolean incompatible_layout;
+};
+
+struct u_vbuf_mgr_priv {
+   struct u_vbuf_mgr b;
+   struct u_vbuf_caps caps;
+   struct pipe_context *pipe;
+
+   struct translate_cache *translate_cache;
+   unsigned translate_vb_slot;
+
+   struct u_vbuf_mgr_elements *ve;
+   void *saved_ve, *fallback_ve;
+   boolean ve_binding_lock;
+
+   boolean any_user_vbs;
+   boolean incompatible_vb_layout;
+};
+
+static void u_vbuf_mgr_init_format_caps(struct u_vbuf_mgr_priv *mgr)
+{
+   struct pipe_screen *screen = mgr->pipe->screen;
+
+   mgr->caps.format_fixed32 =
+      screen->is_format_supported(screen, PIPE_FORMAT_R32_FIXED, PIPE_BUFFER,
+                                  0, PIPE_BIND_VERTEX_BUFFER);
+
+   mgr->caps.format_float16 =
+      screen->is_format_supported(screen, PIPE_FORMAT_R16_FLOAT, PIPE_BUFFER,
+                                  0, PIPE_BIND_VERTEX_BUFFER);
+
+   mgr->caps.format_float64 =
+      screen->is_format_supported(screen, PIPE_FORMAT_R64_FLOAT, PIPE_BUFFER,
+                                  0, PIPE_BIND_VERTEX_BUFFER);
+
+   mgr->caps.format_norm32 =
+      screen->is_format_supported(screen, PIPE_FORMAT_R32_UNORM, PIPE_BUFFER,
+                                  0, PIPE_BIND_VERTEX_BUFFER) &&
+      screen->is_format_supported(screen, PIPE_FORMAT_R32_SNORM, PIPE_BUFFER,
+                                  0, PIPE_BIND_VERTEX_BUFFER);
+
+   mgr->caps.format_scaled32 =
+      screen->is_format_supported(screen, PIPE_FORMAT_R32_USCALED, PIPE_BUFFER,
+                                  0, PIPE_BIND_VERTEX_BUFFER) &&
+      screen->is_format_supported(screen, PIPE_FORMAT_R32_SSCALED, PIPE_BUFFER,
+                                  0, PIPE_BIND_VERTEX_BUFFER);
+}
+
+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)
+{
+   struct u_vbuf_mgr_priv *mgr = CALLOC_STRUCT(u_vbuf_mgr_priv);
+
+   mgr->pipe = pipe;
+   mgr->translate_cache = translate_cache_create();
+
+   mgr->b.uploader = u_upload_create(pipe, upload_buffer_size,
+                                     upload_buffer_alignment,
+                                     upload_buffer_bind);
+
+   mgr->caps.fetch_dword_unaligned =
+         fetch_alignment == U_VERTEX_FETCH_BYTE_ALIGNED;
+
+   u_vbuf_mgr_init_format_caps(mgr);
+
+   return &mgr->b;
+}
+
+void u_vbuf_mgr_destroy(struct u_vbuf_mgr *mgrb)
+{
+   struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb;
+   unsigned i;
+
+   for (i = 0; i < mgr->b.nr_real_vertex_buffers; i++) {
+      pipe_resource_reference(&mgr->b.vertex_buffer[i].buffer, NULL);
+      pipe_resource_reference(&mgr->b.real_vertex_buffer[i], NULL);
+   }
+
+   translate_cache_destroy(mgr->translate_cache);
+   u_upload_destroy(mgr->b.uploader);
+   FREE(mgr);
+}
+
+
+static void u_vbuf_translate_begin(struct u_vbuf_mgr_priv *mgr,
+                                   int min_index, int max_index,
+                                   boolean *upload_flushed)
+{
+   struct translate_key key;
+   struct translate_element *te;
+   unsigned tr_elem_index[PIPE_MAX_ATTRIBS];
+   struct translate *tr;
+   boolean vb_translated[PIPE_MAX_ATTRIBS] = {0};
+   uint8_t *vb_map[PIPE_MAX_ATTRIBS] = {0}, *out_map;
+   struct pipe_transfer *vb_transfer[PIPE_MAX_ATTRIBS] = {0};
+   struct pipe_resource *out_buffer = NULL;
+   unsigned i, num_verts, out_offset;
+   struct pipe_vertex_element new_velems[PIPE_MAX_ATTRIBS];
+
+   memset(&key, 0, sizeof(key));
+   memset(tr_elem_index, 0xff, sizeof(tr_elem_index));
+
+   /* Initialize the translate key, i.e. the recipe how vertices should be
+     * translated. */
+   memset(&key, 0, sizeof key);
+   for (i = 0; i < mgr->ve->count; i++) {
+      struct pipe_vertex_buffer *vb =
+            &mgr->b.vertex_buffer[mgr->ve->ve[i].vertex_buffer_index];
+      enum pipe_format output_format = mgr->ve->native_format[i];
+      unsigned output_format_size = mgr->ve->native_format_size[i];
+
+      /* Check for support. */
+      if (mgr->ve->ve[i].src_format == mgr->ve->native_format[i] &&
+          (mgr->caps.fetch_dword_unaligned ||
+           (vb->buffer_offset % 4 == 0 &&
+            vb->stride % 4 == 0 &&
+            mgr->ve->ve[i].src_offset % 4 == 0))) {
+         continue;
+      }
+
+      /* Workaround for translate: output floats instead of halfs. */
+      switch (output_format) {
+      case PIPE_FORMAT_R16_FLOAT:
+         output_format = PIPE_FORMAT_R32_FLOAT;
+         output_format_size = 4;
+         break;
+      case PIPE_FORMAT_R16G16_FLOAT:
+         output_format = PIPE_FORMAT_R32G32_FLOAT;
+         output_format_size = 8;
+         break;
+      case PIPE_FORMAT_R16G16B16_FLOAT:
+         output_format = PIPE_FORMAT_R32G32B32_FLOAT;
+         output_format_size = 12;
+         break;
+      case PIPE_FORMAT_R16G16B16A16_FLOAT:
+         output_format = PIPE_FORMAT_R32G32B32A32_FLOAT;
+         output_format_size = 16;
+         break;
+      default:;
+      }
+
+      /* Add this vertex element. */
+      te = &key.element[key.nr_elements];
+      /*te->type;
+        te->instance_divisor;*/
+      te->input_buffer = mgr->ve->ve[i].vertex_buffer_index;
+      te->input_format = mgr->ve->ve[i].src_format;
+      te->input_offset = mgr->ve->ve[i].src_offset;
+      te->output_format = output_format;
+      te->output_offset = key.output_stride;
+
+      key.output_stride += output_format_size;
+      vb_translated[mgr->ve->ve[i].vertex_buffer_index] = TRUE;
+      tr_elem_index[i] = key.nr_elements;
+      key.nr_elements++;
+   }
+
+   /* Get a translate object. */
+   tr = translate_cache_find(mgr->translate_cache, &key);
+
+   /* Map buffers we want to translate. */
+   for (i = 0; i < mgr->b.nr_vertex_buffers; i++) {
+      if (vb_translated[i]) {
+         struct pipe_vertex_buffer *vb = &mgr->b.vertex_buffer[i];
+
+         vb_map[i] = pipe_buffer_map(mgr->pipe, vb->buffer,
+                                     PIPE_TRANSFER_READ, &vb_transfer[i]);
+
+         tr->set_buffer(tr, i,
+                        vb_map[i] + vb->buffer_offset + vb->stride * min_index,
+                        vb->stride, ~0);
+      }
+   }
+
+   /* Create and map the output buffer. */
+   num_verts = max_index + 1 - min_index;
+
+   u_upload_alloc(mgr->b.uploader,
+                  key.output_stride * min_index,
+                  key.output_stride * num_verts,
+                  &out_offset, &out_buffer, upload_flushed,
+                  (void**)&out_map);
+
+   out_offset -= key.output_stride * min_index;
+
+   /* Translate. */
+   tr->run(tr, 0, num_verts, 0, out_map);
+
+   /* Unmap all buffers. */
+   for (i = 0; i < mgr->b.nr_vertex_buffers; i++) {
+      if (vb_translated[i]) {
+         pipe_buffer_unmap(mgr->pipe, vb_transfer[i]);
+      }
+   }
+
+   /* Setup the new vertex buffer in the first free slot. */
+   mgr->translate_vb_slot = ~0;
+   for (i = 0; i < PIPE_MAX_ATTRIBS; i++) {
+      if (!mgr->b.vertex_buffer[i].buffer) {
+         mgr->translate_vb_slot = i;
+
+         if (i >= mgr->b.nr_vertex_buffers) {
+            mgr->b.nr_real_vertex_buffers = i+1;
+         }
+         break;
+      }
+   }
+
+   if (mgr->translate_vb_slot != ~0) {
+      /* Setup the new vertex buffer. */
+      pipe_resource_reference(
+            &mgr->b.real_vertex_buffer[mgr->translate_vb_slot], out_buffer);
+      mgr->b.vertex_buffer[mgr->translate_vb_slot].buffer_offset = out_offset;
+      mgr->b.vertex_buffer[mgr->translate_vb_slot].stride = key.output_stride;
+
+      /* Setup new vertex elements. */
+      for (i = 0; i < mgr->ve->count; i++) {
+         if (tr_elem_index[i] < key.nr_elements) {
+            te = &key.element[tr_elem_index[i]];
+            new_velems[i].instance_divisor = mgr->ve->ve[i].instance_divisor;
+            new_velems[i].src_format = te->output_format;
+            new_velems[i].src_offset = te->output_offset;
+            new_velems[i].vertex_buffer_index = mgr->translate_vb_slot;
+         } else {
+            memcpy(&new_velems[i], &mgr->ve->ve[i],
+                   sizeof(struct pipe_vertex_element));
+         }
+      }
+
+      mgr->fallback_ve =
+            mgr->pipe->create_vertex_elements_state(mgr->pipe, mgr->ve->count,
+                                                    new_velems);
+
+      /* Preserve saved_ve. */
+      mgr->ve_binding_lock = TRUE;
+      mgr->pipe->bind_vertex_elements_state(mgr->pipe, mgr->fallback_ve);
+      mgr->ve_binding_lock = FALSE;
+   }
+
+   pipe_resource_reference(&out_buffer, NULL);
+}
+
+static void u_vbuf_translate_end(struct u_vbuf_mgr_priv *mgr)
+{
+   if (mgr->fallback_ve == NULL) {
+      return;
+   }
+
+   /* Restore vertex elements. */
+   /* Note that saved_ve will be overwritten in bind_vertex_elements_state. */
+   mgr->pipe->bind_vertex_elements_state(mgr->pipe, mgr->saved_ve);
+   mgr->pipe->delete_vertex_elements_state(mgr->pipe, mgr->fallback_ve);
+   mgr->fallback_ve = NULL;
+
+   /* Delete the now-unused VBO. */
+   pipe_resource_reference(&mgr->b.real_vertex_buffer[mgr->translate_vb_slot],
+                           NULL);
+   mgr->b.nr_real_vertex_buffers = mgr->b.nr_vertex_buffers;
+}
+
+#define FORMAT_REPLACE(what, withwhat) \
+    case PIPE_FORMAT_##what: format = PIPE_FORMAT_##withwhat; break
+
+struct u_vbuf_mgr_elements *
+u_vbuf_mgr_create_vertex_elements(struct u_vbuf_mgr *mgrb,
+                                  unsigned count,
+                                  const struct pipe_vertex_element *attribs,
+                                  struct pipe_vertex_element *native_attribs)
+{
+   struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb;
+   unsigned i;
+   struct u_vbuf_mgr_elements *ve = CALLOC_STRUCT(u_vbuf_mgr_elements);
+
+   ve->count = count;
+
+   if (!count) {
+      return ve;
+   }
+
+   memcpy(ve->ve, attribs, sizeof(struct pipe_vertex_element) * count);
+   memcpy(native_attribs, attribs, sizeof(struct pipe_vertex_element) * count);
+
+   /* Set the best native format in case the original format is not
+    * supported. */
+   for (i = 0; i < count; i++) {
+      enum pipe_format format = ve->ve[i].src_format;
+
+      ve->src_format_size[i] = util_format_get_blocksize(format);
+
+      /* Choose a native format.
+       * For now we don't care about the alignment, that's going to
+       * be sorted out later. */
+      if (!mgr->caps.format_fixed32) {
+         switch (format) {
+            FORMAT_REPLACE(R32_FIXED,           R32_FLOAT);
+            FORMAT_REPLACE(R32G32_FIXED,        R32G32_FLOAT);
+            FORMAT_REPLACE(R32G32B32_FIXED,     R32G32B32_FLOAT);
+            FORMAT_REPLACE(R32G32B32A32_FIXED,  R32G32B32A32_FLOAT);
+            default:;
+         }
+      }
+      if (!mgr->caps.format_float16) {
+         switch (format) {
+            FORMAT_REPLACE(R16_FLOAT,           R32_FLOAT);
+            FORMAT_REPLACE(R16G16_FLOAT,        R32G32_FLOAT);
+            FORMAT_REPLACE(R16G16B16_FLOAT,     R32G32B32_FLOAT);
+            FORMAT_REPLACE(R16G16B16A16_FLOAT,  R32G32B32A32_FLOAT);
+            default:;
+         }
+      }
+      if (!mgr->caps.format_float64) {
+         switch (format) {
+            FORMAT_REPLACE(R64_FLOAT,           R32_FLOAT);
+            FORMAT_REPLACE(R64G64_FLOAT,        R32G32_FLOAT);
+            FORMAT_REPLACE(R64G64B64_FLOAT,     R32G32B32_FLOAT);
+            FORMAT_REPLACE(R64G64B64A64_FLOAT,  R32G32B32A32_FLOAT);
+            default:;
+         }
+      }
+      if (!mgr->caps.format_norm32) {
+         switch (format) {
+            FORMAT_REPLACE(R32_UNORM,           R32_FLOAT);
+            FORMAT_REPLACE(R32G32_UNORM,        R32G32_FLOAT);
+            FORMAT_REPLACE(R32G32B32_UNORM,     R32G32B32_FLOAT);
+            FORMAT_REPLACE(R32G32B32A32_UNORM,  R32G32B32A32_FLOAT);
+            FORMAT_REPLACE(R32_SNORM,           R32_FLOAT);
+            FORMAT_REPLACE(R32G32_SNORM,        R32G32_FLOAT);
+            FORMAT_REPLACE(R32G32B32_SNORM,     R32G32B32_FLOAT);
+            FORMAT_REPLACE(R32G32B32A32_SNORM,  R32G32B32A32_FLOAT);
+            default:;
+         }
+      }
+      if (!mgr->caps.format_scaled32) {
+         switch (format) {
+            FORMAT_REPLACE(R32_USCALED,         R32_FLOAT);
+            FORMAT_REPLACE(R32G32_USCALED,      R32G32_FLOAT);
+            FORMAT_REPLACE(R32G32B32_USCALED,   R32G32B32_FLOAT);
+            FORMAT_REPLACE(R32G32B32A32_USCALED,R32G32B32A32_FLOAT);
+            FORMAT_REPLACE(R32_SSCALED,         R32_FLOAT);
+            FORMAT_REPLACE(R32G32_SSCALED,      R32G32_FLOAT);
+            FORMAT_REPLACE(R32G32B32_SSCALED,   R32G32B32_FLOAT);
+            FORMAT_REPLACE(R32G32B32A32_SSCALED,R32G32B32A32_FLOAT);
+            default:;
+         }
+      }
+
+      native_attribs[i].src_format = format;
+      ve->native_format[i] = format;
+      ve->native_format_size[i] =
+            util_format_get_blocksize(ve->native_format[i]);
+
+      ve->incompatible_layout =
+            ve->incompatible_layout ||
+            ve->ve[i].src_format != ve->native_format[i] ||
+            (!mgr->caps.fetch_dword_unaligned && ve->ve[i].src_offset % 4 != 0);
+   }
+
+   /* Align the formats to the size of DWORD if needed. */
+   if (!mgr->caps.fetch_dword_unaligned) {
+      for (i = 0; i < count; i++) {
+         ve->native_format_size[i] = align(ve->native_format_size[i], 4);
+      }
+   }
+
+   return ve;
+}
+
+void u_vbuf_mgr_bind_vertex_elements(struct u_vbuf_mgr *mgrb,
+                                     void *cso,
+                                     struct u_vbuf_mgr_elements *ve)
+{
+   struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb;
+
+   if (!cso) {
+      return;
+   }
+
+   if (!mgr->ve_binding_lock) {
+      mgr->saved_ve = cso;
+      mgr->ve = ve;
+   }
+}
+
+void u_vbuf_mgr_destroy_vertex_elements(struct u_vbuf_mgr *mgr,
+                                        struct u_vbuf_mgr_elements *ve)
+{
+   FREE(ve);
+}
+
+void u_vbuf_mgr_set_vertex_buffers(struct u_vbuf_mgr *mgrb,
+                                   unsigned count,
+                                   const struct pipe_vertex_buffer *bufs)
+{
+   struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb;
+   unsigned i;
+
+   mgr->any_user_vbs = FALSE;
+   mgr->incompatible_vb_layout = FALSE;
+
+   if (!mgr->caps.fetch_dword_unaligned) {
+      /* Check if the strides and offsets are aligned to the size of DWORD. */
+      for (i = 0; i < count; i++) {
+         if (bufs[i].buffer) {
+            if (bufs[i].stride % 4 != 0 ||
+                bufs[i].buffer_offset % 4 != 0) {
+               mgr->incompatible_vb_layout = TRUE;
+               break;
+            }
+         }
+      }
+   }
+
+   for (i = 0; i < count; i++) {
+      const struct pipe_vertex_buffer *vb = &bufs[i];
+
+      pipe_resource_reference(&mgr->b.vertex_buffer[i].buffer, vb->buffer);
+      pipe_resource_reference(&mgr->b.real_vertex_buffer[i], NULL);
+
+      if (!vb->buffer) {
+         continue;
+      }
+
+      if (u_vbuf_resource(vb->buffer)->user_ptr) {
+         mgr->any_user_vbs = TRUE;
+         continue;
+      }
+
+      pipe_resource_reference(&mgr->b.real_vertex_buffer[i], vb->buffer);
+   }
+
+   for (; i < mgr->b.nr_real_vertex_buffers; i++) {
+      pipe_resource_reference(&mgr->b.vertex_buffer[i].buffer, NULL);
+      pipe_resource_reference(&mgr->b.real_vertex_buffer[i], NULL);
+   }
+
+   memcpy(mgr->b.vertex_buffer, bufs,
+          sizeof(struct pipe_vertex_buffer) * count);
+
+   mgr->b.nr_vertex_buffers = count;
+   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)
+{
+   unsigned i, nr = mgr->ve->count;
+   unsigned count = max_index + 1 - min_index;
+   boolean uploaded[PIPE_MAX_ATTRIBS] = {0};
+
+   for (i = 0; i < nr; i++) {
+      unsigned index = mgr->ve->ve[i].vertex_buffer_index;
+      struct pipe_vertex_buffer *vb = &mgr->b.vertex_buffer[index];
+
+      if (vb->buffer &&
+          u_vbuf_resource(vb->buffer)->user_ptr &&
+          !uploaded[index]) {
+         unsigned first, size;
+         boolean flushed;
+         unsigned instance_div = mgr->ve->ve[i].instance_divisor;
+
+         if (instance_div) {
+            first = 0;
+            size = vb->stride *
+                   ((instance_count + instance_div - 1) / instance_div);
+         } else if (vb->stride) {
+            first = vb->stride * min_index;
+            size = vb->stride * count;
+         } else {
+            first = 0;
+            size = mgr->ve->native_format_size[i];
+         }
+
+         u_upload_data(mgr->b.uploader, first, size,
+                       u_vbuf_resource(vb->buffer)->user_ptr + first,
+                       &vb->buffer_offset,
+                       &mgr->b.real_vertex_buffer[index],
+                       &flushed);
+
+         vb->buffer_offset -= first;
+
+         uploaded[index] = TRUE;
+         *upload_flushed = *upload_flushed || flushed;
+      } else {
+         assert(mgr->b.real_vertex_buffer[index]);
+      }
+   }
+}
+
+static void u_vbuf_mgr_compute_max_index(struct u_vbuf_mgr_priv *mgr)
+{
+   unsigned i, nr = mgr->ve->count;
+
+   mgr->b.max_index = ~0;
+
+   for (i = 0; i < nr; i++) {
+      struct pipe_vertex_buffer *vb =
+            &mgr->b.vertex_buffer[mgr->ve->ve[i].vertex_buffer_index];
+      int unused;
+      unsigned max_index;
+
+      if (!vb->buffer ||
+          !vb->stride ||
+          u_vbuf_resource(vb->buffer)->user_ptr) {
+         continue;
+      }
+
+      /* How many bytes is unused after the last vertex.
+       * width0 may be "count*stride - unused" and we have to compensate
+       * for that when dividing by stride. */
+      unused = vb->stride -
+               (mgr->ve->ve[i].src_offset + mgr->ve->src_format_size[i]);
+      assert(unused >= 0);
+
+      /* Compute the maximum index for this vertex element. */
+      max_index =
+         (vb->buffer->width0 - vb->buffer_offset + (unsigned)unused) /
+         vb->stride - 1;
+
+      mgr->b.max_index = MIN2(mgr->b.max_index, max_index);
+   }
+}
+
+void u_vbuf_mgr_draw_begin(struct u_vbuf_mgr *mgrb,
+                           const struct pipe_draw_info *info,
+                           boolean *buffers_updated,
+                           boolean *uploader_flushed)
+{
+   struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb;
+   boolean bufs_updated = FALSE, upload_flushed = FALSE;
+   int min_index, max_index;
+
+   u_vbuf_mgr_compute_max_index(mgr);
+
+   min_index = info->min_index - info->index_bias;
+   if (info->max_index == ~0) {
+      max_index = mgr->b.max_index;
+   } else {
+      max_index = MIN2(info->max_index - info->index_bias, mgr->b.max_index);
+   }
+
+   /* 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);
+
+      if (mgr->fallback_ve) {
+         bufs_updated = TRUE;
+      }
+   }
+
+   /* 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;
+   }
+}
+
+void u_vbuf_mgr_draw_end(struct u_vbuf_mgr *mgrb)
+{
+   struct u_vbuf_mgr_priv *mgr = (struct u_vbuf_mgr_priv*)mgrb;
+
+   if (mgr->fallback_ve) {
+      u_vbuf_translate_end(mgr);
+   }
+}
diff --git a/mesalib/src/mesa/state_tracker/st_atom_sampler.c b/mesalib/src/mesa/state_tracker/st_atom_sampler.c
index e3d6cbb8e..ccbd54892 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_sampler.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_sampler.c
@@ -120,14 +120,110 @@ gl_filter_to_img_filter(GLenum filter)
    }
 }
 
+static void convert_sampler(struct st_context *st,
+			    struct pipe_sampler_state *sampler,
+			    GLuint texUnit)
+{
+    struct gl_texture_object *texobj;
+    struct gl_sampler_object *msamp;
+
+    texobj = st->ctx->Texture.Unit[texUnit]._Current;
+    if (!texobj) {
+	texobj = st_get_default_texture(st);
+    }
+
+    msamp = _mesa_get_samplerobj(st->ctx, texUnit);
+    sampler->wrap_s = gl_wrap_xlate(msamp->WrapS);
+    sampler->wrap_t = gl_wrap_xlate(msamp->WrapT);
+    sampler->wrap_r = gl_wrap_xlate(msamp->WrapR);
+
+    sampler->min_img_filter = gl_filter_to_img_filter(msamp->MinFilter);
+    sampler->min_mip_filter = gl_filter_to_mip_filter(msamp->MinFilter);
+    sampler->mag_img_filter = gl_filter_to_img_filter(msamp->MagFilter);
+
+    if (texobj->Target != GL_TEXTURE_RECTANGLE_ARB)
+       sampler->normalized_coords = 1;
+
+    sampler->lod_bias = st->ctx->Texture.Unit[texUnit].LodBias +
+       msamp->LodBias;
+
+    sampler->min_lod = CLAMP(msamp->MinLod,
+			     0.0f,
+			     (GLfloat) texobj->MaxLevel - texobj->BaseLevel);
+    sampler->max_lod = MIN2((GLfloat) texobj->MaxLevel - texobj->BaseLevel,
+			    msamp->MaxLod);
+    if (sampler->max_lod < sampler->min_lod) {
+       /* The GL spec doesn't seem to specify what to do in this case.
+	* Swap the values.
+	*/
+       float tmp = sampler->max_lod;
+       sampler->max_lod = sampler->min_lod;
+       sampler->min_lod = tmp;
+       assert(sampler->min_lod <= sampler->max_lod);
+    }
+
+    if (msamp->BorderColor.ui[0] ||
+	msamp->BorderColor.ui[1] ||
+	msamp->BorderColor.ui[2] ||
+	msamp->BorderColor.ui[3]) {
+       struct gl_texture_image *teximg;
+
+       teximg = texobj->Image[0][texobj->BaseLevel];
+
+       st_translate_color(msamp->BorderColor.f,
+			  teximg ? teximg->_BaseFormat : GL_RGBA,
+			  sampler->border_color);
+    }
+
+    sampler->max_anisotropy = (msamp->MaxAnisotropy == 1.0 ?
+			       0 : (GLuint) msamp->MaxAnisotropy);
+
+    /* only care about ARB_shadow, not SGI shadow */
+    if (msamp->CompareMode == GL_COMPARE_R_TO_TEXTURE) {
+       sampler->compare_mode = PIPE_TEX_COMPARE_R_TO_TEXTURE;
+       sampler->compare_func
+	  = st_compare_func_to_pipe(msamp->CompareFunc);
+    }
+
+    sampler->seamless_cube_map =
+       st->ctx->Texture.CubeMapSeamless || msamp->CubeMapSeamless;
+}
 
-static void 
-update_samplers(struct st_context *st)
+static void
+update_vertex_samplers(struct st_context *st)
 {
    struct gl_vertex_program *vprog = st->ctx->VertexProgram._Current;
+   GLuint su;
+
+   st->state.num_vertex_samplers = 0;
+
+   /* loop over sampler units (aka tex image units) */
+   for (su = 0; su < st->ctx->Const.MaxVertexTextureImageUnits; su++) {
+      struct pipe_sampler_state *sampler = st->state.vertex_samplers + su;
+
+      memset(sampler, 0, sizeof(*sampler));
+
+      if (vprog->Base.SamplersUsed & (1 << su)) {
+	 GLuint texUnit;
+
+	 texUnit = vprog->Base.SamplerUnits[su];
+
+	 convert_sampler(st, sampler, texUnit);
+
+	 st->state.num_vertex_samplers = su + 1;
+
+	 cso_single_vertex_sampler(st->cso_context, su, sampler);
+      } else {
+	 cso_single_vertex_sampler(st->cso_context, su, NULL);
+      }
+   }
+   cso_single_vertex_sampler_done(st->cso_context);
+}
+
+static void
+update_fragment_samplers(struct st_context *st)
+{
    struct gl_fragment_program *fprog = st->ctx->FragmentProgram._Current;
-   const GLbitfield samplersUsed = (vprog->Base.SamplersUsed |
-                                    fprog->Base.SamplersUsed);
    GLuint su;
 
    st->state.num_samplers = 0;
@@ -138,95 +234,33 @@ update_samplers(struct st_context *st)
 
       memset(sampler, 0, sizeof(*sampler));
 
-      if (samplersUsed & (1 << su)) {
-         struct gl_texture_object *texobj;
-         struct gl_texture_image *teximg;
-         struct gl_sampler_object *msamp;
+      if (fprog->Base.SamplersUsed & (1 << su)) {
          GLuint texUnit;
 
-         if (fprog->Base.SamplersUsed & (1 << su))
-            texUnit = fprog->Base.SamplerUnits[su];
-         else
-            texUnit = vprog->Base.SamplerUnits[su];
-
-         texobj = st->ctx->Texture.Unit[texUnit]._Current;
-         if (!texobj) {
-            texobj = st_get_default_texture(st);
-         }
-
-         teximg = texobj->Image[0][texobj->BaseLevel];
-
-         msamp = _mesa_get_samplerobj(st->ctx, texUnit);
-
-         sampler->wrap_s = gl_wrap_xlate(msamp->WrapS);
-         sampler->wrap_t = gl_wrap_xlate(msamp->WrapT);
-         sampler->wrap_r = gl_wrap_xlate(msamp->WrapR);
-
-         sampler->min_img_filter = gl_filter_to_img_filter(msamp->MinFilter);
-         sampler->min_mip_filter = gl_filter_to_mip_filter(msamp->MinFilter);
-         sampler->mag_img_filter = gl_filter_to_img_filter(msamp->MagFilter);
-
-         if (texobj->Target != GL_TEXTURE_RECTANGLE_ARB)
-            sampler->normalized_coords = 1;
-
-         sampler->lod_bias = st->ctx->Texture.Unit[texUnit].LodBias +
-            msamp->LodBias;
-
-         sampler->min_lod = CLAMP(msamp->MinLod,
-                                  0.0f,
-                                  (GLfloat) texobj->MaxLevel - texobj->BaseLevel);
-         sampler->max_lod = MIN2((GLfloat) texobj->MaxLevel - texobj->BaseLevel,
-                                 msamp->MaxLod);
-         if (sampler->max_lod < sampler->min_lod) {
-            /* The GL spec doesn't seem to specify what to do in this case.
-             * Swap the values.
-             */
-            float tmp = sampler->max_lod;
-            sampler->max_lod = sampler->min_lod;
-            sampler->min_lod = tmp;
-            assert(sampler->min_lod <= sampler->max_lod);
-         }
-
-         st_translate_color(msamp->BorderColor.f,
-                            teximg ? teximg->_BaseFormat : GL_RGBA,
-                            sampler->border_color);
-
-	 sampler->max_anisotropy = (msamp->MaxAnisotropy == 1.0 ?
-                                    0 : (GLuint) msamp->MaxAnisotropy);
-
-         /* only care about ARB_shadow, not SGI shadow */
-         if (msamp->CompareMode == GL_COMPARE_R_TO_TEXTURE) {
-            sampler->compare_mode = PIPE_TEX_COMPARE_R_TO_TEXTURE;
-            sampler->compare_func
-               = st_compare_func_to_pipe(msamp->CompareFunc);
-         }
-
-         sampler->seamless_cube_map =
-               st->ctx->Texture.CubeMapSeamless || msamp->CubeMapSeamless;
+	 texUnit = fprog->Base.SamplerUnits[su];
+
+	 convert_sampler(st, sampler, texUnit);
 
          st->state.num_samplers = su + 1;
 
          /*printf("%s su=%u non-null\n", __FUNCTION__, su);*/
          cso_single_sampler(st->cso_context, su, sampler);
-         if (su < st->ctx->Const.MaxVertexTextureImageUnits) {
-            cso_single_vertex_sampler(st->cso_context, su, sampler);
-         }
       }
       else {
          /*printf("%s su=%u null\n", __FUNCTION__, su);*/
          cso_single_sampler(st->cso_context, su, NULL);
-         if (su < st->ctx->Const.MaxVertexTextureImageUnits) {
-            cso_single_vertex_sampler(st->cso_context, su, NULL);
-         }
       }
    }
 
    cso_single_sampler_done(st->cso_context);
-   if (st->ctx->Const.MaxVertexTextureImageUnits > 0) {
-      cso_single_vertex_sampler_done(st->cso_context);
-   }
 }
 
+static void
+update_samplers(struct st_context *st)
+{
+    update_fragment_samplers(st);
+    update_vertex_samplers(st);
+}
 
 const struct st_tracked_state st_update_sampler = {
    "st_update_sampler",					/* name */
diff --git a/mesalib/src/mesa/state_tracker/st_atom_texture.c b/mesalib/src/mesa/state_tracker/st_atom_texture.c
index 9d437ad08..990b50438 100644
--- a/mesalib/src/mesa/state_tracker/st_atom_texture.c
+++ b/mesalib/src/mesa/state_tracker/st_atom_texture.c
@@ -182,90 +182,132 @@ st_get_texture_sampler_view_from_stobj(struct st_texture_object *stObj,
    return stObj->sampler_view;
 }
 
+static GLboolean
+update_single_texture(struct st_context *st, struct pipe_sampler_view **sampler_view,
+		      GLuint texUnit)
+{
+   struct pipe_context *pipe = st->pipe;
+   const struct gl_sampler_object *samp;
+   struct gl_texture_object *texObj;
+   struct st_texture_object *stObj;
+   enum pipe_format st_view_format;
+   GLboolean retval;
+
+   samp = _mesa_get_samplerobj(st->ctx, texUnit);
+
+   texObj = st->ctx->Texture.Unit[texUnit]._Current;
+
+   if (!texObj) {
+      texObj = st_get_default_texture(st);
+      samp = &texObj->Sampler;
+   }
+   stObj = st_texture_object(texObj);
+
+   retval = st_finalize_texture(st->ctx, st->pipe, texObj);
+   if (!retval) {
+      /* out of mem */
+      return GL_FALSE;
+   }
+
+   /* Determine the format of the texture sampler view */
+   st_view_format = stObj->pt->format;
+   {
+      const struct st_texture_image *firstImage =
+	 st_texture_image(stObj->base.Image[0][stObj->base.BaseLevel]);
+      const gl_format texFormat = firstImage->base.TexFormat;
+      enum pipe_format firstImageFormat =
+	 st_mesa_format_to_pipe_format(texFormat);
+
+      if ((samp->sRGBDecode == GL_SKIP_DECODE_EXT) &&
+	  (_mesa_get_format_color_encoding(texFormat) == GL_SRGB)) {
+	 /* don't do sRGB->RGB conversion.  Interpret the texture
+	  * texture data as linear values.
+	  */
+	 const gl_format linearFormat =
+	    _mesa_get_srgb_format_linear(texFormat);
+	 firstImageFormat = st_mesa_format_to_pipe_format(linearFormat);
+      }
+
+      if (firstImageFormat != stObj->pt->format)
+	 st_view_format = firstImageFormat;
+   }
+
+
+   /* if sampler view has changed dereference it */
+   if (stObj->sampler_view) {
+      if (check_sampler_swizzle(stObj->sampler_view,
+				stObj->base._Swizzle,
+				samp->DepthMode) ||
+	  (st_view_format != stObj->sampler_view->format) ||
+	  stObj->base.BaseLevel != stObj->sampler_view->u.tex.first_level) {
+	 pipe_sampler_view_reference(&stObj->sampler_view, NULL);
+      }
+   }
+
+   *sampler_view = st_get_texture_sampler_view_from_stobj(stObj, pipe,
+							  samp,
+							  st_view_format);
+   return GL_TRUE;
+}
 
 static void 
-update_textures(struct st_context *st)
+update_vertex_textures(struct st_context *st)
 {
-   struct pipe_context *pipe = st->pipe;
    struct gl_vertex_program *vprog = st->ctx->VertexProgram._Current;
-   struct gl_fragment_program *fprog = st->ctx->FragmentProgram._Current;
-   const GLbitfield samplersUsed = (vprog->Base.SamplersUsed |
-                                    fprog->Base.SamplersUsed);
    GLuint su;
 
-   st->state.num_textures = 0;
+   st->state.num_vertex_textures = 0;
 
    /* loop over sampler units (aka tex image units) */
    for (su = 0; su < st->ctx->Const.MaxTextureImageUnits; su++) {
       struct pipe_sampler_view *sampler_view = NULL;
-      enum pipe_format st_view_format;
-      if (samplersUsed & (1 << su)) {
-         struct gl_texture_object *texObj;
-         struct st_texture_object *stObj;
+      if (vprog->Base.SamplersUsed & (1 << su)) {
          GLboolean retval;
          GLuint texUnit;
-         const struct gl_sampler_object *samp;
 
-         if (fprog->Base.SamplersUsed & (1 << su))
-            texUnit = fprog->Base.SamplerUnits[su];
-         else
-            texUnit = vprog->Base.SamplerUnits[su];
+	 texUnit = vprog->Base.SamplerUnits[su];
 
-         samp = _mesa_get_samplerobj(st->ctx, texUnit);
+	 retval = update_single_texture(st, &sampler_view, texUnit);
+	 if (retval == GL_FALSE)
+	    continue;
 
-         texObj = st->ctx->Texture.Unit[texUnit]._Current;
+	 st->state.num_vertex_textures = su + 1;
 
-         if (!texObj) {
-            texObj = st_get_default_texture(st);
-            samp = &texObj->Sampler;
-         }
-         stObj = st_texture_object(texObj);
+      }
+      pipe_sampler_view_reference(&st->state.sampler_vertex_views[su], sampler_view);
+   }
 
-         retval = st_finalize_texture(st->ctx, st->pipe, texObj);
-         if (!retval) {
-            /* out of mem */
-            continue;
-         }
+   if (st->ctx->Const.MaxVertexTextureImageUnits > 0) {
+      GLuint numUnits = MIN2(st->state.num_vertex_textures,
+                             st->ctx->Const.MaxVertexTextureImageUnits);
+      cso_set_vertex_sampler_views(st->cso_context,
+                                   numUnits,
+                                   st->state.sampler_vertex_views);
+   }
+}
 
-         /* Determine the format of the texture sampler view */
-	 st_view_format = stObj->pt->format;
-	 {
-	    const struct st_texture_image *firstImage =
-               st_texture_image(stObj->base.Image[0][stObj->base.BaseLevel]);
-            const gl_format texFormat = firstImage->base.TexFormat;
-	    enum pipe_format firstImageFormat =
-               st_mesa_format_to_pipe_format(texFormat);
-
-	    if ((samp->sRGBDecode == GL_SKIP_DECODE_EXT) &&
-                (_mesa_get_format_color_encoding(texFormat) == GL_SRGB)) {
-               /* don't do sRGB->RGB conversion.  Interpret the texture
-                * texture data as linear values.
-                */
-               const gl_format linearFormat =
-                  _mesa_get_srgb_format_linear(texFormat);
-	       firstImageFormat = st_mesa_format_to_pipe_format(linearFormat);
-	    }
-
-	    if (firstImageFormat != stObj->pt->format)
-	       st_view_format = firstImageFormat;
-	 }
+static void 
+update_fragment_textures(struct st_context *st)
+{
+   struct gl_fragment_program *fprog = st->ctx->FragmentProgram._Current;
+   GLuint su;
 
-         st->state.num_textures = su + 1;
+   st->state.num_textures = 0;
 
-	 /* if sampler view has changed dereference it */
-	 if (stObj->sampler_view) {
-            if (check_sampler_swizzle(stObj->sampler_view,
-                                      stObj->base._Swizzle,
-                                      samp->DepthMode) ||
-                (st_view_format != stObj->sampler_view->format) ||
-                stObj->base.BaseLevel != stObj->sampler_view->u.tex.first_level) {
-	       pipe_sampler_view_reference(&stObj->sampler_view, NULL);
-            }
-         }
+   /* loop over sampler units (aka tex image units) */
+   for (su = 0; su < st->ctx->Const.MaxTextureImageUnits; su++) {
+      struct pipe_sampler_view *sampler_view = NULL;
+      if (fprog->Base.SamplersUsed & (1 << su)) {
+         GLboolean retval;
+         GLuint texUnit;
+
+	 texUnit = fprog->Base.SamplerUnits[su];
 
-         sampler_view = st_get_texture_sampler_view_from_stobj(stObj, pipe,
-                                                               samp,
-                                                               st_view_format);
+	 retval = update_single_texture(st, &sampler_view, texUnit);
+	 if (retval == GL_FALSE)
+	    continue;
+
+         st->state.num_textures = su + 1;
       }
       pipe_sampler_view_reference(&st->state.sampler_views[su], sampler_view);
    }
@@ -273,16 +315,14 @@ update_textures(struct st_context *st)
    cso_set_fragment_sampler_views(st->cso_context,
                                   st->state.num_textures,
                                   st->state.sampler_views);
-
-   if (st->ctx->Const.MaxVertexTextureImageUnits > 0) {
-      GLuint numUnits = MIN2(st->state.num_textures,
-                             st->ctx->Const.MaxVertexTextureImageUnits);
-      cso_set_vertex_sampler_views(st->cso_context,
-                                   numUnits,
-                                   st->state.sampler_views);
-   }
 }
 
+static void 
+update_textures(struct st_context *st)
+{
+  update_fragment_textures(st);
+  update_vertex_textures(st);
+}
 
 const struct st_tracked_state st_update_texture = {
    "st_update_texture",					/* name */
@@ -293,9 +333,6 @@ const struct st_tracked_state st_update_texture = {
    update_textures					/* update */
 };
 
-
-
-
 static void 
 finalize_textures(struct st_context *st)
 {
diff --git a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
index e377861b8..9948f8d2b 100644
--- a/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -39,6 +39,7 @@
 #include "main/pack.h"
 #include "main/pbo.h"
 #include "main/texformat.h"
+#include "main/teximage.h"
 #include "main/texstore.h"
 #include "program/program.h"
 #include "program/prog_print.h"
@@ -419,10 +420,10 @@ make_texture(struct st_context *st,
    gl_format mformat;
    struct pipe_resource *pt;
    enum pipe_format pipeFormat;
-   GLenum baseFormat, intFormat;
+   GLenum baseInternalFormat, intFormat;
 
-   baseFormat = base_format(format);
    intFormat = internal_format(ctx, format, type);
+   baseInternalFormat = _mesa_base_tex_format(ctx, intFormat);
 
    mformat = st_ChooseTextureFormat_renderable(ctx, intFormat,
                                                format, type, GL_FALSE);
@@ -465,7 +466,7 @@ make_texture(struct st_context *st,
        * the texture.  We deal with that with texcoords.
        */
       success = _mesa_texstore(ctx, 2,           /* dims */
-                               baseFormat,       /* baseInternalFormat */
+                               baseInternalFormat, /* baseInternalFormat */
                                mformat,          /* gl_format */
                                dest,             /* dest */
                                0, 0, 0,          /* dstX/Y/Zoffset */
diff --git a/mesalib/src/mesa/state_tracker/st_context.c b/mesalib/src/mesa/state_tracker/st_context.c
index ce78956e3..6eddbfc88 100644
--- a/mesalib/src/mesa/state_tracker/st_context.c
+++ b/mesalib/src/mesa/state_tracker/st_context.c
@@ -133,9 +133,6 @@ st_create_context_priv( struct gl_context *ctx, struct pipe_context *pipe )
    else
       st->internal_target = PIPE_TEXTURE_RECT;
 
-   for (i = 0; i < PIPE_MAX_SAMPLERS; i++)
-      st->state.sampler_list[i] = &st->state.samplers[i];
-
    for (i = 0; i < 3; i++) {
       memset(&st->velems_util_draw[i], 0, sizeof(struct pipe_vertex_element));
       st->velems_util_draw[i].src_offset = i * 4 * sizeof(float);
diff --git a/mesalib/src/mesa/state_tracker/st_context.h b/mesalib/src/mesa/state_tracker/st_context.h
index a35439741..c6fc31801 100644
--- a/mesalib/src/mesa/state_tracker/st_context.h
+++ b/mesalib/src/mesa/state_tracker/st_context.h
@@ -1,277 +1,280 @@
-/**************************************************************************

- * 

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

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

- * 

- **************************************************************************/

-

-#ifndef ST_CONTEXT_H

-#define ST_CONTEXT_H

-

-#include "main/mtypes.h"

-#include "pipe/p_state.h"

-#include "state_tracker/st_api.h"

-

-struct bitmap_cache;

-struct blit_state;

-struct dd_function_table;

-struct draw_context;

-struct draw_stage;

-struct gen_mipmap_state;

-struct st_context;

-struct st_fragment_program;

-

-

-#define ST_NEW_MESA                    0x1 /* Mesa state has changed */

-#define ST_NEW_FRAGMENT_PROGRAM        0x2

-#define ST_NEW_VERTEX_PROGRAM          0x4

-#define ST_NEW_FRAMEBUFFER             0x8

-#define ST_NEW_EDGEFLAGS_DATA          0x10

-#define ST_NEW_GEOMETRY_PROGRAM        0x20

-

-

-struct st_state_flags {

-   GLuint mesa;

-   GLuint st;

-};

-

-struct st_tracked_state {

-   const char *name;

-   struct st_state_flags dirty;

-   void (*update)( struct st_context *st );

-};

-

-

-

-struct st_context

-{

-   struct st_context_iface iface;

-

-   struct gl_context *ctx;

-

-   struct pipe_context *pipe;

-

-   struct draw_context *draw;  /**< For selection/feedback/rastpos only */

-   struct draw_stage *feedback_stage;  /**< For GL_FEEDBACK rendermode */

-   struct draw_stage *selection_stage;  /**< For GL_SELECT rendermode */

-   struct draw_stage *rastpos_stage;  /**< For glRasterPos */

-

-

-   /* On old libGL's for linux we need to invalidate the drawables

-    * on glViewpport calls, this is set via a option.

-    */

-   boolean invalidate_on_gl_viewport;

-

-   /* Some state is contained in constant objects.

-    * Other state is just parameter values.

-    */

-   struct {

-      struct pipe_blend_state               blend;

-      struct pipe_depth_stencil_alpha_state depth_stencil;

-      struct pipe_rasterizer_state          rasterizer;

-      struct pipe_sampler_state             samplers[PIPE_MAX_SAMPLERS];

-      struct pipe_sampler_state             *sampler_list[PIPE_MAX_SAMPLERS];

-      struct pipe_clip_state clip;

-      struct {

-         void *ptr;

-         unsigned size;

-      } constants[PIPE_SHADER_TYPES];

-      struct pipe_framebuffer_state framebuffer;

-      struct pipe_sampler_view *sampler_views[PIPE_MAX_SAMPLERS];

-      struct pipe_scissor_state scissor;

-      struct pipe_viewport_state viewport;

-      unsigned sample_mask;

-

-      GLuint num_samplers;

-      GLuint num_textures;

-

-      GLuint poly_stipple[32];  /**< In OpenGL's bottom-to-top order */

-   } state;

-

-   char vendor[100];

-   char renderer[100];

-

-   struct st_state_flags dirty;

-

-   GLboolean missing_textures;

-   GLboolean vertdata_edgeflags;

-

-   /** Mapping from VERT_RESULT_x to post-transformed vertex slot */

-   const GLuint *vertex_result_to_slot;

-

-   struct st_vertex_program *vp;    /**< Currently bound vertex program */

-   struct st_fragment_program *fp;  /**< Currently bound fragment program */

-   struct st_geometry_program *gp;  /**< Currently bound geometry program */

-

-   struct st_vp_variant *vp_variant;

-   struct st_fp_variant *fp_variant;

-   struct st_gp_variant *gp_variant;

-

-   struct gl_texture_object *default_texture;

-

-   struct {

-      struct gl_program_cache *cache;

-      struct st_fragment_program *program;  /**< cur pixel transfer prog */

-      GLuint xfer_prog_sn;  /**< pixel xfer program serial no. */

-      GLuint user_prog_sn;  /**< user fragment program serial no. */

-      struct st_fragment_program *combined_prog;

-      GLuint combined_prog_sn;

-      struct pipe_resource *pixelmap_texture;

-      struct pipe_sampler_view *pixelmap_sampler_view;

-      boolean pixelmap_enabled;  /**< use the pixelmap texture? */

-   } pixel_xfer;

-

-   /** for glBitmap */

-   struct {

-      struct pipe_rasterizer_state rasterizer;

-      struct pipe_sampler_state samplers[2];

-      enum pipe_format tex_format;

-      void *vs;

-      float vertices[4][3][4];  /**< vertex pos + color + texcoord */

-      struct pipe_resource *vbuf;

-      unsigned vbuf_slot;       /* next free slot in vbuf */

-      struct bitmap_cache *cache;

-   } bitmap;

-

-   /** for glDraw/CopyPixels */

-   struct {

-      struct gl_fragment_program *shaders[4];

-      void *vert_shaders[2];   /**< ureg shaders */

-   } drawpix;

-

-   /** for glClear */

-   struct {

-      struct pipe_rasterizer_state raster;

-      struct pipe_viewport_state viewport;

-      struct pipe_clip_state clip;

-      void *vs;

-      void *fs;

-      float vertices[4][2][4];  /**< vertex pos + color */

-      struct pipe_resource *vbuf;

-      unsigned vbuf_slot;

-      boolean enable_ds_separate;

-   } clear;

-

-   /** used for anything using util_draw_vertex_buffer */

-   struct pipe_vertex_element velems_util_draw[3];

-

-   void *passthrough_fs;  /**< simple pass-through frag shader */

-

-   enum pipe_texture_target internal_target;

-   struct gen_mipmap_state *gen_mipmap;

-   struct blit_state *blit;

-

-   struct cso_context *cso_context;

-

-   int force_msaa;

-   void *winsys_drawable_handle;

-

-   /* User vertex buffers. */

-   struct {

-      struct pipe_resource *buffer;

-

-      /** Element size */

-      GLuint element_size;

-

-      /** Attribute stride */

-      GLsizei stride;

-   } user_attrib[PIPE_MAX_ATTRIBS];

-   unsigned num_user_attribs;

-};

-

-

-/* Need this so that we can implement Mesa callbacks in this module.

- */

-static INLINE struct st_context *st_context(struct gl_context *ctx)

-{

-   return ctx->st;

-}

-

-

-/**

- * Wrapper for struct gl_framebuffer.

- * This is an opaque type to the outside world.

- */

-struct st_framebuffer

-{

-   struct gl_framebuffer Base;

-   void *Private;

-

-   struct st_framebuffer_iface *iface;

-   enum st_attachment_type statts[ST_ATTACHMENT_COUNT];

-   unsigned num_statts;

-   int32_t revalidate;

-};

-

-

-extern void st_init_driver_functions(struct dd_function_table *functions);

-

-void st_invalidate_state(struct gl_context * ctx, GLuint new_state);

-

-

-

-#define Y_0_TOP 1

-#define Y_0_BOTTOM 2

-

-static INLINE GLuint

-st_fb_orientation(const struct gl_framebuffer *fb)

-{

-   if (fb && fb->Name == 0) {

-      /* Drawing into a window (on-screen buffer).

-       *

-       * Negate Y scale to flip image vertically.

-       * The NDC Y coords prior to viewport transformation are in the range

-       * [y=-1=bottom, y=1=top]

-       * Hardware window coords are in the range [y=0=top, y=H-1=bottom] where

-       * H is the window height.

-       * Use the viewport transformation to invert Y.

-       */

-      return Y_0_TOP;

-   }

-   else {

-      /* Drawing into user-created FBO (very likely a texture).

-       *

-       * For textures, T=0=Bottom, so by extension Y=0=Bottom for rendering.

-       */

-      return Y_0_BOTTOM;

-   }

-}

-

-

-/** clear-alloc a struct-sized object, with casting */

-#define ST_CALLOC_STRUCT(T)   (struct T *) calloc(1, sizeof(struct T))

-

-

-extern int

-st_get_msaa(void);

-

-extern struct st_context *

-st_create_context(gl_api api, struct pipe_context *pipe,

-                  const struct gl_config *visual,

-                  struct st_context *share);

-

-extern void

-st_destroy_context(struct st_context *st);

-

-

-#endif

+/**************************************************************************
+ * 
+ * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
+ * 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.
+ * 
+ **************************************************************************/
+
+#ifndef ST_CONTEXT_H
+#define ST_CONTEXT_H
+
+#include "main/mtypes.h"
+#include "pipe/p_state.h"
+#include "state_tracker/st_api.h"
+
+struct bitmap_cache;
+struct blit_state;
+struct dd_function_table;
+struct draw_context;
+struct draw_stage;
+struct gen_mipmap_state;
+struct st_context;
+struct st_fragment_program;
+
+
+#define ST_NEW_MESA                    0x1 /* Mesa state has changed */
+#define ST_NEW_FRAGMENT_PROGRAM        0x2
+#define ST_NEW_VERTEX_PROGRAM          0x4
+#define ST_NEW_FRAMEBUFFER             0x8
+#define ST_NEW_EDGEFLAGS_DATA          0x10
+#define ST_NEW_GEOMETRY_PROGRAM        0x20
+
+
+struct st_state_flags {
+   GLuint mesa;
+   GLuint st;
+};
+
+struct st_tracked_state {
+   const char *name;
+   struct st_state_flags dirty;
+   void (*update)( struct st_context *st );
+};
+
+
+
+struct st_context
+{
+   struct st_context_iface iface;
+
+   struct gl_context *ctx;
+
+   struct pipe_context *pipe;
+
+   struct draw_context *draw;  /**< For selection/feedback/rastpos only */
+   struct draw_stage *feedback_stage;  /**< For GL_FEEDBACK rendermode */
+   struct draw_stage *selection_stage;  /**< For GL_SELECT rendermode */
+   struct draw_stage *rastpos_stage;  /**< For glRasterPos */
+
+
+   /* On old libGL's for linux we need to invalidate the drawables
+    * on glViewpport calls, this is set via a option.
+    */
+   boolean invalidate_on_gl_viewport;
+
+   /* Some state is contained in constant objects.
+    * Other state is just parameter values.
+    */
+   struct {
+      struct pipe_blend_state               blend;
+      struct pipe_depth_stencil_alpha_state depth_stencil;
+      struct pipe_rasterizer_state          rasterizer;
+      struct pipe_sampler_state             samplers[PIPE_MAX_SAMPLERS];
+      struct pipe_sampler_state             vertex_samplers[PIPE_MAX_VERTEX_SAMPLERS];
+      struct pipe_clip_state clip;
+      struct {
+         void *ptr;
+         unsigned size;
+      } constants[PIPE_SHADER_TYPES];
+      struct pipe_framebuffer_state framebuffer;
+      struct pipe_sampler_view *sampler_views[PIPE_MAX_SAMPLERS];
+      struct pipe_sampler_view *sampler_vertex_views[PIPE_MAX_VERTEX_SAMPLERS];
+      struct pipe_scissor_state scissor;
+      struct pipe_viewport_state viewport;
+      unsigned sample_mask;
+
+      GLuint num_samplers;
+      GLuint num_vertex_samplers;
+      GLuint num_textures;
+      GLuint num_vertex_textures;
+
+      GLuint poly_stipple[32];  /**< In OpenGL's bottom-to-top order */
+   } state;
+
+   char vendor[100];
+   char renderer[100];
+
+   struct st_state_flags dirty;
+
+   GLboolean missing_textures;
+   GLboolean vertdata_edgeflags;
+
+   /** Mapping from VERT_RESULT_x to post-transformed vertex slot */
+   const GLuint *vertex_result_to_slot;
+
+   struct st_vertex_program *vp;    /**< Currently bound vertex program */
+   struct st_fragment_program *fp;  /**< Currently bound fragment program */
+   struct st_geometry_program *gp;  /**< Currently bound geometry program */
+
+   struct st_vp_variant *vp_variant;
+   struct st_fp_variant *fp_variant;
+   struct st_gp_variant *gp_variant;
+
+   struct gl_texture_object *default_texture;
+
+   struct {
+      struct gl_program_cache *cache;
+      struct st_fragment_program *program;  /**< cur pixel transfer prog */
+      GLuint xfer_prog_sn;  /**< pixel xfer program serial no. */
+      GLuint user_prog_sn;  /**< user fragment program serial no. */
+      struct st_fragment_program *combined_prog;
+      GLuint combined_prog_sn;
+      struct pipe_resource *pixelmap_texture;
+      struct pipe_sampler_view *pixelmap_sampler_view;
+      boolean pixelmap_enabled;  /**< use the pixelmap texture? */
+   } pixel_xfer;
+
+   /** for glBitmap */
+   struct {
+      struct pipe_rasterizer_state rasterizer;
+      struct pipe_sampler_state samplers[2];
+      enum pipe_format tex_format;
+      void *vs;
+      float vertices[4][3][4];  /**< vertex pos + color + texcoord */
+      struct pipe_resource *vbuf;
+      unsigned vbuf_slot;       /* next free slot in vbuf */
+      struct bitmap_cache *cache;
+   } bitmap;
+
+   /** for glDraw/CopyPixels */
+   struct {
+      struct gl_fragment_program *shaders[4];
+      void *vert_shaders[2];   /**< ureg shaders */
+   } drawpix;
+
+   /** for glClear */
+   struct {
+      struct pipe_rasterizer_state raster;
+      struct pipe_viewport_state viewport;
+      struct pipe_clip_state clip;
+      void *vs;
+      void *fs;
+      float vertices[4][2][4];  /**< vertex pos + color */
+      struct pipe_resource *vbuf;
+      unsigned vbuf_slot;
+      boolean enable_ds_separate;
+   } clear;
+
+   /** used for anything using util_draw_vertex_buffer */
+   struct pipe_vertex_element velems_util_draw[3];
+
+   void *passthrough_fs;  /**< simple pass-through frag shader */
+
+   enum pipe_texture_target internal_target;
+   struct gen_mipmap_state *gen_mipmap;
+   struct blit_state *blit;
+
+   struct cso_context *cso_context;
+
+   int force_msaa;
+   void *winsys_drawable_handle;
+
+   /* User vertex buffers. */
+   struct {
+      struct pipe_resource *buffer;
+
+      /** Element size */
+      GLuint element_size;
+
+      /** Attribute stride */
+      GLsizei stride;
+   } user_attrib[PIPE_MAX_ATTRIBS];
+   unsigned num_user_attribs;
+};
+
+
+/* Need this so that we can implement Mesa callbacks in this module.
+ */
+static INLINE struct st_context *st_context(struct gl_context *ctx)
+{
+   return ctx->st;
+}
+
+
+/**
+ * Wrapper for struct gl_framebuffer.
+ * This is an opaque type to the outside world.
+ */
+struct st_framebuffer
+{
+   struct gl_framebuffer Base;
+   void *Private;
+
+   struct st_framebuffer_iface *iface;
+   enum st_attachment_type statts[ST_ATTACHMENT_COUNT];
+   unsigned num_statts;
+   int32_t revalidate;
+};
+
+
+extern void st_init_driver_functions(struct dd_function_table *functions);
+
+void st_invalidate_state(struct gl_context * ctx, GLuint new_state);
+
+
+
+#define Y_0_TOP 1
+#define Y_0_BOTTOM 2
+
+static INLINE GLuint
+st_fb_orientation(const struct gl_framebuffer *fb)
+{
+   if (fb && fb->Name == 0) {
+      /* Drawing into a window (on-screen buffer).
+       *
+       * Negate Y scale to flip image vertically.
+       * The NDC Y coords prior to viewport transformation are in the range
+       * [y=-1=bottom, y=1=top]
+       * Hardware window coords are in the range [y=0=top, y=H-1=bottom] where
+       * H is the window height.
+       * Use the viewport transformation to invert Y.
+       */
+      return Y_0_TOP;
+   }
+   else {
+      /* Drawing into user-created FBO (very likely a texture).
+       *
+       * For textures, T=0=Bottom, so by extension Y=0=Bottom for rendering.
+       */
+      return Y_0_BOTTOM;
+   }
+}
+
+
+/** clear-alloc a struct-sized object, with casting */
+#define ST_CALLOC_STRUCT(T)   (struct T *) calloc(1, sizeof(struct T))
+
+
+extern int
+st_get_msaa(void);
+
+extern struct st_context *
+st_create_context(gl_api api, struct pipe_context *pipe,
+                  const struct gl_config *visual,
+                  struct st_context *share);
+
+extern void
+st_destroy_context(struct st_context *st);
+
+
+#endif
diff --git a/mesalib/src/mesa/state_tracker/st_extensions.c b/mesalib/src/mesa/state_tracker/st_extensions.c
index ad8e6bb9e..d3aebe526 100644
--- a/mesalib/src/mesa/state_tracker/st_extensions.c
+++ b/mesalib/src/mesa/state_tracker/st_extensions.c
@@ -603,4 +603,8 @@ void st_init_extensions(struct st_context *st)
    else if (screen->get_param(screen, PIPE_CAP_SEAMLESS_CUBE_MAP)) {
       ctx->Extensions.ARB_seamless_cube_map = GL_TRUE;
    }
+
+   if (screen->get_param(screen, PIPE_CAP_SM3)) {
+      ctx->Extensions.ARB_shader_texture_lod = GL_TRUE;
+   }
 }