Snap for 5067372 from 400bc51942768b046d76e552ab4000b2e4cdea24 to emu-3.0-release

Change-Id: Id87e8eb2d99df332a282cc2a8a8747b8a163c003

3 files changed, 32 insertions, 7 deletions

diff --git a/shared/OpenglCodecCommon/GLClientState.cpp b/shared/OpenglCodecCommon/GLClientState.cpp
index 7d403894..c4bf4da0 100644
--- a/shared/OpenglCodecCommon/GLClientState.cpp
+++ b/shared/OpenglCodecCommon/GLClientState.cpp
@@ -1271,14 +1271,14 @@ void GLClientState::getBoundFramebufferFormat(
             res_info->rb_format = queryRboFormat(props.depthAttachment_rbo);
             res_info->rb_multisamples =
                 queryRboSamples(
-                        props.colorAttachmenti_rbos[colorAttachmentIndex]);
+                        props.depthAttachment_rbo);
         } else if (props.depthAttachment_hasTexObj) {
             res_info->type = FBO_ATTACHMENT_TEXTURE;
             res_info->tex_internalformat = queryTexInternalFormat(props.depthAttachment_texture);
             res_info->tex_format = queryTexFormat(props.depthAttachment_texture);
             res_info->tex_type = queryTexType(props.depthAttachment_texture);
             res_info->tex_multisamples =
-                queryTexSamples(props.colorAttachmenti_textures[colorAttachmentIndex]);
+                queryTexSamples(props.depthAttachment_texture);
         } else {
             res_info->type = FBO_ATTACHMENT_NONE;
         }
@@ -1289,14 +1289,14 @@ void GLClientState::getBoundFramebufferFormat(
             res_info->rb_format = queryRboFormat(props.stencilAttachment_rbo);
             res_info->rb_multisamples =
                 queryRboSamples(
-                        props.colorAttachmenti_rbos[colorAttachmentIndex]);
+                        props.stencilAttachment_rbo);
         } else if (props.stencilAttachment_hasTexObj) {
             res_info->type = FBO_ATTACHMENT_TEXTURE;
             res_info->tex_internalformat = queryTexInternalFormat(props.stencilAttachment_texture);
             res_info->tex_format = queryTexFormat(props.stencilAttachment_texture);
             res_info->tex_type = queryTexType(props.stencilAttachment_texture);
             res_info->tex_multisamples =
-                queryTexSamples(props.colorAttachmenti_textures[colorAttachmentIndex]);
+                queryTexSamples(props.stencilAttachment_texture);
         } else {
             res_info->type = FBO_ATTACHMENT_NONE;
         }
@@ -1307,14 +1307,14 @@ void GLClientState::getBoundFramebufferFormat(
             res_info->rb_format = queryRboFormat(props.depthstencilAttachment_rbo);
             res_info->rb_multisamples =
                 queryRboSamples(
-                        props.colorAttachmenti_rbos[colorAttachmentIndex]);
+                        props.depthstencilAttachment_rbo);
         } else if (props.depthstencilAttachment_hasTexObj) {
             res_info->type = FBO_ATTACHMENT_TEXTURE;
             res_info->tex_internalformat = queryTexInternalFormat(props.depthstencilAttachment_texture);
             res_info->tex_format = queryTexFormat(props.depthstencilAttachment_texture);
             res_info->tex_type = queryTexType(props.depthstencilAttachment_texture);
             res_info->tex_multisamples =
-                queryTexSamples(props.colorAttachmenti_textures[colorAttachmentIndex]);
+                queryTexSamples(props.depthstencilAttachment_texture);
         } else {
             res_info->type = FBO_ATTACHMENT_NONE;
         }
diff --git a/system/egl/ClientAPIExts.cpp b/system/egl/ClientAPIExts.cpp
index 0f02dcb8..40644e74 100644
--- a/system/egl/ClientAPIExts.cpp
+++ b/system/egl/ClientAPIExts.cpp
@@ -97,7 +97,8 @@ void initClientFuncs(const EGLClient_glesInterface *iface, int idx)
         if (!thread->currentContext) { \
             return; \
         } \
-        int idx = (int)thread->currentContext->majorVersion - 1; \
+        int clientMajorVersion = (int)thread->currentContext->majorVersion; \
+        int idx = clientMajorVersion == 1 ? 0 : 1; \
         if (!s_client_extensions[idx].fname) { \
             return; \
         } \
diff --git a/system/egl/ClientAPIExts.in b/system/egl/ClientAPIExts.in
index 58507019..a4595f2e 100644
--- a/system/egl/ClientAPIExts.in
+++ b/system/egl/ClientAPIExts.in
@@ -199,3 +199,27 @@ API_ENTRY(glDrawTexfvOES,
 API_ENTRY(glDrawTexxvOES,
           (const GLfixed *coords),
           (coords))
+
+API_ENTRY(glBindVertexArrayOES,
+          (GLuint array),
+          (array))
+
+API_ENTRY(glDeleteVertexArraysOES,
+          (GLsizei n, const GLuint* arrays),
+          (n, arrays))
+
+API_ENTRY(glGenVertexArraysOES,
+          (GLsizei n, GLuint* arrays),
+          (n, arrays))
+
+API_ENTRY(glIsVertexArrayOES,
+          (GLuint array),
+          (array))
+
+API_ENTRY(glMapBufferOES,
+          (GLenum target, GLenum access),
+          (target, access))
+
+API_ENTRY(glUnmapBufferOES,
+          (GLenum target),
+          (target))
\ No newline at end of file