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

Android: fix build break from nir/glsl move to compiler/

Browse Source 
Commits a39a8fbbaa ("nir: move to compiler/") and eb63640c1d
("glsl: move to compiler/") broke Android builds. Fix them.

There is also a missing dependency between generated NIR headers and
several libraries. This isn't a new issue, but seems to have been
exposed by the NIR move.

Built with i915, i965, freedreno, r300g, r600g, vc4, and virgl enabled.

Cc: "11.2" <mesa-stable@lists.freedesktop.org>
Cc: Mauro Rossi <issor.oruam@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Rob Herring
2016-02-10 16:02:11 -06:00
committed by Emil Velikov
parent a640ad15e1
commit 574a92b048
17 changed files with 30 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@@ -87,7 +87,7 @@ SUBDIRS := \
src/loader \ src/loader \
src/mapi \ src/mapi \
src/compiler \ src/compiler \
src/glsl \ src/compiler/glsl \
src/mesa \ src/mesa \
src/util \ src/util \
src/egl \ src/egl \

4
src/compiler/Android.gen.mk
View File

@@ -42,6 +42,10 @@ LOCAL_EXPORT_C_INCLUDE_DIRS += \
LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
$(NIR_GENERATED_FILES)) $(NIR_GENERATED_FILES))
# Modules using libmesa_nir must set LOCAL_GENERATED_SOURCES to this
MESA_GEN_NIR_H := $(addprefix $(call local-generated-sources-dir)/, \
nir/nir_opcodes.h \
nir/nir_builder_opcodes.h)
nir_builder_opcodes_gen := $(LOCAL_PATH)/nir/nir_builder_opcodes_h.py nir_builder_opcodes_gen := $(LOCAL_PATH)/nir/nir_builder_opcodes_h.py
nir_builder_opcodes_deps := \ nir_builder_opcodes_deps := \

2
src/compiler/glsl/Android.gen.mk
View File

