mesa: merge bind_shader_storage_buffers_{base|range}
Reduced code duplication should make the code more maintainable. Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Nicolai Hähnle
parent
e8dd7cc303
commit
5eb104d6ab
|
|
@ -3128,73 +3128,6 @@ unbind_shader_storage_buffers(struct gl_context *ctx, GLuint first,
|
|||
bufObj, -1, -1, GL_TRUE);
|
||||
}
|
||||
|
||||
static void
|
||||
bind_shader_storage_buffers_base(struct gl_context *ctx, GLuint first,
|
||||
GLsizei count, const GLuint *buffers)
|
||||
{
|
||||
GLint i;
|
||||
|
||||
if (!error_check_bind_shader_storage_buffers(ctx, first, count,
|
||||
"glBindBuffersBase"))
|
||||
return;
|
||||
|
||||
/* Assume that at least one binding will be changed */
|
||||
FLUSH_VERTICES(ctx, 0);
|
||||
ctx->NewDriverState |= ctx->DriverFlags.NewShaderStorageBuffer;
|
||||
|
||||
if (!buffers) {
|
||||
/* The ARB_multi_bind spec says:
|
||||
*
|
||||
* "If <buffers> is NULL, all bindings from <first> through
|
||||
* <first>+<count>-1 are reset to their unbound (zero) state."
|
||||
*/
|
||||
unbind_shader_storage_buffers(ctx, first, count);
|
||||
return;
|
||||
}
|
||||
|
||||
/* Note that the error semantics for multi-bind commands differ from
|
||||
* those of other GL commands.
|
||||
*
|
||||
* The Issues section in the ARB_multi_bind spec says:
|
||||
*
|
||||
* "(11) Typically, OpenGL specifies that if an error is generated by a
|
||||
* command, that command has no effect. This is somewhat
|
||||
* unfortunate for multi-bind commands, because it would require a
|
||||
* first pass to scan the entire list of bound objects for errors
|
||||
* and then a second pass to actually perform the bindings.
|
||||
* Should we have different error semantics?
|
||||
*
|
||||
* RESOLVED: Yes. In this specification, when the parameters for
|
||||
* one of the <count> binding points are invalid, that binding point
|
||||
* is not updated and an error will be generated. However, other
|
||||
* binding points in the same command will be updated if their
|
||||
* parameters are valid and no other error occurs."
|
||||
*/
|
||||
|
||||
_mesa_begin_bufferobj_lookups(ctx);
|
||||
|
||||
for (i = 0; i < count; i++) {
|
||||
struct gl_shader_storage_buffer_binding *binding =
|
||||
&ctx->ShaderStorageBufferBindings[first + i];
|
||||
struct gl_buffer_object *bufObj;
|
||||
|
||||
if (binding->BufferObject && binding->BufferObject->Name == buffers[i])
|
||||
bufObj = binding->BufferObject;
|
||||
else
|
||||
bufObj = _mesa_multi_bind_lookup_bufferobj(ctx, buffers, i,
|
||||
"glBindBuffersBase");
|
||||
|
||||
if (bufObj) {
|
||||
if (bufObj == ctx->Shared->NullBufferObj)
|
||||
set_ssbo_binding(ctx, binding, bufObj, -1, -1, GL_TRUE);
|
||||
else
|
||||
set_ssbo_binding(ctx, binding, bufObj, 0, 0, GL_TRUE);
|
||||
}
|
||||
}
|
||||
|
||||
_mesa_end_bufferobj_lookups(ctx);
|
||||
}
|
||||
|
||||
static void
|
||||
bind_uniform_buffers(struct gl_context *ctx, GLuint first, GLsizei count,
|
||||
const GLuint *buffers,
|
||||
|
|
@ -3307,15 +3240,16 @@ bind_uniform_buffers(struct gl_context *ctx, GLuint first, GLsizei count,
|
|||
}
|
||||
|
||||
static void
|
||||
bind_shader_storage_buffers_range(struct gl_context *ctx, GLuint first,
|
||||
GLsizei count, const GLuint *buffers,
|
||||
const GLintptr *offsets,
|
||||
const GLsizeiptr *sizes)
|
||||
bind_shader_storage_buffers(struct gl_context *ctx, GLuint first,
|
||||
GLsizei count, const GLuint *buffers,
|
||||
bool range,
|
||||
const GLintptr *offsets,
|
||||
const GLsizeiptr *sizes,
|
||||
const char *caller)
|
||||
{
|
||||
GLint i;
|
||||
|
||||
if (!error_check_bind_shader_storage_buffers(ctx, first, count,
|
||||
"glBindBuffersRange"))
|
||||
if (!error_check_bind_shader_storage_buffers(ctx, first, count, caller))
|
||||
return;
|
||||
|
||||
/* Assume that at least one binding will be changed */
|
||||
|
|
@ -3360,52 +3294,57 @@ bind_shader_storage_buffers_range(struct gl_context *ctx, GLuint first,
|
|||
struct gl_shader_storage_buffer_binding *binding =
|
||||
&ctx->ShaderStorageBufferBindings[first + i];
|
||||
struct gl_buffer_object *bufObj;
|
||||
GLintptr offset = 0;
|
||||
GLsizeiptr size = 0;
|
||||
|
||||
if (!bind_buffers_check_offset_and_size(ctx, i, offsets, sizes))
|
||||
continue;
|
||||
if (range) {
|
||||
if (!bind_buffers_check_offset_and_size(ctx, i, offsets, sizes))
|
||||
continue;
|
||||
|
||||
/* The ARB_multi_bind spec says:
|
||||
*
|
||||
* "An INVALID_VALUE error is generated by BindBuffersRange if any
|
||||
* pair of values in <offsets> and <sizes> does not respectively
|
||||
* satisfy the constraints described for those parameters for the
|
||||
* specified target, as described in section 6.7.1 (per binding)."
|
||||
*
|
||||
* Section 6.7.1 refers to table 6.5, which says:
|
||||
*
|
||||
* "┌───────────────────────────────────────────────────────────────┐
|
||||
* │ Shader storage buffer array bindings (see sec. 7.8) │
|
||||
* ├─────────────────────┬─────────────────────────────────────────┤
|
||||
* │ ... │ ... │
|
||||
* │ offset restriction │ multiple of value of SHADER_STORAGE_- │
|
||||
* │ │ BUFFER_OFFSET_ALIGNMENT │
|
||||
* │ ... │ ... │
|
||||
* │ size restriction │ none │
|
||||
* └─────────────────────┴─────────────────────────────────────────┘"
|
||||
*/
|
||||
if (offsets[i] & (ctx->Const.ShaderStorageBufferOffsetAlignment - 1)) {
|
||||
_mesa_error(ctx, GL_INVALID_VALUE,
|
||||
"glBindBuffersRange(offsets[%u]=%" PRId64
|
||||
" is misaligned; it must be a multiple of the value of "
|
||||
"GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT=%u when "
|
||||
"target=GL_SHADER_STORAGE_BUFFER)",
|
||||
i, (int64_t) offsets[i],
|
||||
ctx->Const.ShaderStorageBufferOffsetAlignment);
|
||||
continue;
|
||||
/* The ARB_multi_bind spec says:
|
||||
*
|
||||
* "An INVALID_VALUE error is generated by BindBuffersRange if any
|
||||
* pair of values in <offsets> and <sizes> does not respectively
|
||||
* satisfy the constraints described for those parameters for the
|
||||
* specified target, as described in section 6.7.1 (per binding)."
|
||||
*
|
||||
* Section 6.7.1 refers to table 6.5, which says:
|
||||
*
|
||||
* "┌───────────────────────────────────────────────────────────────┐
|
||||
* │ Shader storage buffer array bindings (see sec. 7.8) │
|
||||
* ├─────────────────────┬─────────────────────────────────────────┤
|
||||
* │ ... │ ... │
|
||||
* │ offset restriction │ multiple of value of SHADER_STORAGE_- │
|
||||
* │ │ BUFFER_OFFSET_ALIGNMENT │
|
||||
* │ ... │ ... │
|
||||
* │ size restriction │ none │
|
||||
* └─────────────────────┴─────────────────────────────────────────┘"
|
||||
*/
|
||||
if (offsets[i] & (ctx->Const.ShaderStorageBufferOffsetAlignment - 1)) {
|
||||
_mesa_error(ctx, GL_INVALID_VALUE,
|
||||
"glBindBuffersRange(offsets[%u]=%" PRId64
|
||||
" is misaligned; it must be a multiple of the value of "
|
||||
"GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT=%u when "
|
||||
"target=GL_SHADER_STORAGE_BUFFER)",
|
||||
i, (int64_t) offsets[i],
|
||||
ctx->Const.ShaderStorageBufferOffsetAlignment);
|
||||
continue;
|
||||
}
|
||||
|
||||
offset = offsets[i];
|
||||
size = sizes[i];
|
||||
}
|
||||
|
||||
if (binding->BufferObject && binding->BufferObject->Name == buffers[i])
|
||||
bufObj = binding->BufferObject;
|
||||
else
|
||||
bufObj = _mesa_multi_bind_lookup_bufferobj(ctx, buffers, i,
|
||||
"glBindBuffersRange");
|
||||
bufObj = _mesa_multi_bind_lookup_bufferobj(ctx, buffers, i, caller);
|
||||
|
||||
if (bufObj) {
|
||||
if (bufObj == ctx->Shared->NullBufferObj)
|
||||
set_ssbo_binding(ctx, binding, bufObj, -1, -1, GL_FALSE);
|
||||
set_ssbo_binding(ctx, binding, bufObj, -1, -1, !range);
|
||||
else
|
||||
set_ssbo_binding(ctx, binding, bufObj,
|
||||
offsets[i], sizes[i], GL_FALSE);
|
||||
set_ssbo_binding(ctx, binding, bufObj, offset, size, !range);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -3960,8 +3899,8 @@ _mesa_BindBuffersRange(GLenum target, GLuint first, GLsizei count,
|
|||
"glBindBuffersRange");
|
||||
return;
|
||||
case GL_SHADER_STORAGE_BUFFER:
|
||||
bind_shader_storage_buffers_range(ctx, first, count, buffers, offsets,
|
||||
sizes);
|
||||
bind_shader_storage_buffers(ctx, first, count, buffers, true, offsets, sizes,
|
||||
"glBindBuffersRange");
|
||||
return;
|
||||
case GL_ATOMIC_COUNTER_BUFFER:
|
||||
bind_atomic_buffers_range(ctx, first, count, buffers,
|
||||
|
|
@ -3995,7 +3934,8 @@ _mesa_BindBuffersBase(GLenum target, GLuint first, GLsizei count,
|
|||
"glBindBuffersBase");
|
||||
return;
|
||||
case GL_SHADER_STORAGE_BUFFER:
|
||||
bind_shader_storage_buffers_base(ctx, first, count, buffers);
|
||||
bind_shader_storage_buffers(ctx, first, count, buffers, false, NULL, NULL,
|
||||
"glBindBuffersBase");
|
||||
return;
|
||||
case GL_ATOMIC_COUNTER_BUFFER:
|
||||
bind_atomic_buffers_base(ctx, first, count, buffers);
|
||||
|
|
|
|||
Loading…
Reference in New Issue