On 10/09/2012 09:49 PM, Oliver McFadden wrote:
Signed-off-by: Oliver McFadden <oliver.mcfad...@linux.intel.com>
CC: Chad Versace <chad.vers...@linux.intel.com>
---
v3: split the unconditional DEBUG_PERF printing for Android into a separate
patch. The second patch doesn't necessarily need to be upstreamed; I'm open to
feedback here...
src/mesa/drivers/dri/Android.mk | 3 ++-
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 577f664..d6196bb 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 d16101d..b732696 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
Patch 1 is:
Acked-by: Kenneth Graunke <kenn...@whitecape.org>
(I don't know Android's logging infrastructure, but it all looks
reasonable and printing the debug output to logs seems like a really
good idea.)
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
