commit fe2e5ce29837d9bf20f029adeafda9adf109621d
author The Android Automerger <android-build@google.com> Thu Jun 23 00:02:21 2016 -0700
committer The Android Automerger <android-build@google.com> Thu Jun 23 00:02:21 2016 -0700
tree 88290b25ccec3d175951ede36ace45f25310ad62
parent fbbbd30da0d40e256a08b37702f49ceeaab483e0
parent 5a23015556cb92d1939bf035006edbc546b4280d

merge in nyc-release history after reset to nyc-dev

opengl/system/GLESv2_enc/GL2Encoder.cpp

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 @@
 
     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,