[Mesa-dev] [PATCH] freedreno/ir3: fix build breaks due to nir changes

[Rob Clark]

oh, I guess I should have checked mesa list first..  but already
pushed fixes for the build breaks before I noticed this..

Btw, you can actually build freedreno on x86 (to at least compile test
it).. hint, hint..

BR,
-R

On Mon, Aug 24, 2015 at 11:43 PM, Jason Ekstrand <jason at jlekstrand.net> wrote:
> For whatever it's worth,
>
> Reviewed-by: Jason Ekstrand <jason.ekstrand at intel.com>
>
> On Mon, Aug 24, 2015 at 8:24 PM, Ilia Mirkin <imirkin at alum.mit.edu> wrote:
>> ---
>>  src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c | 2 +-
>>  src/gallium/drivers/freedreno/ir3/ir3_nir.h          | 1 +
>>  2 files changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
>> index 13c395f..071901a 100644
>> --- a/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
>> +++ b/src/gallium/drivers/freedreno/ir3/ir3_compiler_nir.c
>> @@ -2312,7 +2312,7 @@ emit_instructions(struct ir3_compile *ctx)
>>         ctx->ir = ir3_create(ctx->compiler, ninputs, noutputs);
>>
>>         /* Create inputs in first block: */
>> -       ctx->block = get_block(ctx, fxn->start_block);
>> +       ctx->block = get_block(ctx, nir_start_block(fxn));
>>         ctx->in_block = ctx->block;
>>         list_addtail(&ctx->block->node, &ctx->ir->block_list);
>>
>> diff --git a/src/gallium/drivers/freedreno/ir3/ir3_nir.h b/src/gallium/drivers/freedreno/ir3/ir3_nir.h
>> index f3d3075..ea72726 100644
>> --- a/src/gallium/drivers/freedreno/ir3/ir3_nir.h
>> +++ b/src/gallium/drivers/freedreno/ir3/ir3_nir.h
>> @@ -30,6 +30,7 @@
>>  #define IR3_NIR_H_
>>
>>  #include "glsl/nir/nir.h"
>> +#include "glsl/nir/nir_control_flow.h"
>>
>>  bool ir3_nir_lower_if_else(nir_shader *shader);
>>
>> --
>> 2.4.6
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev