OSDN Git Service

Treat the call to getIntegerv as a non-error on Android only.
authorGreg Hartman <ghartman@google.com>
Wed, 8 Apr 2015 16:57:16 +0000 (09:57 -0700)
committerGreg Hartman <ghartman@google.com>
Fri, 10 Apr 2015 22:22:20 +0000 (22:22 +0000)
Change-Id: I8aab90d46971bc47ab14a8b3df573637f8a0106f
Reviewed-on: https://swiftshader-review.googlesource.com/2820
Tested-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Greg Hartman <ghartman@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
src/OpenGL/libGLESv2/libGLESv2.cpp

index e5e4abf..f5bed4f 100644 (file)
 \r
 #include <limits>\r
 \r
+#ifdef ANDROID\r
+#include <cutils/log.h>\r
+#endif\r
+\r
 typedef std::pair<GLenum, GLenum> InternalFormatTypePair;\r
 typedef std::map<InternalFormatTypePair, GLenum> FormatMap;\r
 \r
@@ -2718,7 +2722,12 @@ void GL_APIENTRY glGetIntegerv(GLenum pname, GLint* params)
 \r
        if(!context)\r
        {\r
-               ERR("glGetIntegerv() called without current context.");   // Not strictly an error, but probably unintended or attempting to rely on non-compliant behavior\r
+               // Not strictly an error, but probably unintended or attempting to rely on non-compliant behavior\r
+               #ifdef __ANDROID__\r
+                       ALOGI("expected_badness glGetIntegerv() called without current context.");\r
+               #else\r
+                       ERR("glGetIntegerv() called without current context.");\r
+               #endif\r
 \r
                // This is not spec compliant! When there is no current GL context, functions should\r
                // have no side effects. Google Maps queries these values before creating a context,\r