fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 03:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

main: Add entry point for NamedBufferStorage.

Browse source 
Reviewed-by: Martin Peres <martin.peres@linux.intel.com>
This commit is contained in:
Laura Ekstrand 2015-01-09 16:17:10 -08:00
parent 2cf48c37c1
commit a76808dc19
4 changed files with 65 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mapi/glapi/gen/ARB_direct_state_access.xml
View file

@ -14,6 +14,13 @@
<param name="buffers" type="GLuint *" />
</function>
<function name="NamedBufferStorage" offset="assign">
<param name="buffer" type="GLuint" />
<param name="size" type="GLsizeiptr" />
<param name="data" type="const GLvoid *" />
<param name="flags" type="GLbitfield" />
</function>
<!-- Texture object functions -->
<function name="CreateTextures" offset="assign">

65
src/mesa/main/bufferobj.c
View file

@ -1395,15 +1395,13 @@ _mesa_IsBuffer(GLuint id)
}
void GLAPIENTRY
_mesa_BufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data,
GLbitfield flags)
void
_mesa_buffer_storage(struct gl_context *ctx, struct gl_buffer_object *bufObj,
GLenum target, GLsizeiptr size, const GLvoid *data,
GLbitfield flags, const char *func)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object *bufObj;
if (size <= 0) {
_mesa_error(ctx, GL_INVALID_VALUE, "glBufferStorage(size <= 0)");
_mesa_error(ctx, GL_INVALID_VALUE, "%s(size <= 0)", func);
return;
}
@ -1413,27 +1411,25 @@ _mesa_BufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data,
GL_MAP_COHERENT_BIT |
GL_DYNAMIC_STORAGE_BIT |
GL_CLIENT_STORAGE_BIT)) {
_mesa_error(ctx, GL_INVALID_VALUE, "glBufferStorage(flags)");
_mesa_error(ctx, GL_INVALID_VALUE, "%s(invalid flag bits set)", func);
return;
}
if (flags & GL_MAP_PERSISTENT_BIT &&
!(flags & (GL_MAP_READ_BIT | GL_MAP_WRITE_BIT))) {
_mesa_error(ctx, GL_INVALID_VALUE, "glBufferStorage(flags!=READ/WRITE)");
_mesa_error(ctx, GL_INVALID_VALUE,
"%s(PERSISTENT and flags!=READ/WRITE)", func);
return;
}
if (flags & GL_MAP_COHERENT_BIT && !(flags & GL_MAP_PERSISTENT_BIT)) {
_mesa_error(ctx, GL_INVALID_VALUE, "glBufferStorage(flags!=PERSISTENT)");
_mesa_error(ctx, GL_INVALID_VALUE,
"%s(COHERENT and flags!=PERSISTENT)", func);
return;
}
bufObj = get_buffer(ctx, "glBufferStorage", target, GL_INVALID_OPERATION);
if (!bufObj)
return;
if (bufObj->Immutable) {
_mesa_error(ctx, GL_INVALID_OPERATION, "glBufferStorage(immutable)");
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(immutable)", func);
return;
}
@ -1453,14 +1449,49 @@ _mesa_BufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data,
* glBufferStorage is not described in the spec, Graham Sellers
* said that it should behave the same as glBufferData.
*/
_mesa_error(ctx, GL_INVALID_OPERATION, "glBufferStorage()");
_mesa_error(ctx, GL_INVALID_OPERATION, "%s", func);
}
else {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glBufferStorage()");
_mesa_error(ctx, GL_OUT_OF_MEMORY, "%s", func);
}
}
}
void GLAPIENTRY
_mesa_BufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data,
GLbitfield flags)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object *bufObj;
bufObj = get_buffer(ctx, "glBufferStorage", target, GL_INVALID_OPERATION);
if (!bufObj)
return;
_mesa_buffer_storage(ctx, bufObj, target, size, data, flags,
"glBufferStorage");
}
void GLAPIENTRY
_mesa_NamedBufferStorage(GLuint buffer, GLsizeiptr size, const GLvoid *data,
GLbitfield flags)
{
GET_CURRENT_CONTEXT(ctx);
struct gl_buffer_object *bufObj;
bufObj = _mesa_lookup_bufferobj_err(ctx, buffer, "glNamedBufferStorage");
if (!bufObj)
return;
/*
* In direct state access, buffer objects have an unspecified target since
* they are not required to be bound.
*/
_mesa_buffer_storage(ctx, bufObj, GL_NONE, size, data, flags,
"glNamedBufferStorage");
}
void GLAPIENTRY
_mesa_BufferData(GLenum target, GLsizeiptrARB size,

9
src/mesa/main/bufferobj.h
View file

@ -129,6 +129,11 @@ _mesa_total_buffer_object_memory(struct gl_context *ctx);
extern void
_mesa_init_buffer_object_functions(struct dd_function_table *driver);
extern void
_mesa_buffer_storage(struct gl_context *ctx, struct gl_buffer_object *bufObj,
GLenum target, GLsizeiptr size, const GLvoid *data,
GLbitfield flags, const char *func);
extern void
_mesa_buffer_unmap_all_mappings(struct gl_context *ctx,
struct gl_buffer_object *bufObj);
@ -162,6 +167,10 @@ void GLAPIENTRY
_mesa_BufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data,
GLbitfield flags);
void GLAPIENTRY
_mesa_NamedBufferStorage(GLuint buffer, GLsizeiptr size, const GLvoid *data,
GLbitfield flags);
void GLAPIENTRY
_mesa_BufferData(GLenum target, GLsizeiptrARB size,
const GLvoid * data, GLenum usage);

1
src/mesa/main/tests/dispatch_sanity.cpp
View file

@ -954,6 +954,7 @@ const struct function gl_core_functions_possible[] = {
/* GL_ARB_direct_state_access */
{ "glCreateBuffers", 45, -1 },
{ "glNamedBufferStorage", 45, -1 },
{ "glCreateTextures", 45, -1 },
{ "glTextureStorage1D", 45, -1 },
{ "glTextureStorage2D", 45, -1 },