merge in jb-mr1-release history after reset to jb-mr1-dev
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 @@
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 @@
#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 @@
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) { \