diff options
| author | Vince Harron <vharron@google.com> | 2014-10-30 16:03:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2014-10-30 16:03:11 +0000 |
| commit | 5645bcd2a89111add720362a9a247670c799c03c (patch) | |
| tree | 400f9dea354b00435d33aa8003623fb2c85e499b /emulator | |
| parent | 4c8933a8267da1715b8c7402392c731346c0ae83 (diff) | |
| parent | d5b5fdb5bb3635bab96be2b9aef1b1da2e96d564 (diff) | |
| download | sdk-5645bcd2a89111add720362a9a247670c799c03c.tar.gz sdk-5645bcd2a89111add720362a9a247670c799c03c.tar.bz2 sdk-5645bcd2a89111add720362a9a247670c799c03c.zip | |
Merge "Handle empty data parameter in glTexSubImage2D" into studio-1.0-dev
automerge: d5b5fdb
* commit 'd5b5fdb5bb3635bab96be2b9aef1b1da2e96d564':
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 29f83589f..d90a7e5b8 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 |