[RFC][PATCH 0/3] mesa: Initial build fixups for AOSP/master

[RFC][PATCH 0/3] mesa: Initial build fixups for AOSP/master

[John Stultz]

Somewhat recent changes in the AOSP build system has been made
which fairly severely restricts the build environment. This has
made it difficult to test mesa/master w/ AOSP/master.

I'm working with others to try to remedy this, but as a first
step I used some hacks to temporarily remove the build environment
restrictions, and unsuprizingly found mesa/master has a few
build issues when trying to build w/ freedreno.

So this patch set provides only some very basic build fixes
that are needed to get mesa/master building w/ AOSP/master
(minus the build restrictions on external tools).

Feedback would be greatly appreciated!

thanks
-john

Cc: Rob Clark <robdclark@chromium.org>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Cc: Amit Pundir <amit.pundir@linaro.org>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Alistair Strachan <astrachan@google.com>
Cc: Greg Hartman <ghartman@google.com>
Cc: Tapani Pälli <tapani.palli@intel.com>
Cc: Jason Ekstrand <jason@jlekstrand.net>

Alistair Strachan (1):
  mesa: android: Remove unnecessary dependency tracking rules

Amit Pundir (1):
  mesa: android: freedreno: build libfreedreno_{drm,ir3} static libs

John Stultz (1):
  mesa: android: freedreno: Fix build failure due to path change

 Android.mk                                   |  1 +
 src/compiler/Android.glsl.gen.mk             |  2 -
 src/compiler/Android.nir.gen.mk              |  2 -
 src/freedreno/Android.drm.mk                 | 41 ++++++++++++++++
 src/freedreno/Android.ir3.mk                 | 51 ++++++++++++++++++++
 src/freedreno/Android.mk                     | 30 ++++++++++++
 src/freedreno/Makefile.sources               |  2 +
 src/gallium/Android.common.mk                |  5 +-
 src/gallium/drivers/freedreno/Android.gen.mk |  2 +-
 src/gallium/drivers/freedreno/Android.mk     |  2 +-
 src/gallium/targets/dri/Android.mk           |  4 ++
 11 files changed, 135 insertions(+), 7 deletions(-)
 create mode 100644 src/freedreno/Android.drm.mk
 create mode 100644 src/freedreno/Android.ir3.mk
 create mode 100644 src/freedreno/Android.mk

-- 
2.17.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[RFC][PATCH 1/3] mesa: android: Remove unnecessary dependency tracking rules

[John Stultz]

From: Alistair Strachan <astrachan@google.com>

The current AOSP master build system breaks building mesa due to the
following error:

external/mesa3d/src/compiler/Android.glsl.gen.mk:94: error:
  writing to readonly directory: "external/mesa3d/src/compiler/glsl/ir.h"

This error is bogus -- nothing "writes" to ir.h -- but the rule is
unnecessary because the generated header that is a dependency of the
non-generated header should be added to LOCAL_GENERATED_SOURCES and this
will track if the dependency needs to be regenerated.

(This change fixes a similar problem affecting nir.h too.)

Cc: Rob Clark <robdclark@chromium.org>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Cc: Amit Pundir <amit.pundir@linaro.org>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Alistair Strachan <astrachan@google.com>
Cc: Greg Hartman <ghartman@google.com>
Cc: Tapani Pälli <tapani.palli@intel.com>
Cc: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Alistair Strachan <astrachan@google.com>
[jstultz: Forward ported and tweaked commit subject]
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
 src/compiler/Android.glsl.gen.mk | 2 --
 src/compiler/Android.nir.gen.mk  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/compiler/Android.glsl.gen.mk b/src/compiler/Android.glsl.gen.mk
index 3b94ea7bd2f..1308de2db97 100644
--- a/src/compiler/Android.glsl.gen.mk
+++ b/src/compiler/Android.glsl.gen.mk
@@ -90,8 +90,6 @@ $(intermediates)/glsl/glcpp/glcpp-lex.c: $(LOCAL_PATH)/glsl/glcpp/glcpp-lex.l
 $(intermediates)/glsl/glcpp/glcpp-parse.c: $(LOCAL_PATH)/glsl/glcpp/glcpp-parse.y
 	$(call glsl_local-y-to-c-and-h)
 
-$(LOCAL_PATH)/glsl/ir.h: $(intermediates)/glsl/ir_expression_operation.h
-
 $(intermediates)/glsl/ir_expression_operation.h: $(LOCAL_PATH)/glsl/ir_expression_operation.py
 	@mkdir -p $(dir $@)
 	$(hide) $(MESA_PYTHON2) $< enum > $@
diff --git a/src/compiler/Android.nir.gen.mk b/src/compiler/Android.nir.gen.mk
index 894fb12c4be..26115f446a3 100644
--- a/src/compiler/Android.nir.gen.mk
+++ b/src/compiler/Android.nir.gen.mk
@@ -76,8 +76,6 @@ $(intermediates)/nir/nir_opcodes.h: $(nir_opcodes_h_deps)
 	@mkdir -p $(dir $@)
 	$(hide) $(MESA_PYTHON2) $(nir_opcodes_h_gen) $< > $@
 
-$(LOCAL_PATH)/nir/nir.h: $(intermediates)/nir/nir_opcodes.h
-
 nir_opcodes_c_gen := $(LOCAL_PATH)/nir/nir_opcodes_c.py
 nir_opcodes_c_deps := \
 	$(LOCAL_PATH)/nir/nir_opcodes.py \
-- 
2.17.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[RFC][PATCH 2/3] mesa: android: freedreno: build libfreedreno_{drm, ir3} static libs

[John Stultz]

From: Amit Pundir <amit.pundir@linaro.org>

Add libfreedreno_drm/ir3 to the build

Cc: Rob Clark <robdclark@chromium.org>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Cc: Amit Pundir <amit.pundir@linaro.org>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Alistair Strachan <astrachan@google.com>
Cc: Greg Hartman <ghartman@google.com>
Cc: Tapani Pälli <tapani.palli@intel.com>
Cc: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
[jstultz: Tweaked to add extra ir3 files from master]
Signed-off-by: John Stultz <john.stultz@lianro.org>
---
 Android.mk                               |  1 +
 src/freedreno/Android.drm.mk             | 41 +++++++++++++++++++
 src/freedreno/Android.ir3.mk             | 51 ++++++++++++++++++++++++
 src/freedreno/Android.mk                 | 30 ++++++++++++++
 src/freedreno/Makefile.sources           |  2 +
 src/gallium/Android.common.mk            |  5 ++-
 src/gallium/drivers/freedreno/Android.mk |  2 +-
 src/gallium/targets/dri/Android.mk       |  4 ++
 8 files changed, 134 insertions(+), 2 deletions(-)
 create mode 100644 src/freedreno/Android.drm.mk
 create mode 100644 src/freedreno/Android.ir3.mk
 create mode 100644 src/freedreno/Android.mk

diff --git a/Android.mk b/Android.mk
index d2b12ea4473..5fe028c6d19 100644
--- a/Android.mk
+++ b/Android.mk
@@ -110,6 +110,7 @@ endef
 
 # add subdirectories
 SUBDIRS := \
+	src/freedreno \
 	src/gbm \
 	src/loader \
 	src/mapi \
