diff options
| author | bohu <bohu@google.com> | 2014-10-21 17:11:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-21 17:11:34 +0000 |
| commit | dc69376bd3d1c65ad19abfc036a85266b2199136 (patch) | |
| tree | 3bf96f16d608afdc43457de9c2e6bcc04f8f4793 /opengl | |
| parent | 45d03a067a753d50e7aeb2ab50048db851538ab8 (diff) | |
| parent | ebe80e44011264a1f5abc01708ce4b378a08a22e (diff) | |
| download | android_device_generic_goldfish-dc69376bd3d1c65ad19abfc036a85266b2199136.tar.gz android_device_generic_goldfish-dc69376bd3d1c65ad19abfc036a85266b2199136.tar.bz2 android_device_generic_goldfish-dc69376bd3d1c65ad19abfc036a85266b2199136.zip | |
Merge "Handle empty data parameter in glTexSubImage2D_enc"
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/system/GLESv2_enc/gl2_enc.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/opengl/system/GLESv2_enc/gl2_enc.cpp b/opengl/system/GLESv2_enc/gl2_enc.cpp index 8baa289..5929697 100644 --- a/opengl/system/GLESv2_enc/gl2_enc.cpp +++ b/opengl/system/GLESv2_enc/gl2_enc.cpp @@ -1923,7 +1923,7 @@ void glTexSubImage2D_enc(void *self , GLenum target, GLint level, GLint xoffset, gl2_encoder_context_t *ctx = (gl2_encoder_context_t *)self; IOStream *stream = ctx->m_stream; - const unsigned int __size_pixels = pixelDataSize(self, width, height, format, type, 0); + const unsigned int __size_pixels = ((pixels != NULL) ? pixelDataSize(self, width, height, format, type, 0) : 0); unsigned char *ptr; const size_t packetSize = 8 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + __size_pixels + 1*4; ptr = stream->alloc(8 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4); @@ -1940,7 +1940,7 @@ void glTexSubImage2D_enc(void *self , GLenum target, GLint level, GLint xoffset, memcpy(ptr, &type, 4); ptr += 4; stream->flush(); stream->writeFully(&__size_pixels,4); - stream->writeFully(pixels, __size_pixels); + if (pixels != NULL) stream->writeFully(pixels, __size_pixels); } void glUniform1f_enc(void *self , GLint location, GLfloat x) |