freedreno/ir3: debug cleanup

[mesa.git] / src / gallium / drivers / freedreno / freedreno_context.h

diff --git a/src/gallium/drivers/freedreno/freedreno_context.h b/src/gallium/drivers/freedreno/freedreno_context.h
index 2f92b0575c24d5dc15b75e269877390ee5018a9f..12aaba1d4d08ab17f2b5e9ec29249cad4814780d 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_context.h
+++ b/src/gallium/drivers/freedreno/freedreno_context.h
@@ -55,7 +55,7 @@ struct fd_texture_stateobj {
 };
 
 struct fd_program_stateobj {
-       void *vp, *fp;
+       void *vs, *hs, *ds, *gs, *fs;
 };
 
 struct fd_constbuf_stateobj {
@@ -86,6 +86,9 @@ struct fd_vertex_stateobj {
 
 struct fd_streamout_stateobj {
        struct pipe_stream_output_target *targets[PIPE_MAX_SO_BUFFERS];
+       /* Bitmask of stream that should be reset. */
+       unsigned reset;
+
        unsigned num_targets;
        /* Track offset from vtxcnt for streamout data.  This counter
         * is just incremented by # of vertices on each draw until
@@ -212,7 +215,7 @@ struct fd_context {
                uint64_t draw_calls;
                uint64_t batch_total, batch_sysmem, batch_gmem, batch_nondraw, batch_restore;
                uint64_t staging_uploads, shadow_uploads;
-               uint64_t vs_regs, fs_regs;
+               uint64_t vs_regs, hs_regs, ds_regs, gs_regs, fs_regs;
        } stats;
 
        /* Current batch.. the rule here is that you can deref ctx->batch
@@ -327,11 +330,8 @@ struct fd_context {
        /* compute: */
        void (*launch_grid)(struct fd_context *ctx, const struct pipe_grid_info *info);
 
-       /* indirect-branch emit: */
-       void (*emit_ib)(struct fd_ringbuffer *ring, struct fd_ringbuffer *target);
-
        /* query: */
-       struct fd_query * (*create_query)(struct fd_context *ctx, unsigned query_type);
+       struct fd_query * (*create_query)(struct fd_context *ctx, unsigned query_type, unsigned index);
        void (*query_prepare)(struct fd_batch *batch, uint32_t num_tiles);
        void (*query_prepare_tile)(struct fd_batch *batch, uint32_t n,
                        struct fd_ringbuffer *ring);
@@ -340,11 +340,6 @@ struct fd_context {
        /* blitter: */
        bool (*blit)(struct fd_context *ctx, const struct pipe_blit_info *info);
 
-       /* simple gpu "memcpy": */
-       void (*mem_to_mem)(struct fd_ringbuffer *ring, struct pipe_resource *dst,
-                       unsigned dst_off, struct pipe_resource *src, unsigned src_off,
-                       unsigned sizedwords);
-
        /* handling for barriers: */
        void (*framebuffer_barrier)(struct fd_context *ctx);