diff options
| author | bohu <bohu@google.com> | 2015-01-15 03:46:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-15 03:46:03 +0000 |
| commit | 6d171076e8a5d1c6302efc48e7c558863b36a6e4 (patch) | |
| tree | a73e290325fa97787797df27a4cd465bf26e591c | |
| parent | d72c930b8d0fabb47b4c598488cf558ce0a1f3c5 (diff) | |
| parent | dde8f23d96c06add9486327256bd80363e017927 (diff) | |
| download | android_device_generic_goldfish-6d171076e8a5d1c6302efc48e7c558863b36a6e4.tar.gz android_device_generic_goldfish-6d171076e8a5d1c6302efc48e7c558863b36a6e4.tar.bz2 android_device_generic_goldfish-6d171076e8a5d1c6302efc48e7c558863b36a6e4.zip | |
Merge "opengl: Regenerate GPU emulation encoder sources to fix NULL parameters in some gl functions."
| -rw-r--r-- | opengl/system/GLESv2_enc/gl2_enc.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/opengl/system/GLESv2_enc/gl2_enc.cpp b/opengl/system/GLESv2_enc/gl2_enc.cpp index 1c4f73c..089a9ae 100644 --- a/opengl/system/GLESv2_enc/gl2_enc.cpp +++ b/opengl/system/GLESv2_enc/gl2_enc.cpp @@ -934,8 +934,8 @@ void glGetActiveAttrib_enc(void *self , GLuint program, GLuint index, GLsizei bu IOStream *stream = ctx->m_stream; const unsigned int __size_length = ((length != NULL) ? (sizeof(GLsizei)) : 0); - const unsigned int __size_size = (sizeof(GLint)); - const unsigned int __size_type = (sizeof(GLenum)); + const unsigned int __size_size = ((size != NULL) ? (sizeof(GLint)) : 0); + const unsigned int __size_type = ((type != NULL) ? (sizeof(GLenum)) : 0); const unsigned int __size_name = ((name != NULL) ? bufsize : 0); unsigned char *ptr; const size_t packetSize = 8 + 4 + 4 + 4 + __size_length + __size_size + __size_type + __size_name + 4*4; @@ -951,8 +951,8 @@ void glGetActiveAttrib_enc(void *self , GLuint program, GLuint index, GLsizei bu *(unsigned int *)(ptr) = __size_type; ptr += 4; *(unsigned int *)(ptr) = __size_name; ptr += 4; if (length != NULL) stream->readback(length, __size_length); - stream->readback(size, __size_size); - stream->readback(type, __size_type); + if (size != NULL) stream->readback(size, __size_size); + if (type != NULL) stream->readback(type, __size_type); if (name != NULL) stream->readback(name, __size_name); } @@ -963,8 +963,8 @@ void glGetActiveUniform_enc(void *self , GLuint program, GLuint index, GLsizei b IOStream *stream = ctx->m_stream; const unsigned int __size_length = ((length != NULL) ? (sizeof(GLsizei)) : 0); - const unsigned int __size_size = (sizeof(GLint)); - const unsigned int __size_type = (sizeof(GLenum)); + const unsigned int __size_size = ((size != NULL) ? (sizeof(GLint)) : 0); + const unsigned int __size_type = ((type != NULL) ? (sizeof(GLenum)) : 0); const unsigned int __size_name = ((name != NULL) ? bufsize : 0); unsigned char *ptr; const size_t packetSize = 8 + 4 + 4 + 4 + __size_length + __size_size + __size_type + __size_name + 4*4; @@ -980,8 +980,8 @@ void glGetActiveUniform_enc(void *self , GLuint program, GLuint index, GLsizei b *(unsigned int *)(ptr) = __size_type; ptr += 4; *(unsigned int *)(ptr) = __size_name; ptr += 4; if (length != NULL) stream->readback(length, __size_length); - stream->readback(size, __size_size); - stream->readback(type, __size_type); + if (size != NULL) stream->readback(size, __size_size); + if (type != NULL) stream->readback(type, __size_type); if (name != NULL) stream->readback(name, __size_name); } |