ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

Merge "Add GL Error logs (temporary)" into jb-mr1-dev

Browse Source
This commit is contained in:
Chet Haase 2012-10-04 19:45:16 -07:00 committed by Android (Google) Code Review
commit 27b28fd996
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opengl/libs/Android.mk
View File

@ -126,6 +126,10 @@ LOCAL_SRC_FILES:= \
GLES2/gl2.cpp.arm \ GLES2/gl2.cpp.arm \
# #
ifneq (,$(filter manta, $(TARGET_DEVICE)))
LOCAL_CFLAGS += -DIS_MANTA
endif
LOCAL_SHARED_LIBRARIES += libcutils libutils libEGL LOCAL_SHARED_LIBRARIES += libcutils libutils libEGL
LOCAL_LDLIBS := -lpthread -ldl LOCAL_LDLIBS := -lpthread -ldl
LOCAL_MODULE:= libGLESv2 LOCAL_MODULE:= libGLESv2

10
opengl/libs/GLES2/gl2.cpp
View File

@ -44,10 +44,18 @@ using namespace android;
#undef CALL_GL_API #undef CALL_GL_API
#undef CALL_GL_API_RETURN #undef CALL_GL_API_RETURN
#ifdef IS_MANTA
#define DEBUG_CALL_GL_API 1
#else
#define DEBUG_CALL_GL_API 0 #define DEBUG_CALL_GL_API 0
#endif
#define DEBUG_PRINT_CALL_STACK_ON_ERROR 0 #define DEBUG_PRINT_CALL_STACK_ON_ERROR 0
#define SYSTRACE_CALL_GL_API 0 #define SYSTRACE_CALL_GL_API 0
#ifdef IS_MANTA
#undef USE_FAST_TLS_KEY
#endif
#if USE_FAST_TLS_KEY #if USE_FAST_TLS_KEY
#ifdef HAVE_ARM_TLS_REGISTER #ifdef HAVE_ARM_TLS_REGISTER
@ -91,7 +99,7 @@ using namespace android;
GLenum status = GL_NO_ERROR; \ GLenum status = GL_NO_ERROR; \
bool error = false; \ bool error = false; \
while ((status = glGetError()) != GL_NO_ERROR) { \ while ((status = glGetError()) != GL_NO_ERROR) { \
ALOGD("[" #_api "] 0x%x", status); \ ALOGD("GL Error: [" #_api "] 0x%x", status); \
error = true; \ error = true; \
} \ } \
if (DEBUG_PRINT_CALL_STACK_ON_ERROR && error) { \ if (DEBUG_PRINT_CALL_STACK_ON_ERROR && error) { \