diff options
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/llvmpipe/SConscript | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_quad_blend.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_tile_cache.c | 42 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_tile_cache.h | 5 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_tile_soa.c | 934 | ||||
| -rw-r--r-- | src/gallium/drivers/llvmpipe/lp_tile_soa.h | 60 |
6 files changed, 1019 insertions, 27 deletions
diff --git a/src/gallium/drivers/llvmpipe/SConscript b/src/gallium/drivers/llvmpipe/SConscript index 8565c7e0118..e3106763cb5 100644 --- a/src/gallium/drivers/llvmpipe/SConscript +++ b/src/gallium/drivers/llvmpipe/SConscript @@ -51,6 +51,7 @@ llvmpipe = env.ConvenienceLibrary( 'lp_tex_sample.c', 'lp_texture.c', 'lp_tile_cache.c', + 'lp_tile_soa.c', ]) diff --git a/src/gallium/drivers/llvmpipe/lp_quad_blend.c b/src/gallium/drivers/llvmpipe/lp_quad_blend.c index 2f4c46d5cbf..fbfd51f6003 100644 --- a/src/gallium/drivers/llvmpipe/lp_quad_blend.c +++ b/src/gallium/drivers/llvmpipe/lp_quad_blend.c @@ -183,7 +183,7 @@ blend_run(struct quad_stage *qs, int x = itx + (j & 1); int y = ity + (j >> 1); for (i = 0; i < 4; i++) { - dest[i][j] = tile->data.color[y][x][i]; + dest[i][j] = tile->data.color[i][y][x]; } } @@ -207,7 +207,7 @@ blend_run(struct quad_stage *qs, int x = itx + (j & 1); int y = ity + (j >> 1); for (i = 0; i < 4; i++) { /* loop over color chans */ - tile->data.color[y][x][i] = quadColor[i][j]; + tile->data.color[i][y][x] = quadColor[i][j]; } } } diff --git a/src/gallium/drivers/llvmpipe/lp_tile_cache.c b/src/gallium/drivers/llvmpipe/lp_tile_cache.c index 01ba843806b..65b62c44dcd 100644 --- a/src/gallium/drivers/llvmpipe/lp_tile_cache.c +++ b/src/gallium/drivers/llvmpipe/lp_tile_cache.c @@ -38,6 +38,7 @@ #include "lp_context.h" #include "lp_surface.h" #include "lp_texture.h" +#include "lp_tile_soa.h" #include "lp_tile_cache.h" @@ -216,15 +217,11 @@ clear_tile_rgba(struct llvmpipe_cached_tile *tile, memset(tile->data.color, 0, sizeof(tile->data.color)); } else { - uint i, j; - for (i = 0; i < TILE_SIZE; i++) { - for (j = 0; j < TILE_SIZE; j++) { - tile->data.color[i][j][0] = clear_value[0]; - tile->data.color[i][j][1] = clear_value[1]; - tile->data.color[i][j][2] = clear_value[2]; - tile->data.color[i][j][3] = clear_value[3]; - } - } + uint i, x, y; + for (i = 0; i < 4; ++i) + for (y = 0; y < TILE_SIZE; y++) + for (x = 0; x < TILE_SIZE; x++) + tile->data.color[i][y][x] = clear_value[i]; } } @@ -334,11 +331,10 @@ lp_flush_tile_cache(struct llvmpipe_tile_cache *tc) tile->data.depth32, 0/*STRIDE*/); } else { - pipe_put_tile_rgba(pt, - tile->addr.bits.x * TILE_SIZE, - tile->addr.bits.y * TILE_SIZE, - TILE_SIZE, TILE_SIZE, - (float *) tile->data.color); + lp_put_tile_rgba_soa(pt, + tile->addr.bits.x * TILE_SIZE, + tile->addr.bits.y * TILE_SIZE, + tile->data.color); } tile->addr.bits.invalid = 1; /* mark as empty */ inuse++; @@ -390,11 +386,10 @@ lp_find_cached_tile(struct llvmpipe_tile_cache *tc, tile->data.depth32, 0/*STRIDE*/); } else { - pipe_put_tile_rgba(pt, - tile->addr.bits.x * TILE_SIZE, - tile->addr.bits.y * TILE_SIZE, - TILE_SIZE, TILE_SIZE, - (float *) tile->data.color); + lp_put_tile_rgba_soa(pt, + tile->addr.bits.x * TILE_SIZE, + tile->addr.bits.y * TILE_SIZE, + tile->data.color); } } @@ -420,11 +415,10 @@ lp_find_cached_tile(struct llvmpipe_tile_cache *tc, tile->data.depth32, 0/*STRIDE*/); } else { - pipe_get_tile_rgba(pt, - tile->addr.bits.x * TILE_SIZE, - tile->addr.bits.y * TILE_SIZE, - TILE_SIZE, TILE_SIZE, - (float *) tile->data.color); + lp_get_tile_rgba_soa(pt, + tile->addr.bits.x * TILE_SIZE, + tile->addr.bits.y * TILE_SIZE, + tile->data.color); } } } diff --git a/src/gallium/drivers/llvmpipe/lp_tile_cache.h b/src/gallium/drivers/llvmpipe/lp_tile_cache.h index 19676392dcf..2f904d9e530 100644 --- a/src/gallium/drivers/llvmpipe/lp_tile_cache.h +++ b/src/gallium/drivers/llvmpipe/lp_tile_cache.h @@ -64,7 +64,10 @@ struct llvmpipe_cached_tile { union tile_address addr; union { - float color[TILE_SIZE][TILE_SIZE][4]; + + /** color in SOA format (rrrr, gggg, bbbb, aaaa) */ + float color[4][TILE_SIZE][TILE_SIZE]; + uint color32[TILE_SIZE][TILE_SIZE]; uint depth32[TILE_SIZE][TILE_SIZE]; ushort depth16[TILE_SIZE][TILE_SIZE]; diff --git a/src/gallium/drivers/llvmpipe/lp_tile_soa.c b/src/gallium/drivers/llvmpipe/lp_tile_soa.c new file mode 100644 index 00000000000..9d37cf68053 --- /dev/null +++ b/src/gallium/drivers/llvmpipe/lp_tile_soa.c @@ -0,0 +1,934 @@ +/************************************************************************** + * + * Copyright 2007 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. + * + **************************************************************************/ + +/** + * RGBA/float tile get/put functions. + * Usable both by drivers and state trackers. + */ + + +#include "pipe/p_defines.h" +#include "pipe/p_inlines.h" + +#include "util/u_math.h" +#include "util/u_memory.h" +#include "util/u_rect.h" +#include "util/u_tile.h" +#include "lp_tile_soa.h" + + +#define PIXEL(_p, _x, _y, _c) ((_p)[(_c)*TILE_SIZE*TILE_SIZE + (_y)*TILE_SIZE + (_x)]) + + +/** Convert short in [-32768,32767] to GLfloat in [-1.0,1.0] */ +#define SHORT_TO_FLOAT(S) ((2.0F * (S) + 1.0F) * (1.0F/65535.0F)) + +#define UNCLAMPED_FLOAT_TO_SHORT(us, f) \ + us = ( (short) ( CLAMP((f), -1.0, 1.0) * 32767.0F) ) + + + +/*** PIPE_FORMAT_A8R8G8B8_UNORM ***/ + +static void +a8r8g8b8_get_tile_rgba(const unsigned *src, + unsigned w, unsigned h, + float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + const unsigned pixel = *src++; + PIXEL(p, j, i, 0) = ubyte_to_float((pixel >> 16) & 0xff); + PIXEL(p, j, i, 1) = ubyte_to_float((pixel >> 8) & 0xff); + PIXEL(p, j, i, 2) = ubyte_to_float((pixel >> 0) & 0xff); + PIXEL(p, j, i, 3) = ubyte_to_float((pixel >> 24) & 0xff); + } + } +} + + +static void +a8r8g8b8_put_tile_rgba(unsigned *dst, + unsigned w, unsigned h, + const float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + unsigned r, g, b, a; + r = float_to_ubyte(PIXEL(p, j, i, 0)); + g = float_to_ubyte(PIXEL(p, j, i, 1)); + b = float_to_ubyte(PIXEL(p, j, i, 2)); + a = float_to_ubyte(PIXEL(p, j, i, 3)); + *dst++ = (a << 24) | (r << 16) | (g << 8) | b; + } + } +} + + +/*** PIPE_FORMAT_A8R8G8B8_UNORM ***/ + +static void +x8r8g8b8_get_tile_rgba(const unsigned *src, + unsigned w, unsigned h, + float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + const unsigned pixel = *src++; + PIXEL(p, j, i, 0) = ubyte_to_float((pixel >> 16) & 0xff); + PIXEL(p, j, i, 1) = ubyte_to_float((pixel >> 8) & 0xff); + PIXEL(p, j, i, 2) = ubyte_to_float((pixel >> 0) & 0xff); + PIXEL(p, j, i, 3) = ubyte_to_float(0xff); + } + } +} + + +static void +x8r8g8b8_put_tile_rgba(unsigned *dst, + unsigned w, unsigned h, + const float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + unsigned r, g, b; + r = float_to_ubyte(PIXEL(p, j, i, 0)); + g = float_to_ubyte(PIXEL(p, j, i, 1)); + b = float_to_ubyte(PIXEL(p, j, i, 2)); + *dst++ = (0xff << 24) | (r << 16) | (g << 8) | b; + } + } +} + + +/*** PIPE_FORMAT_B8G8R8A8_UNORM ***/ + +static void +b8g8r8a8_get_tile_rgba(const unsigned *src, + unsigned w, unsigned h, + float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + const unsigned pixel = *src++; + PIXEL(p, j, i, 0) = ubyte_to_float((pixel >> 8) & 0xff); + PIXEL(p, j, i, 1) = ubyte_to_float((pixel >> 16) & 0xff); + PIXEL(p, j, i, 2) = ubyte_to_float((pixel >> 24) & 0xff); + PIXEL(p, j, i, 3) = ubyte_to_float((pixel >> 0) & 0xff); + } + } +} + + +static void +b8g8r8a8_put_tile_rgba(unsigned *dst, + unsigned w, unsigned h, + const float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + unsigned r, g, b, a; + r = float_to_ubyte(PIXEL(p, j, i, 0)); + g = float_to_ubyte(PIXEL(p, j, i, 1)); + b = float_to_ubyte(PIXEL(p, j, i, 2)); + a = float_to_ubyte(PIXEL(p, j, i, 3)); + *dst++ = (b << 24) | (g << 16) | (r << 8) | a; + } + } +} + + +/*** PIPE_FORMAT_A1R5G5B5_UNORM ***/ + +static void +a1r5g5b5_get_tile_rgba(const ushort *src, + unsigned w, unsigned h, + float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + const ushort pixel = *src++; + PIXEL(p, j, i, 0) = ((pixel >> 10) & 0x1f) * (1.0f / 31.0f); + PIXEL(p, j, i, 1) = ((pixel >> 5) & 0x1f) * (1.0f / 31.0f); + PIXEL(p, j, i, 2) = ((pixel ) & 0x1f) * (1.0f / 31.0f); + PIXEL(p, j, i, 3) = ((pixel >> 15) ) * 1.0f; + } + } +} + + +static void +a1r5g5b5_put_tile_rgba(ushort *dst, + unsigned w, unsigned h, + const float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + unsigned r, g, b, a; + r = float_to_ubyte(PIXEL(p, j, i, 0)); + g = float_to_ubyte(PIXEL(p, j, i, 1)); + b = float_to_ubyte(PIXEL(p, j, i, 2)); + a = float_to_ubyte(PIXEL(p, j, i, 3)); + r = r >> 3; /* 5 bits */ + g = g >> 3; /* 5 bits */ + b = b >> 3; /* 5 bits */ + a = a >> 7; /* 1 bit */ + *dst++ = (a << 15) | (r << 10) | (g << 5) | b; + } + } +} + + +/*** PIPE_FORMAT_A4R4G4B4_UNORM ***/ + +static void +a4r4g4b4_get_tile_rgba(const ushort *src, + unsigned w, unsigned h, + float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + const ushort pixel = *src++; + PIXEL(p, j, i, 0) = ((pixel >> 8) & 0xf) * (1.0f / 15.0f); + PIXEL(p, j, i, 1) = ((pixel >> 4) & 0xf) * (1.0f / 15.0f); + PIXEL(p, j, i, 2) = ((pixel ) & 0xf) * (1.0f / 15.0f); + PIXEL(p, j, i, 3) = ((pixel >> 12) ) * (1.0f / 15.0f); + } + } +} + + +static void +a4r4g4b4_put_tile_rgba(ushort *dst, + unsigned w, unsigned h, + const float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + unsigned r, g, b, a; + r = float_to_ubyte(PIXEL(p, j, i, 0)); + g = float_to_ubyte(PIXEL(p, j, i, 1)); + b = float_to_ubyte(PIXEL(p, j, i, 2)); + a = float_to_ubyte(PIXEL(p, j, i, 3)); + r >>= 4; + g >>= 4; + b >>= 4; + a >>= 4; + *dst++ = (a << 12) | (r << 16) | (g << 4) | b; + } + } +} + + +/*** PIPE_FORMAT_R5G6B5_UNORM ***/ + +static void +r5g6b5_get_tile_rgba(const ushort *src, + unsigned w, unsigned h, + float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + const ushort pixel = *src++; + PIXEL(p, j, i, 0) = ((pixel >> 11) & 0x1f) * (1.0f / 31.0f); + PIXEL(p, j, i, 1) = ((pixel >> 5) & 0x3f) * (1.0f / 63.0f); + PIXEL(p, j, i, 2) = ((pixel ) & 0x1f) * (1.0f / 31.0f); + PIXEL(p, j, i, 3) = 1.0f; + } + } +} + + +static void +r5g6b5_put_tile_rgba(ushort *dst, + unsigned w, unsigned h, + const float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + uint r = (uint) (CLAMP(PIXEL(p, j, i, 0), 0.0, 1.0) * 31.0); + uint g = (uint) (CLAMP(PIXEL(p, j, i, 1), 0.0, 1.0) * 63.0); + uint b = (uint) (CLAMP(PIXEL(p, j, i, 2), 0.0, 1.0) * 31.0); + *dst++ = (r << 11) | (g << 5) | (b); + } + } +} + + + +/*** PIPE_FORMAT_Z16_UNORM ***/ + +/** + * Return each Z value as four floats in [0,1]. + */ +static void +z16_get_tile_rgba(const ushort *src, + unsigned w, unsigned h, + float *p) +{ + const float scale = 1.0f / 65535.0f; + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + PIXEL(p, j, i, 0) = + PIXEL(p, j, i, 1) = + PIXEL(p, j, i, 2) = + PIXEL(p, j, i, 3) = *src++ * scale; + } + } +} + + + + +/*** PIPE_FORMAT_L8_UNORM ***/ + +static void +l8_get_tile_rgba(const ubyte *src, + unsigned w, unsigned h, + float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++, src++) { + PIXEL(p, j, i, 0) = + PIXEL(p, j, i, 1) = + PIXEL(p, j, i, 2) = ubyte_to_float(*src); + PIXEL(p, j, i, 3) = 1.0; + } + } +} + + +static void +l8_put_tile_rgba(ubyte *dst, + unsigned w, unsigned h, + const float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + unsigned r; + r = float_to_ubyte(PIXEL(p, j, i, 0)); + *dst++ = (ubyte) r; + } + } +} + + + +/*** PIPE_FORMAT_A8_UNORM ***/ + +static void +a8_get_tile_rgba(const ubyte *src, + unsigned w, unsigned h, + float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++, src++) { + PIXEL(p, j, i, 0) = + PIXEL(p, j, i, 1) = + PIXEL(p, j, i, 2) = 0.0; + PIXEL(p, j, i, 3) = ubyte_to_float(*src); + } + } +} + + +static void +a8_put_tile_rgba(ubyte *dst, + unsigned w, unsigned h, + const float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + unsigned a; + a = float_to_ubyte(PIXEL(p, j, i, 3)); + *dst++ = (ubyte) a; + } + } +} + + + +/*** PIPE_FORMAT_R16_SNORM ***/ + +static void +r16_get_tile_rgba(const short *src, + unsigned w, unsigned h, + float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++, src++) { + PIXEL(p, j, i, 0) = SHORT_TO_FLOAT(src[0]); + PIXEL(p, j, i, 1) = + PIXEL(p, j, i, 2) = 0.0; + PIXEL(p, j, i, 3) = 1.0; + } + } +} + + +static void +r16_put_tile_rgba(short *dst, + unsigned w, unsigned h, + const float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++, dst++) { + UNCLAMPED_FLOAT_TO_SHORT(dst[0], PIXEL(p, j, i, 0)); + } + } +} + + +/*** PIPE_FORMAT_R16G16B16A16_SNORM ***/ + +static void +r16g16b16a16_get_tile_rgba(const short *src, + unsigned w, unsigned h, + float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++, src += 4) { + PIXEL(p, j, i, 0) = SHORT_TO_FLOAT(src[0]); + PIXEL(p, j, i, 1) = SHORT_TO_FLOAT(src[1]); + PIXEL(p, j, i, 2) = SHORT_TO_FLOAT(src[2]); + PIXEL(p, j, i, 3) = SHORT_TO_FLOAT(src[3]); + } + } +} + + +static void +r16g16b16a16_put_tile_rgba(short *dst, + unsigned w, unsigned h, + const float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++, dst += 4) { + UNCLAMPED_FLOAT_TO_SHORT(dst[0], PIXEL(p, j, i, 0)); + UNCLAMPED_FLOAT_TO_SHORT(dst[1], PIXEL(p, j, i, 1)); + UNCLAMPED_FLOAT_TO_SHORT(dst[2], PIXEL(p, j, i, 2)); + UNCLAMPED_FLOAT_TO_SHORT(dst[3], PIXEL(p, j, i, 3)); + } + } +} + + + +/*** PIPE_FORMAT_I8_UNORM ***/ + +static void +i8_get_tile_rgba(const ubyte *src, + unsigned w, unsigned h, + float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++, src++) { + PIXEL(p, j, i, 0) = + PIXEL(p, j, i, 1) = + PIXEL(p, j, i, 2) = + PIXEL(p, j, i, 3) = ubyte_to_float(*src); + } + } +} + + +static void +i8_put_tile_rgba(ubyte *dst, + unsigned w, unsigned h, + const float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + unsigned r; + r = float_to_ubyte(PIXEL(p, j, i, 0)); + *dst++ = (ubyte) r; + } + } +} + + +/*** PIPE_FORMAT_A8L8_UNORM ***/ + +static void +a8l8_get_tile_rgba(const ushort *src, + unsigned w, unsigned h, + float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + ushort ra = *src++; + PIXEL(p, j, i, 0) = + PIXEL(p, j, i, 1) = + PIXEL(p, j, i, 2) = ubyte_to_float(ra & 0xff); + PIXEL(p, j, i, 3) = ubyte_to_float(ra >> 8); + } + } +} + + +static void +a8l8_put_tile_rgba(ushort *dst, + unsigned w, unsigned h, + const float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + unsigned r, a; + r = float_to_ubyte(PIXEL(p, j, i, 0)); + a = float_to_ubyte(PIXEL(p, j, i, 3)); + *dst++ = (a << 8) | r; + } + } +} + + + + +/*** PIPE_FORMAT_Z32_UNORM ***/ + +/** + * Return each Z value as four floats in [0,1]. + */ +static void +z32_get_tile_rgba(const unsigned *src, + unsigned w, unsigned h, + float *p) +{ + const double scale = 1.0 / (double) 0xffffffff; + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + PIXEL(p, j, i, 0) = + PIXEL(p, j, i, 1) = + PIXEL(p, j, i, 2) = + PIXEL(p, j, i, 3) = (float) (*src++ * scale); + } + } +} + + +/*** PIPE_FORMAT_S8Z24_UNORM ***/ + +/** + * Return Z component as four float in [0,1]. Stencil part ignored. + */ +static void +s8z24_get_tile_rgba(const unsigned *src, + unsigned w, unsigned h, + float *p) +{ + const double scale = 1.0 / ((1 << 24) - 1); + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + PIXEL(p, j, i, 0) = + PIXEL(p, j, i, 1) = + PIXEL(p, j, i, 2) = + PIXEL(p, j, i, 3) = (float) (scale * (*src++ & 0xffffff)); + } + } +} + + +/*** PIPE_FORMAT_Z24S8_UNORM ***/ + +/** + * Return Z component as four float in [0,1]. Stencil part ignored. + */ +static void +z24s8_get_tile_rgba(const unsigned *src, + unsigned w, unsigned h, + float *p) +{ + const double scale = 1.0 / ((1 << 24) - 1); + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + PIXEL(p, j, i, 0) = + PIXEL(p, j, i, 1) = + PIXEL(p, j, i, 2) = + PIXEL(p, j, i, 3) = (float) (scale * (*src++ >> 8)); + } + } +} + + +/*** PIPE_FORMAT_Z32_FLOAT ***/ + +/** + * Return each Z value as four floats in [0,1]. + */ +static void +z32f_get_tile_rgba(const float *src, + unsigned w, unsigned h, + float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + PIXEL(p, j, i, 0) = + PIXEL(p, j, i, 1) = + PIXEL(p, j, i, 2) = + PIXEL(p, j, i, 3) = *src++; + } + } +} + + +/*** PIPE_FORMAT_YCBCR / PIPE_FORMAT_YCBCR_REV ***/ + +/** + * Convert YCbCr (or YCrCb) to RGBA. + */ +static void +ycbcr_get_tile_rgba(const ushort *src, + unsigned w, unsigned h, + float *p, + boolean rev) +{ + const float scale = 1.0f / 255.0f; + unsigned i, j; + + for (i = 0; i < h; i++) { + /* do two texels at a time */ + for (j = 0; j < (w & ~1); j += 2, src += 2) { + const ushort t0 = src[0]; + const ushort t1 = src[1]; + const ubyte y0 = (t0 >> 8) & 0xff; /* luminance */ + const ubyte y1 = (t1 >> 8) & 0xff; /* luminance */ + ubyte cb, cr; + float r, g, b; + + if (rev) { + cb = t1 & 0xff; /* chroma U */ + cr = t0 & 0xff; /* chroma V */ + } + else { + cb = t0 & 0xff; /* chroma U */ + cr = t1 & 0xff; /* chroma V */ + } + + /* even pixel: y0,cr,cb */ + r = 1.164f * (y0-16) + 1.596f * (cr-128); + g = 1.164f * (y0-16) - 0.813f * (cr-128) - 0.391f * (cb-128); + b = 1.164f * (y0-16) + 2.018f * (cb-128); + PIXEL(p, j, i, 0) = r * scale; + PIXEL(p, j, i, 1) = g * scale; + PIXEL(p, j, i, 2) = b * scale; + PIXEL(p, j, i, 3) = 1.0f; + + /* odd pixel: use y1,cr,cb */ + r = 1.164f * (y1-16) + 1.596f * (cr-128); + g = 1.164f * (y1-16) - 0.813f * (cr-128) - 0.391f * (cb-128); + b = 1.164f * (y1-16) + 2.018f * (cb-128); + PIXEL(p, j + 1, i, 0) = r * scale; + PIXEL(p, j + 1, i, 1) = g * scale; + PIXEL(p, j + 1, i, 2) = b * scale; + PIXEL(p, j + 1, i, 3) = 1.0f; + } + /* do the last texel */ + if (w & 1) { + const ushort t0 = src[0]; + const ushort t1 = src[1]; + const ubyte y0 = (t0 >> 8) & 0xff; /* luminance */ + ubyte cb, cr; + float r, g, b; + + if (rev) { + cb = t1 & 0xff; /* chroma U */ + cr = t0 & 0xff; /* chroma V */ + } + else { + cb = t0 & 0xff; /* chroma U */ + cr = t1 & 0xff; /* chroma V */ + } + + /* even pixel: y0,cr,cb */ + r = 1.164f * (y0-16) + 1.596f * (cr-128); + g = 1.164f * (y0-16) - 0.813f * (cr-128) - 0.391f * (cb-128); + b = 1.164f * (y0-16) + 2.018f * (cb-128); + PIXEL(p, j, i, 0) = r * scale; + PIXEL(p, j, i, 1) = g * scale; + PIXEL(p, j, i, 2) = b * scale; + PIXEL(p, j, i, 3) = 1.0f; + } + } +} + + +static void +fake_get_tile_rgba(const ushort *src, + unsigned w, unsigned h, + float *p) +{ + unsigned i, j; + + for (i = 0; i < h; i++) { + for (j = 0; j < w; j++) { + PIXEL(p, j, i, 0) = + PIXEL(p, j, i, 1) = + PIXEL(p, j, i, 2) = + PIXEL(p, j, i, 3) = (i ^ j) & 1 ? 1.0f : 0.0f; + } + } +} + + +static void +lp_tile_raw_to_rgba_soa(enum pipe_format format, + void *src, + uint w, uint h, + float *p) +{ + switch (format) { + case PIPE_FORMAT_A8R8G8B8_UNORM: + a8r8g8b8_get_tile_rgba((unsigned *) src, w, h, p); + break; + case PIPE_FORMAT_X8R8G8B8_UNORM: + x8r8g8b8_get_tile_rgba((unsigned *) src, w, h, p); + break; + case PIPE_FORMAT_B8G8R8A8_UNORM: + b8g8r8a8_get_tile_rgba((unsigned *) src, w, h, p); + break; + case PIPE_FORMAT_A1R5G5B5_UNORM: + a1r5g5b5_get_tile_rgba((ushort *) src, w, h, p); + break; + case PIPE_FORMAT_A4R4G4B4_UNORM: + a4r4g4b4_get_tile_rgba((ushort *) src, w, h, p); + break; + case PIPE_FORMAT_R5G6B5_UNORM: + r5g6b5_get_tile_rgba((ushort *) src, w, h, p); + break; + case PIPE_FORMAT_L8_UNORM: + l8_get_tile_rgba((ubyte *) src, w, h, p); + break; + case PIPE_FORMAT_A8_UNORM: + a8_get_tile_rgba((ubyte *) src, w, h, p); + break; + case PIPE_FORMAT_I8_UNORM: + i8_get_tile_rgba((ubyte *) src, w, h, p); + break; + case PIPE_FORMAT_A8L8_UNORM: + a8l8_get_tile_rgba((ushort *) src, w, h, p); + break; + case PIPE_FORMAT_R16_SNORM: + r16_get_tile_rgba((short *) src, w, h, p); + break; + case PIPE_FORMAT_R16G16B16A16_SNORM: + r16g16b16a16_get_tile_rgba((short *) src, w, h, p); + break; + case PIPE_FORMAT_Z16_UNORM: + z16_get_tile_rgba((ushort *) src, w, h, p); + break; + case PIPE_FORMAT_Z32_UNORM: + z32_get_tile_rgba((unsigned *) src, w, h, p); + break; + case PIPE_FORMAT_S8Z24_UNORM: + case PIPE_FORMAT_X8Z24_UNORM: + s8z24_get_tile_rgba((unsigned *) src, w, h, p); + break; + case PIPE_FORMAT_Z24S8_UNORM: + case PIPE_FORMAT_Z24X8_UNORM: + z24s8_get_tile_rgba((unsigned *) src, w, h, p); + break; + case PIPE_FORMAT_Z32_FLOAT: + z32f_get_tile_rgba((float *) src, w, h, p); + break; + case PIPE_FORMAT_YCBCR: + ycbcr_get_tile_rgba((ushort *) src, w, h, p, FALSE); + break; + case PIPE_FORMAT_YCBCR_REV: + ycbcr_get_tile_rgba((ushort *) src, w, h, p, TRUE); + break; + default: + debug_printf("%s: unsupported format %s\n", __FUNCTION__, pf_name(format)); + fake_get_tile_rgba(src, w, h, p); + } +} + + +void +lp_get_tile_rgba_soa(struct pipe_transfer *pt, + uint x, uint y, + float *p) +{ + uint w = TILE_SIZE, h = TILE_SIZE; + void *packed; + + if (pipe_clip_tile(x, y, &w, &h, pt)) + return; + + packed = MALLOC(pf_get_nblocks(&pt->block, w, h) * pt->block.size); + + if (!packed) + return; + + if(pt->format == PIPE_FORMAT_YCBCR || pt->format == PIPE_FORMAT_YCBCR_REV) + assert((x & 1) == 0); + + pipe_get_tile_raw(pt, x, y, w, h, packed, 0); + + lp_tile_raw_to_rgba_soa(pt->format, packed, w, h, p); + + FREE(packed); +} + + +void +lp_put_tile_rgba_soa(struct pipe_transfer *pt, + uint x, uint y, + const float *p) +{ + uint w = TILE_SIZE, h = TILE_SIZE; + void *packed; + + if (pipe_clip_tile(x, y, &w, &h, pt)) + return; + + packed = MALLOC(pf_get_nblocks(&pt->block, w, h) * pt->block.size); + + if (!packed) + return; + + switch (pt->format) { + case PIPE_FORMAT_A8R8G8B8_UNORM: + a8r8g8b8_put_tile_rgba((unsigned *) packed, w, h, p); + break; + case PIPE_FORMAT_X8R8G8B8_UNORM: + x8r8g8b8_put_tile_rgba((unsigned *) packed, w, h, p); + break; + case PIPE_FORMAT_B8G8R8A8_UNORM: + b8g8r8a8_put_tile_rgba((unsigned *) packed, w, h, p); + break; + case PIPE_FORMAT_A1R5G5B5_UNORM: + a1r5g5b5_put_tile_rgba((ushort *) packed, w, h, p); + break; + case PIPE_FORMAT_R5G6B5_UNORM: + r5g6b5_put_tile_rgba((ushort *) packed, w, h, p); + break; + case PIPE_FORMAT_R8G8B8A8_UNORM: + assert(0); + break; + case PIPE_FORMAT_A4R4G4B4_UNORM: + a4r4g4b4_put_tile_rgba((ushort *) packed, w, h, p); + break; + case PIPE_FORMAT_L8_UNORM: + l8_put_tile_rgba((ubyte *) packed, w, h, p); + break; + case PIPE_FORMAT_A8_UNORM: + a8_put_tile_rgba((ubyte *) packed, w, h, p); + break; + case PIPE_FORMAT_I8_UNORM: + i8_put_tile_rgba((ubyte *) packed, w, h, p); + break; + case PIPE_FORMAT_A8L8_UNORM: + a8l8_put_tile_rgba((ushort *) packed, w, h, p); + break; + case PIPE_FORMAT_R16_SNORM: + r16_put_tile_rgba((short *) packed, w, h, p); + break; + case PIPE_FORMAT_R16G16B16A16_SNORM: + r16g16b16a16_put_tile_rgba((short *) packed, w, h, p); + break; + case PIPE_FORMAT_Z16_UNORM: + /*z16_put_tile_rgba((ushort *) packed, w, h, p);*/ + break; + case PIPE_FORMAT_Z32_UNORM: + /*z32_put_tile_rgba((unsigned *) packed, w, h, p);*/ + break; + case PIPE_FORMAT_S8Z24_UNORM: + case PIPE_FORMAT_X8Z24_UNORM: + /*s8z24_put_tile_rgba((unsigned *) packed, w, h, p);*/ + break; + case PIPE_FORMAT_Z24S8_UNORM: + case PIPE_FORMAT_Z24X8_UNORM: + /*z24s8_put_tile_rgba((unsigned *) packed, w, h, p);*/ + break; + default: + debug_printf("%s: unsupported format %s\n", __FUNCTION__, pf_name(pt->format)); + } + + pipe_put_tile_raw(pt, x, y, w, h, packed, 0); + + FREE(packed); +} + + diff --git a/src/gallium/drivers/llvmpipe/lp_tile_soa.h b/src/gallium/drivers/llvmpipe/lp_tile_soa.h new file mode 100644 index 00000000000..23b27b77eb8 --- /dev/null +++ b/src/gallium/drivers/llvmpipe/lp_tile_soa.h @@ -0,0 +1,60 @@ +/************************************************************************** + * + * Copyright 2007 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 LP_TILE_SOA_H +#define LP_TILE_SOA_H + +#include "pipe/p_compiler.h" + +#include "lp_tile_cache.h" + + +struct pipe_transfer; + + + +#ifdef __cplusplus +extern "C" { +#endif + + +void +lp_get_tile_rgba_soa(struct pipe_transfer *pt, + uint x, uint y, + float *p); + +void +lp_put_tile_rgba_soa(struct pipe_transfer *pt, + uint x, uint y, + const float *p); + + +#ifdef __cplusplus +} +#endif + +#endif |