freedreno/a3xx/compiler: refactor trans_samp()

[mesa.git] / src / gallium / drivers / freedreno / freedreno_draw.c

diff --git a/src/gallium/drivers/freedreno/freedreno_draw.c b/src/gallium/drivers/freedreno/freedreno_draw.c
index 0069438c87da5c8bd5433661cd5aa18958136e5d..e3c8cc8e5a0c89b79ca64a06599fcffd5b2a7dcd 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_draw.c
+++ b/src/gallium/drivers/freedreno/freedreno_draw.c
@@ -36,6 +36,7 @@
 #include "freedreno_context.h"
 #include "freedreno_state.h"
 #include "freedreno_resource.h"
+#include "freedreno_query_hw.h"
 #include "freedreno_util.h"
 
 
@@ -54,7 +55,9 @@ size2indextype(unsigned index_size)
 
 /* this is same for a2xx/a3xx, so split into helper: */
 void
-fd_draw_emit(struct fd_context *ctx, const struct pipe_draw_info *info)
+fd_draw_emit(struct fd_context *ctx, struct fd_ringbuffer *ring,
+               enum pc_di_vis_cull_mode vismode,
+               const struct pipe_draw_info *info)
 {
        struct pipe_index_buffer *idx = &ctx->indexbuf;
        struct fd_bo *idx_bo = NULL;
@@ -68,7 +71,7 @@ fd_draw_emit(struct fd_context *ctx, const struct pipe_draw_info *info)
                idx_bo = fd_resource(idx->buffer)->bo;
                idx_type = size2indextype(idx->index_size);
                idx_size = idx->index_size * info->count;
-               idx_offset = idx->offset;
+               idx_offset = idx->offset + (info->start * idx->index_size);
                src_sel = DI_SRC_SEL_DMA;
        } else {
                idx_bo = NULL;
@@ -78,8 +81,8 @@ fd_draw_emit(struct fd_context *ctx, const struct pipe_draw_info *info)
                src_sel = DI_SRC_SEL_AUTO_INDEX;
        }
 
-       fd_draw(ctx, ctx->primtypes[info->mode], src_sel, info->count,
-                       idx_type, idx_size, idx_offset, idx_bo);
+       fd_draw(ctx, ring, ctx->primtypes[info->mode], vismode, src_sel,
+                       info->count, idx_type, idx_size, idx_offset, idx_bo);
 }
 
 static void
@@ -126,7 +129,12 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info)
                ctx->gmem_reason |= FD_GMEM_LOGICOP_ENABLED;
 
        for (i = 0; i < pfb->nr_cbufs; i++) {
-               struct pipe_resource *surf = pfb->cbufs[i]->texture;
+               struct pipe_resource *surf;
+
+               if (!pfb->cbufs[i])
+                       continue;
+
+               surf = pfb->cbufs[i]->texture;
 
                fd_resource(surf)->dirty = true;
                buffers |= FD_BUFFER_COLOR;
@@ -140,11 +148,16 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info)
 
        ctx->num_draws++;
 
+       ctx->stats.draw_calls++;
+       ctx->stats.prims_emitted +=
+               u_reduced_prims_for_vertices(info->mode, info->count);
+
        /* any buffers that haven't been cleared, we need to restore: */
        ctx->restore |= buffers & (FD_BUFFER_ALL & ~ctx->cleared);
        /* and any buffers used, need to be resolved: */
        ctx->resolve |= buffers;
 
+       fd_hw_query_set_stage(ctx, ctx->ring, FD_STAGE_DRAW);
        ctx->draw(ctx, info);
 }
 
@@ -177,9 +190,12 @@ fd_clear(struct pipe_context *pctx, unsigned buffers,
                util_format_short_name(pipe_surface_format(pfb->cbufs[0])),
                util_format_short_name(pipe_surface_format(pfb->zsbuf)));
 
+       fd_hw_query_set_stage(ctx, ctx->ring, FD_STAGE_CLEAR);
+
        ctx->clear(ctx, buffers, color, depth, stencil);
 
        ctx->dirty |= FD_DIRTY_ZSA |
+                       FD_DIRTY_VIEWPORT |
                        FD_DIRTY_RASTERIZER |
                        FD_DIRTY_SAMPLE_MASK |
                        FD_DIRTY_PROG |