gallium: add PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT

[mesa.git] / src / gallium / drivers / llvmpipe / lp_tile_soa.py

diff --git a/src/gallium/drivers/llvmpipe/lp_tile_soa.py b/src/gallium/drivers/llvmpipe/lp_tile_soa.py
index f4324e699713c6bf2b332df0ca1a14dce45db024..d548ad845c7e2f3b44ebc742457f37443fbdc623 100644 (file)
--- a/src/gallium/drivers/llvmpipe/lp_tile_soa.py
+++ b/src/gallium/drivers/llvmpipe/lp_tile_soa.py
@@ -51,6 +51,12 @@ def is_format_supported(format):
 
     # FIXME: Ideally we would support any format combination here.
 
+    if format.name == 'PIPE_FORMAT_R11G11B10_FLOAT':
+        return True;
+
+    if format.name == 'PIPE_FORMAT_R9G9B9E5_FLOAT':
+        return True;
+
     if format.layout != PLAIN:
         return False
 
@@ -75,7 +81,7 @@ def generate_format_read(format, dst_channel, dst_native_type, dst_suffix):
     src_native_type = native_type(format)
 
     print 'static void'
-    print 'lp_tile_%s_swizzle_%s(%s *dst, const uint8_t *src, unsigned src_stride, unsigned x0, unsigned y0)' % (name, dst_suffix, dst_native_type)
+    print 'lp_tile_%s_swizzle_%s(%s * restrict dst, const uint8_t * restrict src, unsigned src_stride, unsigned x0, unsigned y0)' % (name, dst_suffix, dst_native_type)
     print '{'
     print '   unsigned x, y;'
     print '   const uint8_t *src_row = src + y0*src_stride;'
@@ -98,7 +104,19 @@ def generate_format_read(format, dst_channel, dst_native_type, dst_suffix):
     else:
         assert False
 
-    if format.layout == PLAIN:
+    if format.name == 'PIPE_FORMAT_R11G11B10_FLOAT':
+        print '         float tmp[3];'
+        print '         uint8_t r, g, b;'
+        print '         r11g11b10f_to_float3(*src_pixel++, tmp);'
+        for i in range(3):
+            print '         %s = tmp[%d] * 0xff;' % (names[i], i)
+    elif format.name == 'PIPE_FORMAT_R9G9B9E5_FLOAT':
+        print '         float tmp[3];'
+        print '         uint8_t r, g, b;'
+        print '         rgb9e5_to_float3(*src_pixel++, tmp);'
+        for i in range(3):
+            print '         %s = tmp[%d] * 0xff;' % (names[i], i)
+    elif format.layout == PLAIN:
         if not format.is_array():
             print '         %s pixel = *src_pixel++;' % src_native_type
             shift = 0;
@@ -235,7 +253,17 @@ def emit_tile_pixel_unswizzle_code(format, src_channel):
     print '      %s *dst_pixel = (%s *)(dst_row + x0*%u);' % (dst_native_type, dst_native_type, format.stride())
     print '      for (x = 0; x < TILE_SIZE; ++x) {'
 
-    if format.layout == PLAIN:
+    if format.name == 'PIPE_FORMAT_R11G11B10_FLOAT':
+        print '         float tmp[3];'
+        for i in range(3):
+            print '         tmp[%d] = ubyte_to_float(TILE_PIXEL(src, x, y, %u));' % (i, inv_swizzle[i])
+        print '         *dst_pixel++ = float3_to_r11g11b10f(tmp);'
+    elif format.name == 'PIPE_FORMAT_R9G9B9E5_FLOAT':
+        print '         float tmp[3];'
+        for i in range(3):
+            print '         tmp[%d] = ubyte_to_float(TILE_PIXEL(src, x, y, %u));' % (i, inv_swizzle[i])
+        print '         *dst_pixel++ = float3_to_rgb9e5(tmp);'
+    elif format.layout == PLAIN:
         if not format.is_array():
             print '         %s pixel = 0;' % dst_native_type
             shift = 0;
@@ -273,7 +301,7 @@ def generate_format_write(format, src_channel, src_native_type, src_suffix):
     name = format.short_name()
 
     print 'static void'
-    print 'lp_tile_%s_unswizzle_%s(const %s *src, uint8_t *dst, unsigned dst_stride, unsigned x0, unsigned y0)' % (name, src_suffix, src_native_type)
+    print 'lp_tile_%s_unswizzle_%s(const %s * restrict src, uint8_t * restrict dst, unsigned dst_stride, unsigned x0, unsigned y0)' % (name, src_suffix, src_native_type)
     print '{'
     if format.layout == PLAIN \
         and format.colorspace == 'rgb' \
@@ -501,7 +529,7 @@ def generate_swizzle(formats, dst_channel, dst_native_type, dst_suffix):
     print 'void'
     print 'lp_tile_swizzle_%s(enum pipe_format format, %s *dst, const void *src, unsigned src_stride, unsigned x, unsigned y)' % (dst_suffix, dst_native_type)
     print '{'
-    print '   void (*func)(%s *dst, const uint8_t *src, unsigned src_stride, unsigned x0, unsigned y0);' % dst_native_type
+    print '   void (*func)(%s * restrict dst, const uint8_t * restrict src, unsigned src_stride, unsigned x0, unsigned y0);' % dst_native_type
     print '#ifdef DEBUG'
     print '   lp_tile_swizzle_count += 1;'
     print '#endif'
@@ -539,7 +567,7 @@ def generate_unswizzle(formats, src_channel, src_native_type, src_suffix):
     print 'lp_tile_unswizzle_%s(enum pipe_format format, const %s *src, void *dst, unsigned dst_stride, unsigned x, unsigned y)' % (src_suffix, src_native_type)
     
     print '{'
-    print '   void (*func)(const %s *src, uint8_t *dst, unsigned dst_stride, unsigned x0, unsigned y0);' % src_native_type
+    print '   void (*func)(const %s * restrict src, uint8_t * restrict dst, unsigned dst_stride, unsigned x0, unsigned y0);' % src_native_type
     print '#ifdef DEBUG'
     print '   lp_tile_unswizzle_count += 1;'
     print '#endif'
@@ -577,8 +605,10 @@ def main():
     print CopyRight.strip()
     print
     print '#include "pipe/p_compiler.h"'
-    print '#include "util/u_format.h"'
     print '#include "util/u_math.h"'
+    print '#include "util/u_format.h"'
+    print '#include "util/u_format_r11g11b10f.h"'
+    print '#include "util/u_format_rgb9e5.h"'
     print '#include "util/u_half.h"'
     print '#include "util/u_cpu_detect.h"'
     print '#include "lp_tile_soa.h"'
@@ -612,7 +642,7 @@ def main():
 
     generate_sse2()
 
-    channel = Channel(UNSIGNED, True, 8)
+    channel = Channel(UNSIGNED, True, False, 8)
     native_type = 'uint8_t'
     suffix = '4ub'