emulator/opengl: Backport fixes from master branch.

This back-ports several fixes from aosp/master branch into idea133:

  145e25 Fix the Google Maps crash issue
  e33909 Support GL_MAX_TEXTURE_SIZE case to glGetIntegerv API
  c6dd20 Fix Mac build.

Change-Id: I26a05956c3b926dddeb638c6cff979199075ecbb

1 files changed, 11 insertions, 1 deletions

diff --git a/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp b/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp
index c96ba52..fe64f6f 100644
--- a/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp
+++ b/emulator/opengl/host/libs/Translator/GLES_V2/GLESv2Imp.cpp
@@ -940,11 +940,19 @@ GL_APICALL void  GL_APIENTRY glGetFloatv(GLenum pname, GLfloat* params){
 }
 
 GL_APICALL void  GL_APIENTRY glGetIntegerv(GLenum pname, GLint* params){
+    int destroyCtx = 0;
     GET_CTX();
 
+    if (!ctx) {
+        ctx = createGLESContext();
+        if (ctx)
+            destroyCtx = 1;
+    }
     if (ctx->glGetIntegerv(pname,params))
     {
-        return;
+        if (destroyCtx)
+            deleteGLESContext(ctx);
+            return;
     }
   
     bool es2 = ctx->getCaps()->GL_ARB_ES2_COMPATIBILITY;
@@ -1030,6 +1038,8 @@ GL_APICALL void  GL_APIENTRY glGetIntegerv(GLenum pname, GLint* params){
     default:
         ctx->dispatcher().glGetIntegerv(pname,params);
     }
+    if (destroyCtx)
+            deleteGLESContext(ctx);
 }
 
 GL_APICALL void  GL_APIENTRY glGetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment, GLenum pname, GLint* params){