Update goldfish from aosp/master

    Merge aosp/master fixes into lmp-dev

    This patch updates the goldfish device to match the following
    patches:
        1c9492dd Fix GPU emulation crash.
        1da62b8c opengl: Fix a few function name typos.
        a4d0e1ca opengl: Remove accessor functions from encoders.
        223a765d opengl: Remove compiler warnings.
        b7837c3c opengl: Regenerate GPU emulation encoder sources.
        622970b4 opengl: Fix 64-bit build.
        5fa17220 Unbind buffer when buffer is deleted
        4a01a642 Properly initialize GLClientState's m_states
        2c71ccd4 handles glGetBooleanv when value is nonboolean
        4f9ec391 Fix eglDestroyContext and glTexImage2D
        585a4b03 opengl: Fix pixelDataSize() ambiguity.

Change-Id: I3f574149558b4b4cee8a3e354314f6da8f49957d

1 files changed, 6 insertions, 0 deletions

diff --git a/opengl/shared/OpenglCodecCommon/GLClientState.h b/opengl/shared/OpenglCodecCommon/GLClientState.h
index c86329b..09ee571 100644
--- a/opengl/shared/OpenglCodecCommon/GLClientState.h
+++ b/opengl/shared/OpenglCodecCommon/GLClientState.h
@@ -91,6 +91,12 @@ public:
     void setActiveTexture(int texUnit) {m_activeTexture = texUnit; };
     int getActiveTexture() const { return m_activeTexture; }
 
+    void unBindBuffer(GLuint id)
+    {
+        if (m_currentArrayVbo == id) m_currentArrayVbo = 0;
+        else if (m_currentIndexVbo == id) m_currentIndexVbo = 0;
+    }
+
     int bindBuffer(GLenum target, GLuint id)
     {
         int err = 0;