X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fr300%2Fr300_texture.c;h=6f8893eee6c995567050b05bef5a68796e463798;hb=9779f34326a6d01f4b026202c72d77dc968fd174;hp=62c2f1fff6ceeffb3120c13cf351dae6a57244ae;hpb=bc517d64dad41bc66ab5cc1c82d8d8111145d8a1;p=mesa.git diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c index 62c2f1fff6c..6f8893eee6c 100644 --- a/src/gallium/drivers/r300/r300_texture.c +++ b/src/gallium/drivers/r300/r300_texture.c @@ -34,19 +34,68 @@ #include "util/u_format_s3tc.h" #include "util/u_math.h" #include "util/u_memory.h" -#include "util/u_mm.h" #include "pipe/p_screen.h" -void util_format_combine_swizzles(unsigned char *dst, - const unsigned char *swz1, - const unsigned char *swz2) +/* These formats are supported by swapping their bytes. + * The swizzles must be set exactly like their non-swapped counterparts, + * because byte-swapping is what reverses the component order, not swizzling. + * + * This function returns the format that must be used to program CB and TX + * swizzles. + */ +static enum pipe_format r300_unbyteswap_array_format(enum pipe_format format) { - unsigned i; + /* FIXME: Disabled on little endian because of a reported regression: + * https://bugs.freedesktop.org/show_bug.cgi?id=98869 */ + if (PIPE_ENDIAN_NATIVE != PIPE_ENDIAN_BIG) + return format; - for (i = 0; i < 4; i++) { - dst[i] = swz2[i] <= UTIL_FORMAT_SWIZZLE_W ? - swz1[swz2[i]] : swz2[i]; + /* Only BGRA 8888 array formats are supported for simplicity of + * the implementation. */ + switch (format) { + case PIPE_FORMAT_A8R8G8B8_UNORM: + return PIPE_FORMAT_B8G8R8A8_UNORM; + case PIPE_FORMAT_A8R8G8B8_SRGB: + return PIPE_FORMAT_B8G8R8A8_SRGB; + case PIPE_FORMAT_X8R8G8B8_UNORM: + return PIPE_FORMAT_B8G8R8X8_UNORM; + case PIPE_FORMAT_X8R8G8B8_SRGB: + return PIPE_FORMAT_B8G8R8X8_SRGB; + default: + return format; + } +} + +static unsigned r300_get_endian_swap(enum pipe_format format) +{ + const struct util_format_description *desc; + unsigned swap_size; + + if (r300_unbyteswap_array_format(format) != format) + return R300_SURF_DWORD_SWAP; + + if (PIPE_ENDIAN_NATIVE != PIPE_ENDIAN_BIG) + return R300_SURF_NO_SWAP; + + desc = util_format_description(format); + if (!desc) + return R300_SURF_NO_SWAP; + + /* Compressed formats should be in the little endian format. */ + if (desc->block.width != 1 || desc->block.height != 1) + return R300_SURF_NO_SWAP; + + swap_size = desc->is_array ? desc->channel[0].size : desc->block.bits; + + switch (swap_size) { + default: /* shouldn't happen? */ + case 8: + return R300_SURF_NO_SWAP; + case 16: + return R300_SURF_WORD_SWAP; + case 32: + return R300_SURF_DWORD_SWAP; } } @@ -72,7 +121,7 @@ unsigned r300_get_swizzle_combined(const unsigned char *swizzle_format, if (swizzle_view) { /* Combine two sets of swizzles. */ - util_format_combine_swizzles(swizzle, swizzle_format, swizzle_view); + util_format_compose_swizzles(swizzle_format, swizzle_view, swizzle); } else { memcpy(swizzle, swizzle_format, 4); } @@ -80,22 +129,22 @@ unsigned r300_get_swizzle_combined(const unsigned char *swizzle_format, /* Get swizzle. */ for (i = 0; i < 4; i++) { switch (swizzle[i]) { - case UTIL_FORMAT_SWIZZLE_Y: + case PIPE_SWIZZLE_Y: result |= swizzle_bit[1] << swizzle_shift[i]; break; - case UTIL_FORMAT_SWIZZLE_Z: + case PIPE_SWIZZLE_Z: result |= swizzle_bit[2] << swizzle_shift[i]; break; - case UTIL_FORMAT_SWIZZLE_W: + case PIPE_SWIZZLE_W: result |= swizzle_bit[3] << swizzle_shift[i]; break; - case UTIL_FORMAT_SWIZZLE_0: + case PIPE_SWIZZLE_0: result |= R300_TX_FORMAT_ZERO << swizzle_shift[i]; break; - case UTIL_FORMAT_SWIZZLE_1: + case PIPE_SWIZZLE_1: result |= R300_TX_FORMAT_ONE << swizzle_shift[i]; break; - default: /* UTIL_FORMAT_SWIZZLE_X */ + default: /* PIPE_SWIZZLE_X */ result |= swizzle_bit[0] << swizzle_shift[i]; } } @@ -130,6 +179,7 @@ uint32_t r300_translate_texformat(enum pipe_format format, R300_TX_FORMAT_SIGNED_X, }; + format = r300_unbyteswap_array_format(format); desc = util_format_description(format); /* Colorspace (return non-RGB formats directly). */ @@ -141,7 +191,7 @@ uint32_t r300_translate_texformat(enum pipe_format format, case PIPE_FORMAT_Z16_UNORM: return R300_TX_FORMAT_X16; case PIPE_FORMAT_X8Z24_UNORM: - case PIPE_FORMAT_S8_USCALED_Z24_UNORM: + case PIPE_FORMAT_S8_UINT_Z24_UNORM: if (is_r500) return R500_TX_FORMAT_Y8X24; else @@ -181,28 +231,25 @@ uint32_t r300_translate_texformat(enum pipe_format format, /* Add swizzling. */ /* The RGTC1_SNORM and LATC1_SNORM swizzle is done in the shader. */ - if (format != PIPE_FORMAT_RGTC1_SNORM && + if (util_format_is_compressed(format) && + dxtc_swizzle && + format != PIPE_FORMAT_RGTC2_UNORM && + format != PIPE_FORMAT_RGTC2_SNORM && + format != PIPE_FORMAT_LATC2_UNORM && + format != PIPE_FORMAT_LATC2_SNORM && + format != PIPE_FORMAT_RGTC1_UNORM && + format != PIPE_FORMAT_RGTC1_SNORM && + format != PIPE_FORMAT_LATC1_UNORM && format != PIPE_FORMAT_LATC1_SNORM) { - if (util_format_is_compressed(format) && - dxtc_swizzle && - format != PIPE_FORMAT_RGTC2_UNORM && - format != PIPE_FORMAT_RGTC2_SNORM && - format != PIPE_FORMAT_LATC2_UNORM && - format != PIPE_FORMAT_LATC2_SNORM) { - result |= r300_get_swizzle_combined(desc->swizzle, swizzle_view, - TRUE); - } else { - result |= r300_get_swizzle_combined(desc->swizzle, swizzle_view, - FALSE); - } + result |= r300_get_swizzle_combined(desc->swizzle, swizzle_view, + TRUE); + } else { + result |= r300_get_swizzle_combined(desc->swizzle, swizzle_view, + FALSE); } /* S3TC formats. */ if (desc->layout == UTIL_FORMAT_LAYOUT_S3TC) { - if (!util_format_s3tc_enabled) { - return ~0; /* Unsupported. */ - } - switch (format) { case PIPE_FORMAT_DXT1_RGB: case PIPE_FORMAT_DXT1_RGBA: @@ -225,6 +272,7 @@ uint32_t r300_translate_texformat(enum pipe_format format, switch (format) { case PIPE_FORMAT_RGTC1_SNORM: case PIPE_FORMAT_LATC1_SNORM: + result |= sign_bit[0]; case PIPE_FORMAT_LATC1_UNORM: case PIPE_FORMAT_RGTC1_UNORM: return R500_TX_FORMAT_ATI1N | result; @@ -248,6 +296,17 @@ uint32_t r300_translate_texformat(enum pipe_format format, return R300_TX_FORMAT_CxV8U8 | result; } + /* Integer and fixed-point 16.16 textures are not supported. */ + for (i = 0; i < 4; i++) { + if (desc->channel[i].type == UTIL_FORMAT_TYPE_FIXED || + ((desc->channel[i].type == UTIL_FORMAT_TYPE_SIGNED || + desc->channel[i].type == UTIL_FORMAT_TYPE_UNSIGNED) && + (!desc->channel[i].normalized || + desc->channel[i].pure_integer))) { + return ~0; /* Unsupported/unknown. */ + } + } + /* Add sign. */ for (i = 0; i < desc->nr_channels; i++) { if (desc->channel[i].type == UTIL_FORMAT_TYPE_SIGNED) { @@ -386,7 +445,7 @@ uint32_t r500_tx_format_msb_bit(enum pipe_format format) case PIPE_FORMAT_LATC1_UNORM: case PIPE_FORMAT_LATC1_SNORM: case PIPE_FORMAT_X8Z24_UNORM: - case PIPE_FORMAT_S8_USCALED_Z24_UNORM: + case PIPE_FORMAT_S8_UINT_Z24_UNORM: return R500_TXFORMAT_MSB; default: return 0; @@ -399,6 +458,8 @@ uint32_t r500_tx_format_msb_bit(enum pipe_format format) * output. For the swizzling of the targets, check the shader's format. */ static uint32_t r300_translate_colorformat(enum pipe_format format) { + format = r300_unbyteswap_array_format(format); + switch (format) { /* 8-bit buffers. */ case PIPE_FORMAT_A8_UNORM: @@ -416,6 +477,8 @@ static uint32_t r300_translate_colorformat(enum pipe_format format) case PIPE_FORMAT_L8A8_SNORM: case PIPE_FORMAT_R8G8_UNORM: case PIPE_FORMAT_R8G8_SNORM: + case PIPE_FORMAT_R8A8_UNORM: + case PIPE_FORMAT_R8A8_SNORM: /* These formats work fine with UV88 if US_OUT_FMT is set correctly. */ case PIPE_FORMAT_A16_UNORM: case PIPE_FORMAT_A16_SNORM: @@ -450,7 +513,7 @@ static uint32_t r300_translate_colorformat(enum pipe_format format) case PIPE_FORMAT_R8G8B8A8_UNORM: case PIPE_FORMAT_R8G8B8A8_SNORM: case PIPE_FORMAT_R8G8B8X8_UNORM: - /*case PIPE_FORMAT_R8G8B8X8_SNORM:*/ + case PIPE_FORMAT_R8G8B8X8_SNORM: /* These formats work fine with ARGB8888 if US_OUT_FMT is set * correctly. */ case PIPE_FORMAT_R16G16_UNORM: @@ -459,6 +522,9 @@ static uint32_t r300_translate_colorformat(enum pipe_format format) case PIPE_FORMAT_L16A16_UNORM: case PIPE_FORMAT_L16A16_SNORM: case PIPE_FORMAT_L16A16_FLOAT: + case PIPE_FORMAT_R16A16_UNORM: + case PIPE_FORMAT_R16A16_SNORM: + case PIPE_FORMAT_R16A16_FLOAT: case PIPE_FORMAT_A32_FLOAT: case PIPE_FORMAT_L32_FLOAT: case PIPE_FORMAT_I32_FLOAT: @@ -468,20 +534,26 @@ static uint32_t r300_translate_colorformat(enum pipe_format format) case PIPE_FORMAT_R10G10B10A2_UNORM: case PIPE_FORMAT_R10G10B10X2_SNORM: case PIPE_FORMAT_B10G10R10A2_UNORM: + case PIPE_FORMAT_B10G10R10X2_UNORM: return R500_COLOR_FORMAT_ARGB2101010; /* R5xx-only? */ /* 64-bit buffers. */ case PIPE_FORMAT_R16G16B16A16_UNORM: case PIPE_FORMAT_R16G16B16A16_SNORM: case PIPE_FORMAT_R16G16B16A16_FLOAT: + case PIPE_FORMAT_R16G16B16X16_UNORM: + case PIPE_FORMAT_R16G16B16X16_SNORM: + case PIPE_FORMAT_R16G16B16X16_FLOAT: /* These formats work fine with ARGB16161616 if US_OUT_FMT is set * correctly. */ case PIPE_FORMAT_R32G32_FLOAT: case PIPE_FORMAT_L32A32_FLOAT: + case PIPE_FORMAT_R32A32_FLOAT: return R300_COLOR_FORMAT_ARGB16161616; /* 128-bit buffers. */ case PIPE_FORMAT_R32G32B32A32_FLOAT: + case PIPE_FORMAT_R32G32B32X32_FLOAT: return R300_COLOR_FORMAT_ARGB32323232; /* YUV buffers. */ @@ -504,7 +576,7 @@ static uint32_t r300_translate_zsformat(enum pipe_format format) /* 24-bit depth, ignored stencil */ case PIPE_FORMAT_X8Z24_UNORM: /* 24-bit depth, 8-bit stencil */ - case PIPE_FORMAT_S8_USCALED_Z24_UNORM: + case PIPE_FORMAT_S8_UINT_Z24_UNORM: return R300_DEPTHFORMAT_24BIT_INT_Z_8BIT_STENCIL; default: return ~0; /* Unsupported. */ @@ -522,6 +594,7 @@ static uint32_t r300_translate_out_fmt(enum pipe_format format) const struct util_format_description *desc; boolean uniform_sign; + format = r300_unbyteswap_array_format(format); desc = util_format_description(format); /* Find the first non-VOID channel. */ @@ -626,6 +699,8 @@ static uint32_t r300_translate_out_fmt(enum pipe_format format) * COLORFORMAT_UV88 stores ZX (C2 and C0). */ case PIPE_FORMAT_L8A8_SNORM: case PIPE_FORMAT_L8A8_UNORM: + case PIPE_FORMAT_R8A8_SNORM: + case PIPE_FORMAT_R8A8_UNORM: return modifier | R300_C0_SEL_A | R300_C2_SEL_R; case PIPE_FORMAT_R8G8_SNORM: case PIPE_FORMAT_R8G8_UNORM: @@ -649,6 +724,7 @@ static uint32_t r300_translate_out_fmt(enum pipe_format format) case PIPE_FORMAT_B8G8R8X8_UNORM: /*case PIPE_FORMAT_B8G8R8X8_SNORM:*/ case PIPE_FORMAT_B10G10R10A2_UNORM: + case PIPE_FORMAT_B10G10R10X2_UNORM: return modifier | R300_C0_SEL_B | R300_C1_SEL_G | R300_C2_SEL_R | R300_C3_SEL_A; @@ -664,7 +740,7 @@ static uint32_t r300_translate_out_fmt(enum pipe_format format) /* RGBA outputs. */ case PIPE_FORMAT_R8G8B8X8_UNORM: - /*case PIPE_FORMAT_R8G8B8X8_SNORM:*/ + case PIPE_FORMAT_R8G8B8X8_SNORM: case PIPE_FORMAT_R8G8B8A8_UNORM: case PIPE_FORMAT_R8G8B8A8_SNORM: case PIPE_FORMAT_R10G10B10A2_UNORM: @@ -680,6 +756,7 @@ static uint32_t r300_translate_out_fmt(enum pipe_format format) case PIPE_FORMAT_R16G16B16A16_FLOAT: case PIPE_FORMAT_R32_FLOAT: case PIPE_FORMAT_R32G32B32A32_FLOAT: + case PIPE_FORMAT_R32G32B32X32_FLOAT: case PIPE_FORMAT_L16_UNORM: case PIPE_FORMAT_L16_SNORM: case PIPE_FORMAT_L16_FLOAT: @@ -688,6 +765,9 @@ static uint32_t r300_translate_out_fmt(enum pipe_format format) case PIPE_FORMAT_I16_SNORM: case PIPE_FORMAT_I16_FLOAT: case PIPE_FORMAT_I32_FLOAT: + case PIPE_FORMAT_R16G16B16X16_UNORM: + case PIPE_FORMAT_R16G16B16X16_SNORM: + case PIPE_FORMAT_R16G16B16X16_FLOAT: return modifier | R300_C0_SEL_R | R300_C1_SEL_G | R300_C2_SEL_B | R300_C3_SEL_A; @@ -696,7 +776,11 @@ static uint32_t r300_translate_out_fmt(enum pipe_format format) case PIPE_FORMAT_L16A16_UNORM: case PIPE_FORMAT_L16A16_SNORM: case PIPE_FORMAT_L16A16_FLOAT: + case PIPE_FORMAT_R16A16_UNORM: + case PIPE_FORMAT_R16A16_SNORM: + case PIPE_FORMAT_R16A16_FLOAT: case PIPE_FORMAT_L32A32_FLOAT: + case PIPE_FORMAT_R32A32_FLOAT: return modifier | R300_C0_SEL_R | R300_C1_SEL_A; @@ -705,10 +789,105 @@ static uint32_t r300_translate_out_fmt(enum pipe_format format) } } +static uint32_t r300_translate_colormask_swizzle(enum pipe_format format) +{ + format = r300_unbyteswap_array_format(format); + + switch (format) { + case PIPE_FORMAT_A8_UNORM: + case PIPE_FORMAT_A8_SNORM: + case PIPE_FORMAT_A16_UNORM: + case PIPE_FORMAT_A16_SNORM: + case PIPE_FORMAT_A16_FLOAT: + case PIPE_FORMAT_A32_FLOAT: + return COLORMASK_AAAA; + + case PIPE_FORMAT_I8_UNORM: + case PIPE_FORMAT_I8_SNORM: + case PIPE_FORMAT_L8_UNORM: + case PIPE_FORMAT_L8_SNORM: + case PIPE_FORMAT_R8_UNORM: + case PIPE_FORMAT_R8_SNORM: + case PIPE_FORMAT_R32_FLOAT: + case PIPE_FORMAT_L32_FLOAT: + case PIPE_FORMAT_I32_FLOAT: + return COLORMASK_RRRR; + + case PIPE_FORMAT_L8A8_SNORM: + case PIPE_FORMAT_L8A8_UNORM: + case PIPE_FORMAT_R8A8_UNORM: + case PIPE_FORMAT_R8A8_SNORM: + case PIPE_FORMAT_L16A16_UNORM: + case PIPE_FORMAT_L16A16_SNORM: + case PIPE_FORMAT_L16A16_FLOAT: + case PIPE_FORMAT_R16A16_UNORM: + case PIPE_FORMAT_R16A16_SNORM: + case PIPE_FORMAT_R16A16_FLOAT: + case PIPE_FORMAT_L32A32_FLOAT: + case PIPE_FORMAT_R32A32_FLOAT: + return COLORMASK_ARRA; + + case PIPE_FORMAT_R8G8_SNORM: + case PIPE_FORMAT_R8G8_UNORM: + case PIPE_FORMAT_R16G16_UNORM: + case PIPE_FORMAT_R16G16_SNORM: + case PIPE_FORMAT_R16G16_FLOAT: + case PIPE_FORMAT_R32G32_FLOAT: + return COLORMASK_GRRG; + + case PIPE_FORMAT_B5G5R5X1_UNORM: + case PIPE_FORMAT_B4G4R4X4_UNORM: + case PIPE_FORMAT_B8G8R8X8_UNORM: + /*case PIPE_FORMAT_B8G8R8X8_SNORM:*/ + case PIPE_FORMAT_B10G10R10X2_UNORM: + return COLORMASK_BGRX; + + case PIPE_FORMAT_B5G6R5_UNORM: + case PIPE_FORMAT_B5G5R5A1_UNORM: + case PIPE_FORMAT_B4G4R4A4_UNORM: + case PIPE_FORMAT_B8G8R8A8_UNORM: + /*case PIPE_FORMAT_B8G8R8A8_SNORM:*/ + case PIPE_FORMAT_B10G10R10A2_UNORM: + return COLORMASK_BGRA; + + case PIPE_FORMAT_R8G8B8X8_UNORM: + /* RGBX_SNORM formats are broken for an unknown reason */ + /*case PIPE_FORMAT_R8G8B8X8_SNORM:*/ + /*case PIPE_FORMAT_R10G10B10X2_SNORM:*/ + case PIPE_FORMAT_R16G16B16X16_UNORM: + /*case PIPE_FORMAT_R16G16B16X16_SNORM:*/ + case PIPE_FORMAT_R16G16B16X16_FLOAT: + case PIPE_FORMAT_R32G32B32X32_FLOAT: + return COLORMASK_RGBX; + + case PIPE_FORMAT_R8G8B8A8_UNORM: + case PIPE_FORMAT_R8G8B8A8_SNORM: + case PIPE_FORMAT_R10G10B10A2_UNORM: + case PIPE_FORMAT_R16_UNORM: + case PIPE_FORMAT_R16G16B16A16_UNORM: + case PIPE_FORMAT_R16_SNORM: + case PIPE_FORMAT_R16G16B16A16_SNORM: + case PIPE_FORMAT_R16_FLOAT: + case PIPE_FORMAT_R16G16B16A16_FLOAT: + case PIPE_FORMAT_R32G32B32A32_FLOAT: + case PIPE_FORMAT_L16_UNORM: + case PIPE_FORMAT_L16_SNORM: + case PIPE_FORMAT_L16_FLOAT: + case PIPE_FORMAT_I16_UNORM: + case PIPE_FORMAT_I16_SNORM: + case PIPE_FORMAT_I16_FLOAT: + return COLORMASK_RGBA; + + default: + return ~0; /* Unsupported. */ + } +} + boolean r300_is_colorbuffer_format_supported(enum pipe_format format) { return r300_translate_colorformat(format) != ~0 && - r300_translate_out_fmt(format) != ~0; + r300_translate_out_fmt(format) != ~0 && + r300_translate_colormask_swizzle(format) != ~0; } boolean r300_is_zs_format_supported(enum pipe_format format) @@ -723,17 +902,20 @@ boolean r300_is_sampler_format_supported(enum pipe_format format) void r300_texture_setup_format_state(struct r300_screen *screen, struct r300_resource *tex, + enum pipe_format format, unsigned level, + unsigned width0_override, + unsigned height0_override, struct r300_texture_format_state *out) { - struct pipe_resource *pt = &tex->b.b.b; + struct pipe_resource *pt = &tex->b.b; struct r300_texture_desc *desc = &tex->tex; boolean is_r500 = screen->caps.is_r500; unsigned width, height, depth; unsigned txwidth, txheight, txdepth; - width = u_minify(desc->width0, level); - height = u_minify(desc->height0, level); + width = u_minify(width0_override, level); + height = u_minify(height0_override, level); depth = u_minify(desc->depth0, level); txwidth = (width - 1) & 0x7ff; @@ -753,9 +935,11 @@ void r300_texture_setup_format_state(struct r300_screen *screen, R300_TX_DEPTH(txdepth); if (desc->uses_stride_addressing) { + unsigned stride = + r300_stride_to_width(format, desc->stride_in_bytes[level]); /* rectangles love this */ out->format0 |= R300_TX_PITCH_EN; - out->format2 = (desc->stride_in_pixels[level] - 1) & 0x1fff; + out->format2 = (stride - 1) & 0x1fff; } if (pt->target == PIPE_TEXTURE_CUBE) { @@ -797,90 +981,84 @@ void r300_texture_setup_format_state(struct r300_screen *screen, } out->tile_config = R300_TXO_MACRO_TILE(desc->macrotile[level]) | - R300_TXO_MICRO_TILE(desc->microtile); + R300_TXO_MICRO_TILE(desc->microtile) | + R300_TXO_ENDIAN(r300_get_endian_swap(format)); } static void r300_texture_setup_fb_state(struct r300_surface *surf) { struct r300_resource *tex = r300_resource(surf->base.texture); unsigned level = surf->base.u.tex.level; + unsigned stride = + r300_stride_to_width(surf->base.format, tex->tex.stride_in_bytes[level]); /* Set framebuffer state. */ if (util_format_is_depth_or_stencil(surf->base.format)) { surf->pitch = - tex->tex.stride_in_pixels[level] | + stride | R300_DEPTHMACROTILE(tex->tex.macrotile[level]) | - R300_DEPTHMICROTILE(tex->tex.microtile); + R300_DEPTHMICROTILE(tex->tex.microtile) | + R300_DEPTHENDIAN(r300_get_endian_swap(surf->base.format)); surf->format = r300_translate_zsformat(surf->base.format); surf->pitch_zmask = tex->tex.zmask_stride_in_pixels[level]; surf->pitch_hiz = tex->tex.hiz_stride_in_pixels[level]; } else { + enum pipe_format format = util_format_linear(surf->base.format); + surf->pitch = - tex->tex.stride_in_pixels[level] | - r300_translate_colorformat(surf->base.format) | + stride | + r300_translate_colorformat(format) | R300_COLOR_TILE(tex->tex.macrotile[level]) | - R300_COLOR_MICROTILE(tex->tex.microtile); - surf->format = r300_translate_out_fmt(surf->base.format); + R300_COLOR_MICROTILE(tex->tex.microtile) | + R300_COLOR_ENDIAN(r300_get_endian_swap(format)); + surf->format = r300_translate_out_fmt(format); + surf->colormask_swizzle = + r300_translate_colormask_swizzle(format); + surf->pitch_cmask = tex->tex.cmask_stride_in_pixels; } } -boolean r300_resource_set_properties(struct pipe_screen *screen, - struct pipe_resource *tex, - unsigned offset, - const struct pipe_resource *new_properties) -{ - struct r300_screen *rscreen = r300_screen(screen); - struct r300_resource *res = r300_resource(tex); - - SCREEN_DBG(rscreen, DBG_TEX, - "r300: texture_set_properties: %s -> %s\n", - util_format_short_name(tex->format), - util_format_short_name(new_properties->format)); - - if (!r300_texture_desc_init(rscreen, res, new_properties)) { - fprintf(stderr, "r300: ERROR: Cannot set texture properties.\n"); - return FALSE; - } - res->tex_offset = offset; - r300_texture_setup_format_state(rscreen, res, 0, &res->tx_format); - - return TRUE; -} - static void r300_texture_destroy(struct pipe_screen *screen, struct pipe_resource* texture) { + struct r300_screen *rscreen = r300_screen(screen); struct r300_resource* tex = (struct r300_resource*)texture; + if (tex->tex.cmask_dwords) { + mtx_lock(&rscreen->cmask_mutex); + if (texture == rscreen->cmask_resource) { + rscreen->cmask_resource = NULL; + } + mtx_unlock(&rscreen->cmask_mutex); + } pb_reference(&tex->buf, NULL); FREE(tex); } boolean r300_resource_get_handle(struct pipe_screen* screen, + struct pipe_context *ctx, struct pipe_resource *texture, - struct winsys_handle *whandle) + struct winsys_handle *whandle, + unsigned usage) { - struct radeon_winsys *rws = (struct radeon_winsys *)screen->winsys; + struct radeon_winsys *rws = r300_screen(screen)->rws; struct r300_resource* tex = (struct r300_resource*)texture; if (!tex) { return FALSE; } - return rws->buffer_get_handle(tex->buf, - tex->tex.stride_in_bytes[0], whandle); + return rws->buffer_get_handle(tex->buf, tex->tex.stride_in_bytes[0], + 0, 0, whandle); } static const struct u_resource_vtbl r300_texture_vtbl = { NULL, /* get_handle */ r300_texture_destroy, /* resource_destroy */ - r300_texture_get_transfer, /* get_transfer */ - r300_texture_transfer_destroy, /* transfer_destroy */ r300_texture_transfer_map, /* transfer_map */ NULL, /* transfer_flush_region */ r300_texture_transfer_unmap, /* transfer_unmap */ - u_default_transfer_inline_write /* transfer_inline_write */ }; /* The common texture constructor. */ @@ -890,59 +1068,77 @@ r300_texture_create_object(struct r300_screen *rscreen, enum radeon_bo_layout microtile, enum radeon_bo_layout macrotile, unsigned stride_in_bytes_override, - unsigned max_buffer_size, struct pb_buffer *buffer) { struct radeon_winsys *rws = rscreen->rws; - struct r300_resource *tex = CALLOC_STRUCT(r300_resource); + struct r300_resource *tex = NULL; + struct radeon_bo_metadata tiling = {}; + + tex = CALLOC_STRUCT(r300_resource); if (!tex) { - if (buffer) - pb_reference(&buffer, NULL); - return NULL; + goto fail; } - pipe_reference_init(&tex->b.b.b.reference, 1); - tex->b.b.b.screen = &rscreen->screen; - tex->b.b.b.usage = base->usage; - tex->b.b.b.bind = base->bind; - tex->b.b.b.flags = base->flags; - tex->b.b.vtbl = &r300_texture_vtbl; + pipe_reference_init(&tex->b.b.reference, 1); + tex->b.b.screen = &rscreen->screen; + tex->b.b.usage = base->usage; + tex->b.b.bind = base->bind; + tex->b.b.flags = base->flags; + tex->b.vtbl = &r300_texture_vtbl; tex->tex.microtile = microtile; tex->tex.macrotile[0] = macrotile; tex->tex.stride_in_bytes_override = stride_in_bytes_override; - tex->domain = base->flags & R300_RESOURCE_FLAG_TRANSFER ? - RADEON_DOMAIN_GTT : - RADEON_DOMAIN_VRAM | RADEON_DOMAIN_GTT; - tex->buf_size = max_buffer_size; - - if (!r300_resource_set_properties(&rscreen->screen, &tex->b.b.b, 0, base)) { - if (buffer) - pb_reference(&buffer, NULL); - FREE(tex); - return NULL; + tex->domain = (base->flags & R300_RESOURCE_FLAG_TRANSFER || + base->usage == PIPE_USAGE_STAGING) ? RADEON_DOMAIN_GTT : + base->nr_samples > 1 ? RADEON_DOMAIN_VRAM : + RADEON_DOMAIN_VRAM | RADEON_DOMAIN_GTT; + tex->buf = buffer; + + r300_texture_desc_init(rscreen, tex, base); + + /* Figure out the ideal placement for the texture.. */ + if (tex->domain & RADEON_DOMAIN_VRAM && + tex->tex.size_in_bytes >= rscreen->info.vram_size) { + tex->domain &= ~RADEON_DOMAIN_VRAM; + tex->domain |= RADEON_DOMAIN_GTT; + } + if (tex->domain & RADEON_DOMAIN_GTT && + tex->tex.size_in_bytes >= rscreen->info.gart_size) { + tex->domain &= ~RADEON_DOMAIN_GTT; + } + /* Just fail if the texture is too large. */ + if (!tex->domain) { + goto fail; } /* Create the backing buffer if needed. */ - if (!buffer) { - tex->buf_size = tex->tex.size_in_bytes; + if (!tex->buf) { tex->buf = rws->buffer_create(rws, tex->tex.size_in_bytes, 2048, - base->bind, base->usage, tex->domain); + tex->domain, RADEON_FLAG_NO_SUBALLOC); if (!tex->buf) { - FREE(tex); - return NULL; + goto fail; } - } else { - tex->buf = buffer; } - tex->cs_buf = rws->buffer_get_cs_handle(tex->buf); + if (SCREEN_DBG_ON(rscreen, DBG_MSAA) && base->nr_samples > 1) { + fprintf(stderr, "r300: %ix MSAA %s buffer created\n", + base->nr_samples, + util_format_is_depth_or_stencil(base->format) ? "depth" : "color"); + } - rws->buffer_set_tiling(tex->buf, NULL, - tex->tex.microtile, tex->tex.macrotile[0], - tex->tex.stride_in_bytes[0]); + tiling.u.legacy.microtile = tex->tex.microtile; + tiling.u.legacy.macrotile = tex->tex.macrotile[0]; + tiling.u.legacy.stride = tex->tex.stride_in_bytes[0]; + rws->buffer_set_metadata(tex->buf, &tiling); return tex; + +fail: + FREE(tex); + if (buffer) + pb_reference(&buffer, NULL); + return NULL; } /* Create a new texture. */ @@ -953,7 +1149,7 @@ struct pipe_resource *r300_texture_create(struct pipe_screen *screen, enum radeon_bo_layout microtile, macrotile; if ((base->flags & R300_RESOURCE_FLAG_TRANSFER) || - (base->bind & PIPE_BIND_SCANOUT)) { + (base->bind & (PIPE_BIND_SCANOUT | PIPE_BIND_LINEAR))) { microtile = RADEON_LAYOUT_LINEAR; macrotile = RADEON_LAYOUT_LINEAR; } else { @@ -964,18 +1160,19 @@ struct pipe_resource *r300_texture_create(struct pipe_screen *screen, return (struct pipe_resource*) r300_texture_create_object(rscreen, base, microtile, macrotile, - 0, 0, NULL); + 0, NULL); } struct pipe_resource *r300_texture_from_handle(struct pipe_screen *screen, const struct pipe_resource *base, - struct winsys_handle *whandle) + struct winsys_handle *whandle, + unsigned usage) { - struct radeon_winsys *rws = (struct radeon_winsys*)screen->winsys; struct r300_screen *rscreen = r300_screen(screen); + struct radeon_winsys *rws = rscreen->rws; struct pb_buffer *buffer; - enum radeon_bo_layout microtile, macrotile; - unsigned stride, size; + unsigned stride; + struct radeon_bo_metadata tiling = {}; /* Support only 2D textures without mipmaps */ if ((base->target != PIPE_TEXTURE_2D && @@ -985,36 +1182,38 @@ struct pipe_resource *r300_texture_from_handle(struct pipe_screen *screen, return NULL; } - buffer = rws->buffer_from_handle(rws, whandle, &stride, &size); + buffer = rws->buffer_from_handle(rws, whandle, &stride, NULL); if (!buffer) return NULL; - rws->buffer_get_tiling(buffer, µtile, ¯otile); + rws->buffer_get_metadata(buffer, &tiling); /* Enforce a microtiled zbuffer. */ if (util_format_is_depth_or_stencil(base->format) && - microtile == RADEON_LAYOUT_LINEAR) { + tiling.u.legacy.microtile == RADEON_LAYOUT_LINEAR) { switch (util_format_get_blocksize(base->format)) { case 4: - microtile = RADEON_LAYOUT_TILED; + tiling.u.legacy.microtile = RADEON_LAYOUT_TILED; break; case 2: - microtile = RADEON_LAYOUT_SQUARETILED; + tiling.u.legacy.microtile = RADEON_LAYOUT_SQUARETILED; break; } } return (struct pipe_resource*) - r300_texture_create_object(rscreen, base, microtile, macrotile, - stride, size, buffer); + r300_texture_create_object(rscreen, base, tiling.u.legacy.microtile, tiling.u.legacy.macrotile, + stride, buffer); } /* Not required to implement u_resource_vtbl, consider moving to another file: */ -struct pipe_surface* r300_create_surface(struct pipe_context * ctx, +struct pipe_surface* r300_create_surface_custom(struct pipe_context * ctx, struct pipe_resource* texture, - const struct pipe_surface *surf_tmpl) + const struct pipe_surface *surf_tmpl, + unsigned width0_override, + unsigned height0_override) { struct r300_resource* tex = r300_resource(texture); struct r300_surface* surface = CALLOC_STRUCT(r300_surface); @@ -1029,15 +1228,13 @@ struct pipe_surface* r300_create_surface(struct pipe_context * ctx, pipe_resource_reference(&surface->base.texture, texture); surface->base.context = ctx; surface->base.format = surf_tmpl->format; - surface->base.width = u_minify(texture->width0, level); - surface->base.height = u_minify(texture->height0, level); - surface->base.usage = surf_tmpl->usage; + surface->base.width = u_minify(width0_override, level); + surface->base.height = u_minify(height0_override, level); surface->base.u.tex.level = level; surface->base.u.tex.first_layer = surf_tmpl->u.tex.first_layer; surface->base.u.tex.last_layer = surf_tmpl->u.tex.last_layer; surface->buf = tex->buf; - surface->cs_buf = tex->cs_buf; /* Prefer VRAM if there are multiple domains to choose from. */ surface->domain = tex->domain; @@ -1053,8 +1250,8 @@ struct pipe_surface* r300_create_surface(struct pipe_context * ctx, surface->cbzb_width = align(surface->base.width, 64); /* Height must be aligned to the size of a tile. */ - tile_height = r300_get_pixel_alignment(tex->b.b.b.format, - tex->b.b.b.nr_samples, + tile_height = r300_get_pixel_alignment(surface->base.format, + tex->b.b.nr_samples, tex->tex.microtile, tex->tex.macrotile[level], DIM_HEIGHT, 0); @@ -1087,6 +1284,15 @@ struct pipe_surface* r300_create_surface(struct pipe_context * ctx, return &surface->base; } +struct pipe_surface* r300_create_surface(struct pipe_context * ctx, + struct pipe_resource* texture, + const struct pipe_surface *surf_tmpl) +{ + return r300_create_surface_custom(ctx, texture, surf_tmpl, + texture->width0, + texture->height0); +} + /* Not required to implement u_resource_vtbl, consider moving to another file: */ void r300_surface_destroy(struct pipe_context *ctx, struct pipe_surface* s)