freedreno/a6xx: cleanup magic registers

[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 c35b0d9f4a1ab2be48b611edac9364b7b984d0d3..059de2ec8c612dcf9f1165bd4adc834f3b5a73a7 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_draw.c
+++ b/src/gallium/drivers/freedreno/freedreno_draw.c
@@ -32,6 +32,7 @@
 #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"
@@ -63,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
@@ -80,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;
@@ -99,7 +93,7 @@ fd_draw_vbo(struct pipe_context *pctx, const struct pipe_draw_info *info)
                return;
        }
 
-       fd_fence_ref(pctx->screen, &ctx->last_fence, NULL);
+       fd_fence_ref(&ctx->last_fence, NULL);
 
        /* Upload a user index buffer. */
        struct pipe_resource *indexbuf = NULL;
@@ -303,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)
@@ -387,7 +311,7 @@ fd_clear(struct pipe_context *pctx, unsigned buffers,
        if (!fd_render_condition_check(pctx))
                return;
 
-       fd_fence_ref(pctx->screen, &ctx->last_fence, NULL);
+       fd_fence_ref(&ctx->last_fence, NULL);
 
        if (ctx->in_blit) {
                fd_batch_reset(batch);
@@ -410,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;
@@ -533,7 +457,7 @@ 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);