summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorOliver McFadden <oliver.mcfadden@linux.intel.com>2012-09-25 17:47:45 +0300
committerOliver McFadden <oliver.mcfadden@linux.intel.com>2012-10-12 11:14:54 +0300
commit1b921acd5fa84a498857afcf6c2a404028cf0fb7 (patch)
tree77c5985868c9d388f3d94cbfcaa296a8f5b01fb7 /src/mesa
parent743d859e62b56ebc1cedd4b9a06ea2d84743417e (diff)
intel: print debug either to stdout or `logcat' depending on platform.
Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com> Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/Android.mk3
-rw-r--r--src/mesa/drivers/dri/intel/intel_context.h17
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