radeonsi: remove DBG_NO_DISCARD_RANGE

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>

diff --git a/src/gallium/drivers/radeon/r600_buffer_common.c b/src/gallium/drivers/radeon/r600_buffer_common.c
index 519e52ecfa3b3bc78149120d57009c13bc85c8fc..f0cfd0979a26ea5782468e2e161386f47b015326 100644 (file)
--- a/src/gallium/drivers/radeon/r600_buffer_common.c
+++ b/src/gallium/drivers/radeon/r600_buffer_common.c
@@ -368,7 +368,6 @@ static void *r600_buffer_transfer_map(struct pipe_context *ctx,
                                       struct pipe_transfer **ptransfer)
 {
        struct r600_common_context *rctx = (struct r600_common_context*)ctx;
-       struct r600_common_screen *rscreen = (struct r600_common_screen*)ctx->screen;
        struct r600_resource *rbuffer = r600_resource(resource);
        uint8_t *data;
 
@@ -436,7 +435,6 @@ static void *r600_buffer_transfer_map(struct pipe_context *ctx,
        }
 
        if ((usage & PIPE_TRANSFER_DISCARD_RANGE) &&
-           !(rscreen->debug_flags & DBG(NO_DISCARD_RANGE)) &&
            ((!(usage & (PIPE_TRANSFER_UNSYNCHRONIZED |
                         PIPE_TRANSFER_PERSISTENT)) &&
              r600_can_dma_copy_buffer(rctx, box->x, 0, box->width)) ||

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
index 06ae95d8f8ebec58d52293febaf07b704610707c..68bde2ad18aaa7892bfb4fe7d72eea1294993294 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.c
+++ b/src/gallium/drivers/radeon/r600_pipe_common.c
@@ -615,8 +615,6 @@ static const struct debug_named_value common_debug_options[] = {
        /* features */
        { "nodma", DBG(NO_ASYNC_DMA), "Disable asynchronous DMA" },
        { "nohyperz", DBG(NO_HYPERZ), "Disable Hyper-Z" },
-       /* GL uses the word INVALIDATE, gallium uses the word DISCARD */
-       { "noinvalrange", DBG(NO_DISCARD_RANGE), "Disable handling of INVALIDATE_RANGE map flags" },
        { "no2d", DBG(NO_2D_TILING), "Disable 2D tiling" },
        { "notiling", DBG(NO_TILING), "Disable tiling" },
        { "switch_on_eop", DBG(SWITCH_ON_EOP), "Program WD/IA to switch on end-of-packet." },

diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index 0ef5a2820261f5d2ed511450cbedf33e7a01af1f..b09acac0dfccf6dad199834a5cb43796e89743f8 100644 (file)
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -101,7 +101,6 @@ enum {
        /* Driver options: */
        DBG_FORCE_DMA,
        DBG_NO_ASYNC_DMA,
-       DBG_NO_DISCARD_RANGE,
        DBG_NO_WC,
        DBG_CHECK_VM,
        DBG_RESERVE_VMID,