From: Yahan Zhou <yahan@google.com>
Date: Thu, 16 Jun 2016 01:14:56 +0000 (-0700)
Subject: Fix glTexSubImage2D
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fbbbd30da0d40e256a08b37702f49ceeaab483e0;p=android-x86%2Fdevice-generic-goldfish.git

Fix glTexSubImage2D

Fix b/29367586

Change-Id: Id690184a060190cf595562c891cf310b3901bc00
---

diff --git a/opengl/system/GLESv2_enc/GL2Encoder.cpp b/opengl/system/GLESv2_enc/GL2Encoder.cpp
index efd2d42..268f76c 100755
--- a/opengl/system/GLESv2_enc/GL2Encoder.cpp
+++ b/opengl/system/GLESv2_enc/GL2Encoder.cpp
@@ -1441,7 +1441,15 @@ void GL2Encoder::s_glTexSubImage2D(void* self, GLenum target, GLint level,
 
     SET_ERROR_IF((level < 0 || level > log2(maxTextureSize)), GL_INVALID_VALUE);
 
-    ctx->m_glTexSubImage2D_enc(ctx, target, level, xoffset, yoffset, width, height, format, type, pixels);
+     if (target == GL_TEXTURE_2D || target == GL_TEXTURE_EXTERNAL_OES) {
+        ctx->override2DTextureTarget(target);
+        ctx->m_glTexSubImage2D_enc(ctx, target, level, xoffset, yoffset, width,
+                height, format, type, pixels);
+        ctx->restore2DTextureTarget();
+     } else {
+         ctx->m_glTexSubImage2D_enc(ctx, target, level, xoffset, yoffset, width,
+                 height, format, type, pixels);
+     }
 }
 
 void GL2Encoder::s_glTexParameteriv(void* self,