[Mesa-dev] [PATCH 13/13] mesa: add support for glMapNamedBufferEXT()

[Timothy Arceri]

---
 .../glapi/gen/EXT_direct_state_access.xml     |  6 +++++
 src/mesa/main/bufferobj.c                     | 23 +++++++++++++++++++
 src/mesa/main/bufferobj.h                     |  2 ++
 src/mesa/main/tests/dispatch_sanity.cpp       |  2 +-
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/mapi/glapi/gen/EXT_direct_state_access.xml b/src/mapi/glapi/gen/EXT_direct_state_access.xml
index b4087969816..db701096ff2 100644
--- a/src/mapi/glapi/gen/EXT_direct_state_access.xml
+++ b/src/mapi/glapi/gen/EXT_direct_state_access.xml
@@ -154,6 +154,12 @@
       <param name="data" type="const GLvoid *" />
    </function>
 
+   <function name="MapNamedBufferEXT">
+      <return type="GLvoid *" />
+      <param name="buffer" type="GLuint" />
+      <param name="access" type="GLenum" />
+   </function>
+
    <function name="UnmapNamedBufferEXT">
       <return type="GLboolean" />
       <param name="buffer" type="GLuint" />
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c
index 45e9af21c5f..82f3442805d 100644
--- a/src/mesa/main/bufferobj.c
+++ b/src/mesa/main/bufferobj.c
@@ -3418,6 +3418,29 @@ _mesa_MapNamedBuffer(GLuint buffer, GLenum access)
                            "glMapNamedBuffer");
 }
 
+void * GLAPIENTRY
+_mesa_MapNamedBufferEXT(GLuint buffer, GLenum access)
+{
+   GET_CURRENT_CONTEXT(ctx);
+
+   GLbitfield accessFlags;
+   if (!get_map_buffer_access_flags(ctx, access, &accessFlags)) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glMapNamedBufferEXT(invalid access)");
+      return NULL;
+   }
+
+   struct gl_buffer_object *bufObj = _mesa_lookup_bufferobj(ctx, buffer);
+   if (!_mesa_handle_bind_buffer_gen(ctx, buffer,
+                                     &bufObj, "glMapNamedBufferEXT"))
+      return NULL;
+
+   if (!validate_map_buffer_range(ctx, bufObj, 0, bufObj->Size, accessFlags,
+                                  "glMapNamedBufferEXT"))
+      return NULL;
+
+   return map_buffer_range(ctx, bufObj, 0, bufObj->Size, accessFlags,
+                           "glMapNamedBufferEXT");
+}
 
 static void
 flush_mapped_buffer_range(struct gl_context *ctx,
diff --git a/src/mesa/main/bufferobj.h b/src/mesa/main/bufferobj.h
index 91df7e9c231..6dca61ea0ab 100644
--- a/src/mesa/main/bufferobj.h
+++ b/src/mesa/main/bufferobj.h
@@ -370,6 +370,8 @@ void * GLAPIENTRY
 _mesa_MapNamedBuffer_no_error(GLuint buffer, GLenum access);
 void * GLAPIENTRY
 _mesa_MapNamedBuffer(GLuint buffer, GLenum access);
+void * GLAPIENTRY
+_mesa_MapNamedBufferEXT(GLuint buffer, GLenum access);
 
 void GLAPIENTRY
 _mesa_FlushMappedBufferRange_no_error(GLenum target, GLintptr offset,
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index 8b0977731a7..5d6068dfdbc 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -1134,7 +1134,7 @@ const struct function common_desktop_functions_possible[] = {
    /* GL_EXT_direct_state_access - GL 1.5 */
    { "glNamedBufferDataEXT", 10, -1 },
    { "glNamedBufferSubDataEXT", 10, -1 },
-   //{ "glMapNamedBufferEXT", 10, -1 },
+   { "glMapNamedBufferEXT", 10, -1 },
    { "glUnmapNamedBufferEXT", 10, -1 },
    //{ "glGetNamedBufferParameterivEXT", 10, -1 },
    //{ "glGetNamedBufferPointervEXT", 10, -1 },
-- 
2.17.1