[Mesa-dev] [PATCH] Android: fix build break in libmesa_program

[Rob Herring]

Commit 5fd848f6c9ee ("program: Use _mesa_geometric_samples to calculate
gl_NumSamples") broken Android builds. Add the missing include path to fix
it.

Cc: Neil Roberts 
Signed-off-by: Rob Herring 
---
Another rebase to master, another build break. This has a trivial 
conflict with the previous compiler move patch.

 src/mesa/program/Android.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk
index 6f48543..07c02bc 100644
--- a/src/mesa/program/Android.mk
+++ b/src/mesa/program/Android.mk
@@ -74,6 +74,7 @@ $(intermediates)/program/lex.yy.c: 
$(LOCAL_PATH)/program_lexer.l
 LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/mesa \
+   $(MESA_TOP)/src/mesa/main \
$(MESA_TOP)/src/compiler/nir \
$(MESA_TOP)/src/gallium/auxiliary \
$(MESA_TOP)/src/gallium/include
-- 
2.5.0

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] Android: fix build break in libmesa_program

[Rob Herring]

On Wed, Feb 10, 2016 at 4:33 PM, Ilia Mirkin  wrote:
> I think prog_statevars.c needs to be fixed instead to include
> "main/framebuffer.h". I wonder why that worked in the regular build =/

I was assuming it did work which is why I didn't do that.

Rob

>
> On Wed, Feb 10, 2016 at 5:10 PM, Rob Herring  wrote:
>> Commit 5fd848f6c9ee ("program: Use _mesa_geometric_samples to calculate
>> gl_NumSamples") broken Android builds. Add the missing include path to fix
>> it.
>>
>> Cc: Neil Roberts 
>> Signed-off-by: Rob Herring 
>> ---
>> Another rebase to master, another build break. This has a trivial
>> conflict with the previous compiler move patch.
>>
>>  src/mesa/program/Android.mk | 1 +
>>  1 file changed, 1 insertion(+)
>>
>> diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk
>> index 6f48543..07c02bc 100644
>> --- a/src/mesa/program/Android.mk
>> +++ b/src/mesa/program/Android.mk
>> @@ -74,6 +74,7 @@ $(intermediates)/program/lex.yy.c: 
>> $(LOCAL_PATH)/program_lexer.l
>>  LOCAL_C_INCLUDES := \
>> $(MESA_TOP)/src/mapi \
>> $(MESA_TOP)/src/mesa \
>> +   $(MESA_TOP)/src/mesa/main \
>> $(MESA_TOP)/src/compiler/nir \
>> $(MESA_TOP)/src/gallium/auxiliary \
>> $(MESA_TOP)/src/gallium/include
>> --
>> 2.5.0
>>
>> ___
>> mesa-dev mailing list
>> mesa-dev@lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] Android: fix build break in libmesa_program

[Ilia Mirkin]

I think prog_statevars.c needs to be fixed instead to include
"main/framebuffer.h". I wonder why that worked in the regular build =/

On Wed, Feb 10, 2016 at 5:10 PM, Rob Herring  wrote:
> Commit 5fd848f6c9ee ("program: Use _mesa_geometric_samples to calculate
> gl_NumSamples") broken Android builds. Add the missing include path to fix
> it.
>
> Cc: Neil Roberts 
> Signed-off-by: Rob Herring 
> ---
> Another rebase to master, another build break. This has a trivial
> conflict with the previous compiler move patch.
>
>  src/mesa/program/Android.mk | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk
> index 6f48543..07c02bc 100644
> --- a/src/mesa/program/Android.mk
> +++ b/src/mesa/program/Android.mk
> @@ -74,6 +74,7 @@ $(intermediates)/program/lex.yy.c: 
> $(LOCAL_PATH)/program_lexer.l
>  LOCAL_C_INCLUDES := \
> $(MESA_TOP)/src/mapi \
> $(MESA_TOP)/src/mesa \
> +   $(MESA_TOP)/src/mesa/main \
> $(MESA_TOP)/src/compiler/nir \
> $(MESA_TOP)/src/gallium/auxiliary \
> $(MESA_TOP)/src/gallium/include
> --
> 2.5.0
>
> ___
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

Re: [Mesa-dev] [PATCH] Android: fix build break in libmesa_program

[Ilia Mirkin]

On Wed, Feb 10, 2016 at 5:48 PM, Rob Herring  wrote:
> On Wed, Feb 10, 2016 at 4:33 PM, Ilia Mirkin  wrote:
>> I think prog_statevars.c needs to be fixed instead to include
>> "main/framebuffer.h". I wonder why that worked in the regular build =/
>
> I was assuming it did work which is why I didn't do that.

Well, it's already including main/samplerobj.h, so it makes sense that
it'd include main/framebuffer.h. I think most of these were fixed some
time back, but perhaps that cleanup work wasn't finished? Not sure.

  -ilia
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev