OSDN Git Service

Merge aosp/master fixes into lmp-dev
authorbohu <bohu@google.com>
Tue, 21 Oct 2014 21:02:45 +0000 (14:02 -0700)
committerbohu <bohu@google.com>
Tue, 21 Oct 2014 23:07:36 +0000 (16:07 -0700)
commit68e02cb5db46be56c2b51b18eb8d53bbf26bdb93
treebdd7c9a91784710a87a5353e076086a0017788c6
parentdbe92cf66badda7d3e6c4146633b5ce964c669e2
Merge aosp/master fixes into lmp-dev

This patch updates the goldfish device to match the following
patches:
         3f62b50d Make the size of "cb_handle_t" same for 32/64-bit
         7a2929cd Remove display initialization from eglGetProcAddress API
         d0fead3c ranchu: Add ARM64-specific root/ramdisk config files.
         58ab34d9 Upgrade goldfish sensor HAL module to 1_0
         e3e68659 ranchu: Fix goldfish_pipe definitions.
         fe2c5beb Use more appropriate type in cb_handle_t::validate.
         40a674e0 Fix emulator crashes on glDrawElements command
         972291ae Handle empty buffer in QemuPipeStream::writeFully
         4aad46d9 Allow glGetProgramInfoLog_enc to have empty length
         691e021d Guard against negative width and height
         f2f04f45 Guard against negative buffer size
         ebe80e44 Handle empty data parameter in glTexSubImage2D_enc

Change-Id: Ib272952af902dc57fa6c76f966eb508a5fda838e
shared/OpenglCodecCommon/GLClientState.cpp
system/GLESv2_enc/GL2Encoder.cpp
system/GLESv2_enc/GL2Encoder.h
system/GLESv2_enc/gl2_enc.cpp
system/OpenglSystemCommon/QemuPipeStream.cpp
system/OpenglSystemCommon/gralloc_cb.h