* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "r600_pipe.h"
+#include "compute_memory_pool.h"
+#include "evergreen_compute.h"
#include "util/u_surface.h"
-#include "util/u_blitter.h"
#include "util/u_format.h"
#include "evergreend.h"
R600_COPY_TEXTURE = R600_SAVE_FRAGMENT_STATE | R600_SAVE_FRAMEBUFFER | R600_SAVE_TEXTURES |
R600_DISABLE_RENDER_COND,
- R600_BLIT = R600_SAVE_FRAGMENT_STATE | R600_SAVE_FRAMEBUFFER | R600_SAVE_TEXTURES |
- R600_DISABLE_RENDER_COND,
+ R600_BLIT = R600_SAVE_FRAGMENT_STATE | R600_SAVE_FRAMEBUFFER | R600_SAVE_TEXTURES,
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
+ R600_COLOR_RESOLVE = R600_SAVE_FRAGMENT_STATE | R600_SAVE_FRAMEBUFFER
};
static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op)
{
struct r600_context *rctx = (struct r600_context *)ctx;
- r600_suspend_nontimer_queries(rctx);
+ r600_suspend_nontimer_queries(&rctx->b);
util_blitter_save_vertex_buffer_slot(rctx->blitter, rctx->vertex_buffer_state.vb);
util_blitter_save_vertex_elements(rctx->blitter, rctx->vertex_fetch_shader.cso);
util_blitter_save_vertex_shader(rctx->blitter, rctx->vs_shader);
+ util_blitter_save_geometry_shader(rctx->blitter, rctx->gs_shader);
util_blitter_save_so_targets(rctx->blitter, rctx->b.streamout.num_targets,
(struct pipe_stream_output_target**)rctx->b.streamout.targets);
util_blitter_save_rasterizer(rctx->blitter, rctx->rasterizer_state.cso);
if (op & R600_SAVE_FRAGMENT_STATE) {
- util_blitter_save_viewport(rctx->blitter, &rctx->viewport.state);
- util_blitter_save_scissor(rctx->blitter, &rctx->scissor.scissor);
+ util_blitter_save_viewport(rctx->blitter, &rctx->viewport[0].state);
+ util_blitter_save_scissor(rctx->blitter, &rctx->scissor[0].scissor);
util_blitter_save_fragment_shader(rctx->blitter, rctx->ps_shader);
util_blitter_save_blend(rctx->blitter, rctx->blend_state.cso);
util_blitter_save_depth_stencil_alpha(rctx->blitter, rctx->dsa_state.cso);
(struct pipe_sampler_view**)rctx->samplers[PIPE_SHADER_FRAGMENT].views.views);
}
- if ((op & R600_DISABLE_RENDER_COND) && rctx->current_render_cond) {
+ if ((op & R600_DISABLE_RENDER_COND) && rctx->b.current_render_cond) {
util_blitter_save_render_condition(rctx->blitter,
- rctx->current_render_cond,
- rctx->current_render_cond_cond,
- rctx->current_render_cond_mode);
+ rctx->b.current_render_cond,
+ rctx->b.current_render_cond_cond,
+ rctx->b.current_render_cond_mode);
}
}
static void r600_blitter_end(struct pipe_context *ctx)
{
struct r600_context *rctx = (struct r600_context *)ctx;
- r600_resume_nontimer_queries(rctx);
+ r600_resume_nontimer_queries(&rctx->b);
}
static unsigned u_max_sample(struct pipe_resource *r)
return true;
}
-static boolean is_simple_msaa_resolve(const struct pipe_blit_info *info)
-{
- unsigned dst_width = u_minify(info->dst.resource->width0, info->dst.level);
- unsigned dst_height = u_minify(info->dst.resource->height0, info->dst.level);
- struct r600_texture *dst = (struct r600_texture*)info->dst.resource;
- unsigned dst_tile_mode = dst->surface.level[info->dst.level].mode;
-
- return info->dst.resource->format == info->src.resource->format &&
- info->dst.resource->format == info->dst.format &&
- info->src.resource->format == info->src.format &&
- !info->scissor_enable &&
- info->mask == PIPE_MASK_RGBA &&
- dst_width == info->src.resource->width0 &&
- dst_height == info->src.resource->height0 &&
- info->dst.box.x == 0 &&
- info->dst.box.y == 0 &&
- info->dst.box.width == dst_width &&
- info->dst.box.height == dst_height &&
- info->src.box.x == 0 &&
- info->src.box.y == 0 &&
- info->src.box.width == dst_width &&
- info->src.box.height == dst_height &&
- /* Dst must be tiled. If it's not, we have to use a temporary
- * resource which is tiled. */
- dst_tile_mode >= RADEON_SURF_MODE_1D;
-}
-
-static void r600_clear_buffer(struct pipe_context *ctx, struct pipe_resource *dst,
- unsigned offset, unsigned size, unsigned value);
-
-static void evergreen_set_clear_color(struct pipe_surface *cbuf,
- const union pipe_color_union *color)
-{
- unsigned *clear_value = ((struct r600_texture *)cbuf->texture)->color_clear_value;
- union util_color uc;
-
- memset(&uc, 0, sizeof(uc));
-
- if (util_format_is_pure_uint(cbuf->format)) {
- util_format_write_4ui(cbuf->format, color->ui, 0, &uc, 0, 0, 0, 1, 1);
- } else if (util_format_is_pure_sint(cbuf->format)) {
- util_format_write_4i(cbuf->format, color->i, 0, &uc, 0, 0, 0, 1, 1);
- } else {
- util_pack_color(color->f, cbuf->format, &uc);
- }
-
- memcpy(clear_value, &uc, 2 * sizeof(uint32_t));
-}
-
-static void evergreen_check_alloc_cmask(struct pipe_context *ctx,
- struct pipe_surface *cbuf)
-{
- struct r600_context *rctx = (struct r600_context *)ctx;
- struct r600_texture *tex = (struct r600_texture *)cbuf->texture;
- struct r600_surface *surf = (struct r600_surface *)cbuf;
-
- if (tex->cmask_buffer)
- return;
-
- r600_texture_init_cmask(&rctx->screen->b, tex);
-
- /* update colorbuffer state bits */
- if (tex->cmask_buffer != NULL) {
- uint64_t va = r600_resource_va(rctx->b.b.screen, &tex->cmask_buffer->b.b);
- surf->cb_color_cmask = va >> 8;
- surf->cb_color_cmask_slice = S_028C80_TILE_MAX(tex->cmask.slice_tile_max);
- surf->cb_color_info |= S_028C70_FAST_CLEAR(1);
- }
-}
-
-static bool can_fast_clear_color(struct pipe_context *ctx)
-{
- struct r600_context *rctx = (struct r600_context *)ctx;
- struct pipe_framebuffer_state *fb = &rctx->framebuffer.state;
- int i;
-
- if (rctx->b.chip_class < EVERGREEN) {
- return false;
- }
-
- for (i = 0; i < fb->nr_cbufs; i++) {
- struct r600_texture *tex = (struct r600_texture *)fb->cbufs[i]->texture;
-
- /* 128-bit formats are unuspported */
- if (util_format_get_blocksizebits(fb->cbufs[i]->format) > 64) {
- return false;
- }
-
- /* the clear is allowed if all layers are bound */
- if (fb->cbufs[i]->u.tex.first_layer != 0 ||
- fb->cbufs[i]->u.tex.last_layer != util_max_layer(&tex->resource.b.b, 0)) {
- return false;
- }
-
- /* cannot clear mipmapped textures */
- if (fb->cbufs[i]->texture->last_level != 0) {
- return false;
- }
-
- /* only supported on tiled surfaces */
- if (tex->surface.level[0].mode < RADEON_SURF_MODE_1D) {
- return false;
- }
-
- /* ensure CMASK is enabled */
- evergreen_check_alloc_cmask(ctx, fb->cbufs[i]);
- if (tex->cmask.size == 0) {
- return false;
- }
- }
-
- return true;
-}
-
static void r600_clear(struct pipe_context *ctx, unsigned buffers,
const union pipe_color_union *color,
double depth, unsigned stencil)
struct r600_context *rctx = (struct r600_context *)ctx;
struct pipe_framebuffer_state *fb = &rctx->framebuffer.state;
- /* fast clear on colorbuffers (EG+) */
- if ((buffers & PIPE_CLEAR_COLOR) && can_fast_clear_color(ctx)) {
+ if (buffers & PIPE_CLEAR_COLOR && rctx->b.chip_class >= EVERGREEN) {
+ evergreen_do_fast_color_clear(&rctx->b, fb, &rctx->framebuffer.atom,
+ &buffers, color);
+ }
+
+ if (buffers & PIPE_CLEAR_COLOR) {
int i;
+ /* These buffers cannot use fast clear, make sure to disable expansion. */
for (i = 0; i < fb->nr_cbufs; i++) {
- struct r600_texture *tex = (struct r600_texture *)fb->cbufs[i]->texture;
+ struct r600_texture *tex;
- evergreen_set_clear_color(fb->cbufs[i], color);
- r600_clear_buffer(ctx, &tex->cmask_buffer->b.b,
- tex->cmask.offset, tex->cmask.size, 0);
- tex->dirty_level_mask |= 1 << fb->cbufs[i]->u.tex.level;
- }
-
- rctx->framebuffer.atom.dirty = true;
+ /* If not clearing this buffer, skip. */
+ if (!(buffers & (PIPE_CLEAR_COLOR0 << i)))
+ continue;
- buffers &= ~PIPE_CLEAR_COLOR;
- if (!buffers)
- return;
- } else if (buffers & PIPE_CLEAR_COLOR) {
- int i;
+ if (!fb->cbufs[i])
+ continue;
- /* cannot use fast clear, make sure to disable expansion */
- for (i = 0; i < fb->nr_cbufs; i++) {
- struct r600_texture *tex = (struct r600_texture *)fb->cbufs[i]->texture;
+ tex = (struct r600_texture *)fb->cbufs[i]->texture;
if (tex->fmask.size == 0)
- tex->dirty_level_mask &= ~(1 << fb->cbufs[i]->u.tex.level);
+ tex->dirty_level_mask &= ~(1 << fb->cbufs[i]->u.tex.level);
}
}
* disable fast clear for texture array.
*/
/* Only use htile for first level */
- if (rtex->htile_buffer && !level && rtex->surface.array_size == 1) {
+ if (rtex->htile_buffer && !level &&
+ fb->zsbuf->u.tex.first_layer == 0 &&
+ fb->zsbuf->u.tex.last_layer == util_max_layer(&rtex->resource.b.b, level)) {
if (rtex->depth_clear_value != depth) {
rtex->depth_clear_value = depth;
rctx->db_state.atom.dirty = true;
}
r600_blitter_begin(ctx, R600_CLEAR);
- util_blitter_clear(rctx->blitter, fb->width, fb->height, 1,
+ util_blitter_clear(rctx->blitter, fb->width, fb->height,
+ util_framebuffer_get_num_layers(fb),
buffers, color, depth, stencil);
r600_blitter_end(ctx);
} else {
util_resource_copy_region(ctx, dst, 0, dstx, 0, 0, src, 0, src_box);
}
+
+ /* The index buffer (VGT) doesn't seem to see the result of the copying.
+ * Can we somehow flush the index buffer cache? Starting a new IB seems
+ * to do the trick. */
+ if (rctx->b.chip_class <= R700)
+ rctx->b.rings.gfx.flush(ctx, RADEON_FLUSH_ASYNC, NULL);
}
/**
* into a single global resource (r600_screen::global_pool). The means
* they don't have their own cs_buf handle, so they cannot be passed
* to r600_copy_buffer() and must be handled separately.
- *
- * XXX: It should be possible to implement this function using
- * r600_copy_buffer() by passing the memory_pool resource as both src
- * and dst and updating dstx and src_box to point to the correct offsets.
- * This would likely perform better than the current implementation.
*/
static void r600_copy_global_buffer(struct pipe_context *ctx,
struct pipe_resource *dst, unsigned
dstx, struct pipe_resource *src,
const struct pipe_box *src_box)
{
- struct pipe_box dst_box; struct pipe_transfer *src_pxfer,
- *dst_pxfer;
-
- u_box_1d(dstx, src_box->width, &dst_box);
- void *src_ptr = ctx->transfer_map(ctx, src, 0, PIPE_TRANSFER_READ,
- src_box, &src_pxfer);
- void *dst_ptr = ctx->transfer_map(ctx, dst, 0, PIPE_TRANSFER_WRITE,
- &dst_box, &dst_pxfer);
- memcpy(dst_ptr, src_ptr, src_box->width);
-
- ctx->transfer_unmap(ctx, src_pxfer);
- ctx->transfer_unmap(ctx, dst_pxfer);
+ struct r600_context *rctx = (struct r600_context*)ctx;
+ struct compute_memory_pool *pool = rctx->screen->global_pool;
+ struct pipe_box new_src_box = *src_box;
+
+ if (src->bind & PIPE_BIND_GLOBAL) {
+ struct r600_resource_global *rsrc =
+ (struct r600_resource_global *)src;
+ struct compute_memory_item *item = rsrc->chunk;
+
+ if (is_item_in_pool(item)) {
+ new_src_box.x += 4 * item->start_in_dw;
+ src = (struct pipe_resource *)pool->bo;
+ } else {
+ if (item->real_buffer == NULL) {
+ item->real_buffer = (struct r600_resource*)
+ r600_compute_buffer_alloc_vram(pool->screen,
+ item->size_in_dw * 4);
+ }
+ src = (struct pipe_resource*)item->real_buffer;
+ }
+ }
+ if (dst->bind & PIPE_BIND_GLOBAL) {
+ struct r600_resource_global *rdst =
+ (struct r600_resource_global *)dst;
+ struct compute_memory_item *item = rdst->chunk;
+
+ if (is_item_in_pool(item)) {
+ dstx += 4 * item->start_in_dw;
+ dst = (struct pipe_resource *)pool->bo;
+ } else {
+ if (item->real_buffer == NULL) {
+ item->real_buffer = (struct r600_resource*)
+ r600_compute_buffer_alloc_vram(pool->screen,
+ item->size_in_dw * 4);
+ }
+ dst = (struct pipe_resource*)item->real_buffer;
+ }
+ }
+
+ r600_copy_buffer(ctx, dst, dstx, src, &new_src_box);
}
static void r600_clear_buffer(struct pipe_context *ctx, struct pipe_resource *dst,
}
}
-static bool util_format_is_subsampled_2x1_32bpp(enum pipe_format format)
-{
- const struct util_format_description *desc = util_format_description(format);
-
- return desc->layout == UTIL_FORMAT_LAYOUT_SUBSAMPLED &&
- desc->block.width == 2 &&
- desc->block.height == 1 &&
- desc->block.bits == 32;
-}
-
-static void r600_resource_copy_region(struct pipe_context *ctx,
- struct pipe_resource *dst,
- unsigned dst_level,
- unsigned dstx, unsigned dsty, unsigned dstz,
- struct pipe_resource *src,
- unsigned src_level,
- const struct pipe_box *src_box)
+void r600_resource_copy_region(struct pipe_context *ctx,
+ struct pipe_resource *dst,
+ unsigned dst_level,
+ unsigned dstx, unsigned dsty, unsigned dstz,
+ struct pipe_resource *src,
+ unsigned src_level,
+ const struct pipe_box *src_box)
{
struct r600_context *rctx = (struct r600_context *)ctx;
struct pipe_surface *dst_view, dst_templ;
struct pipe_sampler_view src_templ, *src_view;
unsigned dst_width, dst_height, src_width0, src_height0, src_widthFL, src_heightFL;
+ unsigned src_force_level = 0;
struct pipe_box sbox, dstbox;
/* Handle buffers first. */
sbox.height = util_format_get_nblocksy(src->format, src_box->height);
sbox.depth = src_box->depth;
src_box = &sbox;
+
+ src_force_level = src_level;
} else if (!util_blitter_is_copy_supported(rctx->blitter, dst, src)) {
- if (util_format_is_subsampled_2x1_32bpp(src->format)) {
+ if (util_format_is_subsampled_422(src->format)) {
src_templ.format = PIPE_FORMAT_R8G8B8A8_UINT;
dst_templ.format = PIPE_FORMAT_R8G8B8A8_UINT;
if (rctx->b.chip_class >= EVERGREEN) {
src_view = evergreen_create_sampler_view_custom(ctx, src, &src_templ,
- src_width0, src_height0);
+ src_width0, src_height0,
+ src_force_level);
} else {
src_view = r600_create_sampler_view_custom(ctx, src, &src_templ,
src_widthFL, src_heightFL);
}
}
-static void r600_msaa_color_resolve(struct pipe_context *ctx,
- const struct pipe_blit_info *info)
+static bool do_hardware_msaa_resolve(struct pipe_context *ctx,
+ const struct pipe_blit_info *info)
{
- struct r600_context *rctx = (struct r600_context *)ctx;
- struct pipe_screen *screen = ctx->screen;
- struct pipe_resource *tmp, templ;
- struct pipe_blit_info blit;
+ struct r600_context *rctx = (struct r600_context*)ctx;
+ struct r600_texture *dst = (struct r600_texture*)info->dst.resource;
+ unsigned dst_width = u_minify(info->dst.resource->width0, info->dst.level);
+ unsigned dst_height = u_minify(info->dst.resource->height0, info->dst.level);
+ enum pipe_format format = int_to_norm_format(info->dst.format);
unsigned sample_mask =
rctx->b.chip_class == CAYMAN ? ~0 :
((1ull << MAX2(1, info->src.resource->nr_samples)) - 1);
- assert(info->src.level == 0);
- assert(info->src.box.depth == 1);
- assert(info->dst.box.depth == 1);
-
- if (is_simple_msaa_resolve(info)) {
- r600_blitter_begin(ctx, R600_COLOR_RESOLVE);
+ if (info->src.resource->nr_samples > 1 &&
+ info->dst.resource->nr_samples <= 1 &&
+ util_max_layer(info->src.resource, 0) == 0 &&
+ util_max_layer(info->dst.resource, info->dst.level) == 0 &&
+ info->dst.format == info->src.format &&
+ !util_format_is_pure_integer(format) &&
+ !util_format_is_depth_or_stencil(format) &&
+ !info->scissor_enable &&
+ (info->mask & PIPE_MASK_RGBA) == PIPE_MASK_RGBA &&
+ dst_width == info->src.resource->width0 &&
+ dst_height == info->src.resource->height0 &&
+ info->dst.box.x == 0 &&
+ info->dst.box.y == 0 &&
+ info->dst.box.width == dst_width &&
+ info->dst.box.height == dst_height &&
+ info->dst.box.depth == 1 &&
+ info->src.box.x == 0 &&
+ info->src.box.y == 0 &&
+ info->src.box.width == dst_width &&
+ info->src.box.height == dst_height &&
+ info->src.box.depth == 1 &&
+ dst->surface.level[info->dst.level].mode >= RADEON_SURF_MODE_1D &&
+ (!dst->cmask.size || !dst->dirty_level_mask) /* dst cannot be fast-cleared */) {
+ r600_blitter_begin(ctx, R600_COLOR_RESOLVE |
+ (info->render_condition_enable ? 0 : R600_DISABLE_RENDER_COND));
util_blitter_custom_resolve_color(rctx->blitter,
info->dst.resource, info->dst.level,
info->dst.box.z,
info->src.resource, info->src.box.z,
sample_mask, rctx->custom_blend_resolve,
- int_to_norm_format(info->dst.format));
+ format);
r600_blitter_end(ctx);
- return;
+ return true;
}
-
- /* resolve into a temporary texture, then blit */
- templ.target = PIPE_TEXTURE_2D;
- templ.format = info->src.resource->format;
- templ.width0 = info->src.resource->width0;
- templ.height0 = info->src.resource->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 = R600_RESOURCE_FLAG_FORCE_TILING; /* dst must not have a linear layout */
-
- tmp = screen->resource_create(screen, &templ);
-
- /* resolve */
- r600_blitter_begin(ctx, R600_COLOR_RESOLVE);
- util_blitter_custom_resolve_color(rctx->blitter,
- tmp, 0, 0,
- info->src.resource, info->src.box.z,
- sample_mask, rctx->custom_blend_resolve,
- int_to_norm_format(tmp->format));
- r600_blitter_end(ctx);
-
- /* blit */
- blit = *info;
- blit.src.resource = tmp;
- blit.src.box.z = 0;
-
- r600_blitter_begin(ctx, R600_BLIT);
- util_blitter_blit(rctx->blitter, &blit);
- r600_blitter_end(ctx);
-
- pipe_resource_reference(&tmp, NULL);
+ return false;
}
static void r600_blit(struct pipe_context *ctx,
{
struct r600_context *rctx = (struct r600_context*)ctx;
- assert(util_blitter_is_blit_supported(rctx->blitter, info));
-
- if (info->src.resource->nr_samples > 1 &&
- info->dst.resource->nr_samples <= 1 &&
- !util_format_is_depth_or_stencil(info->src.resource->format) &&
- !util_format_is_pure_integer(int_to_norm_format(info->src.resource->format))) {
- r600_msaa_color_resolve(ctx, info);
+ if (do_hardware_msaa_resolve(ctx, info)) {
return;
}
+ assert(util_blitter_is_blit_supported(rctx->blitter, info));
+
/* The driver doesn't decompress resources automatically while
* u_blitter is rendering. */
if (!r600_decompress_subresource(ctx, info->src.resource, info->src.level,
return; /* error */
}
- r600_blitter_begin(ctx, R600_BLIT);
+ if (rctx->screen->b.debug_flags & DBG_FORCE_DMA &&
+ util_try_blit_via_copy_region(ctx, info))
+ return;
+
+ r600_blitter_begin(ctx, R600_BLIT |
+ (info->render_condition_enable ? 0 : R600_DISABLE_RENDER_COND));
util_blitter_blit(rctx->blitter, info);
r600_blitter_end(ctx);
}
if (!rtex->is_depth && rtex->cmask.size) {
r600_blit_decompress_color(ctx, rtex, 0, res->last_level,
- 0, res->array_size - 1);
+ 0, util_max_layer(res, 0));
}
}
projects / mesa.git / blobdiff