diff options
| author | Yahan Zhou <yahan@google.com> | 2016-06-22 18:57:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-22 18:57:07 +0000 |
| commit | 975ed60b2a131d61dca98b0b189aab21a391adb6 (patch) | |
| tree | 88290b25ccec3d175951ede36ace45f25310ad62 | |
| parent | 745eb6090644ea5a79dcc1c4b835c253bf673ce0 (diff) | |
| parent | fbbbd30da0d40e256a08b37702f49ceeaab483e0 (diff) | |
| download | device_generic_goldfish-android-7.1.0_r5.tar.gz device_generic_goldfish-android-7.1.0_r5.tar.bz2 device_generic_goldfish-android-7.1.0_r5.zip | |
Fix glTexSubImage2Dandroid-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-dr1-release
am: fbbbd30da0
Change-Id: I04a1bc976715046227f6a97ede1a002b21e56e62
| -rwxr-xr-x | opengl/system/GLESv2_enc/GL2Encoder.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/opengl/system/GLESv2_enc/GL2Encoder.cpp b/opengl/system/GLESv2_enc/GL2Encoder.cpp index efd2d42a..268f76c9 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, |