@@ -33,7 +33,7 @@ LOCAL_SRC_FILES := $(LOCAL_SRC_FILES)
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(intermediates)/glcpp \ $(intermediates)/glcpp \
$(MESA_TOP)/src/glsl/glcpp \ $(LOCAL_PATH)/glcpp \
LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \ LOCAL_GENERATED_SOURCES += $(addprefix $(intermediates)/, \
$(LIBGLCPP_GENERATED_FILES) \ $(LIBGLCPP_GENERATED_FILES) \

3
src/compiler/glsl/Android.mk
View File

@@ -36,7 +36,6 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(LIBGLCPP_FILES) \ $(LIBGLCPP_FILES) \
$(LIBGLSL_FILES) \ $(LIBGLSL_FILES) \
$(NIR_FILES)
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mapi \
@@ -67,7 +66,7 @@ LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/gallium/include \ $(MESA_TOP)/src/gallium/include \
$(MESA_TOP)/src/gallium/auxiliary $(MESA_TOP)/src/gallium/auxiliary
LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_glsl_utils libmesa_util LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_glsl_utils libmesa_util libmesa_compiler
LOCAL_MODULE_TAGS := eng LOCAL_MODULE_TAGS := eng
LOCAL_MODULE := glsl_compiler LOCAL_MODULE := glsl_compiler

6
src/gallium/auxiliary/Android.mk
View File

@@ -44,9 +44,9 @@ LOCAL_SRC_FILES += \
LOCAL_CPPFLAGS := -std=c++11 LOCAL_CPPFLAGS := -std=c++11
endif endif
# We need libmesa_glsl to get NIR's generated include directories. # We need libmesa_nir to get NIR's generated include directories.
LOCAL_MODULE := libmesa_gallium LOCAL_MODULE := libmesa_gallium
LOCAL_STATIC_LIBRARIES += libmesa_glsl LOCAL_STATIC_LIBRARIES += libmesa_nir
# generate sources # generate sources
LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE_CLASS := STATIC_LIBRARIES
@@ -64,5 +64,7 @@ $(intermediates)/util/u_format_srgb.c: $(intermediates)/%.c: $(LOCAL_PATH)/%.py
$(intermediates)/util/u_format_table.c: $(intermediates)/%.c: $(LOCAL_PATH)/%.py $(LOCAL_PATH)/util/u_format.csv $(intermediates)/util/u_format_table.c: $(intermediates)/%.c: $(LOCAL_PATH)/%.py $(LOCAL_PATH)/util/u_format.csv
$(transform-generated-source) $(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(MESA_GEN_NIR_H)
include $(GALLIUM_COMMON_MK) include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

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

@@ -38,8 +38,10 @@ LOCAL_CFLAGS := \
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/ir3 $(LOCAL_PATH)/ir3
LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H)
LOCAL_SHARED_LIBRARIES := libdrm libdrm_freedreno LOCAL_SHARED_LIBRARIES := libdrm libdrm_freedreno
LOCAL_STATIC_LIBRARIES := libmesa_glsl LOCAL_STATIC_LIBRARIES := libmesa_glsl libmesa_nir
LOCAL_MODULE := libmesa_pipe_freedreno LOCAL_MODULE := libmesa_pipe_freedreno
include $(GALLIUM_COMMON_MK) include $(GALLIUM_COMMON_MK)

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

@@ -32,7 +32,6 @@ LOCAL_SRC_FILES := $(C_SOURCES)
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/glsl \
$(MESA_TOP)/src/mesa $(MESA_TOP)/src/mesa

6
src/gallium/drivers/vc4/Android.mk
View File

@@ -28,9 +28,11 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(C_SOURCES) $(C_SOURCES)
LOCAL_GENERATED_SOURCES := $(MESA_GEN_NIR_H)
LOCAL_SHARED_LIBRARIES := libdrm LOCAL_SHARED_LIBRARIES := libdrm
# We need libmesa_glsl to get NIR's generated include directories. # We need libmesa_nir to get NIR's generated include directories.
LOCAL_STATIC_LIBRARIES := libmesa_glsl LOCAL_STATIC_LIBRARIES := libmesa_nir
LOCAL_MODULE := libmesa_pipe_vc4 LOCAL_MODULE := libmesa_pipe_vc4
include $(GALLIUM_COMMON_MK) include $(GALLIUM_COMMON_MK)

2
src/gallium/targets/dri/Android.mk
View File

@@ -109,6 +109,8 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libmesa_st_dri \ libmesa_st_dri \
libmesa_st_mesa \ libmesa_st_mesa \
libmesa_glsl \ libmesa_glsl \
libmesa_compiler \
libmesa_nir \
libmesa_dri_common \ libmesa_dri_common \
libmesa_megadriver_stub \ libmesa_megadriver_stub \
libmesa_gallium \ libmesa_gallium \

1
src/mesa/Android.libmesa_dricore.mk
View File

@@ -59,7 +59,6 @@ endif
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/mesa/main \ $(MESA_TOP)/src/mesa/main \
$(MESA_TOP)/src/glsl \
$(MESA_TOP)/src/compiler/nir \ $(MESA_TOP)/src/compiler/nir \
$(MESA_TOP)/src/gallium/include \ $(MESA_TOP)/src/gallium/include \
$(MESA_TOP)/src/gallium/auxiliary $(MESA_TOP)/src/gallium/auxiliary

2
src/mesa/Android.libmesa_glsl_utils.mk
View File

@@ -36,7 +36,6 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_glsl_utils LOCAL_MODULE := libmesa_glsl_utils
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/glsl \
$(MESA_TOP)/src/compiler/nir \ $(MESA_TOP)/src/compiler/nir \
$(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/gallium/include \ $(MESA_TOP)/src/gallium/include \
@@ -62,7 +61,6 @@ LOCAL_IS_HOST_MODULE := true
LOCAL_CFLAGS := -D_POSIX_C_SOURCE=199309L LOCAL_CFLAGS := -D_POSIX_C_SOURCE=199309L
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/glsl \
$(MESA_TOP)/src/compiler/nir \ $(MESA_TOP)/src/compiler/nir \
$(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/gallium/include \ $(MESA_TOP)/src/gallium/include \

1
src/mesa/Android.libmesa_st_mesa.mk
View File

@@ -54,7 +54,6 @@ endif
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/mesa/main \ $(MESA_TOP)/src/mesa/main \
$(MESA_TOP)/src/glsl \
$(MESA_TOP)/src/compiler/nir \ $(MESA_TOP)/src/compiler/nir \
$(MESA_TOP)/src/gallium/auxiliary \ $(MESA_TOP)/src/gallium/auxiliary \
$(MESA_TOP)/src/gallium/include $(MESA_TOP)/src/gallium/include

3
src/mesa/Android.mesa_gen_matypes.mk
View File

@@ -35,8 +35,7 @@ LOCAL_MODULE := mesa_gen_matypes
LOCAL_IS_HOST_MODULE := true LOCAL_IS_HOST_MODULE := true
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mapi
$(MESA_TOP)/src/glsl
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
x86/gen_matypes.c x86/gen_matypes.c

2
src/mesa/drivers/dri/Android.mk
View File

@@ -42,6 +42,8 @@ MESA_DRI_C_INCLUDES := \
MESA_DRI_WHOLE_STATIC_LIBRARIES := \ MESA_DRI_WHOLE_STATIC_LIBRARIES := \
libmesa_glsl \ libmesa_glsl \
libmesa_compiler \
libmesa_nir \
libmesa_megadriver_stub \ libmesa_megadriver_stub \
libmesa_dri_common \ libmesa_dri_common \
libmesa_dricore \ libmesa_dricore \

3
src/mesa/drivers/dri/i915/Android.mk
View File

@@ -54,7 +54,8 @@ LOCAL_SHARED_LIBRARIES := \
libdrm_intel libdrm_intel
LOCAL_GENERATED_SOURCES := \ LOCAL_GENERATED_SOURCES := \
$(MESA_DRI_OPTIONS_H) $(MESA_DRI_OPTIONS_H) \
$(MESA_GEN_NIR_H)
include $(MESA_COMMON_MK) include $(MESA_COMMON_MK)
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

3
src/mesa/drivers/dri/i965/Android.mk
View File

@@ -59,7 +59,8 @@ LOCAL_SHARED_LIBRARIES := \
libdrm_intel libdrm_intel
LOCAL_GENERATED_SOURCES := \ LOCAL_GENERATED_SOURCES := \
$(MESA_DRI_OPTIONS_H) $(MESA_DRI_OPTIONS_H) \
$(MESA_GEN_NIR_H)
include $(MESA_COMMON_MK) include $(MESA_COMMON_MK)
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

5
src/mesa/program/Android.mk
View File

@@ -44,7 +44,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE := libmesa_program LOCAL_MODULE := libmesa_program
LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE_CLASS := STATIC_LIBRARIES
LOCAL_STATIC_LIBRARIES := libmesa_glsl LOCAL_STATIC_LIBRARIES := libmesa_nir
intermediates := $(call local-generated-sources-dir) intermediates := $(call local-generated-sources-dir)
@@ -74,12 +74,13 @@ $(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program_lexer.l
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(MESA_TOP)/src/mapi \ $(MESA_TOP)/src/mapi \
$(MESA_TOP)/src/mesa \ $(MESA_TOP)/src/mesa \
$(MESA_TOP)/src/glsl \
$(MESA_TOP)/src/compiler/nir \ $(MESA_TOP)/src/compiler/nir \
$(MESA_TOP)/src/gallium/auxiliary \ $(MESA_TOP)/src/gallium/auxiliary \
$(MESA_TOP)/src/gallium/include $(MESA_TOP)/src/gallium/include
LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates) LOCAL_EXPORT_C_INCLUDE_DIRS := $(intermediates)
LOCAL_GENERATED_SOURCES += $(MESA_GEN_NIR_H)
include $(MESA_COMMON_MK) include $(MESA_COMMON_MK)
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)