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

mesa: split bind_buffer_range_shader_storage_buffer() in two

Browse Source 
This will help us implement KHR_no_error support.

Reviewed-by: Iago Toral Quiroga <itoral@igalia.com>
Tested-by: Dieter Nützel <Dieter@nuetzel-hh.de>
This commit is contained in:
Timothy Arceri
2017-05-22 15:46:57 +10:00
parent cea384fa75
commit 135e5659bd
1 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/main/bufferobj.c
+23 -13
View File
@@ -3160,6 +3160,22 @@ bind_buffer_range_uniform_buffer_err(struct gl_context *ctx, GLuint index,
bind_buffer_range_uniform_buffer(ctx, index, bufObj, offset, size);
}
static void
bind_buffer_range_shader_storage_buffer(struct gl_context *ctx,
GLuint index,
struct gl_buffer_object *bufObj,
GLintptr offset,
GLsizeiptr size)
{
if (bufObj == ctx->Shared->NullBufferObj) {
offset = -1;
size = -1;
}
_mesa_reference_buffer_object(ctx, &ctx->ShaderStorageBuffer, bufObj);
bind_shader_storage_buffer(ctx, index, bufObj, offset, size, GL_FALSE);
}
/**
* Bind a region of a buffer object to a shader storage block binding point.
* \param index the shader storage buffer binding point index
@@ -3168,11 +3184,10 @@ bind_buffer_range_uniform_buffer_err(struct gl_context *ctx, GLuint index,
* \param size size of the buffer object region
*/
static void
bind_buffer_range_shader_storage_buffer(struct gl_context *ctx,
GLuint index,
struct gl_buffer_object *bufObj,
GLintptr offset,
GLsizeiptr size)
bind_buffer_range_shader_storage_buffer_err(struct gl_context *ctx,
GLuint index,
struct gl_buffer_object *bufObj,
GLintptr offset, GLsizeiptr size)
{
if (index >= ctx->Const.MaxShaderStorageBufferBindings) {
_mesa_error(ctx, GL_INVALID_VALUE, "glBindBufferRange(index=%d)", index);
@@ -3186,13 +3201,7 @@ bind_buffer_range_shader_storage_buffer(struct gl_context *ctx,
return;
}
if (bufObj == ctx->Shared->NullBufferObj) {
offset = -1;
size = -1;
}
_mesa_reference_buffer_object(ctx, &ctx->ShaderStorageBuffer, bufObj);
bind_shader_storage_buffer(ctx, index, bufObj, offset, size, GL_FALSE);
bind_buffer_range_shader_storage_buffer(ctx, index, bufObj, offset, size);
}
/**
@@ -4025,7 +4034,8 @@ _mesa_BindBufferRange(GLenum target, GLuint index,
bind_buffer_range_uniform_buffer_err(ctx, index, bufObj, offset, size);
return;
case GL_SHADER_STORAGE_BUFFER:
bind_buffer_range_shader_storage_buffer(ctx, index, bufObj, offset, size);
bind_buffer_range_shader_storage_buffer_err(ctx, index, bufObj, offset,
size);
return;
case GL_ATOMIC_COUNTER_BUFFER:
bind_atomic_buffer(ctx, index, bufObj, offset, size,