diff options
| author | Chet Haase <chet@google.com> | 2012-10-08 13:19:08 -0700 |
|---|---|---|
| committer | Chet Haase <chet@google.com> | 2012-10-10 13:10:40 -0700 |
| commit | 8d5d2019805df1f27cbec07eeca47dd5ab453dad (patch) | |
| tree | 87d01369ba51f74d18ef9c6606ad3da593549143 /opengl | |
| parent | 0acb00c2d780b60ed3d71be256460375dd8715b4 (diff) | |
| download | frameworks_native-8d5d2019805df1f27cbec07eeca47dd5ab453dad.zip frameworks_native-8d5d2019805df1f27cbec07eeca47dd5ab453dad.tar.gz frameworks_native-8d5d2019805df1f27cbec07eeca47dd5ab453dad.tar.bz2 | |
Revert "Add GL Error logs (temporary)"
This reverts commit 2da2c15068327a4fdad411f638905abcb2209d8a.
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libs/Android.mk | 4 | ||||
| -rw-r--r-- | opengl/libs/GLES2/gl2.cpp | 10 |
2 files changed, 1 insertions, 13 deletions
diff --git a/opengl/libs/Android.mk b/opengl/libs/Android.mk index bbdef62..31bfcd7 100644 --- a/opengl/libs/Android.mk +++ b/opengl/libs/Android.mk @@ -126,10 +126,6 @@ LOCAL_SRC_FILES:= \ GLES2/gl2.cpp.arm \ # -ifneq (,$(filter manta, $(TARGET_DEVICE))) - LOCAL_CFLAGS += -DIS_MANTA -endif - LOCAL_SHARED_LIBRARIES += libcutils libutils libEGL LOCAL_LDLIBS := -lpthread -ldl LOCAL_MODULE:= libGLESv2 diff --git a/opengl/libs/GLES2/gl2.cpp b/opengl/libs/GLES2/gl2.cpp index cd70ac8..2d0045e 100644 --- a/opengl/libs/GLES2/gl2.cpp +++ b/opengl/libs/GLES2/gl2.cpp @@ -44,18 +44,10 @@ using namespace android; #undef CALL_GL_API #undef CALL_GL_API_RETURN -#ifdef IS_MANTA -#define DEBUG_CALL_GL_API 1 -#else #define DEBUG_CALL_GL_API 0 -#endif #define DEBUG_PRINT_CALL_STACK_ON_ERROR 0 #define SYSTRACE_CALL_GL_API 0 -#ifdef IS_MANTA -#undef USE_FAST_TLS_KEY -#endif - #if USE_FAST_TLS_KEY #ifdef HAVE_ARM_TLS_REGISTER @@ -99,7 +91,7 @@ using namespace android; GLenum status = GL_NO_ERROR; \ bool error = false; \ while ((status = glGetError()) != GL_NO_ERROR) { \ - ALOGD("GL Error: [" #_api "] 0x%x", status); \ + ALOGD("[" #_api "] 0x%x", status); \ error = true; \ } \ if (DEBUG_PRINT_CALL_STACK_ON_ERROR && error) { \ |