KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Android: i965: remove libdrm_intel dependency 

Commit 7dd20bc3ee ("anv/i965: drop libdrm_intel dependency completely")
removed the libdrm_intel dependency for automake, but Android builds still
depended on it. Now the build requires a newer version of i915_drm.h and
fails on Android builds:

src/mesa/drivers/dri/i965/brw_performance_query.c:616:9: error: use of undeclared identifier 'I915_OA_FORMAT_A32u40_A4u32_B8_C8'
   case I915_OA_FORMAT_A32u40_A4u32_B8_C8:
        ^
src/mesa/drivers/dri/i965/brw_performance_query.c:1887:18: error: use of undeclared identifier 'I915_PARAM_SLICE_MASK'
      gp.param = I915_PARAM_SLICE_MASK;
                 ^
src/mesa/drivers/dri/i965/brw_performance_query.c:1893:18: error: use of undeclared identifier 'I915_PARAM_SUBSLICE_MASK'
      gp.param = I915_PARAM_SUBSLICE_MASK;
                 ^

Remove the libdrm_intel dependency for Android builds and add the necessary
include paths for the local copy of i915_drm.h.

Fixes: 7dd20bc ("anv/i965: drop libdrm_intel dependency completely")
Signed-off-by: Rob Herring <robh@kernel.org>
Reviewed-by: Juan A. Suarez Romero <jasuarez@igalia.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Rob Herring 2017-06-28 17:08:54 -05:00 committed by Emil Velikov
parent b693fd8464
commit 4aaa21d12e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -29,11 +29,11 @@ include $(LOCAL_PATH)/Makefile.sources
I965_PERGEN_COMMON_INCLUDES := \
$(MESA_DRI_C_INCLUDES) \
$(MESA_TOP)/src/intel
$(MESA_TOP)/src/intel \
$(MESA_TOP)/src/intel/drm
I965_PERGEN_SHARED_LIBRARIES := \
$(MESA_DRI_SHARED_LIBRARIES) \
libdrm_intel
$(MESA_DRI_SHARED_LIBRARIES)
I965_PERGEN_STATIC_LIBRARIES := \
libmesa_genxml \
@ -257,7 +257,8 @@ LOCAL_CFLAGS += \
endif
LOCAL_C_INCLUDES := \
$(MESA_DRI_C_INCLUDES)
$(MESA_DRI_C_INCLUDES) \
$(MESA_TOP)/src/intel/drm
LOCAL_SRC_FILES := \
$(i965_FILES)
@ -271,8 +272,7 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
libmesa_intel_compiler
LOCAL_SHARED_LIBRARIES := \
$(MESA_DRI_SHARED_LIBRARIES) \
libdrm_intel
$(MESA_DRI_SHARED_LIBRARIES)
LOCAL_GENERATED_SOURCES := \
$(MESA_DRI_OPTIONS_H) \