diff --git a/src/freedreno/Android.drm.mk b/src/freedreno/Android.drm.mk
new file mode 100644
index 00000000000..dfa9bed7d2e
--- /dev/null
+++ b/src/freedreno/Android.drm.mk
@@ -0,0 +1,41 @@
+# Mesa 3-D graphics library
+#
+# Copyright (C)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+# Android.mk for libfreedreno_drm.a
+
+# ---------------------------------------
+# Build libfreedreno_drm
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+	$(drm_SOURCES)
+
+LOCAL_C_INCLUDES := \
+	$(MESA_TOP)/src/gallium/include \
+	$(MESA_TOP)/src/gallium/auxiliary
+
+LOCAL_MODULE := libfreedreno_drm
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/src/freedreno/Android.ir3.mk b/src/freedreno/Android.ir3.mk
new file mode 100644
index 00000000000..c6a9d3288d7
--- /dev/null
+++ b/src/freedreno/Android.ir3.mk
@@ -0,0 +1,51 @@
+# Mesa 3-D graphics library
+#
+# Copyright (C)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+# Android.mk for libfreedreno_ir3.a
+
+# ---------------------------------------
+# Build libfreedreno_ir3
+# ---------------------------------------
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := \
+	$(ir3_SOURCES)
+
+LOCAL_C_INCLUDES := \
+	$(MESA_TOP)/src/compiler/nir \
+	$(MESA_TOP)/src/gallium/include \
+	$(MESA_TOP)/src/gallium/auxiliary \
+	$(MESA_TOP)/prebuilt-intermediates/nir \
+
+# We need libmesa_nir to get NIR's generated include directories.
+LOCAL_STATIC_LIBRARIES := \
+	libmesa_nir
+
+LOCAL_MODULE := libfreedreno_ir3
+
+LOCAL_GENERATED_SOURCES := \
+	$(MESA_GEN_GLSL_H) \
+	$(MESA_GEN_NIR_H)
+
+include $(MESA_COMMON_MK)
+include $(BUILD_STATIC_LIBRARY)
diff --git a/src/freedreno/Android.mk b/src/freedreno/Android.mk
new file mode 100644
index 00000000000..e46e2199dc1
--- /dev/null
+++ b/src/freedreno/Android.mk
@@ -0,0 +1,30 @@
+# Mesa 3-D graphics library
+#
+# Copyright (C)
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+
+# Android.mk for libfreedreno_*
+
+LOCAL_PATH := $(call my-dir)
+
+include $(LOCAL_PATH)/Makefile.sources
+include $(MESA_TOP)/src/gallium/drivers/freedreno/Android.gen.mk
+include $(LOCAL_PATH)/Android.drm.mk
+include $(LOCAL_PATH)/Android.ir3.mk
diff --git a/src/freedreno/Makefile.sources b/src/freedreno/Makefile.sources
index aa8edec82f2..a46a2c30913 100644
--- a/src/freedreno/Makefile.sources
+++ b/src/freedreno/Makefile.sources
@@ -36,6 +36,8 @@ ir3_SOURCES := \
 	ir3/ir3_nir.c \
 	ir3/ir3_nir.h \
 	ir3/ir3_nir_analyze_ubo_ranges.c \
+	ir3/ir3_nir_lower_load_barycentric_at_sample.c \
+	ir3/ir3_nir_lower_load_barycentric_at_offset.c \
 	ir3/ir3_nir_lower_io_offsets.c \
 	ir3/ir3_nir_lower_tg4_to_tex.c \
 	ir3/ir3_nir_move_varying_inputs.c \
diff --git a/src/gallium/Android.common.mk b/src/gallium/Android.common.mk
index 782510ff0f4..0d55f04ac94 100644
--- a/src/gallium/Android.common.mk
+++ b/src/gallium/Android.common.mk
@@ -27,6 +27,9 @@ LOCAL_C_INCLUDES += \
 	$(GALLIUM_TOP)/include \
 	$(GALLIUM_TOP)/auxiliary \
 	$(GALLIUM_TOP)/winsys \
-	$(GALLIUM_TOP)/drivers
+	$(GALLIUM_TOP)/drivers \
+	$(MESA_TOP)/src/freedreno \
+	$(MESA_TOP)/src/freedreno/ir3 \
+	$(MESA_TOP)/src/freedreno/registers
 
 include $(MESA_COMMON_MK)
diff --git a/src/gallium/drivers/freedreno/Android.mk b/src/gallium/drivers/freedreno/Android.mk
index ccd88a7d16c..f0ae361cd6a 100644
--- a/src/gallium/drivers/freedreno/Android.mk
+++ b/src/gallium/drivers/freedreno/Android.mk
@@ -44,7 +44,7 @@ LOCAL_C_INCLUDES := \
 LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H)
 
 LOCAL_SHARED_LIBRARIES := libdrm
-LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_nir
+LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_nir libfreedreno_drm libfreedreno_ir3
 LOCAL_MODULE := libmesa_pipe_freedreno
 
 include $(LOCAL_PATH)/Android.gen.mk
diff --git a/src/gallium/targets/dri/Android.mk b/src/gallium/targets/dri/Android.mk
index 6134251b5ca..10b27a80ef3 100644
--- a/src/gallium/targets/dri/Android.mk
+++ b/src/gallium/targets/dri/Android.mk
@@ -53,6 +53,10 @@ LOCAL_SHARED_LIBRARIES += \
 	libexpat
 endif
 
+LOCAL_STATIC_LIBRARIES += \
+	libfreedreno_drm \
+	libfreedreno_ir3
+
 ifeq ($(USE_LIBBACKTRACE),true)
 	LOCAL_SHARED_LIBRARIES += libbacktrace
 endif
