diff options
| -rw-r--r-- | src/mesa/drivers/dri/Android.mk | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.h | 17 |
2 files changed, 16 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk index 577f66408a5..d6196bb4326 100644 --- a/src/mesa/drivers/dri/Android.mk +++ b/src/mesa/drivers/dri/Android.mk @@ -34,7 +34,8 @@ MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/dri MESA_DRI_CFLAGS := \ -DFEATURE_GL=1 \ -DFEATURE_ES1=1 \ - -DFEATURE_ES2=1 + -DFEATURE_ES2=1 \ + -DHAVE_ANDROID_PLATFORM MESA_DRI_C_INCLUDES := \ $(addprefix $(MESA_TOP)/, $(mesa_dri_common_INCLUDES)) \ diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h index d16101d7c17..b732696bdaf 100644 --- a/src/mesa/drivers/dri/intel/intel_context.h +++ b/src/mesa/drivers/dri/intel/intel_context.h @@ -457,19 +457,30 @@ extern int INTEL_DEBUG; #define DEBUG_CLIP 0x2000000 #define DEBUG_AUB 0x4000000 +#ifdef HAVE_ANDROID_PLATFORM +#define LOG_TAG "INTEL-MESA" +#include <cutils/log.h> +#ifndef ALOGW +#define ALOGW LOGW +#endif +#define dbg_printf(...) ALOGW(__VA_ARGS__) +#else +#define dbg_printf(...) printf(__VA_ARGS__) +#endif /* HAVE_ANDROID_PLATFORM */ + #define DBG(...) do { \ if (unlikely(INTEL_DEBUG & FILE_DEBUG_FLAG)) \ - printf(__VA_ARGS__); \ + dbg_printf(__VA_ARGS__); \ } while(0) #define fallback_debug(...) do { \ if (unlikely(INTEL_DEBUG & DEBUG_PERF)) \ - printf(__VA_ARGS__); \ + dbg_printf(__VA_ARGS__); \ } while(0) #define perf_debug(...) do { \ if (unlikely(INTEL_DEBUG & DEBUG_PERF)) \ - printf(__VA_ARGS__); \ + dbg_printf(__VA_ARGS__); \ } while(0) #define PCI_CHIP_845_G 0x2562 |