freedreno: rename a couple debug flags

dscis -> noscis
dbypass -> nobypass

a bit more consistant w/ nobin, etc.  And IMO a bit more sensible names.

Signed-off-by: Rob Clark <robclark@freedesktop.org>

diff --git a/src/gallium/drivers/freedreno/freedreno_gmem.c b/src/gallium/drivers/freedreno/freedreno_gmem.c
index 7f6c8476cdb1a8614cd477686d4ff02c75449580..392c547c1372d26a6a0922c9c893672d4ae8b12a 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_gmem.c
+++ b/src/gallium/drivers/freedreno/freedreno_gmem.c
@@ -105,7 +105,7 @@ calculate_tiles(struct fd_context *ctx)
                max_width /= 2;
        }
 
-       if (fd_mesa_debug & FD_DBG_DSCIS) {
+       if (fd_mesa_debug & FD_DBG_NOSCIS) {
                minx = 0;
                miny = 0;
                width = pfb->width;
@@ -324,7 +324,7 @@ fd_gmem_render_tiles(struct fd_context *ctx)
                if (ctx->cleared || ctx->gmem_reason || (ctx->num_draws > 5)) {
                        DBG("GMEM: cleared=%x, gmem_reason=%x, num_draws=%u",
                                ctx->cleared, ctx->gmem_reason, ctx->num_draws);
-               } else if (!(fd_mesa_debug & FD_DBG_DBYPASS)) {
+               } else if (!(fd_mesa_debug & FD_DBG_NOBYPASS)) {
                        sysmem = true;
                }
        }

diff --git a/src/gallium/drivers/freedreno/freedreno_screen.c b/src/gallium/drivers/freedreno/freedreno_screen.c
index 7a3cd952ce265913775a6b8e85b4a4879974ca9a..e873af9294370ca6187c0115221de79223124f11 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_screen.c
+++ b/src/gallium/drivers/freedreno/freedreno_screen.c
@@ -61,9 +61,9 @@ static const struct debug_named_value debug_options[] = {
                {"disasm",    FD_DBG_DISASM, "Dump TGSI and adreno shader disassembly"},
                {"dclear",    FD_DBG_DCLEAR, "Mark all state dirty after clear"},
                {"flush",     FD_DBG_FLUSH,  "Force flush after every draw"},
-               {"dscis",     FD_DBG_DSCIS,  "Disable scissor optimization"},
+               {"noscis",    FD_DBG_NOSCIS, "Disable scissor optimization"},
                {"direct",    FD_DBG_DIRECT, "Force inline (SS_DIRECT) state loads"},
-               {"dbypass",   FD_DBG_DBYPASS,"Disable GMEM bypass"},
+               {"nobypass",  FD_DBG_NOBYPASS, "Disable GMEM bypass"},
                {"fraghalf",  FD_DBG_FRAGHALF, "Use half-precision in fragment shader"},
                {"nobin",     FD_DBG_NOBIN,  "Disable hw binning"},
                {"noopt",     FD_DBG_NOOPT , "Disable optimization passes in compiler"},
@@ -352,7 +352,7 @@ fd_screen_get_shader_param(struct pipe_screen *pscreen, unsigned shader,
        case PIPE_SHADER_CAP_MAX_CONTROL_FLOW_DEPTH:
                return 8; /* XXX */
        case PIPE_SHADER_CAP_MAX_INPUTS:
-        case PIPE_SHADER_CAP_MAX_OUTPUTS:
+       case PIPE_SHADER_CAP_MAX_OUTPUTS:
                return 16;
        case PIPE_SHADER_CAP_MAX_TEMPS:
                return 64; /* Max native temporaries. */

diff --git a/src/gallium/drivers/freedreno/freedreno_util.h b/src/gallium/drivers/freedreno/freedreno_util.h
index 36a5995c43ddff5833c4286746c7be0bd340fa14..5508514194e74e972eb11aa96770883dddf91467 100644 (file)
--- a/src/gallium/drivers/freedreno/freedreno_util.h
+++ b/src/gallium/drivers/freedreno/freedreno_util.h
@@ -57,9 +57,9 @@ enum adreno_stencil_op fd_stencil_op(unsigned op);
 #define FD_DBG_DISASM   0x0002
 #define FD_DBG_DCLEAR   0x0004
 #define FD_DBG_FLUSH    0x0008
-#define FD_DBG_DSCIS    0x0010
+#define FD_DBG_NOSCIS   0x0010
 #define FD_DBG_DIRECT   0x0020
-#define FD_DBG_DBYPASS  0x0040
+#define FD_DBG_NOBYPASS 0x0040
 #define FD_DBG_FRAGHALF 0x0080
 #define FD_DBG_NOBIN    0x0100
 #define FD_DBG_NOOPT    0x0200