translate: Make translate_generic truly generic.

PIPE_FORMAT_R10G10B10X2_USCALED, half floats, were not supported, so
just rely on u_format for (almost) universal format support.

1 files changed, 90 insertions, 301 deletions

diff --git a/src/gallium/auxiliary/translate/translate_generic.c b/src/gallium/auxiliary/translate/translate_generic.c
index a9272fbb49..f8dbd2b36a 100644
--- a/src/gallium/auxiliary/translate/translate_generic.c
+++ b/src/gallium/auxiliary/translate/translate_generic.c
@@ -31,6 +31,7 @@
   */
 
 #include "util/u_memory.h"
+#include "util/u_format.h"
 #include "util/u_math.h"
 #include "pipe/p_state.h"
 #include "translate.h"
@@ -38,7 +39,9 @@
 
 #define DRAW_DBG 0
 
-typedef void (*fetch_func)(const void *ptr, float *attrib);
+typedef void (*fetch_func)(float *dst,
+                           const uint8_t *src,
+                           unsigned i, unsigned j);
 typedef void (*emit_func)(const float *attrib, void *ptr);
 
 
@@ -57,7 +60,7 @@ struct translate_generic {
       emit_func emit;
       unsigned output_offset;
       
-      char *input_ptr;
+      const uint8_t *input_ptr;
       unsigned input_stride;
       unsigned max_index;
 
@@ -79,22 +82,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, TYPE, FROM, TO )		\
-static void						\
-fetch_##NAME(const void *ptr, float *attrib)		\
-{							\
-   const float defaults[4] = { 0.0f,0.0f,0.0f,1.0f };	\
-   unsigned i;						\
-							\
-   for (i = 0; i < SZ; i++) {				\
-      attrib[i] = FROM(i);				\
-   }							\
-							\
-   for (; i < 4; i++) {					\
-      attrib[i] = defaults[i];				\
-   }							\
-}							\
-							\
+#define ATTRIB( NAME, SZ, TYPE, TO )	    	        \
 static void						\
 emit_##NAME(const float *attrib, void *ptr)		\
 {  \
@@ -107,27 +95,6 @@ emit_##NAME(const float *attrib, void *ptr)		\
 }
 
 
-#define FROM_64_FLOAT(i)   ((float) ((double *) ptr)[i])
-#define FROM_32_FLOAT(i)   (((float *) ptr)[i])
-
-#define FROM_8_USCALED(i)  ((float) ((unsigned char *) ptr)[i])
-#define FROM_16_USCALED(i) ((float) ((unsigned short *) ptr)[i])
-#define FROM_32_USCALED(i) ((float) ((unsigned int *) ptr)[i])
-
-#define FROM_8_SSCALED(i)  ((float) ((char *) ptr)[i])
-#define FROM_16_SSCALED(i) ((float) ((short *) ptr)[i])
-#define FROM_32_SSCALED(i) ((float) ((int *) ptr)[i])
-
-#define FROM_8_UNORM(i)    ((float) ((unsigned char *) ptr)[i] / 255.0f)
-#define FROM_16_UNORM(i)   ((float) ((unsigned short *) ptr)[i] / 65535.0f)
-#define FROM_32_UNORM(i)   ((float) ((unsigned int *) ptr)[i] / 4294967295.0f)
-
-#define FROM_8_SNORM(i)    ((float) ((char *) ptr)[i] / 127.0f)
-#define FROM_16_SNORM(i)   ((float) ((short *) ptr)[i] / 32767.0f)
-#define FROM_32_SNORM(i)   ((float) ((int *) ptr)[i] / 2147483647.0f)
-
-#define FROM_32_FIXED(i)   (((int *) ptr)[i] / 65536.0f)
-
 #define TO_64_FLOAT(x)   ((double) x)
 #define TO_32_FLOAT(x)   (x)
 
@@ -150,95 +117,79 @@ emit_##NAME(const float *attrib, void *ptr)		\
 #define TO_32_FIXED(x)   ((int) (x * 65536.0f))
 
 
