diff options
| author | bohu <bohu@google.com> | 2014-10-21 17:11:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-10-21 17:11:46 +0000 |
| commit | eafacf27fc36109fb9ad92606754aa761696f429 (patch) | |
| tree | f9fdfbaebf76290a3a39e82e5d8cf4d71e591410 /emulator | |
| parent | 654e8c9acc3981d32c303f1a1ba705465d09d676 (diff) | |
| parent | f68413b2dbf5a73643195589b3fb5c10886a150e (diff) | |
| download | sdk-eafacf27fc36109fb9ad92606754aa761696f429.zip sdk-eafacf27fc36109fb9ad92606754aa761696f429.tar.gz sdk-eafacf27fc36109fb9ad92606754aa761696f429.tar.bz2 | |
Merge "Handle empty data parameter in glTexSubImage2D"
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 |