[Mesa-dev] [PATCH] gallium/radeon: fix r600g build if LLVM is disabled

Edward O'Callaghan edward.ocallaghan at koparo.com
Sun Aug 9 16:48:20 PDT 2015


LGTM

Reviewed-by: Edward O'Callaghan <eocallaghan at alterapraxis.com>

-- 
  Edward O'Callaghan
  edward.ocallaghan at koparo.com

On Sat, Aug 8, 2015, at 10:05 PM, Marek Olšák wrote:
> From: Marek Olšák <marek.olsak at amd.com>
> 
> MESA_LLVM_VERSION_PATCH is undefined.
> ---
>  src/gallium/drivers/radeon/r600_pipe_common.c | 9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c
> b/src/gallium/drivers/radeon/r600_pipe_common.c
> index d6b9a01..e50e768 100644
> --- a/src/gallium/drivers/radeon/r600_pipe_common.c
> +++ b/src/gallium/drivers/radeon/r600_pipe_common.c
> @@ -891,10 +891,11 @@ bool r600_common_screen_init(struct
> r600_common_screen *rscreen,
>  
>  	ws->query_info(ws, &rscreen->info);
>  
> -       if (HAVE_LLVM)
> -               snprintf(llvm_string, sizeof(llvm_string),
> -                        ", LLVM %i.%i.%i", (HAVE_LLVM >> 8) & 0xff,
> -                        HAVE_LLVM & 0xff, MESA_LLVM_VERSION_PATCH);
> +#if HAVE_LLVM
> +       snprintf(llvm_string, sizeof(llvm_string),
> +                ", LLVM %i.%i.%i", (HAVE_LLVM >> 8) & 0xff,
> +                HAVE_LLVM & 0xff, MESA_LLVM_VERSION_PATCH);
> +#endif
>  
>  	snprintf(rscreen->renderer_string, sizeof(rscreen->renderer_string),
>  		 "%s (DRM %i.%i.%i%s)",
> -- 
> 2.1.4
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list