+ATTRIB( R64G64B64A64_FLOAT,   4, double, TO_64_FLOAT )
+ATTRIB( R64G64B64_FLOAT,      3, double, TO_64_FLOAT )
+ATTRIB( R64G64_FLOAT,         2, double, TO_64_FLOAT )
+ATTRIB( R64_FLOAT,            1, double, TO_64_FLOAT )
+
+ATTRIB( R32G32B32A32_FLOAT,   4, float, TO_32_FLOAT )
+ATTRIB( R32G32B32_FLOAT,      3, float, TO_32_FLOAT )
+ATTRIB( R32G32_FLOAT,         2, float, TO_32_FLOAT )
+ATTRIB( R32_FLOAT,            1, float, TO_32_FLOAT )
+
+ATTRIB( R32G32B32A32_USCALED, 4, unsigned, TO_32_USCALED )
+ATTRIB( R32G32B32_USCALED,    3, unsigned, TO_32_USCALED )
+ATTRIB( R32G32_USCALED,       2, unsigned, TO_32_USCALED )
+ATTRIB( R32_USCALED,          1, unsigned, TO_32_USCALED )
+
+ATTRIB( R32G32B32A32_SSCALED, 4, int, TO_32_SSCALED )
+ATTRIB( R32G32B32_SSCALED,    3, int, TO_32_SSCALED )
+ATTRIB( R32G32_SSCALED,       2, int, TO_32_SSCALED )
+ATTRIB( R32_SSCALED,          1, int, TO_32_SSCALED )
+
+ATTRIB( R32G32B32A32_UNORM, 4, unsigned, TO_32_UNORM )
+ATTRIB( R32G32B32_UNORM,    3, unsigned, TO_32_UNORM )
+ATTRIB( R32G32_UNORM,       2, unsigned, TO_32_UNORM )
+ATTRIB( R32_UNORM,          1, unsigned, TO_32_UNORM )
+
+ATTRIB( R32G32B32A32_SNORM, 4, int, TO_32_SNORM )
+ATTRIB( R32G32B32_SNORM,    3, int, TO_32_SNORM )
+ATTRIB( R32G32_SNORM,       2, int, TO_32_SNORM )
+ATTRIB( R32_SNORM,          1, int, TO_32_SNORM )
+
+ATTRIB( R16G16B16A16_USCALED, 4, ushort, TO_16_USCALED )
+ATTRIB( R16G16B16_USCALED,    3, ushort, TO_16_USCALED )
+ATTRIB( R16G16_USCALED,       2, ushort, TO_16_USCALED )
+ATTRIB( R16_USCALED,          1, ushort, TO_16_USCALED )
+
+ATTRIB( R16G16B16A16_SSCALED, 4, short, TO_16_SSCALED )
+ATTRIB( R16G16B16_SSCALED,    3, short, TO_16_SSCALED )
+ATTRIB( R16G16_SSCALED,       2, short, TO_16_SSCALED )
+ATTRIB( R16_SSCALED,          1, short, TO_16_SSCALED )
+
+ATTRIB( R16G16B16A16_UNORM, 4, ushort, TO_16_UNORM )
+ATTRIB( R16G16B16_UNORM,    3, ushort, TO_16_UNORM )
+ATTRIB( R16G16_UNORM,       2, ushort, TO_16_UNORM )
+ATTRIB( R16_UNORM,          1, ushort, TO_16_UNORM )
+
+ATTRIB( R16G16B16A16_SNORM, 4, short, TO_16_SNORM )
+ATTRIB( R16G16B16_SNORM,    3, short, TO_16_SNORM )
+ATTRIB( R16G16_SNORM,       2, short, TO_16_SNORM )
+ATTRIB( R16_SNORM,          1, short, TO_16_SNORM )
+
+ATTRIB( R8G8B8A8_USCALED,   4, ubyte, TO_8_USCALED )
+ATTRIB( R8G8B8_USCALED,     3, ubyte, TO_8_USCALED )
+ATTRIB( R8G8_USCALED,       2, ubyte, TO_8_USCALED )
+ATTRIB( R8_USCALED,         1, ubyte, TO_8_USCALED )
+
+ATTRIB( R8G8B8A8_SSCALED,  4, char, TO_8_SSCALED )
+ATTRIB( R8G8B8_SSCALED,    3, char, TO_8_SSCALED )
+ATTRIB( R8G8_SSCALED,      2, char, TO_8_SSCALED )
+ATTRIB( R8_SSCALED,        1, char, TO_8_SSCALED )
+
+ATTRIB( R8G8B8A8_UNORM,  4, ubyte, TO_8_UNORM )
+ATTRIB( R8G8B8_UNORM,    3, ubyte, TO_8_UNORM )
+ATTRIB( R8G8_UNORM,      2, ubyte, TO_8_UNORM )
+ATTRIB( R8_UNORM,        1, ubyte, TO_8_UNORM )
+
+ATTRIB( R8G8B8A8_SNORM,  4, char, TO_8_SNORM )
+ATTRIB( R8G8B8_SNORM,    3, char, TO_8_SNORM )
+ATTRIB( R8G8_SNORM,      2, char, TO_8_SNORM )
+ATTRIB( R8_SNORM,        1, char, TO_8_SNORM )
+
+ATTRIB( A8R8G8B8_UNORM,       4, ubyte, TO_8_UNORM )
+/*ATTRIB( R8G8B8A8_UNORM,       4, ubyte, TO_8_UNORM )*/
 
-ATTRIB( R64G64B64A64_FLOAT,   4, double, FROM_64_FLOAT, TO_64_FLOAT )
-ATTRIB( R64G64B64_FLOAT,      3, double, FROM_64_FLOAT, TO_64_FLOAT )
-ATTRIB( R64G64_FLOAT,         2, double, FROM_64_FLOAT, TO_64_FLOAT )
-ATTRIB( R64_FLOAT,            1, double, FROM_64_FLOAT, TO_64_FLOAT )
-
-ATTRIB( R32G32B32A32_FLOAT,   4, float, FROM_32_FLOAT, TO_32_FLOAT )
-ATTRIB( R32G32B32_FLOAT,      3, float, FROM_32_FLOAT, TO_32_FLOAT )
-ATTRIB( R32G32_FLOAT,         2, float, FROM_32_FLOAT, TO_32_FLOAT )
-ATTRIB( R32_FLOAT,            1, float, FROM_32_FLOAT, TO_32_FLOAT )
-
-ATTRIB( R32G32B32A32_USCALED, 4, unsigned, FROM_32_USCALED, TO_32_USCALED )
-ATTRIB( R32G32B32_USCALED,    3, unsigned, FROM_32_USCALED, TO_32_USCALED )
-ATTRIB( R32G32_USCALED,       2, unsigned, FROM_32_USCALED, TO_32_USCALED )
-ATTRIB( R32_USCALED,          1, unsigned, FROM_32_USCALED, TO_32_USCALED )
-
-ATTRIB( R32G32B32A32_SSCALED, 4, int, FROM_32_SSCALED, TO_32_SSCALED )
-ATTRIB( R32G32B32_SSCALED,    3, int, FROM_32_SSCALED, TO_32_SSCALED )
-ATTRIB( R32G32_SSCALED,       2, int, FROM_32_SSCALED, TO_32_SSCALED )
-ATTRIB( R32_SSCALED,          1, int, FROM_32_SSCALED, TO_32_SSCALED )
-
-ATTRIB( R32G32B32A32_UNORM, 4, unsigned, FROM_32_UNORM, TO_32_UNORM )
-ATTRIB( R32G32B32_UNORM,    3, unsigned, FROM_32_UNORM, TO_32_UNORM )
-ATTRIB( R32G32_UNORM,       2, unsigned, FROM_32_UNORM, TO_32_UNORM )
-ATTRIB( R32_UNORM,          1, unsigned, FROM_32_UNORM, TO_32_UNORM )
-
-ATTRIB( R32G32B32A32_SNORM, 4, int, FROM_32_SNORM, TO_32_SNORM )
-ATTRIB( R32G32B32_SNORM,    3, int, FROM_32_SNORM, TO_32_SNORM )
-ATTRIB( R32G32_SNORM,       2, int, FROM_32_SNORM, TO_32_SNORM )
-ATTRIB( R32_SNORM,          1, int, FROM_32_SNORM, TO_32_SNORM )
-
-ATTRIB( R16G16B16A16_USCALED, 4, ushort, FROM_16_USCALED, TO_16_USCALED )
-ATTRIB( R16G16B16_USCALED,    3, ushort, FROM_16_USCALED, TO_16_USCALED )
-ATTRIB( R16G16_USCALED,       2, ushort, FROM_16_USCALED, TO_16_USCALED )
-ATTRIB( R16_USCALED,          1, ushort, FROM_16_USCALED, TO_16_USCALED )
-
-ATTRIB( R16G16B16A16_SSCALED, 4, short, FROM_16_SSCALED, TO_16_SSCALED )
-ATTRIB( R16G16B16_SSCALED,    3, short, FROM_16_SSCALED, TO_16_SSCALED )
-ATTRIB( R16G16_SSCALED,       2, short, FROM_16_SSCALED, TO_16_SSCALED )
-ATTRIB( R16_SSCALED,          1, short, FROM_16_SSCALED, TO_16_SSCALED )
-
-ATTRIB( R16G16B16A16_UNORM, 4, ushort, FROM_16_UNORM, TO_16_UNORM )
-ATTRIB( R16G16B16_UNORM,    3, ushort, FROM_16_UNORM, TO_16_UNORM )
-ATTRIB( R16G16_UNORM,       2, ushort, FROM_16_UNORM, TO_16_UNORM )
-ATTRIB( R16_UNORM,          1, ushort, FROM_16_UNORM, TO_16_UNORM )
-
-ATTRIB( R16G16B16A16_SNORM, 4, short, FROM_16_SNORM, TO_16_SNORM )
-ATTRIB( R16G16B16_SNORM,    3, short, FROM_16_SNORM, TO_16_SNORM )
-ATTRIB( R16G16_SNORM,       2, short, FROM_16_SNORM, TO_16_SNORM )
-ATTRIB( R16_SNORM,          1, short, FROM_16_SNORM, TO_16_SNORM )
-
-ATTRIB( R8G8B8A8_USCALED,   4, ubyte, FROM_8_USCALED, TO_8_USCALED )
-ATTRIB( R8G8B8_USCALED,     3, ubyte, FROM_8_USCALED, TO_8_USCALED )
-ATTRIB( R8G8_USCALED,       2, ubyte, FROM_8_USCALED, TO_8_USCALED )
-ATTRIB( R8_USCALED,         1, ubyte, FROM_8_USCALED, TO_8_USCALED )
-
-ATTRIB( R8G8B8A8_SSCALED,  4, char, FROM_8_SSCALED, TO_8_SSCALED )
-ATTRIB( R8G8B8_SSCALED,    3, char, FROM_8_SSCALED, TO_8_SSCALED )
-ATTRIB( R8G8_SSCALED,      2, char, FROM_8_SSCALED, TO_8_SSCALED )
-ATTRIB( R8_SSCALED,        1, char, FROM_8_SSCALED, TO_8_SSCALED )
-
-ATTRIB( R8G8B8A8_UNORM,  4, ubyte, FROM_8_UNORM, TO_8_UNORM )
-ATTRIB( R8G8B8_UNORM,    3, ubyte, FROM_8_UNORM, TO_8_UNORM )
-ATTRIB( R8G8_UNORM,      2, ubyte, FROM_8_UNORM, TO_8_UNORM )
-ATTRIB( R8_UNORM,        1, ubyte, FROM_8_UNORM, TO_8_UNORM )
-
-ATTRIB( R8G8B8A8_SNORM,  4, char, FROM_8_SNORM, TO_8_SNORM )
-ATTRIB( R8G8B8_SNORM,    3, char, FROM_8_SNORM, TO_8_SNORM )
-ATTRIB( R8G8_SNORM,      2, char, FROM_8_SNORM, TO_8_SNORM )
-ATTRIB( R8_SNORM,        1, char, FROM_8_SNORM, TO_8_SNORM )
-
-ATTRIB( A8R8G8B8_UNORM,       4, ubyte, FROM_8_UNORM, TO_8_UNORM )
-/*ATTRIB( R8G8B8A8_UNORM,       4, ubyte, FROM_8_UNORM, TO_8_UNORM )*/
-
-ATTRIB( R32G32B32A32_FIXED,   4, int, FROM_32_FIXED, TO_32_FIXED )
-ATTRIB( R32G32B32_FIXED,      3, int, FROM_32_FIXED, TO_32_FIXED )
-ATTRIB( R32G32_FIXED,         2, int, FROM_32_FIXED, TO_32_FIXED )
-ATTRIB( R32_FIXED,            1, int, FROM_32_FIXED, TO_32_FIXED )
-
-
-
-static void
-fetch_B8G8R8A8_UNORM(const void *ptr, float *attrib)
-{
-   attrib[2] = FROM_8_UNORM(0);
-   attrib[1] = FROM_8_UNORM(1);
-   attrib[0] = FROM_8_UNORM(2);
-   attrib[3] = FROM_8_UNORM(3);
-}
 
 static void
 emit_B8G8R8A8_UNORM( const float *attrib, void *ptr)
