KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: Refactor set_atomic_buffer_binding() 

Make set_atomic_buffer_binding() just update the binding, and move
the code that does validation, flushes the vertices etc. into a new
bind_atomic_buffer() function.

Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Fredrik Höglund 2013-11-15 19:45:43 +01:00
parent 4f30c0ba80
commit 19f7eeb6fb
1 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/mesa/main/bufferobj.c
View File

@ -2613,13 +2613,45 @@ bind_buffer_base_uniform_buffer(struct gl_context *ctx,
set_ubo_binding(ctx, index, bufObj, 0, 0, GL_TRUE);
}
/**
* Binds a buffer object to an atomic buffer binding point.
*
* The caller is responsible for validating the offset,
* flushing the vertices and updating NewDriverState.
*/
static void
set_atomic_buffer_binding(struct gl_context *ctx,
unsigned index,
struct gl_atomic_buffer_binding *binding,
struct gl_buffer_object *bufObj,
GLintptr offset,
GLsizeiptr size,
const char *name)
GLsizeiptr size)
{
_mesa_reference_buffer_object(ctx, &binding->BufferObject, bufObj);
if (bufObj == ctx->Shared->NullBufferObj) {
binding->Offset = -1;
binding->Size = -1;
} else {
binding->Offset = offset;
binding->Size = size;
}
}
/**
* Binds a buffer object to an atomic buffer binding point.
*
* Unlike set_atomic_buffer_binding(), this function also validates the
* index and offset, flushes vertices, and updates NewDriverState.
* It also checks if the binding has actually changing before
* updating it.
*/
static void
bind_atomic_buffer(struct gl_context *ctx,
unsigned index,
struct gl_buffer_object *bufObj,
GLintptr offset,
GLsizeiptr size,
const char *name)
{
struct gl_atomic_buffer_binding *binding;
@ -2647,15 +2679,7 @@ set_atomic_buffer_binding(struct gl_context *ctx,
FLUSH_VERTICES(ctx, 0);
ctx->NewDriverState |= ctx->DriverFlags.NewAtomicBuffer;
_mesa_reference_buffer_object(ctx, &binding->BufferObject, bufObj);
if (bufObj == ctx->Shared->NullBufferObj) {
binding->Offset = -1;
binding->Size = -1;
} else {
binding->Offset = offset;
binding->Size = size;
}
set_atomic_buffer_binding(ctx, binding, bufObj, offset, size);
}
void GLAPIENTRY
@ -2697,8 +2721,8 @@ _mesa_BindBufferRange(GLenum target, GLuint index,
bind_buffer_range_uniform_buffer(ctx, index, bufObj, offset, size);
return;
case GL_ATOMIC_COUNTER_BUFFER:
set_atomic_buffer_binding(ctx, index, bufObj, offset, size,
"glBindBufferRange");
bind_atomic_buffer(ctx, index, bufObj, offset, size,
"glBindBufferRange");
return;
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferRange(target)");
@ -2761,8 +2785,8 @@ _mesa_BindBufferBase(GLenum target, GLuint index, GLuint buffer)
bind_buffer_base_uniform_buffer(ctx, index, bufObj);
return;
case GL_ATOMIC_COUNTER_BUFFER:
set_atomic_buffer_binding(ctx, index, bufObj, 0, 0,
"glBindBufferBase");
bind_atomic_buffer(ctx, index, bufObj, 0, 0,
"glBindBufferBase");
return;
default:
_mesa_error(ctx, GL_INVALID_ENUM, "glBindBufferBase(target)");