translate: whitespace fixes in translate_generic.c

1 files changed, 206 insertions, 199 deletions

diff --git a/src/gallium/auxiliary/translate/translate_generic.c b/src/gallium/auxiliary/translate/translate_generic.c
index 3b460e11c34..9f8be2fa837 100644
--- a/src/gallium/auxiliary/translate/translate_generic.c
+++ b/src/gallium/auxiliary/translate/translate_generic.c
@@ -1,8 +1,8 @@
 /**************************************************************************
- * 
+ *
  * Copyright 2007 VMware, Inc.
  * All Rights Reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the
  * "Software"), to deal in the Software without restriction, including
@@ -10,11 +10,11 @@
  * 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.
@@ -22,7 +22,7 @@
  * 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.
- * 
+ *
  **************************************************************************/
 
  /*
@@ -60,15 +60,17 @@ struct translate_generic {
 
       emit_func emit;
       unsigned output_offset;
-      
+
       const uint8_t *input_ptr;
       unsigned input_stride;
       unsigned max_index;
 
-      /* this value is set to -1 if this is a normal element with output_format != input_format:
-       * in this case, u_format is used to do a full conversion
+      /* this value is set to -1 if this is a normal element with
+       * output_format != input_format: in this case, u_format is used
+       * to do a full conversion
        *
-       * this value is set to the format size in bytes if output_format == input_format or for 32-bit instance ids:
+       * this value is set to the format size in bytes if
+       * output_format == input_format or for 32-bit instance ids:
        * in this case, memcpy is used to copy this amount of bytes
        */
       int copy_size;
@@ -79,11 +81,13 @@ struct translate_generic {
 };
 
 
-static struct translate_generic *translate_generic( struct translate *translate )
+static struct translate_generic *
+translate_generic(struct translate *translate)
 {
    return (struct translate_generic *)translate;
 }
 
+
 /**
  * Fetch a dword[4] vertex attribute from memory, doing format/type
  * conversion as needed.
@@ -91,7 +95,7 @@ static struct translate_generic *translate_generic( struct translate *translate
  * This is probably needed/dupliocated elsewhere, eg format
  * conversion, texture sampling etc.
  */