-- 
2.17.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH 3/3] mesa: android: freedreno: Fix build failure due to path change

[John Stultz]

The ir3_nir_trig.py file was moved in a previous commit,
aa0fed10d3574 (freedreno: move ir3 to common location),
so update the Android.gen.mk file to match.

Cc: Rob Clark <robdclark@chromium.org>
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Cc: Amit Pundir <amit.pundir@linaro.org>
Cc: Sumit Semwal <sumit.semwal@linaro.org>
Cc: Alistair Strachan <astrachan@google.com>
Cc: Greg Hartman <ghartman@google.com>
Cc: Tapani Pälli <tapani.palli@intel.com>
Cc: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
 src/gallium/drivers/freedreno/Android.gen.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/freedreno/Android.gen.mk b/src/gallium/drivers/freedreno/Android.gen.mk
index 17b6fbe1b7e..d29ba159d5c 100644
--- a/src/gallium/drivers/freedreno/Android.gen.mk
+++ b/src/gallium/drivers/freedreno/Android.gen.mk
@@ -25,7 +25,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 endif
 
 ir3_nir_trig_deps := \
-	$(LOCAL_PATH)/ir3/ir3_nir_trig.py \
+	$(MESA_TOP)/src/freedreno/ir3/ir3_nir_trig.py \
 	$(MESA_TOP)/src/compiler/nir/nir_algebraic.py
 
 intermediates := $(call local-generated-sources-dir)
-- 
2.17.1

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [RFC][PATCH 0/3] mesa: Initial build fixups for AOSP/master

[Greg Hartman]

[-- Attachment #1.1: Type: text/plain, Size: 2459 bytes --]

+ dwillemsen@google.com background on the build changes.

Thanks for doing this. It will be helpful to have fixes to make this build
again.

On Thu, May 2, 2019 at 11:03 AM John Stultz <john.stultz@linaro.org> wrote:

> Somewhat recent changes in the AOSP build system has been made
> which fairly severely restricts the build environment. This has
> made it difficult to test mesa/master w/ AOSP/master.
>
> I'm working with others to try to remedy this, but as a first
> step I used some hacks to temporarily remove the build environment
> restrictions, and unsuprizingly found mesa/master has a few
> build issues when trying to build w/ freedreno.
>
> So this patch set provides only some very basic build fixes
> that are needed to get mesa/master building w/ AOSP/master
> (minus the build restrictions on external tools).
>
> Feedback would be greatly appreciated!
>
> thanks
> -john
>
> Cc: Rob Clark <robdclark@chromium.org>
> Cc: Emil Velikov <emil.l.velikov@gmail.com>
> Cc: Amit Pundir <amit.pundir@linaro.org>
> Cc: Sumit Semwal <sumit.semwal@linaro.org>
> Cc: Alistair Strachan <astrachan@google.com>
> Cc: Greg Hartman <ghartman@google.com>
> Cc: Tapani Pälli <tapani.palli@intel.com>
> Cc: Jason Ekstrand <jason@jlekstrand.net>
>
> Alistair Strachan (1):
>   mesa: android: Remove unnecessary dependency tracking rules
>
> Amit Pundir (1):
>   mesa: android: freedreno: build libfreedreno_{drm,ir3} static libs
>
> John Stultz (1):
>   mesa: android: freedreno: Fix build failure due to path change
>
>  Android.mk                                   |  1 +
>  src/compiler/Android.glsl.gen.mk             |  2 -
>  src/compiler/Android.nir.gen.mk              |  2 -
>  src/freedreno/Android.drm.mk                 | 41 ++++++++++++++++
>  src/freedreno/Android.ir3.mk                 | 51 ++++++++++++++++++++
>  src/freedreno/Android.mk                     | 30 ++++++++++++
>  src/freedreno/Makefile.sources               |  2 +
>  src/gallium/Android.common.mk                |  5 +-
>  src/gallium/drivers/freedreno/Android.gen.mk |  2 +-
>  src/gallium/drivers/freedreno/Android.mk     |  2 +-
>  src/gallium/targets/dri/Android.mk           |  4 ++
>  11 files changed, 135 insertions(+), 7 deletions(-)
>  create mode 100644 src/freedreno/Android.drm.mk
>  create mode 100644 src/freedreno/Android.ir3.mk
>  create mode 100644 src/freedreno/Android.mk
>
> --
> 2.17.1
>
>

[-- Attachment #1.2: Type: text/html, Size: 4124 bytes --]

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [RFC][PATCH 0/3] mesa: Initial build fixups for AOSP/master

[Rob Clark]

fyi, John pushed a MR w/ the same patches:
https://gitlab.freedesktop.org/mesa/mesa/merge_requests/795

(I'm not really an expert on android build system, but if it works,
then ack-by from me)

BR,
-R

On Thu, May 2, 2019 at 1:20 PM Greg Hartman <ghartman@google.com> wrote:
>
> + dwillemsen@google.com background on the build changes.
>
> Thanks for doing this. It will be helpful to have fixes to make this build again.
>
> On Thu, May 2, 2019 at 11:03 AM John Stultz <john.stultz@linaro.org> wrote:
>>
>> Somewhat recent changes in the AOSP build system has been made
>> which fairly severely restricts the build environment. This has
>> made it difficult to test mesa/master w/ AOSP/master.
>>
>> I'm working with others to try to remedy this, but as a first
>> step I used some hacks to temporarily remove the build environment
>> restrictions, and unsuprizingly found mesa/master has a few
>> build issues when trying to build w/ freedreno.
>>
>> So this patch set provides only some very basic build fixes
>> that are needed to get mesa/master building w/ AOSP/master
>> (minus the build restrictions on external tools).
>>
>> Feedback would be greatly appreciated!
>>
>> thanks
>> -john
>>
>> Cc: Rob Clark <robdclark@chromium.org>
>> Cc: Emil Velikov <emil.l.velikov@gmail.com>
>> Cc: Amit Pundir <amit.pundir@linaro.org>
>> Cc: Sumit Semwal <sumit.semwal@linaro.org>
>> Cc: Alistair Strachan <astrachan@google.com>
>> Cc: Greg Hartman <ghartman@google.com>
>> Cc: Tapani Pälli <tapani.palli@intel.com>
>> Cc: Jason Ekstrand <jason@jlekstrand.net>
>>
>> Alistair Strachan (1):
>>   mesa: android: Remove unnecessary dependency tracking rules
>>
>> Amit Pundir (1):
>>   mesa: android: freedreno: build libfreedreno_{drm,ir3} static libs
>>
>> John Stultz (1):
>>   mesa: android: freedreno: Fix build failure due to path change
>>
>>  Android.mk                                   |  1 +
>>  src/compiler/Android.glsl.gen.mk             |  2 -
>>  src/compiler/Android.nir.gen.mk              |  2 -
>>  src/freedreno/Android.drm.mk                 | 41 ++++++++++++++++
>>  src/freedreno/Android.ir3.mk                 | 51 ++++++++++++++++++++
>>  src/freedreno/Android.mk                     | 30 ++++++++++++
>>  src/freedreno/Makefile.sources               |  2 +
>>  src/gallium/Android.common.mk                |  5 +-
>>  src/gallium/drivers/freedreno/Android.gen.mk |  2 +-
>>  src/gallium/drivers/freedreno/Android.mk     |  2 +-
>>  src/gallium/targets/dri/Android.mk           |  4 ++
>>  11 files changed, 135 insertions(+), 7 deletions(-)
>>  create mode 100644 src/freedreno/Android.drm.mk
>>  create mode 100644 src/freedreno/Android.ir3.mk
>>  create mode 100644 src/freedreno/Android.mk
>>
>> --
>> 2.17.1
>>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [RFC][PATCH 0/3] mesa: Initial build fixups for AOSP/master

[John Stultz]

On Thu, May 2, 2019 at 1:31 PM Rob Clark <robdclark@chromium.org> wrote:
>
> fyi, John pushed a MR w/ the same patches:
> https://gitlab.freedesktop.org/mesa/mesa/merge_requests/795
>
> (I'm not really an expert on android build system, but if it works,
> then ack-by from me)
>

So there's one new issue that cropped up when I re-based, but I'll
have a fix for that here in a second and will update the MR.

thanks
-john
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [RFC][PATCH 0/3] mesa: Initial build fixups for AOSP/master

[John Stultz]

On Thu, May 2, 2019 at 1:20 PM Greg Hartman <ghartman@google.com> wrote:
>
> + dwillemsen@google.com background on the build changes.
>
> Thanks for doing this. It will be helpful to have fixes to make this build again.
>

We're still a bit out from getting master to build w/ the current AOSP tree.

We need solutions for the xgettext and the python-mako usage.  The
current AOSP tree checks in prebuilt-intermediates that are hand
generated (which is messy to re-create), so I'm thinking we should
externalize the intermediate source generation into something like a
script, which the build system can call in the normal case, or that we
can run independently on a host to generate prebuilt intermediate
source files that can be checked into the AOSP tree.

But I wanted to get these basic fixes in so its easier to have working
before and after trees to compare any such build changes.

thanks
-john
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [RFC][PATCH 0/3] mesa: Initial build fixups for AOSP/master

[Dan Willemsen]

On Thu, May 2, 2019 at 1:52 PM John Stultz <john.stultz@linaro.org> wrote:
>
> We need solutions for the xgettext and the python-mako usage.

 Android doesn't support translations at this level, so you may be
able to just skip xgettext altogether.

- Dan
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [RFC][PATCH 0/3] mesa: Initial build fixups for AOSP/master

[Rob Clark]

On Thu, May 2, 2019 at 2:57 PM Dan Willemsen <dwillemsen@google.com> wrote:
>
> On Thu, May 2, 2019 at 1:52 PM John Stultz <john.stultz@linaro.org> wrote:
> >
> > We need solutions for the xgettext and the python-mako usage.
>
>  Android doesn't support translations at this level, so you may be
> able to just skip xgettext altogether.
>

from quick look, gettext is just needed for docs build (which I guess
android doesn't do) and driconf (not supported on android afaiu,
although it could be nice if there was a way to support something like
driconf on android, but I guess a different topic[1]).. so yeah,
probably not needed

[1] and maybe not needed for driconf itself but just for
infrastructure for driconf gui tool, which probably doesn't make sense
on android.. only use-case where I think it could make sense is
switches to enable workarounds for buggy apps, ie. allowing
buggy/incorrect glsl.. maybe that just isn't as much a problem on
android?

BR,
-R
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [RFC][PATCH 0/3] mesa: Initial build fixups for AOSP/master

[Emil Velikov]

On Thu, 2 May 2019 at 23:19, Rob Clark <robdclark@chromium.org> wrote:
>
> On Thu, May 2, 2019 at 2:57 PM Dan Willemsen <dwillemsen@google.com> wrote:
> >
> > On Thu, May 2, 2019 at 1:52 PM John Stultz <john.stultz@linaro.org> wrote:
> > >
> > > We need solutions for the xgettext and the python-mako usage.
> >
> >  Android doesn't support translations at this level, so you may be
> > able to just skip xgettext altogether.
> >
>
> from quick look, gettext is just needed for docs build (which I guess
> android doesn't do) and driconf (not supported on android afaiu,
> although it could be nice if there was a way to support something like
> driconf on android, but I guess a different topic[1]).. so yeah,
> probably not needed
>
Pretty much what I've mentioned last time John brought the gettext
patches - simply disable/drop the thing for Android.

One of these days we should even look closely at these "wanna-be
translations, yet 90% not translated" and drop all together?

-Emil
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [RFC][PATCH 0/3] mesa: Initial build fixups for AOSP/master

[Dylan Baker]

[-- Attachment #1.1: Type: text/plain, Size: 1341 bytes --]

Quoting Emil Velikov (2019-05-03 03:41:42)
> On Thu, 2 May 2019 at 23:19, Rob Clark <robdclark@chromium.org> wrote:
> >
> > On Thu, May 2, 2019 at 2:57 PM Dan Willemsen <dwillemsen@google.com> wrote:
> > >
> > > On Thu, May 2, 2019 at 1:52 PM John Stultz <john.stultz@linaro.org> wrote:
> > > >
> > > > We need solutions for the xgettext and the python-mako usage.
> > >
> > >  Android doesn't support translations at this level, so you may be
> > > able to just skip xgettext altogether.
> > >
> >
> > from quick look, gettext is just needed for docs build (which I guess
> > android doesn't do) and driconf (not supported on android afaiu,
> > although it could be nice if there was a way to support something like
> > driconf on android, but I guess a different topic[1]).. so yeah,
> > probably not needed
> >
> Pretty much what I've mentioned last time John brought the gettext
> patches - simply disable/drop the thing for Android.
> 
> One of these days we should even look closely at these "wanna-be
> translations, yet 90% not translated" and drop all together?
> 
> -Emil

Eric Engrstrom and I talked about this some time ago, the translations are very
incomplete and out of date at this point. Unless someone wants to step up and
maintain them I'd be in favor of dropping them all together.

Dylan

[-- Attachment #1.2: signature --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

-----BEGIN PGP SIGNATURE-----

iHUEABYKAB0WIQRxxLdWILx1cItL2yVMlfqrPrBz7AUCXNHPMQAKCRBMlfqrPrBz
7CPhAQDyNheC+72taLkoCrRv3R9TNzaGPlLCtE3pHaHgp3SQ1AEA4g9brn22N/vl
24oWvVwY4LeKa/jStXGqtfyt6vrwrAo=
=2Nl6
-----END PGP SIGNATURE-----

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 3/3] mesa: android: freedreno: Fix build failure due to path change

[Dylan Baker]

[-- Attachment #1.1: Type: text/plain, Size: 1945 bytes --]

Hi John,

This patch and the previous one landed with a fixes tag nominating them for the
staging/19.0 branch, but they don't apply, and to get the to apply requires
pulling in several other android build system patches. If you'd like those in
the 19.0 stable branch can you put together an MR against the staging/19.0
branch, or if you don't care let me know so I can mark them as de-nominated?

Thanks,
Dylan

Quoting John Stultz (2019-05-02 11:03:46)
> The ir3_nir_trig.py file was moved in a previous commit,
> aa0fed10d3574 (freedreno: move ir3 to common location),
> so update the Android.gen.mk file to match.
> 
> Cc: Rob Clark <robdclark@chromium.org>
> Cc: Emil Velikov <emil.l.velikov@gmail.com>
> Cc: Amit Pundir <amit.pundir@linaro.org>
> Cc: Sumit Semwal <sumit.semwal@linaro.org>
> Cc: Alistair Strachan <astrachan@google.com>
> Cc: Greg Hartman <ghartman@google.com>
> Cc: Tapani Pälli <tapani.palli@intel.com>
> Cc: Jason Ekstrand <jason@jlekstrand.net>
> Signed-off-by: John Stultz <john.stultz@linaro.org>
> ---
>  src/gallium/drivers/freedreno/Android.gen.mk | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/gallium/drivers/freedreno/Android.gen.mk b/src/gallium/drivers/freedreno/Android.gen.mk
> index 17b6fbe1b7e..d29ba159d5c 100644
> --- a/src/gallium/drivers/freedreno/Android.gen.mk
> +++ b/src/gallium/drivers/freedreno/Android.gen.mk
> @@ -25,7 +25,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
>  endif
>  
>  ir3_nir_trig_deps := \
> -       $(LOCAL_PATH)/ir3/ir3_nir_trig.py \
> +       $(MESA_TOP)/src/freedreno/ir3/ir3_nir_trig.py \
>         $(MESA_TOP)/src/compiler/nir/nir_algebraic.py
>  
>  intermediates := $(call local-generated-sources-dir)
> -- 
> 2.17.1
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

[-- Attachment #1.2: signature --]
[-- Type: application/pgp-signature, Size: 228 bytes --]

-----BEGIN PGP SIGNATURE-----

iHUEABYKAB0WIQRxxLdWILx1cItL2yVMlfqrPrBz7AUCXNHPxAAKCRBMlfqrPrBz
7JfkAP9DC7QmpFnoX8MNnl2LtbSskcoHBuSa42jucLdBlGZiywD8DwReEstcRxDT
NPR5kMbVEiLELjlXc8yUBUXPHTrzfQg=
=WQFD
-----END PGP SIGNATURE-----

[-- Attachment #2: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH 3/3] mesa: android: freedreno: Fix build failure due to path change

[John Stultz]

On Tue, May 7, 2019 at 11:34 AM Dylan Baker <dylan@pnwbakers.com> wrote:
>
> This patch and the previous one landed with a fixes tag nominating them for the
> staging/19.0 branch, but they don't apply, and to get the to apply requires
> pulling in several other android build system patches. If you'd like those in
> the 19.0 stable branch can you put together an MR against the staging/19.0
> branch, or if you don't care let me know so I can mark them as de-nominated?
>

Yea, so this one I don't think is necessary for  19.0

So you can see the patchset I'm pushing at the moment against 19.0.3 for AOSP:
  https://android-review.googlesource.com/c/platform/external/mesa3d/+/956844

thanks
-john
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel