X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fdrivers%2Ffreedreno%2Ffreedreno_draw.c;h=059de2ec8c612dcf9f1165bd4adc834f3b5a73a7;hb=4b82d1bbb723e77f278d9348e8437cf12811e0ca;hp=5f9706c0b6e9b8a3f477717c29e82c8d25c4bf15;hpb=ec717fc629ca4e34a2b934f2b4d02217a4249080;p=mesa.git diff --git a/src/gallium/drivers/freedreno/freedreno_draw.c b/src/gallium/drivers/freedreno/freedreno_draw.c index 5f9706c0b6e..059de2ec8c6 100644 --- a/src/gallium/drivers/freedreno/freedreno_draw.c +++ b/src/gallium/drivers/freedreno/freedreno_draw.c @@ -32,8 +32,10 @@ #include "util/u_format.h" #include "util/u_helpers.h" +#include "freedreno_blitter.h" #include "freedreno_draw.h" #include "freedreno_context.h" +#include "freedreno_fence.h" #include "freedreno_state.h" #include "freedreno_resource.h" #include "freedreno_query_acc.h" @@ -62,7 +64,6 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) struct fd_context *ctx = fd_context(pctx); struct fd_batch *batch = fd_context_batch(ctx); struct pipe_framebuffer_state *pfb = &batch->framebuffer; - struct pipe_scissor_state *scissor = fd_context_get_scissor(ctx); unsigned i, prims, buffers = 0, restore_buffers = 0; /* for debugging problems with indirect draw, it is convenient @@ -79,12 +80,6 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) !u_trim_pipe_prim(info->mode, (unsigned*)&info->count)) return; - /* if we supported transform feedback, we'd have to disable this: */ - if (((scissor->maxx - scissor->minx) * - (scissor->maxy - scissor->miny)) == 0) { - return; - } - /* TODO: push down the region versions into the tiles */ if (!fd_render_condition_check(pctx)) return; @@ -98,6 +93,8 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) return; } + fd_fence_ref(&ctx->last_fence, NULL); + /* Upload a user index buffer. */ struct pipe_resource *indexbuf = NULL; unsigned index_offset = 0; @@ -134,16 +131,20 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) mtx_lock(&ctx->screen->lock); - if (ctx->dirty & FD_DIRTY_FRAMEBUFFER) { + if (ctx->dirty & (FD_DIRTY_FRAMEBUFFER | FD_DIRTY_ZSA)) { if (fd_depth_enabled(ctx)) { if (fd_resource(pfb->zsbuf->texture)->valid) { restore_buffers |= FD_BUFFER_DEPTH; } else { batch->invalidated |= FD_BUFFER_DEPTH; } - buffers |= FD_BUFFER_DEPTH; - resource_written(batch, pfb->zsbuf->texture); batch->gmem_reason |= FD_GMEM_DEPTH_ENABLED; + if (fd_depth_write_enabled(ctx)) { + buffers |= FD_BUFFER_DEPTH; + resource_written(batch, pfb->zsbuf->texture); + } else { + resource_read(batch, pfb->zsbuf->texture); + } } if (fd_stencil_enabled(ctx)) { @@ -152,16 +153,9 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) } else { batch->invalidated |= FD_BUFFER_STENCIL; } + batch->gmem_reason |= FD_GMEM_STENCIL_ENABLED; buffers |= FD_BUFFER_STENCIL; resource_written(batch, pfb->zsbuf->texture); - batch->gmem_reason |= FD_GMEM_STENCIL_ENABLED; - } - - for (i = 0; i < pfb->nr_cbufs; i++) { - if (!pfb->cbufs[i]) - continue; - - resource_written(batch, pfb->cbufs[i]->texture); } } @@ -186,6 +180,9 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) if (fd_blend_enabled(ctx, i)) batch->gmem_reason |= FD_GMEM_BLEND_ENABLED; + + if (ctx->dirty & FD_DIRTY_FRAMEBUFFER) + resource_written(batch, pfb->cbufs[i]->texture); } /* Mark SSBOs as being written.. we don't actually know which ones are @@ -286,6 +283,8 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) if (ctx->draw_vbo(ctx, info, index_offset)) batch->needs_flush = true; + batch->num_vertices += info->count * info->instance_count; + for (i = 0; i < ctx->streamout.num_targets; i++) ctx->streamout.offsets[i] += info->count; @@ -298,76 +297,6 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info) pipe_resource_reference(&indexbuf, NULL); } -/* Generic clear implementation (partially) using u_blitter: */ -static void -fd_blitter_clear(struct pipe_context *pctx, unsigned buffers, - const union pipe_color_union *color, double depth, unsigned stencil) -{ - struct fd_context *ctx = fd_context(pctx); - struct pipe_framebuffer_state *pfb = &ctx->batch->framebuffer; - struct blitter_context *blitter = ctx->blitter; - - fd_blitter_pipe_begin(ctx, false, true, FD_STAGE_CLEAR); - - util_blitter_common_clear_setup(blitter, pfb->width, pfb->height, - buffers, NULL, NULL); - - struct pipe_stencil_ref sr = { - .ref_value = { stencil & 0xff } - }; - pctx->set_stencil_ref(pctx, &sr); - - struct pipe_constant_buffer cb = { - .buffer_size = 16, - .user_buffer = &color->ui, - }; - pctx->set_constant_buffer(pctx, PIPE_SHADER_FRAGMENT, 0, &cb); - - if (!ctx->clear_rs_state) { - const struct pipe_rasterizer_state tmpl = { - .cull_face = PIPE_FACE_NONE, - .half_pixel_center = 1, - .bottom_edge_rule = 1, - .flatshade = 1, - .depth_clip_near = 1, - .depth_clip_far = 1, - }; - ctx->clear_rs_state = pctx->create_rasterizer_state(pctx, &tmpl); - } - pctx->bind_rasterizer_state(pctx, ctx->clear_rs_state); - - struct pipe_viewport_state vp = { - .scale = { 0.5f * pfb->width, -0.5f * pfb->height, depth }, - .translate = { 0.5f * pfb->width, 0.5f * pfb->height, 0.0f }, - }; - pctx->set_viewport_states(pctx, 0, 1, &vp); - - pctx->bind_vertex_elements_state(pctx, ctx->solid_vbuf_state.vtx); - pctx->set_vertex_buffers(pctx, blitter->vb_slot, 1, - &ctx->solid_vbuf_state.vertexbuf.vb[0]); - pctx->set_stream_output_targets(pctx, 0, NULL, NULL); - pctx->bind_vs_state(pctx, ctx->solid_prog.vp); - pctx->bind_fs_state(pctx, ctx->solid_prog.fp); - - struct pipe_draw_info info = { - .mode = PIPE_PRIM_MAX, /* maps to DI_PT_RECTLIST */ - .count = 2, - .max_index = 1, - .instance_count = 1, - }; - ctx->draw_vbo(ctx, &info, 0); - - util_blitter_restore_constant_buffer_state(blitter); - util_blitter_restore_vertex_states(blitter); - util_blitter_restore_fragment_states(blitter); - util_blitter_restore_textures(blitter); - util_blitter_restore_fb_state(blitter); - util_blitter_restore_render_cond(blitter); - util_blitter_unset_running_flag(blitter); - - fd_blitter_pipe_end(ctx); -} - static void fd_clear(struct pipe_context *pctx, unsigned buffers, const union pipe_color_union *color, double depth, unsigned stencil) @@ -382,6 +311,8 @@ fd_clear(struct pipe_context *pctx, unsigned buffers, if (!fd_render_condition_check(pctx)) return; + fd_fence_ref(&ctx->last_fence, NULL); + if (ctx->in_blit) { fd_batch_reset(batch); fd_context_all_dirty(ctx); @@ -403,7 +334,7 @@ fd_clear(struct pipe_context *pctx, unsigned buffers, * the depth buffer, etc) */ cleared_buffers = buffers & (FD_BUFFER_ALL & ~batch->restore); - batch->cleared |= cleared_buffers; + batch->cleared |= buffers; batch->invalidated |= cleared_buffers; batch->resolve |= buffers; @@ -485,6 +416,7 @@ fd_launch_grid(struct pipe_context *pctx, const struct pipe_grid_info *info) batch = fd_bc_alloc_batch(&ctx->screen->batch_cache, ctx, true); fd_batch_reference(&save_batch, ctx->batch); fd_batch_reference(&ctx->batch, batch); + fd_context_all_dirty(ctx); mtx_lock(&ctx->screen->lock); @@ -525,9 +457,10 @@ fd_launch_grid(struct pipe_context *pctx, const struct pipe_grid_info *info) batch->needs_flush = true; ctx->launch_grid(ctx, info); - fd_batch_flush(batch, false, false); + fd_batch_flush(batch, false); fd_batch_reference(&ctx->batch, save_batch); + fd_context_all_dirty(ctx); fd_batch_reference(&save_batch, NULL); fd_batch_reference(&batch, NULL); }