main: Add entry points for MapNamedBuffer[Range].

Reviewed-by: Fredrik Höglund <fredrik@kde.org>
This commit is contained in:
Laura Ekstrand
2015-02-11 14:09:52 -08:00
parent 4f513bc330
commit a0cc03929e
4 changed files with 69 additions and 3 deletions
@@ -61,6 +61,20 @@
<param name="data" type="const GLvoid *" />
</function>
<function name="MapNamedBuffer" offset="assign">
<return type="GLvoid *" />
<param name="buffer" type="GLuint" />
<param name="access" type="GLenum" />
</function>
<function name="MapNamedBufferRange" offset="assign">
<return type="GLvoid *" />
<param name="buffer" type="GLuint" />
<param name="offset" type="GLintptr" />
<param name="length" type="GLsizeiptr" />
<param name="access" type="GLbitfield" />
</function>
<!-- Texture object functions -->
<function name="CreateTextures" offset="assign">
+42
View File
@@ -2346,6 +2346,28 @@ _mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
"glMapBufferRange");
}
void * GLAPIENTRY
_mesa_MapNamedBufferRange(GLuint buffer, GLintptr offset, GLsizeiptr length,
GLbitfield access)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object *bufObj;
if (!ctx->Extensions.ARB_map_buffer_range) {
_mesa_error(ctx, GL_INVALID_OPERATION,
"glMapNamedBufferRange("
"ARB_map_buffer_range not supported)");
return NULL;
}
bufObj = _mesa_lookup_bufferobj_err(ctx, buffer, "glMapNamedBufferRange");
if (!bufObj)
return NULL;
return _mesa_map_buffer_range(ctx, bufObj, offset, length, access,
"glMapNamedBufferRange");
}
/**
* Converts GLenum access from MapBuffer and MapNamedBuffer into
* flags for input to _mesa_map_buffer_range.
@@ -2391,6 +2413,26 @@ _mesa_MapBuffer(GLenum target, GLenum access)
"glMapBuffer");
}
void * GLAPIENTRY
_mesa_MapNamedBuffer(GLuint buffer, GLenum access)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object *bufObj;
GLbitfield accessFlags;
if (!get_map_buffer_access_flags(ctx, access, &accessFlags)) {
_mesa_error(ctx, GL_INVALID_ENUM, "glMapNamedBuffer(invalid access)");
return NULL;
}
bufObj = _mesa_lookup_bufferobj_err(ctx, buffer, "glMapNamedBuffer");
if (!bufObj)
return NULL;
return _mesa_map_buffer_range(ctx, bufObj, 0, bufObj->Size, accessFlags,
"glMapNamedBuffer");
}
/**
* See GL_ARB_map_buffer_range spec
+11 -3
View File
@@ -245,9 +245,6 @@ _mesa_ClearNamedBufferSubData(GLuint buffer, GLenum internalformat,
GLenum format, GLenum type,
const GLvoid *data);
void * GLAPIENTRY
_mesa_MapBuffer(GLenum target, GLenum access);
GLboolean GLAPIENTRY
_mesa_UnmapBuffer(GLenum target);
@@ -274,6 +271,17 @@ void * GLAPIENTRY
_mesa_MapBufferRange(GLenum target, GLintptr offset, GLsizeiptr length,
GLbitfield access);
void * GLAPIENTRY
_mesa_MapNamedBufferRange(GLuint buffer, GLintptr offset, GLsizeiptr length,
GLbitfield access);
void * GLAPIENTRY
_mesa_MapBuffer(GLenum target, GLenum access);
void * GLAPIENTRY
_mesa_MapNamedBuffer(GLuint buffer, GLenum access);
void GLAPIENTRY
_mesa_FlushMappedBufferRange(GLenum target,
GLintptr offset, GLsizeiptr length);
+2
View File
@@ -960,6 +960,8 @@ const struct function gl_core_functions_possible[] = {
{ "glCopyNamedBufferSubData", 45, -1 },
{ "glClearNamedBufferData", 45, -1 },
{ "glClearNamedBufferSubData", 45, -1 },
{ "glMapNamedBuffer", 45, -1 },
{ "glMapNamedBufferRange", 45, -1 },
{ "glCreateTextures", 45, -1 },
{ "glTextureStorage1D", 45, -1 },
{ "glTextureStorage2D", 45, -1 },