R600_DISABLE_RENDER_COND,
R600_DECOMPRESS = R600_SAVE_FRAGMENT_STATE | R600_SAVE_FRAMEBUFFER | R600_DISABLE_RENDER_COND,
+
+ R600_COLOR_RESOLVE = R600_SAVE_FRAGMENT_STATE | R600_SAVE_FRAMEBUFFER | R600_DISABLE_RENDER_COND
};
static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op)
if (rctx->states[R600_PIPE_STATE_STENCIL_REF]) {
util_blitter_save_stencil_ref(rctx->blitter, &rctx->stencil_ref);
}
+ util_blitter_save_sample_mask(rctx->blitter, rctx->sample_mask.sample_mask);
}
if (op & R600_SAVE_FRAMEBUFFER)
}
}
+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,
+ struct r600_texture *texture,
+ struct r600_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;
- struct r600_resource_texture *flushed_depth_texture = staging ?
+ unsigned layer, level, sample, checked_last_layer, max_layer, max_sample;
+ struct r600_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;
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;
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->resource.b.b.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->resource.b.b.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);
}
}
while (depth_texture_mask) {
struct pipe_sampler_view *view;
- struct r600_resource_texture *tex;
+ struct r600_texture *tex;
i = u_bit_scan(&depth_texture_mask);
view = &textures->views[i]->base;
assert(view);
- tex = (struct r600_resource_texture *)view->texture;
+ tex = (struct r600_texture *)view->texture;
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_texture *rsrc = (struct r600_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 boolean is_simple_resolve(const struct pipe_resolve_info *info)
+{
+ unsigned dst_width = u_minify(info->dst.res->width0, info->dst.level);
+ unsigned dst_height = u_minify(info->dst.res->height0, info->dst.level);
+
+ return info->dst.res->format == info->src.res->format &&
+ dst_width == info->src.res->width0 &&
+ dst_height == info->src.res->height0 &&
+ info->dst.x0 == 0 &&
+ info->dst.y0 == 0 &&
+ info->dst.x1 == dst_width &&
+ info->dst.y1 == dst_height &&
+ info->src.x0 == 0 &&
+ info->src.y0 == 0 &&
+ info->src.x1 == dst_width &&
+ info->src.y1 == dst_height;
+}
+
+static void r600_color_resolve(struct pipe_context *ctx,
+ const struct pipe_resolve_info *info)
+{
+ struct r600_context *rctx = (struct r600_context *)ctx;
+ struct pipe_screen *screen = ctx->screen;
+ struct pipe_resource *tmp, templ;
+ struct pipe_box box;
+
+ assert((info->mask & PIPE_MASK_RGBA) == PIPE_MASK_RGBA);
+
+ if (is_simple_resolve(info)) {
+ r600_blitter_begin(ctx, R600_COLOR_RESOLVE);
+ util_blitter_custom_resolve_color(rctx->blitter,
+ info->dst.res, info->dst.level, info->dst.layer,
+ info->src.res, info->src.layer,
+ rctx->custom_blend_resolve);
+ r600_blitter_end(ctx);
+ return;
+ }
+
+ /* resolve into a temporary texture, then blit */
+ templ.target = PIPE_TEXTURE_2D;
+ templ.format = info->src.res->format;
+ templ.width0 = info->src.res->width0;
+ templ.height0 = info->src.res->height0;
+ templ.depth0 = 1;
+ templ.array_size = 1;
+ templ.last_level = 0;
+ templ.nr_samples = 0;
+ templ.usage = PIPE_USAGE_STATIC;
+ templ.bind = PIPE_BIND_RENDER_TARGET | PIPE_BIND_SAMPLER_VIEW;
+ templ.flags = 0;
+
+ tmp = screen->resource_create(screen, &templ);
+
+ /* XXX use scissor, so that only the needed part of the resource is resolved */
+ r600_blitter_begin(ctx, R600_COLOR_RESOLVE);
+ util_blitter_custom_resolve_color(rctx->blitter,
+ tmp, 0, 0,
+ info->src.res, info->src.layer,
+ rctx->custom_blend_resolve);
+ r600_blitter_end(ctx);
+
+ /* 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);
+
+ r600_blitter_begin(ctx, R600_COPY_TEXTURE);
+ util_blitter_copy_texture(rctx->blitter, info->dst.res, info->dst.level,
+ ~0, info->dst.x0, info->dst.y0, info->dst.layer,
+ tmp, 0, 0, &box);
+ r600_blitter_end(ctx);
+
+ pipe_resource_reference(&tmp, 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);
+ } else {
+ r600_color_resolve(ctx, info);
}
}
unsigned level,
struct texture_orig_info *orig)
{
- struct r600_resource_texture *rtex = (struct r600_resource_texture*)tex;
- unsigned pixsize = util_format_get_blocksize(rtex->real_format);
+ struct r600_texture *rtex = (struct r600_texture*)tex;
+ unsigned pixsize = util_format_get_blocksize(rtex->resource.b.b.format);
int new_format;
int new_height, new_width;
struct texture_orig_info *orig,
enum pipe_format format)
{
- struct r600_resource_texture *rtex = (struct r600_resource_texture*)tex;
+ struct r600_texture *rtex = (struct r600_texture*)tex;
orig->format = tex->format;
orig->width0 = tex->width0;
unsigned level,
struct texture_orig_info *orig)
{
- struct r600_resource_texture *rtex = (struct r600_resource_texture*)tex;
+ struct r600_texture *rtex = (struct r600_texture*)tex;
tex->format = orig->format;
tex->width0 = orig->width0;
const struct pipe_box *src_box)
{
struct r600_context *rctx = (struct r600_context *)ctx;
- struct r600_resource_texture *rsrc = (struct r600_resource_texture*)src;
+ struct r600_texture *rsrc = (struct r600_texture*)src;
struct texture_orig_info orig_info[2];
struct pipe_box sbox;
const struct pipe_box *psbox = src_box;
boolean restore_orig[2];
+ unsigned last_sample, i;
memset(orig_info, 0, sizeof(orig_info));
return;
}
+ assert(u_max_sample(dst) == u_max_sample(src));
+ last_sample = u_max_sample(dst);
+
/* This must be done before entering u_blitter to avoid recursion. */
if (rsrc->is_depth && !rsrc->is_flushing_texture) {
if (!r600_init_flushed_depth_texture(ctx, src, NULL))
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;
restore_orig[1] = TRUE;
}
- r600_blitter_begin(ctx, R600_COPY_TEXTURE);
- util_blitter_copy_texture(rctx->blitter, dst, dst_level, dstx, dsty, dstz,
- src, src_level, psbox);
- r600_blitter_end(ctx);
+ for (i = 0; i <= last_sample; i++) {
+ r600_blitter_begin(ctx, R600_COPY_TEXTURE);
+ util_blitter_copy_texture(rctx->blitter, dst, dst_level, 1 << i, dstx, dsty, dstz,
+ src, src_level, i, psbox);
+ r600_blitter_end(ctx);
+ }
if (restore_orig[0])
r600_reset_blittable_to_orig(src, src_level, &orig_info[0]);
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;
}
projects / mesa.git / blobdiff