[Mesa-dev] [PATCH] radeonsi, r600g: Rename 'R600_DEBUG' -> 'RADEON_DEBUG'

[Marek Olšák]

I don't think this patch is necessary. I don't mind people getting
confused by the name.

Marek

On Mon, Feb 20, 2017 at 9:42 AM, Edward O'Callaghan
<funfunctor at folklore1984.net> wrote:
> The name has become a little misleading now that it applies
> to both r600g and radeonsi.
>
> Signed-off-by: Edward O'Callaghan <funfunctor at folklore1984.net>
> ---
>  src/gallium/drivers/r600/r600_pipe.c                   | 2 +-
>  src/gallium/drivers/radeon/r600_pipe_common.c          | 2 +-
>  src/gallium/drivers/radeonsi/glsl_tests/amdgcn_glslc.c | 2 +-
>  src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c          | 2 +-
>  src/gallium/winsys/radeon/drm/radeon_drm_winsys.c      | 2 +-
>  5 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
> index 1803c26..8c2b7ef 100644
> --- a/src/gallium/drivers/r600/r600_pipe.c
> +++ b/src/gallium/drivers/r600/r600_pipe.c
> @@ -640,7 +640,7 @@ struct pipe_screen *r600_screen_create(struct radeon_winsys *ws)
>                 rscreen->b.b.is_format_supported = r600_is_format_supported;
>         }
>
> -       rscreen->b.debug_flags |= debug_get_flags_option("R600_DEBUG", r600_debug_options, 0);
> +       rscreen->b.debug_flags |= debug_get_flags_option("RADEON_DEBUG", r600_debug_options, 0);
>         if (debug_get_bool_option("R600_DEBUG_COMPUTE", FALSE))
>                 rscreen->b.debug_flags |= DBG_COMPUTE;
>         if (debug_get_bool_option("R600_DUMP_SHADERS", FALSE))
> diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c
> index 1781584..9124ec2 100644
> --- a/src/gallium/drivers/radeon/r600_pipe_common.c
> +++ b/src/gallium/drivers/radeon/r600_pipe_common.c
> @@ -1257,7 +1257,7 @@ bool r600_common_screen_init(struct r600_common_screen *rscreen,
>         rscreen->ws = ws;
>         rscreen->family = rscreen->info.family;
>         rscreen->chip_class = rscreen->info.chip_class;
> -       rscreen->debug_flags = debug_get_flags_option("R600_DEBUG", common_debug_options, 0);
> +       rscreen->debug_flags = debug_get_flags_option("RADEON_DEBUG", common_debug_options, 0);
>
>         slab_create_parent(&rscreen->pool_transfers, sizeof(struct r600_transfer), 64);
>
> diff --git a/src/gallium/drivers/radeonsi/glsl_tests/amdgcn_glslc.c b/src/gallium/drivers/radeonsi/glsl_tests/amdgcn_glslc.c
> index 3f52188..5eef8fb 100644
> --- a/src/gallium/drivers/radeonsi/glsl_tests/amdgcn_glslc.c
> +++ b/src/gallium/drivers/radeonsi/glsl_tests/amdgcn_glslc.c
> @@ -206,7 +206,7 @@ main(int argc, char **argv)
>          return 1;
>      }
>
> -    addenv("R600_DEBUG", "precompile,vs,tcs,tes,gs,ps,cs,noir,notgsi");
> +    addenv("RADEON_DEBUG", "precompile,vs,tcs,tes,gs,ps,cs,noir,notgsi");
>
>      create_gl_core_context();
>
> diff --git a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
> index 6511c48..f039843 100644
> --- a/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
> +++ b/src/gallium/winsys/amdgpu/drm/amdgpu_winsys.c
> @@ -370,7 +370,7 @@ static bool do_winsys_init(struct amdgpu_winsys *ws, int fd)
>     if (ws->info.chip_class == SI)
>        ws->info.gfx_ib_pad_with_type2 = TRUE;
>
> -   ws->check_vm = strstr(debug_get_option("R600_DEBUG", ""), "check_vm") != NULL;
> +   ws->check_vm = strstr(debug_get_option("RADEON_DEBUG", ""), "check_vm") != NULL;
>
>     return true;
>
> diff --git a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
> index a39a7be..24611ed 100644
> --- a/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
> +++ b/src/gallium/winsys/radeon/drm/radeon_drm_winsys.c
> @@ -526,7 +526,7 @@ static bool do_winsys_init(struct radeon_drm_winsys *ws)
>                                       ws->accel_working2 < 3);
>      ws->info.tcc_cache_line_size = 64; /* TC L2 line size on GCN */
>
> -    ws->check_vm = strstr(debug_get_option("R600_DEBUG", ""), "check_vm") != NULL;
> +    ws->check_vm = strstr(debug_get_option("RADEON_DEBUG", ""), "check_vm") != NULL;
>
>      return true;
>  }
> --
> 2.9.3
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev