Re: [Mesa-dev] [PATCH] i965: fix autotools/android build

2018-03-20 Thread Lionel Landwerlin 

On 20/03/18 16:23, Emil Velikov wrote:

On 20 March 2018 at 14:59, Lionel Landwerlin
 wrote:

Autotools/android builds generate the header & code files in 2 steps,
but the code generation requires the name of the header file to
include it.

This change generates both files in one command.

Fixes: 035cc7a12dc ("i965: perf: reduce i965 binary size")
Signed-off-by: Lionel Landwerlin 
---

Hmm I did not see that the reworked script requires the header, since
the required=True is missing.
Will send a patch for that in a moment.


  # .c and .h files in one go so we don't hit problems with parallel
  # make and multiple invocations of the same script trying to write
  # to the same files.

Please drop the comment block. With that the patch is
Reviewed-by: Emil Velikov 

-Emil


Thanks, pushed.

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

Re: [Mesa-dev] [PATCH] i965: fix autotools/android build

2018-03-20 Thread Emil Velikov 
On 20 March 2018 at 14:59, Lionel Landwerlin
 wrote:
> Autotools/android builds generate the header & code files in 2 steps,
> but the code generation requires the name of the header file to
> include it.
>
> This change generates both files in one command.
>
> Fixes: 035cc7a12dc ("i965: perf: reduce i965 binary size")
> Signed-off-by: Lionel Landwerlin 
> ---
Hmm I did not see that the reworked script requires the header, since
the required=True is missing.
Will send a patch for that in a moment.

>  # .c and .h files in one go so we don't hit problems with parallel
>  # make and multiple invocations of the same script trying to write
>  # to the same files.
Please drop the comment block. With that the patch is
Reviewed-by: Emil Velikov 

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

Re: [Mesa-dev] [PATCH] i965: fix autotools/android build

2018-03-20 Thread Tapani Pälli 

Reviewed-by: Tapani Pälli 

On 20.03.2018 16:59, Lionel Landwerlin wrote:

Autotools/android builds generate the header & code files in 2 steps,
but the code generation requires the name of the header file to
include it.

This change generates both files in one command.

Fixes: 035cc7a12dc ("i965: perf: reduce i965 binary size")
Signed-off-by: Lionel Landwerlin 
---
  src/mesa/drivers/dri/i965/Android.mk  | 9 +++--
  src/mesa/drivers/dri/i965/Makefile.am | 6 +++---
  2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/Android.mk 
b/src/mesa/drivers/dri/i965/Android.mk
index a3d010a5894..8c4a613bcf3 100644
--- a/src/mesa/drivers/dri/i965/Android.mk
+++ b/src/mesa/drivers/dri/i965/Android.mk
@@ -312,15 +312,12 @@ LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, 
\
  i965_oa_xml_FILES := $(addprefix $(LOCAL_PATH)/, \
$(i965_oa_xml_FILES))
  
-$(intermediates)/brw_oa_metrics.h: $(LOCAL_PATH)/brw_oa.py $(i965_oa_xml_FILES)

-   @echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))"
-   @mkdir -p $(dir $@)
-   $(hide) $(MESA_PYTHON2) $< --header=$@ $(i965_oa_xml_FILES)
-
  $(intermediates)/brw_oa_metrics.c: $(LOCAL_PATH)/brw_oa.py 
$(i965_oa_xml_FILES)
@echo "target Generated: $(PRIVATE_MODULE) <= $(notdir $(@))"
@mkdir -p $(dir $@)
-   $(hide) $(MESA_PYTHON2) $< --code=$@ $(i965_oa_xml_FILES)
+   $(hide) $(MESA_PYTHON2) $< --code=$@ $(i965_oa_xml_FILES) --header=$@ 
$(i965_oa_xml_FILES)
+
+$(intermediates)/brw_oa_metrics.h: $(intermediates)/brw_oa_metrics.c
  
  include $(MESA_COMMON_MK)

  include $(BUILD_SHARED_LIBRARY)
diff --git a/src/mesa/drivers/dri/i965/Makefile.am 
b/src/mesa/drivers/dri/i965/Makefile.am
index 8c8ecc6d76b..f561d680f2c 100644
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -118,7 +118,7 @@ EXTRA_DIST = \
  # .c and .h files in one go so we don't hit problems with parallel
  # make and multiple invocations of the same script trying to write
  # to the same files.
-brw_oa_metrics.h: brw_oa.py $(i965_oa_xml_FILES)
-   $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py 
--header=$(builddir)/brw_oa_metrics.h $(i965_oa_xml_FILES)
  brw_oa_metrics.c: brw_oa.py $(i965_oa_xml_FILES)
-   $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py 
--code=$(builddir)/brw_oa_metrics.c $(i965_oa_xml_FILES)
+   $(PYTHON2) $(PYTHON_FLAGS) $(srcdir)/brw_oa.py 
--code=$(builddir)/brw_oa_metrics.c --header=$(builddir)/brw_oa_metrics.h 
$(i965_oa_xml_FILES)
+
+brw_oa_metrics.h: brw_oa_metrics.c


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