diff options
| author | bohu <bohu@google.com> | 2014-10-17 16:40:23 -0700 |
|---|---|---|
| committer | Vince Harron <vharron@google.com> | 2014-10-29 19:17:40 +0000 |
| commit | 04caa43a77ed82a5e364830dea8617527418abad (patch) | |
| tree | 54273aaf1b064a9b336d80386267c02bf6658d09 /emulator | |
| parent | 75c9edb0abb98eee51cdf972287fe405662a9c19 (diff) | |
| download | sdk-04caa43a77ed82a5e364830dea8617527418abad.zip sdk-04caa43a77ed82a5e364830dea8617527418abad.tar.gz sdk-04caa43a77ed82a5e364830dea8617527418abad.tar.bz2 | |
Handle empty data parameter in glTexSubImage2D
This commit handles empty data parameter in decoder side to avoid
crashing emultor.
Change-Id: I1605c328506d1fa1506023ca7b261d210b944d12
(cherry picked from commit f68413b2dbf5a73643195589b3fb5c10886a150e)
Diffstat (limited to 'emulator')
| -rw-r--r-- | emulator/opengl/host/libs/GLESv2_dec/gl2.attrib | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/emulator/opengl/host/libs/GLESv2_dec/gl2.attrib b/emulator/opengl/host/libs/GLESv2_dec/gl2.attrib index 29f8358..d90a7e5 100644 --- a/emulator/opengl/host/libs/GLESv2_dec/gl2.attrib +++ b/emulator/opengl/host/libs/GLESv2_dec/gl2.attrib @@ -258,7 +258,7 @@ glTexParameteriv #void glTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels) glTexSubImage2D len pixels pixelDataSize(self, width, height, format, type, 0) - var_flag pixels isLarge + var_flag pixels nullAllowed isLarge #void glUniform1fv(GLint location, GLsizei count, GLfloat *v) glUniform1fv |