[Mesa-dev] [PATCH] Fix commit f9caabe8f1bff86d19b53d9ecba5c72b238d9e23

[Albert Freeman]

On 12 September 2015 at 08:39, Kai Wasserbäch
<kai at dev.carbon-project.org> wrote:
> One place in r600_llvm.c was forgotten when replacing
> R600_UCP_CONST_BUFFER with R600_BUFFER_INFO_CONST_BUFFER.
>
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91985
> CC: Dave Airlie <airlied at redhat.com>
> Signed-off-by: Kai Wasserbäch <kai at dev.carbon-project.org>
> ---
>
> Hi,
> this fixes a FTBFS after the commit mentioned above. If you accept this patch,
> please commit it for me, as I do not have commit access.
>
> Cheers,
> Kai
>
>  src/gallium/drivers/r600/r600_llvm.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/gallium/drivers/r600/r600_llvm.c b/src/gallium/drivers/r600/r600_llvm.c
> index 3362fd0..372cd41 100644
> --- a/src/gallium/drivers/r600/r600_llvm.c
> +++ b/src/gallium/drivers/r600/r600_llvm.c
> @@ -22,7 +22,7 @@
>  #if defined R600_USE_LLVM || defined HAVE_OPENCL
>
>  #define CONSTANT_BUFFER_0_ADDR_SPACE 8
> -#define CONSTANT_BUFFER_1_ADDR_SPACE (CONSTANT_BUFFER_0_ADDR_SPACE + R600_UCP_CONST_BUFFER)
> +#define CONSTANT_BUFFER_1_ADDR_SPACE (CONSTANT_BUFFER_0_ADDR_SPACE + R600_BUFFER_INFO_CONST_BUFFER)
>  #define LLVM_R600_BUFFER_INFO_CONST_BUFFER \
>         (CONSTANT_BUFFER_0_ADDR_SPACE + R600_BUFFER_INFO_CONST_BUFFER)
>
> --
> 2.5.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Fixes the build for me.
Tested-by: Albert Freeman <albertwdfreeman at gmail.com>