mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-05 16:08:04 +02:00
i965: add build rule for brw_nir_trig_workarounds.c on Android
Commit bfd17c76c1 ("i965: Port INTEL_PRECISE_TRIG=1 to NIR.") added a
generated file brw_nir_trig_workarounds.c which broke the Android build.
Add the necessary makefiles to the Android build.
Cc: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Rob Herring <robh@kernel.org>
Tested-by: Chih-Wei Huang <cwhuang@linux.org.tw>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
parent
30239ba056
commit
b27c85c4c0
4 changed files with 49 additions and 2 deletions
38
src/mesa/drivers/dri/i965/Android.gen.mk
Normal file
38
src/mesa/drivers/dri/i965/Android.gen.mk
Normal file
|
|
@ -0,0 +1,38 @@
|
||||||
|
#
|
||||||
|
# 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 := SHARED_LIBRARIES
|
||||||
|
endif
|
||||||
|
|
||||||
|
brw_nir_trig_workarounds_deps := \
|
||||||
|
$(LOCAL_PATH)/brw_nir_trig_workarounds.py \
|
||||||
|
$(MESA_TOP)/src/compiler/nir/nir_algebraic.py
|
||||||
|
|
||||||
|
intermediates := $(call local-generated-sources-dir)
|
||||||
|
|
||||||
|
$(intermediates)/brw_nir_trig_workarounds.c: $(brw_nir_trig_workarounds_deps)
|
||||||
|
@mkdir -p $(dir $@)
|
||||||
|
$(hide) PYTHONPATH=$(MESA_TOP)/src/compiler/nir $(MESA_PYTHON2) $< > $@
|
||||||
|
|
||||||
|
LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
|
||||||
|
$(i965_compiler_GENERATED_FILES))
|
||||||
|
|
@ -62,5 +62,7 @@ LOCAL_GENERATED_SOURCES := \
|
||||||
$(MESA_DRI_OPTIONS_H) \
|
$(MESA_DRI_OPTIONS_H) \
|
||||||
$(MESA_GEN_NIR_H)
|
$(MESA_GEN_NIR_H)
|
||||||
|
|
||||||
|
include $(LOCAL_PATH)/Android.gen.mk
|
||||||
|
|
||||||
include $(MESA_COMMON_MK)
|
include $(MESA_COMMON_MK)
|
||||||
include $(BUILD_SHARED_LIBRARY)
|
include $(BUILD_SHARED_LIBRARY)
|
||||||
|
|
|
||||||
|
|
@ -50,7 +50,12 @@ noinst_LTLIBRARIES = libi965_dri.la libi965_compiler.la
|
||||||
libi965_dri_la_SOURCES = $(i965_FILES)
|
libi965_dri_la_SOURCES = $(i965_FILES)
|
||||||
libi965_dri_la_LIBADD = libi965_compiler.la $(INTEL_LIBS)
|
libi965_dri_la_LIBADD = libi965_compiler.la $(INTEL_LIBS)
|
||||||
|
|
||||||
libi965_compiler_la_SOURCES = $(i965_compiler_FILES)
|
libi965_compiler_la_SOURCES = \
|
||||||
|
$(i965_compiler_FILES) \
|
||||||
|
$(i965_compiler_GENERATED_FILES)
|
||||||
|
|
||||||
|
BUILT_SOURCES += $(i965_compiler_GENERATED_FILES)
|
||||||
|
CLEANFILES += $(BUILT_SOURCES)
|
||||||
|
|
||||||
TEST_LIBS = \
|
TEST_LIBS = \
|
||||||
libi965_compiler.la \
|
libi965_compiler.la \
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,6 @@ i965_compiler_FILES = \
|
||||||
brw_nir.c \
|
brw_nir.c \
|
||||||
brw_nir_analyze_boolean_resolves.c \
|
brw_nir_analyze_boolean_resolves.c \
|
||||||
brw_nir_attribute_workarounds.c \
|
brw_nir_attribute_workarounds.c \
|
||||||
brw_nir_trig_workarounds.c \
|
|
||||||
brw_nir_opt_peephole_ffma.c \
|
brw_nir_opt_peephole_ffma.c \
|
||||||
brw_nir_uniforms.cpp \
|
brw_nir_uniforms.cpp \
|
||||||
brw_packed_float.c \
|
brw_packed_float.c \
|
||||||
|
|
@ -92,6 +91,9 @@ i965_compiler_FILES = \
|
||||||
intel_resolve_map.c \
|
intel_resolve_map.c \
|
||||||
intel_resolve_map.h
|
intel_resolve_map.h
|
||||||
|
|
||||||
|
i965_compiler_GENERATED_FILES = \
|
||||||
|
brw_nir_trig_workarounds.c
|
||||||
|
|
||||||
i965_FILES = \
|
i965_FILES = \
|
||||||
brw_binding_tables.c \
|
brw_binding_tables.c \
|
||||||
brw_blorp_blit.cpp \
|
brw_blorp_blit.cpp \
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue