From: Marek Olšák Date: Thu, 9 Aug 2012 15:17:18 +0000 (+0200) Subject: r600g: implement MSAA depth-stencil decompression and resolve X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=94b634eca0e2bd32d4b5bd92d06d510eae8a5625;p=mesa.git r600g: implement MSAA depth-stencil decompression and resolve and integer textures, which are resolved the same as depth, I think. --- diff --git a/src/gallium/auxiliary/util/u_blitter.c b/src/gallium/auxiliary/util/u_blitter.c index 4cc3aa426b8..1e373223eaf 100644 --- a/src/gallium/auxiliary/util/u_blitter.c +++ b/src/gallium/auxiliary/util/u_blitter.c @@ -1383,6 +1383,7 @@ void util_blitter_clear_depth_stencil(struct blitter_context *blitter, void util_blitter_custom_depth_stencil(struct blitter_context *blitter, struct pipe_surface *zsurf, struct pipe_surface *cbsurf, + unsigned sample_mask, void *dsa_stage, float depth) { struct blitter_context_priv *ctx = (struct blitter_context_priv*)blitter; @@ -1418,6 +1419,7 @@ void util_blitter_custom_depth_stencil(struct blitter_context *blitter, } fb_state.zsbuf = zsurf; pipe->set_framebuffer_state(pipe, &fb_state); + pipe->set_sample_mask(pipe, sample_mask); blitter_set_common_draw_rect_state(ctx); blitter_set_dst_dimensions(ctx, zsurf->width, zsurf->height); diff --git a/src/gallium/auxiliary/util/u_blitter.h b/src/gallium/auxiliary/util/u_blitter.h index cccdc061e08..1881e6ae6ce 100644 --- a/src/gallium/auxiliary/util/u_blitter.h +++ b/src/gallium/auxiliary/util/u_blitter.h @@ -297,6 +297,7 @@ void util_blitter_clear_depth_stencil(struct blitter_context *blitter, void util_blitter_custom_depth_stencil(struct blitter_context *blitter, struct pipe_surface *zsurf, struct pipe_surface *cbsurf, + unsigned sample_mask, void *dsa_stage, float depth); /* The functions below should be used to save currently bound constant state diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index b08cb0b2f01..56b578b89f2 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -1801,7 +1801,8 @@ static void evergreen_emit_db_misc_state(struct r600_context *rctx, struct r600_ db_render_control |= S_028000_DEPTH_COPY_ENABLE(a->copy_depth) | S_028000_STENCIL_COPY_ENABLE(a->copy_stencil) | - S_028000_COPY_CENTROID(1); + S_028000_COPY_CENTROID(1) | + S_028000_COPY_SAMPLE(a->copy_sample); } r600_write_context_reg_seq(cs, R_028000_DB_RENDER_CONTROL, 2); diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c index 86af8840645..41c2ef52efa 100644 --- a/src/gallium/drivers/r600/r600_blit.c +++ b/src/gallium/drivers/r600/r600_blit.c @@ -120,19 +120,25 @@ static unsigned u_max_layer(struct pipe_resource *r, unsigned level) } } +static unsigned u_max_sample(struct pipe_resource *r) +{ + return r->nr_samples ? r->nr_samples - 1 : 0; +} + void r600_blit_uncompress_depth(struct pipe_context *ctx, struct r600_resource_texture *texture, struct r600_resource_texture *staging, unsigned first_level, unsigned last_level, - unsigned first_layer, unsigned last_layer) + unsigned first_layer, unsigned last_layer, + unsigned first_sample, unsigned last_sample) { struct r600_context *rctx = (struct r600_context *)ctx; - unsigned layer, level, checked_last_layer, max_layer; - float depth = 1.0f; + unsigned layer, level, sample, checked_last_layer, max_layer, max_sample; struct r600_resource_texture *flushed_depth_texture = staging ? staging : texture->flushed_depth_texture; const struct util_format_description *desc = util_format_description(texture->resource.b.b.format); + float depth; if (!staging && !texture->dirty_db_mask) return; @@ -140,13 +146,18 @@ void r600_blit_uncompress_depth(struct pipe_context *ctx, if (rctx->family == CHIP_RV610 || rctx->family == CHIP_RV630 || rctx->family == CHIP_RV620 || rctx->family == CHIP_RV635) depth = 0.0f; + else + depth = 1.0f; /* Enable decompression in DB_RENDER_CONTROL */ rctx->db_misc_state.flush_depthstencil_through_cb = true; rctx->db_misc_state.copy_depth = util_format_has_depth(desc); rctx->db_misc_state.copy_stencil = util_format_has_stencil(desc); + rctx->db_misc_state.copy_sample = first_sample; r600_atom_dirty(rctx, &rctx->db_misc_state.atom); + max_sample = u_max_sample(&texture->resource.b.b); + for (level = first_level; level <= last_level; level++) { if (!staging && !(texture->dirty_db_mask & (1 << level))) continue; @@ -157,32 +168,45 @@ void r600_blit_uncompress_depth(struct pipe_context *ctx, checked_last_layer = last_layer < max_layer ? last_layer : max_layer; for (layer = first_layer; layer <= checked_last_layer; layer++) { - struct pipe_surface *zsurf, *cbsurf, surf_tmpl; - - surf_tmpl.format = texture->real_format; - surf_tmpl.u.tex.level = level; - surf_tmpl.u.tex.first_layer = layer; - surf_tmpl.u.tex.last_layer = layer; - surf_tmpl.usage = PIPE_BIND_DEPTH_STENCIL; - - zsurf = ctx->create_surface(ctx, &texture->resource.b.b, &surf_tmpl); - - surf_tmpl.format = flushed_depth_texture->real_format; - surf_tmpl.usage = PIPE_BIND_RENDER_TARGET; - cbsurf = ctx->create_surface(ctx, - (struct pipe_resource*)flushed_depth_texture, &surf_tmpl); - - r600_blitter_begin(ctx, R600_DECOMPRESS); - util_blitter_custom_depth_stencil(rctx->blitter, zsurf, cbsurf, rctx->custom_dsa_flush, depth); - r600_blitter_end(ctx); - - pipe_surface_reference(&zsurf, NULL); - pipe_surface_reference(&cbsurf, NULL); + for (sample = first_sample; sample <= last_sample; sample++) { + struct pipe_surface *zsurf, *cbsurf, surf_tmpl; + + if (sample != rctx->db_misc_state.copy_sample) { + rctx->db_misc_state.copy_sample = sample; + r600_atom_dirty(rctx, &rctx->db_misc_state.atom); + } + + surf_tmpl.format = texture->real_format; + surf_tmpl.u.tex.level = level; + surf_tmpl.u.tex.first_layer = layer; + surf_tmpl.u.tex.last_layer = layer; + surf_tmpl.usage = PIPE_BIND_DEPTH_STENCIL; + + zsurf = ctx->create_surface(ctx, &texture->resource.b.b, &surf_tmpl); + + surf_tmpl.format = flushed_depth_texture->real_format; + surf_tmpl.u.tex.level = level; + surf_tmpl.u.tex.first_layer = layer; + surf_tmpl.u.tex.last_layer = layer; + surf_tmpl.usage = PIPE_BIND_RENDER_TARGET; + cbsurf = ctx->create_surface(ctx, + &flushed_depth_texture->resource.b.b, &surf_tmpl); + + r600_blitter_begin(ctx, R600_DECOMPRESS); + util_blitter_custom_depth_stencil(rctx->blitter, zsurf, cbsurf, 1 << sample, + rctx->custom_dsa_flush, depth); + r600_blitter_end(ctx); + + pipe_surface_reference(&zsurf, NULL); + pipe_surface_reference(&cbsurf, NULL); + } } - /* The texture will always be dirty if some layers aren't flushed. - * I don't think this case can occur though. */ - if (!staging && first_layer == 0 && last_layer == max_layer) { + /* The texture will always be dirty if some layers or samples aren't flushed. + * I don't think this case occurs often though. */ + if (!staging && + first_layer == 0 && last_layer == max_layer && + first_sample == 0 && last_sample == max_sample) { texture->dirty_db_mask &= ~(1 << level); } } @@ -211,10 +235,84 @@ void r600_flush_depth_textures(struct r600_context *rctx, assert(tex->is_depth && !tex->is_flushing_texture); r600_blit_uncompress_depth(&rctx->context, tex, NULL, - view->u.tex.first_level, - view->u.tex.last_level, - 0, - u_max_layer(&tex->resource.b.b, view->u.tex.first_level)); + view->u.tex.first_level, view->u.tex.last_level, + 0, u_max_layer(&tex->resource.b.b, view->u.tex.first_level), + 0, u_max_sample(&tex->resource.b.b)); + } +} + +static void r600_copy_first_sample(struct pipe_context *ctx, + const struct pipe_resolve_info *info) +{ + struct r600_context *rctx = (struct r600_context *)ctx; + struct r600_resource_texture *rsrc = (struct r600_resource_texture*)info->src.res; + struct pipe_surface *dst_view, dst_templ; + struct pipe_sampler_view src_templ, *src_view; + struct pipe_box box; + + if (rsrc->is_depth && !rsrc->is_flushing_texture) { + if (!r600_init_flushed_depth_texture(ctx, info->src.res, NULL)) + return; /* error */ + + /* Decompress the first sample only. */ + r600_blit_uncompress_depth(ctx, rsrc, NULL, + 0, 0, + info->src.layer, info->src.layer, + 0, 0); + } + + /* this is correct for upside-down blits too */ + u_box_2d(info->src.x0, + info->src.y0, + info->src.x1 - info->src.x0, + info->src.y1 - info->src.y0, &box); + + /* Initialize the surface. */ + util_blitter_default_dst_texture(&dst_templ, info->dst.res, + info->dst.level, info->dst.layer, &box); + dst_view = ctx->create_surface(ctx, info->dst.res, &dst_templ); + + /* Initialize the sampler view. */ + util_blitter_default_src_texture(&src_templ, info->src.res, 0); + src_view = ctx->create_sampler_view(ctx, info->src.res, &src_templ); + + /* Copy the first sample into dst. */ + r600_blitter_begin(ctx, R600_COPY_TEXTURE); + util_blitter_copy_texture_view(rctx->blitter, dst_view, ~0, info->dst.x0, + info->dst.y0, src_view, 0, &box, + info->src.res->width0, info->src.res->height0, + info->mask); + r600_blitter_end(ctx); + + pipe_surface_reference(&dst_view, NULL); + pipe_sampler_view_reference(&src_view, NULL); +} + +static void r600_resource_resolve(struct pipe_context *ctx, + const struct pipe_resolve_info *info) +{ + /* make sure we're doing a resolve operation */ + assert(info->src.res->nr_samples > 1); + assert(info->dst.res->nr_samples <= 1); + + /* limitations of multisample resources */ + assert(info->src.res->last_level == 0); + assert(info->src.res->target == PIPE_TEXTURE_2D || + info->src.res->target == PIPE_TEXTURE_2D_ARRAY); + + /* check if the resolve box is valid */ + assert(info->dst.x0 < info->dst.x1); + assert(info->dst.y0 < info->dst.y1); + + /* scaled resolve isn't allowed */ + assert(abs(info->dst.x0 - info->dst.x1) == + abs(info->src.x0 - info->src.x1)); + assert(abs(info->dst.y0 - info->dst.y1) == + abs(info->src.y0 - info->src.y1)); + + if ((info->mask & PIPE_MASK_ZS) || + util_format_is_pure_integer(info->src.res->format)) { + r600_copy_first_sample(ctx, info); } } @@ -386,7 +484,8 @@ static void r600_resource_copy_region(struct pipe_context *ctx, r600_blit_uncompress_depth(ctx, rsrc, NULL, src_level, src_level, - src_box->z, src_box->z + src_box->depth - 1); + src_box->z, src_box->z + src_box->depth - 1, + 0, u_max_sample(src)); } restore_orig[0] = restore_orig[1] = FALSE; @@ -452,4 +551,5 @@ void r600_init_blit_functions(struct r600_context *rctx) rctx->context.clear_render_target = r600_clear_render_target; rctx->context.clear_depth_stencil = r600_clear_depth_stencil; rctx->context.resource_copy_region = r600_resource_copy_region; + rctx->context.resource_resolve = r600_resource_resolve; } diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index 8887a982cfd..4cadab809ad 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -81,6 +81,7 @@ struct r600_db_misc_state { bool occlusion_query_enabled; bool flush_depthstencil_through_cb; bool copy_depth, copy_stencil; + unsigned copy_sample; }; struct r600_cb_misc_state { @@ -483,9 +484,11 @@ void r600_blit_uncompress_depth(struct pipe_context *ctx, struct r600_resource_texture *texture, struct r600_resource_texture *staging, unsigned first_level, unsigned last_level, - unsigned first_layer, unsigned last_layer); + unsigned first_layer, unsigned last_layer, + unsigned first_sample, unsigned last_sample); void r600_flush_depth_textures(struct r600_context *rctx, struct r600_samplerview_state *textures); + /* r600_buffer.c */ bool r600_init_resource(struct r600_screen *rscreen, struct r600_resource *res, diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index 1fdecabc1fb..f4c30de1dd1 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -517,7 +517,8 @@ struct pipe_transfer* r600_texture_get_transfer(struct pipe_context *ctx, r600_blit_uncompress_depth(ctx, rtex, staging_depth, level, level, - box->z, box->z + box->depth - 1); + box->z, box->z + box->depth - 1, + 0, 0); trans->transfer.stride = staging_depth->pitch_in_bytes[level]; trans->offset = r600_texture_get_offset(staging_depth, level, box->z);