X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Fr300%2Fr300_texture.c;h=75749e78b2de3cc35cd102ac0da1a3cc9e6d2954;hb=4445e170bee23a3607ece0e010adef7058ac6a11;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..75749e78b2d 100644 --- a/src/gallium/drivers/r300/r300_texture.c +++ b/src/gallium/drivers/r300/r300_texture.c @@ -38,18 +38,6 @@ #include "pipe/p_screen.h" -void util_format_combine_swizzles(unsigned char *dst, - const unsigned char *swz1, - const unsigned char *swz2) -{ - unsigned i; - - for (i = 0; i < 4; i++) { - dst[i] = swz2[i] <= UTIL_FORMAT_SWIZZLE_W ? - swz1[swz2[i]] : swz2[i]; - } -} - unsigned r300_get_swizzle_combined(const unsigned char *swizzle_format, const unsigned char *swizzle_view, boolean dxtc_swizzle) @@ -72,7 +60,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); } @@ -141,7 +129,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 @@ -248,6 +236,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 +385,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; @@ -504,7 +503,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. */ @@ -723,7 +722,10 @@ 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; @@ -732,8 +734,8 @@ void r300_texture_setup_format_state(struct r300_screen *screen, 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 +755,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) { @@ -804,11 +808,13 @@ 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); surf->format = r300_translate_zsformat(surf->base.format); @@ -816,7 +822,7 @@ static void r300_texture_setup_fb_state(struct r300_surface *surf) surf->pitch_hiz = tex->tex.hiz_stride_in_pixels[level]; } else { surf->pitch = - tex->tex.stride_in_pixels[level] | + stride | r300_translate_colorformat(surf->base.format) | R300_COLOR_TILE(tex->tex.macrotile[level]) | R300_COLOR_MICROTILE(tex->tex.microtile); @@ -824,29 +830,6 @@ static void r300_texture_setup_fb_state(struct r300_surface *surf) } } -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) { @@ -860,7 +843,7 @@ boolean r300_resource_get_handle(struct pipe_screen* screen, struct pipe_resource *texture, struct winsys_handle *whandle) { - 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) { @@ -890,7 +873,6 @@ 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; @@ -901,6 +883,9 @@ r300_texture_create_object(struct r300_screen *rscreen, return NULL; } + if (base->nr_samples > 1) + return NULL; + pipe_reference_init(&tex->b.b.b.reference, 1); tex->b.b.b.screen = &rscreen->screen; tex->b.b.b.usage = base->usage; @@ -913,27 +898,19 @@ r300_texture_create_object(struct r300_screen *rscreen, tex->domain = base->flags & R300_RESOURCE_FLAG_TRANSFER ? RADEON_DOMAIN_GTT : RADEON_DOMAIN_VRAM | RADEON_DOMAIN_GTT; - tex->buf_size = max_buffer_size; + tex->buf = buffer; - if (!r300_resource_set_properties(&rscreen->screen, &tex->b.b.b, 0, base)) { - if (buffer) - pb_reference(&buffer, NULL); - FREE(tex); - return NULL; - } + r300_texture_desc_init(rscreen, tex, base); /* 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); + base->bind, tex->domain); if (!tex->buf) { FREE(tex); return NULL; } - } else { - tex->buf = buffer; } tex->cs_buf = rws->buffer_get_cs_handle(tex->buf); @@ -964,18 +941,18 @@ 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 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; /* Support only 2D textures without mipmaps */ if ((base->target != PIPE_TEXTURE_2D && @@ -985,11 +962,11 @@ 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); if (!buffer) return NULL; - rws->buffer_get_tiling(buffer, µtile, ¯otile); + rws->buffer_get_tiling(buffer, µtile, ¯otile, NULL, NULL, NULL, NULL, NULL); /* Enforce a microtiled zbuffer. */ if (util_format_is_depth_or_stencil(base->format) && @@ -1007,14 +984,16 @@ struct pipe_resource *r300_texture_from_handle(struct pipe_screen *screen, return (struct pipe_resource*) r300_texture_create_object(rscreen, base, microtile, macrotile, - stride, size, buffer); + 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,8 +1008,8 @@ 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.width = u_minify(width0_override, level); + surface->base.height = u_minify(height0_override, level); surface->base.usage = surf_tmpl->usage; surface->base.u.tex.level = level; surface->base.u.tex.first_layer = surf_tmpl->u.tex.first_layer; @@ -1053,7 +1032,7 @@ 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, + tile_height = r300_get_pixel_alignment(surface->base.format, tex->b.b.b.nr_samples, tex->tex.microtile, tex->tex.macrotile[level], @@ -1087,6 +1066,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)