radeonsi: remove si_apply_scissor_bug_workaround

It only affects pre-SI chips.

Reviewed-by: Marek Olšák <marek.olsak@amd.com>

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index f6ded92dc5b61f75ffc149fab4bd3294899e869e..4508a76876812b1466077d4448ee32da2da446f9 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -880,8 +880,6 @@ void si_init_screen_texture_functions(struct r600_common_screen *rscreen);
 void si_init_context_texture_functions(struct r600_common_context *rctx);
 
 /* r600_viewport.c */
-void si_apply_scissor_bug_workaround(struct r600_common_context *rctx,
-                                    struct pipe_scissor_state *scissor);
 void si_viewport_set_rast_deps(struct r600_common_context *rctx,
                               bool scissor_enable, bool clip_halfz);
 void si_update_vs_writes_viewport_index(struct r600_common_context *rctx,

diff --git a/src/gallium/drivers/radeonsi/si_state_viewport.c b/src/gallium/drivers/radeonsi/si_state_viewport.c
index 00fa4c0d0264808cbfff12ac563afee830a12587..54f31c4694dd7f8c1c767559ad8b178cd274d45e 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state_viewport.c
+++ b/src/gallium/drivers/radeonsi/si_state_viewport.c
@@ -115,21 +115,6 @@ static void r600_scissor_make_union(struct r600_signed_scissor *out,
        out->maxy = MAX2(out->maxy, in->maxy);
 }
 
-void si_apply_scissor_bug_workaround(struct r600_common_context *rctx,
-                                    struct pipe_scissor_state *scissor)
-{
-       if (rctx->chip_class == EVERGREEN || rctx->chip_class == CAYMAN) {
-               if (scissor->maxx == 0)
-                       scissor->minx = 1;
-               if (scissor->maxy == 0)
-                       scissor->miny = 1;
-
-               if (rctx->chip_class == CAYMAN &&
-                   scissor->maxx == 1 && scissor->maxy == 1)
-                       scissor->maxx = 2;
-       }
-}
-
 static void r600_emit_one_scissor(struct r600_common_context *rctx,
                                  struct radeon_winsys_cs *cs,
                                  struct r600_signed_scissor *vp_scissor,
@@ -147,8 +132,6 @@ static void r600_emit_one_scissor(struct r600_common_context *rctx,
        if (scissor)
                r600_clip_scissor(&final, scissor);
 
-       si_apply_scissor_bug_workaround(rctx, &final);
-
        radeon_emit(cs, S_028250_TL_X(final.minx) |
                        S_028250_TL_Y(final.miny) |
                        S_028250_WINDOW_OFFSET_DISABLE(1));