@@ -251,181 +202,13 @@ emit_B8G8R8A8_UNORM( const float *attrib, void *ptr)
 }
 
 static void 
-fetch_NULL( const void *ptr, float *attrib )
-{
-   attrib[0] = 0;
-   attrib[1] = 0;
-   attrib[2] = 0;
-   attrib[3] = 1;
-}
-
-static void 
 emit_NULL( const float *attrib, void *ptr )
 {
    /* do nothing is the only sensible option */
 }
 
-static fetch_func get_fetch_func( enum pipe_format format )
-{
-   switch (format) {
-   case PIPE_FORMAT_R64_FLOAT:
-      return &fetch_R64_FLOAT;
-   case PIPE_FORMAT_R64G64_FLOAT:
-      return &fetch_R64G64_FLOAT;
-   case PIPE_FORMAT_R64G64B64_FLOAT:
-      return &fetch_R64G64B64_FLOAT;
-   case PIPE_FORMAT_R64G64B64A64_FLOAT:
-      return &fetch_R64G64B64A64_FLOAT;
-
-   case PIPE_FORMAT_R32_FLOAT:
-      return &fetch_R32_FLOAT;
-   case PIPE_FORMAT_R32G32_FLOAT:
-      return &fetch_R32G32_FLOAT;
-   case PIPE_FORMAT_R32G32B32_FLOAT:
-      return &fetch_R32G32B32_FLOAT;
-   case PIPE_FORMAT_R32G32B32A32_FLOAT:
-      return &fetch_R32G32B32A32_FLOAT;
-
-   case PIPE_FORMAT_R32_UNORM:
-      return &fetch_R32_UNORM;
-   case PIPE_FORMAT_R32G32_UNORM:
-      return &fetch_R32G32_UNORM;
-   case PIPE_FORMAT_R32G32B32_UNORM:
-      return &fetch_R32G32B32_UNORM;
-   case PIPE_FORMAT_R32G32B32A32_UNORM:
-      return &fetch_R32G32B32A32_UNORM;
-
-   case PIPE_FORMAT_R32_USCALED:
-      return &fetch_R32_USCALED;
-   case PIPE_FORMAT_R32G32_USCALED:
-      return &fetch_R32G32_USCALED;
-   case PIPE_FORMAT_R32G32B32_USCALED:
-      return &fetch_R32G32B32_USCALED;
-   case PIPE_FORMAT_R32G32B32A32_USCALED:
-      return &fetch_R32G32B32A32_USCALED;
-
-   case PIPE_FORMAT_R32_SNORM:
-      return &fetch_R32_SNORM;
-   case PIPE_FORMAT_R32G32_SNORM:
-      return &fetch_R32G32_SNORM;
-   case PIPE_FORMAT_R32G32B32_SNORM:
-      return &fetch_R32G32B32_SNORM;
-   case PIPE_FORMAT_R32G32B32A32_SNORM:
-      return &fetch_R32G32B32A32_SNORM;
-
-   case PIPE_FORMAT_R32_SSCALED:
-      return &fetch_R32_SSCALED;
-   case PIPE_FORMAT_R32G32_SSCALED:
-      return &fetch_R32G32_SSCALED;
-   case PIPE_FORMAT_R32G32B32_SSCALED:
-      return &fetch_R32G32B32_SSCALED;
-   case PIPE_FORMAT_R32G32B32A32_SSCALED:
-      return &fetch_R32G32B32A32_SSCALED;
-
-   case PIPE_FORMAT_R16_UNORM:
-      return &fetch_R16_UNORM;
-   case PIPE_FORMAT_R16G16_UNORM:
-      return &fetch_R16G16_UNORM;
-   case PIPE_FORMAT_R16G16B16_UNORM:
-      return &fetch_R16G16B16_UNORM;
-   case PIPE_FORMAT_R16G16B16A16_UNORM:
-      return &fetch_R16G16B16A16_UNORM;
-
-   case PIPE_FORMAT_R16_USCALED:
-      return &fetch_R16_USCALED;
-   case PIPE_FORMAT_R16G16_USCALED:
-      return &fetch_R16G16_USCALED;
-   case PIPE_FORMAT_R16G16B16_USCALED:
-      return &fetch_R16G16B16_USCALED;
-   case PIPE_FORMAT_R16G16B16A16_USCALED:
-      return &fetch_R16G16B16A16_USCALED;
-
-   case PIPE_FORMAT_R16_SNORM:
-      return &fetch_R16_SNORM;
-   case PIPE_FORMAT_R16G16_SNORM:
-      return &fetch_R16G16_SNORM;
-   case PIPE_FORMAT_R16G16B16_SNORM:
-      return &fetch_R16G16B16_SNORM;
-   case PIPE_FORMAT_R16G16B16A16_SNORM:
-      return &fetch_R16G16B16A16_SNORM;
-
-   case PIPE_FORMAT_R16_SSCALED:
-      return &fetch_R16_SSCALED;
-   case PIPE_FORMAT_R16G16_SSCALED:
-      return &fetch_R16G16_SSCALED;
-   case PIPE_FORMAT_R16G16B16_SSCALED:
-      return &fetch_R16G16B16_SSCALED;
-   case PIPE_FORMAT_R16G16B16A16_SSCALED:
-      return &fetch_R16G16B16A16_SSCALED;
-
-   case PIPE_FORMAT_R8_UNORM:
-      return &fetch_R8_UNORM;
-   case PIPE_FORMAT_R8G8_UNORM:
-      return &fetch_R8G8_UNORM;
-   case PIPE_FORMAT_R8G8B8_UNORM:
-      return &fetch_R8G8B8_UNORM;
-   case PIPE_FORMAT_R8G8B8A8_UNORM:
-      return &fetch_R8G8B8A8_UNORM;
-
-   case PIPE_FORMAT_R8_USCALED:
-      return &fetch_R8_USCALED;
-   case PIPE_FORMAT_R8G8_USCALED:
-      return &fetch_R8G8_USCALED;
-   case PIPE_FORMAT_R8G8B8_USCALED:
-      return &fetch_R8G8B8_USCALED;
-   case PIPE_FORMAT_R8G8B8A8_USCALED:
-      return &fetch_R8G8B8A8_USCALED;
-
-   case PIPE_FORMAT_R8_SNORM:
-      return &fetch_R8_SNORM;
-   case PIPE_FORMAT_R8G8_SNORM:
-      return &fetch_R8G8_SNORM;
-   case PIPE_FORMAT_R8G8B8_SNORM:
-      return &fetch_R8G8B8_SNORM;
-   case PIPE_FORMAT_R8G8B8A8_SNORM:
-      return &fetch_R8G8B8A8_SNORM;
-
-   case PIPE_FORMAT_R8_SSCALED:
-      return &fetch_R8_SSCALED;
-   case PIPE_FORMAT_R8G8_SSCALED:
-      return &fetch_R8G8_SSCALED;
-   case PIPE_FORMAT_R8G8B8_SSCALED:
-      return &fetch_R8G8B8_SSCALED;
-   case PIPE_FORMAT_R8G8B8A8_SSCALED:
-      return &fetch_R8G8B8A8_SSCALED;
-
-   case PIPE_FORMAT_B8G8R8A8_UNORM:
-      return &fetch_B8G8R8A8_UNORM;
-
-   case PIPE_FORMAT_A8R8G8B8_UNORM:
-      return &fetch_A8R8G8B8_UNORM;
-
-   case PIPE_FORMAT_R32_FIXED:
-      return &fetch_R32_FIXED;
-   case PIPE_FORMAT_R32G32_FIXED:
-      return &fetch_R32G32_FIXED;
-   case PIPE_FORMAT_R32G32B32_FIXED:
-      return &fetch_R32G32B32_FIXED;
-   case PIPE_FORMAT_R32G32B32A32_FIXED:
-      return &fetch_R32G32B32A32_FIXED;
-
-   default:
-      assert(0); 
-      return &fetch_NULL;
-   }
-}
-
-
-
-
 static emit_func get_emit_func( enum pipe_format format )
 {
-   /* silence warnings */
-   (void) emit_R32G32B32A32_FIXED;
-   (void) emit_R32G32B32_FIXED;
-   (void) emit_R32G32_FIXED;
-   (void) emit_R32_FIXED;
-
    switch (format) {
    case PIPE_FORMAT_R64_FLOAT:
       return &emit_R64_FLOAT;
@@ -589,7 +372,7 @@ static void PIPE_CDECL generic_run_elts( struct translate *translate,
 
       for (attr = 0; attr < nr_attrs; attr++) {
 	 float data[4];
-         const char *src;
+         const uint8_t *src;
          unsigned index;
 
 	 char *dst = (vert + 
@@ -606,7 +389,7 @@ static void PIPE_CDECL generic_run_elts( struct translate *translate,
          src = tg->attrib[attr].input_ptr +
                tg->attrib[attr].input_stride * index;
 
-	 tg->attrib[attr].fetch( src, data );
+	 tg->attrib[attr].fetch( data, src, 0, 0 );
 
          if (0) debug_printf("vert %d/%d attr %d: %f %f %f %f\n",
                              i, elt, attr, data[0], data[1], data[2], data[3]);
@@ -644,7 +427,7 @@ static void PIPE_CDECL generic_run( struct translate *translate,
 		      tg->attrib[attr].output_offset);
 
          if (tg->attrib[attr].type == TRANSLATE_ELEMENT_NORMAL) {
-            const char *src;
+            const uint8_t *src;
 
             if (tg->attrib[attr].instance_divisor) {
                src = tg->attrib[attr].input_ptr +
@@ -655,7 +438,7 @@ static void PIPE_CDECL generic_run( struct translate *translate,
                      tg->attrib[attr].input_stride * elt;
             }
 
-            tg->attrib[attr].fetch( src, data );
+            tg->attrib[attr].fetch( data, src, 0, 0 );
          } else {
             data[0] = (float)instance_id;
          }
@@ -683,7 +466,7 @@ static void generic_set_buffer( struct translate *translate,
 
    for (i = 0; i < tg->nr_attrib; i++) {
       if (tg->attrib[i].buffer == buf) {
-	 tg->attrib[i].input_ptr = ((char *)ptr +
+	 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;
@@ -714,9 +497,15 @@ struct translate *translate_generic_create( const struct translate_key *key )
    tg->translate.run = generic_run;
 
    for (i = 0; i < key->nr_elements; i++) {
+      const struct util_format_description *format_desc =
+            util_format_description(key->element[i].input_format);
+
+      assert(format_desc);
+      assert(format_desc->fetch_rgba_float);
+
       tg->attrib[i].type = key->element[i].type;
 
-      tg->attrib[i].fetch = get_fetch_func(key->element[i].input_format);
+      tg->attrib[i].fetch = format_desc->fetch_rgba_float;
       tg->attrib[i].buffer = key->element[i].input_buffer;
       tg->attrib[i].input_offset = key->element[i].input_offset;
       tg->attrib[i].instance_divisor = key->element[i].instance_divisor;