-#define ATTRIB( NAME, SZ, SRCTYPE, DSTTYPE, TO )        \
+#define ATTRIB(NAME, SZ, SRCTYPE, DSTTYPE, TO)  	\
 static void						\
 emit_##NAME(const void *attrib, void *ptr)		\
 {  \
@@ -130,113 +134,113 @@ emit_##NAME(const void *attrib, void *ptr)		\
 #define TO_INT(x)        (x)
 
 
-ATTRIB( R64G64B64A64_FLOAT,   4, float, double, TO_64_FLOAT )
-ATTRIB( R64G64B64_FLOAT,      3, float, double, TO_64_FLOAT )
-ATTRIB( R64G64_FLOAT,         2, float, double, TO_64_FLOAT )
-ATTRIB( R64_FLOAT,            1, float, double, TO_64_FLOAT )
-
-ATTRIB( R32G32B32A32_FLOAT,   4, float, float, TO_32_FLOAT )
-ATTRIB( R32G32B32_FLOAT,      3, float, float, TO_32_FLOAT )
-ATTRIB( R32G32_FLOAT,         2, float, float, TO_32_FLOAT )
-ATTRIB( R32_FLOAT,            1, float, float, TO_32_FLOAT )
-
-ATTRIB( R16G16B16A16_FLOAT,   4, float, ushort, TO_16_FLOAT )
-ATTRIB( R16G16B16_FLOAT,      3, float, ushort, TO_16_FLOAT )
-ATTRIB( R16G16_FLOAT,         2, float, ushort, TO_16_FLOAT )
-ATTRIB( R16_FLOAT,            1, float, ushort, TO_16_FLOAT )
-
-ATTRIB( R32G32B32A32_USCALED, 4, float, unsigned, TO_32_USCALED )
-ATTRIB( R32G32B32_USCALED,    3, float, unsigned, TO_32_USCALED )
-ATTRIB( R32G32_USCALED,       2, float, unsigned, TO_32_USCALED )
-ATTRIB( R32_USCALED,          1, float, unsigned, TO_32_USCALED )
-
-ATTRIB( R32G32B32A32_SSCALED, 4, float, int, TO_32_SSCALED )
-ATTRIB( R32G32B32_SSCALED,    3, float, int, TO_32_SSCALED )
-ATTRIB( R32G32_SSCALED,       2, float, int, TO_32_SSCALED )
-ATTRIB( R32_SSCALED,          1, float, int, TO_32_SSCALED )
-
-ATTRIB( R32G32B32A32_UNORM, 4, float, unsigned, TO_32_UNORM )
-ATTRIB( R32G32B32_UNORM,    3, float, unsigned, TO_32_UNORM )
-ATTRIB( R32G32_UNORM,       2, float, unsigned, TO_32_UNORM )
-ATTRIB( R32_UNORM,          1, float, unsigned, TO_32_UNORM )
-
-ATTRIB( R32G32B32A32_SNORM, 4, float, int, TO_32_SNORM )
-ATTRIB( R32G32B32_SNORM,    3, float, int, TO_32_SNORM )
-ATTRIB( R32G32_SNORM,       2, float, int, TO_32_SNORM )
-ATTRIB( R32_SNORM,          1, float, int, TO_32_SNORM )
-
-ATTRIB( R16G16B16A16_USCALED, 4, float, ushort, TO_16_USCALED )
-ATTRIB( R16G16B16_USCALED,    3, float, ushort, TO_16_USCALED )
-ATTRIB( R16G16_USCALED,       2, float, ushort, TO_16_USCALED )
-ATTRIB( R16_USCALED,          1, float, ushort, TO_16_USCALED )
-
-ATTRIB( R16G16B16A16_SSCALED, 4, float, short, TO_16_SSCALED )
-ATTRIB( R16G16B16_SSCALED,    3, float, short, TO_16_SSCALED )
-ATTRIB( R16G16_SSCALED,       2, float, short, TO_16_SSCALED )
-ATTRIB( R16_SSCALED,          1, float, short, TO_16_SSCALED )
-
-ATTRIB( R16G16B16A16_UNORM, 4, float, ushort, TO_16_UNORM )
-ATTRIB( R16G16B16_UNORM,    3, float, ushort, TO_16_UNORM )
-ATTRIB( R16G16_UNORM,       2, float, ushort, TO_16_UNORM )
-ATTRIB( R16_UNORM,          1, float, ushort, TO_16_UNORM )
-
-ATTRIB( R16G16B16A16_SNORM, 4, float, short, TO_16_SNORM )
-ATTRIB( R16G16B16_SNORM,    3, float, short, TO_16_SNORM )
-ATTRIB( R16G16_SNORM,       2, float, short, TO_16_SNORM )
-ATTRIB( R16_SNORM,          1, float, short, TO_16_SNORM )
-
-ATTRIB( R8G8B8A8_USCALED,   4, float, ubyte, TO_8_USCALED )
-ATTRIB( R8G8B8_USCALED,     3, float, ubyte, TO_8_USCALED )
-ATTRIB( R8G8_USCALED,       2, float, ubyte, TO_8_USCALED )
-ATTRIB( R8_USCALED,         1, float, ubyte, TO_8_USCALED )
-
-ATTRIB( R8G8B8A8_SSCALED,  4, float, char, TO_8_SSCALED )
-ATTRIB( R8G8B8_SSCALED,    3, float, char, TO_8_SSCALED )
-ATTRIB( R8G8_SSCALED,      2, float, char, TO_8_SSCALED )
-ATTRIB( R8_SSCALED,        1, float, char, TO_8_SSCALED )
-
-ATTRIB( R8G8B8A8_UNORM,  4, float, ubyte, TO_8_UNORM )
-ATTRIB( R8G8B8_UNORM,    3, float, ubyte, TO_8_UNORM )
-ATTRIB( R8G8_UNORM,      2, float, ubyte, TO_8_UNORM )
-ATTRIB( R8_UNORM,        1, float, ubyte, TO_8_UNORM )
-
-ATTRIB( R8G8B8A8_SNORM,  4, float, char, TO_8_SNORM )
-ATTRIB( R8G8B8_SNORM,    3, float, char, TO_8_SNORM )
-ATTRIB( R8G8_SNORM,      2, float, char, TO_8_SNORM )
-ATTRIB( R8_SNORM,        1, float, char, TO_8_SNORM )
-
-ATTRIB( R32G32B32A32_UINT, 4, uint32_t, unsigned, TO_INT )
-ATTRIB( R32G32B32_UINT,    3, uint32_t, unsigned, TO_INT )
-ATTRIB( R32G32_UINT,       2, uint32_t, unsigned, TO_INT )
-ATTRIB( R32_UINT,          1, uint32_t, unsigned, TO_INT )
-
-ATTRIB( R16G16B16A16_UINT, 4, uint32_t, ushort, TO_INT )
-ATTRIB( R16G16B16_UINT,    3, uint32_t, ushort, TO_INT )
-ATTRIB( R16G16_UINT,       2, uint32_t, ushort, TO_INT )
-ATTRIB( R16_UINT,          1, uint32_t, ushort, TO_INT )
-
-ATTRIB( R8G8B8A8_UINT,   4, uint32_t, ubyte, TO_INT )
-ATTRIB( R8G8B8_UINT,     3, uint32_t, ubyte, TO_INT )
-ATTRIB( R8G8_UINT,       2, uint32_t, ubyte, TO_INT )
-ATTRIB( R8_UINT,         1, uint32_t, ubyte, TO_INT )
-
-ATTRIB( R32G32B32A32_SINT, 4, int32_t, int, TO_INT )
-ATTRIB( R32G32B32_SINT,    3, int32_t, int, TO_INT )
-ATTRIB( R32G32_SINT,       2, int32_t, int, TO_INT )
-ATTRIB( R32_SINT,          1, int32_t, int, TO_INT )
-
-ATTRIB( R16G16B16A16_SINT, 4, int32_t, short, TO_INT )
-ATTRIB( R16G16B16_SINT,    3, int32_t, short, TO_INT )
-ATTRIB( R16G16_SINT,       2, int32_t, short, TO_INT )
-ATTRIB( R16_SINT,          1, int32_t, short, TO_INT )
-
-ATTRIB( R8G8B8A8_SINT,   4, int32_t, char, TO_INT )
-ATTRIB( R8G8B8_SINT,     3, int32_t, char, TO_INT )
-ATTRIB( R8G8_SINT,       2, int32_t, char, TO_INT )
-ATTRIB( R8_SINT,         1, int32_t, char, TO_INT )
+ATTRIB(R64G64B64A64_FLOAT,   4, float, double, TO_64_FLOAT)
+ATTRIB(R64G64B64_FLOAT,      3, float, double, TO_64_FLOAT)
+ATTRIB(R64G64_FLOAT,         2, float, double, TO_64_FLOAT)
+ATTRIB(R64_FLOAT,            1, float, double, TO_64_FLOAT)
+
+ATTRIB(R32G32B32A32_FLOAT,   4, float, float, TO_32_FLOAT)
+ATTRIB(R32G32B32_FLOAT,      3, float, float, TO_32_FLOAT)
+ATTRIB(R32G32_FLOAT,         2, float, float, TO_32_FLOAT)
+ATTRIB(R32_FLOAT,            1, float, float, TO_32_FLOAT)
+
+ATTRIB(R16G16B16A16_FLOAT,   4, float, ushort, TO_16_FLOAT)
+ATTRIB(R16G16B16_FLOAT,      3, float, ushort, TO_16_FLOAT)
+ATTRIB(R16G16_FLOAT,         2, float, ushort, TO_16_FLOAT)
+ATTRIB(R16_FLOAT,            1, float, ushort, TO_16_FLOAT)
+
+ATTRIB(R32G32B32A32_USCALED, 4, float, unsigned, TO_32_USCALED)
+ATTRIB(R32G32B32_USCALED,    3, float, unsigned, TO_32_USCALED)
+ATTRIB(R32G32_USCALED,       2, float, unsigned, TO_32_USCALED)
+ATTRIB(R32_USCALED,          1, float, unsigned, TO_32_USCALED)
+
+ATTRIB(R32G32B32A32_SSCALED, 4, float, int, TO_32_SSCALED)
+ATTRIB(R32G32B32_SSCALED,    3, float, int, TO_32_SSCALED)
+ATTRIB(R32G32_SSCALED,       2, float, int, TO_32_SSCALED)
+ATTRIB(R32_SSCALED,          1, float, int, TO_32_SSCALED)
+
+ATTRIB(R32G32B32A32_UNORM, 4, float, unsigned, TO_32_UNORM)
+ATTRIB(R32G32B32_UNORM,    3, float, unsigned, TO_32_UNORM)
+ATTRIB(R32G32_UNORM,       2, float, unsigned, TO_32_UNORM)
+ATTRIB(R32_UNORM,          1, float, unsigned, TO_32_UNORM)
+
+ATTRIB(R32G32B32A32_SNORM, 4, float, int, TO_32_SNORM)
+ATTRIB(R32G32B32_SNORM,    3, float, int, TO_32_SNORM)
+ATTRIB(R32G32_SNORM,       2, float, int, TO_32_SNORM)
+ATTRIB(R32_SNORM,          1, float, int, TO_32_SNORM)
+
+ATTRIB(R16G16B16A16_USCALED, 4, float, ushort, TO_16_USCALED)
+ATTRIB(R16G16B16_USCALED,    3, float, ushort, TO_16_USCALED)
+ATTRIB(R16G16_USCALED,       2, float, ushort, TO_16_USCALED)
+ATTRIB(R16_USCALED,          1, float, ushort, TO_16_USCALED)
+
+ATTRIB(R16G16B16A16_SSCALED, 4, float, short, TO_16_SSCALED)
+ATTRIB(R16G16B16_SSCALED,    3, float, short, TO_16_SSCALED)
+ATTRIB(R16G16_SSCALED,       2, float, short, TO_16_SSCALED)
+ATTRIB(R16_SSCALED,          1, float, short, TO_16_SSCALED)
+
+ATTRIB(R16G16B16A16_UNORM, 4, float, ushort, TO_16_UNORM)
+ATTRIB(R16G16B16_UNORM,    3, float, ushort, TO_16_UNORM)
+ATTRIB(R16G16_UNORM,       2, float, ushort, TO_16_UNORM)
+ATTRIB(R16_UNORM,          1, float, ushort, TO_16_UNORM)
+
+ATTRIB(R16G16B16A16_SNORM, 4, float, short, TO_16_SNORM)
+ATTRIB(R16G16B16_SNORM,    3, float, short, TO_16_SNORM)
+ATTRIB(R16G16_SNORM,       2, float, short, TO_16_SNORM)
+ATTRIB(R16_SNORM,          1, float, short, TO_16_SNORM)
+
+ATTRIB(R8G8B8A8_USCALED,   4, float, ubyte, TO_8_USCALED)
+ATTRIB(R8G8B8_USCALED,     3, float, ubyte, TO_8_USCALED)
+ATTRIB(R8G8_USCALED,       2, float, ubyte, TO_8_USCALED)
+ATTRIB(R8_USCALED,         1, float, ubyte, TO_8_USCALED)
+
+ATTRIB(R8G8B8A8_SSCALED,  4, float, char, TO_8_SSCALED)
+ATTRIB(R8G8B8_SSCALED,    3, float, char, TO_8_SSCALED)
+ATTRIB(R8G8_SSCALED,      2, float, char, TO_8_SSCALED)
+ATTRIB(R8_SSCALED,        1, float, char, TO_8_SSCALED)
+
+ATTRIB(R8G8B8A8_UNORM,  4, float, ubyte, TO_8_UNORM)
+ATTRIB(R8G8B8_UNORM,    3, float, ubyte, TO_8_UNORM)
+ATTRIB(R8G8_UNORM,      2, float, ubyte, TO_8_UNORM)
+ATTRIB(R8_UNORM,        1, float, ubyte, TO_8_UNORM)
+
+ATTRIB(R8G8B8A8_SNORM,  4, float, char, TO_8_SNORM)
+ATTRIB(R8G8B8_SNORM,    3, float, char, TO_8_SNORM)
+ATTRIB(R8G8_SNORM,      2, float, char, TO_8_SNORM)
+ATTRIB(R8_SNORM,        1, float, char, TO_8_SNORM)
+
+ATTRIB(R32G32B32A32_UINT, 4, uint32_t, unsigned, TO_INT)
+ATTRIB(R32G32B32_UINT,    3, uint32_t, unsigned, TO_INT)
+ATTRIB(R32G32_UINT,       2, uint32_t, unsigned, TO_INT)
+ATTRIB(R32_UINT,          1, uint32_t, unsigned, TO_INT)
+
+ATTRIB(R16G16B16A16_UINT, 4, uint32_t, ushort, TO_INT)
+ATTRIB(R16G16B16_UINT,    3, uint32_t, ushort, TO_INT)
+ATTRIB(R16G16_UINT,       2, uint32_t, ushort, TO_INT)
+ATTRIB(R16_UINT,          1, uint32_t, ushort, TO_INT)
+
+ATTRIB(R8G8B8A8_UINT,   4, uint32_t, ubyte, TO_INT)
+ATTRIB(R8G8B8_UINT,     3, uint32_t, ubyte, TO_INT)
+ATTRIB(R8G8_UINT,       2, uint32_t, ubyte, TO_INT)
+ATTRIB(R8_UINT,         1, uint32_t, ubyte, TO_INT)
+
+ATTRIB(R32G32B32A32_SINT, 4, int32_t, int, TO_INT)
+ATTRIB(R32G32B32_SINT,    3, int32_t, int, TO_INT)
+ATTRIB(R32G32_SINT,       2, int32_t, int, TO_INT)
+ATTRIB(R32_SINT,          1, int32_t, int, TO_INT)
+
+ATTRIB(R16G16B16A16_SINT, 4, int32_t, short, TO_INT)
+ATTRIB(R16G16B16_SINT,    3, int32_t, short, TO_INT)
+ATTRIB(R16G16_SINT,       2, int32_t, short, TO_INT)
+ATTRIB(R16_SINT,          1, int32_t, short, TO_INT)
+
+ATTRIB(R8G8B8A8_SINT,   4, int32_t, char, TO_INT)
+ATTRIB(R8G8B8_SINT,     3, int32_t, char, TO_INT)
+ATTRIB(R8G8_SINT,       2, int32_t, char, TO_INT)
+ATTRIB(R8_SINT,         1, int32_t, char, TO_INT)
 
 static void
-emit_A8R8G8B8_UNORM( const void *attrib, void *ptr)
+emit_A8R8G8B8_UNORM(const void *attrib, void *ptr)
 {
    float *in = (float *)attrib;
    ubyte *out = (ubyte *)ptr;
@@ -247,7 +251,7 @@ emit_A8R8G8B8_UNORM( const void *attrib, void *ptr)
 }
 
 static void
-emit_B8G8R8A8_UNORM( const void *attrib, void *ptr)
+emit_B8G8R8A8_UNORM(const void *attrib, void *ptr)
 {
    float *in = (float *)attrib;
    ubyte *out = (ubyte *)ptr;
@@ -258,7 +262,7 @@ emit_B8G8R8A8_UNORM( const void *attrib, void *ptr)
 }
 
 static void
-emit_B10G10R10A2_UNORM( const void *attrib, void *ptr )
+emit_B10G10R10A2_UNORM(const void *attrib, void *ptr)
 {
    float *src = (float *)ptr;
    uint32_t value = 0;
@@ -270,7 +274,7 @@ emit_B10G10R10A2_UNORM( const void *attrib, void *ptr )
 }
 
 static void
-emit_B10G10R10A2_USCALED( const void *attrib, void *ptr )
+emit_B10G10R10A2_USCALED(const void *attrib, void *ptr)
 {
    float *src = (float *)ptr;
    uint32_t value = 0;
@@ -282,7 +286,7 @@ emit_B10G10R10A2_USCALED( const void *attrib, void *ptr )
 }
 
 static void
-emit_B10G10R10A2_SNORM( const void *attrib, void *ptr )
+emit_B10G10R10A2_SNORM(const void *attrib, void *ptr)
 {
    float *src = (float *)ptr;
    uint32_t value = 0;
@@ -294,7 +298,7 @@ emit_B10G10R10A2_SNORM( const void *attrib, void *ptr )
 }
 
 static void
-emit_B10G10R10A2_SSCALED( const void *attrib, void *ptr )
+emit_B10G10R10A2_SSCALED(const void *attrib, void *ptr)
 {
    float *src = (float *)ptr;
    uint32_t value = 0;
@@ -306,7 +310,7 @@ emit_B10G10R10A2_SSCALED( const void *attrib, void *ptr )
 }
 
 static void
-emit_R10G10B10A2_UNORM( const void *attrib, void *ptr )
+emit_R10G10B10A2_UNORM(const void *attrib, void *ptr)
 {
    float *src = (float *)ptr;
    uint32_t value = 0;
@@ -318,7 +322,7 @@ emit_R10G10B10A2_UNORM( const void *attrib, void *ptr )
 }
 
 static void
-emit_R10G10B10A2_USCALED( const void *attrib, void *ptr )
+emit_R10G10B10A2_USCALED(const void *attrib, void *ptr)
 {
    float *src = (float *)ptr;
    uint32_t value = 0;
@@ -330,7 +334,7 @@ emit_R10G10B10A2_USCALED( const void *attrib, void *ptr )
 }
 
 static void
-emit_R10G10B10A2_SNORM( const void *attrib, void *ptr )
+emit_R10G10B10A2_SNORM(const void *attrib, void *ptr)
 {
    float *src = (float *)ptr;
    uint32_t value = 0;
@@ -342,7 +346,7 @@ emit_R10G10B10A2_SNORM( const void *attrib, void *ptr )
 }
 
 static void
-emit_R10G10B10A2_SSCALED( const void *attrib, void *ptr)
+emit_R10G10B10A2_SSCALED(const void *attrib, void *ptr)
 {
    float *src = (float *)ptr;
    uint32_t value = 0;
@@ -353,13 +357,14 @@ emit_R10G10B10A2_SSCALED( const void *attrib, void *ptr)
    *(uint32_t *)attrib = util_le32_to_cpu(value);
 }
 
-static void 
-emit_NULL( const void *attrib, void *ptr )
+static void
+emit_NULL(const void *attrib, void *ptr)
 {
    /* do nothing is the only sensible option */
 }
 
-static emit_func get_emit_func( enum pipe_format format )
+static emit_func
+get_emit_func(enum pipe_format format)
 {
    switch (format) {
    case PIPE_FORMAT_R64_FLOAT:
@@ -576,16 +581,17 @@ static emit_func get_emit_func( enum pipe_format format )
       return &emit_R10G10B10A2_SSCALED;
 
    default:
-      assert(0); 
+      assert(0);
       return &emit_NULL;
    }
 }
 
-static ALWAYS_INLINE void PIPE_CDECL generic_run_one( struct translate_generic *tg,
-                                         unsigned elt,
-                                         unsigned start_instance,
-                                         unsigned instance_id,
-                                         void *vert )
+static ALWAYS_INLINE void PIPE_CDECL
+generic_run_one(struct translate_generic *tg,
+                unsigned elt,
+                unsigned start_instance,
+                unsigned instance_id,
+                void *vert)
 {
    unsigned nr_attrs = tg->nr_attrib;
    unsigned attr;
@@ -617,11 +623,10 @@ static ALWAYS_INLINE void PIPE_CDECL generic_run_one( struct translate_generic *
                (ptrdiff_t)tg->attrib[attr].input_stride * index;
 
          copy_size = tg->attrib[attr].copy_size;
-         if(likely(copy_size >= 0))
+         if (likely(copy_size >= 0)) {
             memcpy(dst, src, copy_size);
-         else
-         {
-            tg->attrib[attr].fetch( data, src, 0, 0 );
+         } else {
+            tg->attrib[attr].fetch(data, src, 0, 0);
 
             if (0)
                debug_printf("Fetch linear attr %d  from %p  stride %d  index %d: "
@@ -632,15 +637,14 @@ static ALWAYS_INLINE void PIPE_CDECL generic_run_one( struct translate_generic *
                          index,
                          data[0], data[1],data[2], data[3]);
 
-            tg->attrib[attr].emit( data, dst );
+            tg->attrib[attr].emit(data, dst);
          }
       } else {
-         if(likely(tg->attrib[attr].copy_size >= 0))
+         if (likely(tg->attrib[attr].copy_size >= 0)) {
             memcpy(data, &instance_id, 4);
-         else
-         {
+         } else {
             data[0] = (float)instance_id;
-            tg->attrib[attr].emit( data, dst );
+            tg->attrib[attr].emit(data, dst);
          }
       }
    }
@@ -649,12 +653,13 @@ static ALWAYS_INLINE void PIPE_CDECL generic_run_one( struct translate_generic *
 /**
  * Fetch vertex attributes for 'count' vertices.
  */
-static void PIPE_CDECL generic_run_elts( struct translate *translate,
-                                         const unsigned *elts,
-                                         unsigned count,
-                                         unsigned start_instance,
-                                         unsigned instance_id,
-                                         void *output_buffer )
+static void PIPE_CDECL
+generic_run_elts(struct translate *translate,
+                 const unsigned *elts,
+                 unsigned count,
+                 unsigned start_instance,
+                 unsigned instance_id,
+                 void *output_buffer)
 {
    struct translate_generic *tg = translate_generic(translate);
    char *vert = output_buffer;
@@ -666,12 +671,13 @@ static void PIPE_CDECL generic_run_elts( struct translate *translate,
    }
 }
 
-static void PIPE_CDECL generic_run_elts16( struct translate *translate,
-                                         const uint16_t *elts,
-                                         unsigned count,
-                                         unsigned start_instance,
-                                         unsigned instance_id,
-                                         void *output_buffer )
+static void PIPE_CDECL
+generic_run_elts16(struct translate *translate,
+                   const uint16_t *elts,
+                   unsigned count,
+                   unsigned start_instance,
+                   unsigned instance_id,
+                   void *output_buffer)
 {
    struct translate_generic *tg = translate_generic(translate);
    char *vert = output_buffer;
@@ -683,12 +689,13 @@ static void PIPE_CDECL generic_run_elts16( struct translate *translate,
    }
 }
 
-static void PIPE_CDECL generic_run_elts8( struct translate *translate,
-                                         const uint8_t *elts,
-                                         unsigned count,
-                                         unsigned start_instance, 
-                                         unsigned instance_id,
-                                         void *output_buffer )
+static void PIPE_CDECL
+generic_run_elts8(struct translate *translate,
+                  const uint8_t *elts,
+                  unsigned count,
+                  unsigned start_instance,
+                  unsigned instance_id,
+                  void *output_buffer)
 {
    struct translate_generic *tg = translate_generic(translate);
    char *vert = output_buffer;
@@ -700,12 +707,13 @@ static void PIPE_CDECL generic_run_elts8( struct translate *translate,
    }
 }
 
-static void PIPE_CDECL generic_run( struct translate *translate,
-                                    unsigned start,
-                                    unsigned count,
-                                    unsigned start_instance,
-                                    unsigned instance_id,
-                                    void *output_buffer )
+static void PIPE_CDECL
+generic_run(struct translate *translate,
+            unsigned start,
+            unsigned count,
+            unsigned start_instance,
+            unsigned instance_id,
+            void *output_buffer)
 {
    struct translate_generic *tg = translate_generic(translate);
    char *vert = output_buffer;
@@ -718,28 +726,30 @@ static void PIPE_CDECL generic_run( struct translate *translate,
 }
 
 
-			       
-static void generic_set_buffer( struct translate *translate,
-				unsigned buf,
-				const void *ptr,
-				unsigned stride,
-				unsigned max_index )
+
+static void
+generic_set_buffer(struct translate *translate,
+                   unsigned buf,
+                   const void *ptr,
+                   unsigned stride,
+                   unsigned max_index)
 {
    struct translate_generic *tg = translate_generic(translate);
    unsigned i;
 
    for (i = 0; i < tg->nr_attrib; i++) {
       if (tg->attrib[i].buffer == buf) {
-	 tg->attrib[i].input_ptr = ((const uint8_t *)ptr +
-				    tg->attrib[i].input_offset);
-	 tg->attrib[i].input_stride = stride;
+         tg->attrib[i].input_ptr = ((const uint8_t *)ptr +
+                                    tg->attrib[i].input_offset);
+         tg->attrib[i].input_stride = stride;
          tg->attrib[i].max_index = max_index;
       }
    }
 }
 
 
-static void generic_release( struct translate *translate )
+static void
+generic_release(struct translate *translate)
 {
    /* Refcount?
     */
@@ -747,8 +757,8 @@ static void generic_release( struct translate *translate )
 }
 
 static boolean
-is_legal_int_format_combo( const struct util_format_description *src,
-                           const struct util_format_description *dst )
+is_legal_int_format_combo(const struct util_format_description *src,
+                          const struct util_format_description *dst)
 {
    unsigned i;
    unsigned nr = MIN2(src->nr_channels, dst->nr_channels);
@@ -767,7 +777,8 @@ is_legal_int_format_combo( const struct util_format_description *src,
    return TRUE;
 }
 
-struct translate *translate_generic_create( const struct translate_key *key )
+struct translate *
+translate_generic_create(const struct translate_key *key)
 {
    struct translate_generic *tg = CALLOC_STRUCT(translate_generic);
    unsigned i;
@@ -821,37 +832,33 @@ struct translate *translate_generic_create( const struct translate_key *key )
       tg->attrib[i].output_offset = key->element[i].output_offset;
 
       tg->attrib[i].copy_size = -1;
-      if (tg->attrib[i].type == TRANSLATE_ELEMENT_INSTANCE_ID)
-      {
-            if(key->element[i].output_format == PIPE_FORMAT_R32_USCALED
-                  || key->element[i].output_format == PIPE_FORMAT_R32_SSCALED)
-               tg->attrib[i].copy_size = 4;
-      }
-      else
-      {
-         if(key->element[i].input_format == key->element[i].output_format
-               && format_desc->block.width == 1
-               && format_desc->block.height == 1
-               && !(format_desc->block.bits & 7))
+      if (tg->attrib[i].type == TRANSLATE_ELEMENT_INSTANCE_ID) {
+         if (key->element[i].output_format == PIPE_FORMAT_R32_USCALED
+             || key->element[i].output_format == PIPE_FORMAT_R32_SSCALED)
+            tg->attrib[i].copy_size = 4;
+      } else {
+         if (key->element[i].input_format == key->element[i].output_format
+             && format_desc->block.width == 1
+             && format_desc->block.height == 1
+             && !(format_desc->block.bits & 7))
             tg->attrib[i].copy_size = format_desc->block.bits >> 3;
       }
 
-      if(tg->attrib[i].copy_size < 0)
-	      tg->attrib[i].emit = get_emit_func(key->element[i].output_format);
+      if (tg->attrib[i].copy_size < 0)
+         tg->attrib[i].emit = get_emit_func(key->element[i].output_format);
       else
-	      tg->attrib[i].emit  = NULL;
+         tg->attrib[i].emit  = NULL;
    }
 
    tg->nr_attrib = key->nr_elements;
 
-
    return &tg->translate;
 }
 
-boolean translate_generic_is_output_format_supported(enum pipe_format format)
+boolean
+translate_generic_is_output_format_supported(enum pipe_format format)
 {
-   switch(format)
-   {
+   switch(format) {
    case PIPE_FORMAT_R64G64B64A64_FLOAT: return TRUE;
    case PIPE_FORMAT_R64G64B64_FLOAT: return TRUE;
    case PIPE_FORMAT_R64G64_FLOAT: return TRUE;