OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: freedreno/ir3: simplify generated sources rules

Browse Source 
Simplification and alignment with meson's sources generation rules

Changelog:
- move rules from src/gallium/drivers/freedreno/Android.gen.mk to Android.ir3.mk
- simplify LOCAL_GENERATED_SOURCES based on $(ir3_GENERATED_FILES)
- remove includes of src/gallium/drivers/freedreno/Android.gen.mk
- remove src/gallium/drivers/freedreno/Android.gen.mk

Signed-off-by: Mauro Rossi <issor.oruam@gmail.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Acked-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5580>
This commit is contained in:
Mauro Rossi
2020-06-20 20:47:05 +02:00
committed by Marge Bot
parent 41683157e7
commit 1be67d610f
4 changed files with 17 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/freedreno/Android.ir3.mk
View File

@@ -54,11 +54,19 @@ LOCAL_GENERATED_SOURCES := \
$(MESA_GEN_NIR_H)
LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
ir3/ir3_lexer.c ir3/ir3_parser.c ir3/ir3_parser.h)
$(ir3_GENERATED_FILES))
ir3_lexer_deps := \
$(MESA_TOP)/src/freedreno/ir3/ir3_lexer.l
ir3_nir_imul_deps := \
$(MESA_TOP)/src/freedreno/ir3/ir3_nir_imul.py \
$(MESA_TOP)/src/compiler/nir/nir_algebraic.py
ir3_nir_trig_deps := \
$(MESA_TOP)/src/freedreno/ir3/ir3_nir_trig.py \
$(MESA_TOP)/src/compiler/nir/nir_algebraic.py
ir3_parser_deps := \
$(MESA_TOP)/src/freedreno/ir3/ir3_parser.y
@@ -67,6 +75,14 @@ $(intermediates)/ir3/ir3_lexer.c: $(ir3_lexer_deps)
@echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"
$(hide) flex -o $@ $<
$(intermediates)/ir3/ir3_nir_imul.c: $(ir3_nir_imul_deps)
@mkdir -p $(dir $@)
$(hide) $(MESA_PYTHON2) $< -p $(MESA_TOP)/src/compiler/nir > $@
$(intermediates)/ir3/ir3_nir_trig.c: $(ir3_nir_trig_deps)
@mkdir -p $(dir $@)
$(hide) $(MESA_PYTHON2) $< -p $(MESA_TOP)/src/compiler/nir > $@
$(intermediates)/ir3/ir3_parser.c: $(ir3_parser_deps)
@mkdir -p $(dir $@)
@echo "Gen Header: $(PRIVATE_MODULE) <= $(notdir $(@))"

1
src/freedreno/Android.mk
View File

@@ -25,7 +25,6 @@
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
include $(LOCAL_PATH)/Android.perfcntrs.mk

46
src/gallium/drivers/freedreno/Android.gen.mk
View File

@@ -1,46 +0,0 @@
#
# Copyright (C) 2016 Linaro, Ltd., Rob Herring <robh@kernel.org>
#
# 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.
#
ifeq ($(LOCAL_MODULE_CLASS),)
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
endif
ir3_nir_trig_deps := \
$(MESA_TOP)/src/freedreno/ir3/ir3_nir_trig.py \
$(MESA_TOP)/src/compiler/nir/nir_algebraic.py
ir3_nir_imul_deps := \
$(MESA_TOP)/src/freedreno/ir3/ir3_nir_imul.py \
$(MESA_TOP)/src/compiler/nir/nir_algebraic.py
intermediates := $(call local-generated-sources-dir)
$(intermediates)/ir3/ir3_nir_trig.c: $(ir3_nir_trig_deps)
@mkdir -p $(dir $@)
$(hide) $(MESA_PYTHON2) $< -p $(MESA_TOP)/src/compiler/nir > $@
$(intermediates)/ir3/ir3_nir_imul.c: $(ir3_nir_imul_deps)
@mkdir -p $(dir $@)
$(hide) $(MESA_PYTHON2) $< -p $(MESA_TOP)/src/compiler/nir > $@
LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
ir3/ir3_nir_trig.c ir3/ir3_nir_imul.c)

1
src/gallium/drivers/freedreno/Android.mk
View File

@@ -47,7 +47,6 @@ LOCAL_SHARED_LIBRARIES := libdrm
LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_nir libfreedreno_drm libfreedreno_ir3 libfreedreno_perfcntrs libfreedreno_registers
LOCAL_MODULE := libmesa_pipe_freedreno
include $(LOCAL_PATH)/Android.gen.mk
include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)