mesa: Implement glBindBuffersRange
Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Fredrik Höglund
parent
533cfa03ac
commit
f0c36cf4fa
|
|
@ -2780,6 +2780,39 @@ bind_atomic_buffer(struct gl_context *ctx,
|
|||
set_atomic_buffer_binding(ctx, binding, bufObj, offset, size);
|
||||
}
|
||||
|
||||
static inline bool
|
||||
bind_buffers_check_offset_and_size(struct gl_context *ctx,
|
||||
GLuint index,
|
||||
const GLintptr *offsets,
|
||||
const GLsizeiptr *sizes)
|
||||
{
|
||||
if (offsets[index] < 0) {
|
||||
/* The ARB_multi_bind spec says:
|
||||
*
|
||||
* "An INVALID_VALUE error is generated by BindBuffersRange if any
|
||||
* value in <offsets> is less than zero (per binding)."
|
||||
*/
|
||||
_mesa_error(ctx, GL_INVALID_VALUE,
|
||||
"glBindBuffersRange(offsets[%u]=%lld < 0)",
|
||||
index, (long long int) offsets[index]);
|
||||
return false;
|
||||
}
|
||||
|
||||
if (sizes[index] <= 0) {
|
||||
/* The ARB_multi_bind spec says:
|
||||
*
|
||||
* "An INVALID_VALUE error is generated by BindBuffersRange if any
|
||||
* value in <sizes> is less than or equal to zero (per binding)."
|
||||
*/
|
||||
_mesa_error(ctx, GL_INVALID_VALUE,
|
||||
"glBindBuffersRange(sizes[%u]=%lld <= 0)",
|
||||
index, (long long int) sizes[index]);
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static bool
|
||||
error_check_bind_uniform_buffers(struct gl_context *ctx,
|
||||
GLuint first, GLsizei count,
|
||||
|
|
@ -2890,6 +2923,111 @@ bind_uniform_buffers_base(struct gl_context *ctx, GLuint first, GLsizei count,
|
|||
_mesa_end_bufferobj_lookups(ctx);
|
||||
}
|
||||
|
||||
static void
|
||||
bind_uniform_buffers_range(struct gl_context *ctx, GLuint first, GLsizei count,
|
||||
const GLuint *buffers,
|
||||
const GLintptr *offsets, const GLsizeiptr *sizes)
|
||||
{
|
||||
GLuint i;
|
||||
|
||||
if (!error_check_bind_uniform_buffers(ctx, first, count,
|
||||
"glBindBuffersRange"))
|
||||
return;
|
||||
|
||||
/* Assume that at least one binding will be changed */
|
||||
FLUSH_VERTICES(ctx, 0);
|
||||
ctx->NewDriverState |= ctx->DriverFlags.NewUniformBuffer;
|
||||
|
||||
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.
|
||||
* In this case, the offsets and sizes associated with the
|
||||
* binding points are set to default values, ignoring
|
||||
* <offsets> and <sizes>."
|
||||
*/
|
||||
unbind_uniform_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_uniform_buffer_binding *binding =
|
||||
&ctx->UniformBufferBindings[first + i];
|
||||
struct gl_buffer_object *bufObj;
|
||||
|
||||
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:
|
||||
*
|
||||
* "┌───────────────────────────────────────────────────────────────┐
|
||||
* │ Uniform buffer array bindings (see sec. 7.6) │
|
||||
* ├─────────────────────┬─────────────────────────────────────────┤
|
||||
* │ ... │ ... │
|
||||
* │ offset restriction │ multiple of value of UNIFORM_BUFFER_- │
|
||||
* │ │ OFFSET_ALIGNMENT │
|
||||
* │ ... │ ... │
|
||||
* │ size restriction │ none │
|
||||
* └─────────────────────┴─────────────────────────────────────────┘"
|
||||
*/
|
||||
if (offsets[i] & (ctx->Const.UniformBufferOffsetAlignment - 1)) {
|
||||
_mesa_error(ctx, GL_INVALID_VALUE,
|
||||
"glBindBuffersRange(offsets[%u]=%lld is misaligned; "
|
||||
"it must be a multiple of the value of "
|
||||
"GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT=%u when "
|
||||
"target=GL_UNIFORM_BUFFER)",
|
||||
i, (long long int) offsets[i],
|
||||
ctx->Const.UniformBufferOffsetAlignment);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (binding->BufferObject && binding->BufferObject->Name == buffers[i])
|
||||
bufObj = binding->BufferObject;
|
||||
else
|
||||
bufObj = _mesa_multi_bind_lookup_bufferobj(ctx, buffers, i,
|
||||
"glBindBuffersRange");
|
||||
|
||||
if (bufObj) {
|
||||
if (bufObj == ctx->Shared->NullBufferObj)
|
||||
set_ubo_binding(ctx, binding, bufObj, -1, -1, GL_FALSE);
|
||||
else
|
||||
set_ubo_binding(ctx, binding, bufObj,
|
||||
offsets[i], sizes[i], GL_FALSE);
|
||||
}
|
||||
}
|
||||
|
||||
_mesa_end_bufferobj_lookups(ctx);
|
||||
}
|
||||
|
||||
static bool
|
||||
error_check_bind_xfb_buffers(struct gl_context *ctx,
|
||||
struct gl_transform_feedback_object *tfObj,
|
||||
|
|
@ -3020,6 +3158,117 @@ bind_xfb_buffers_base(struct gl_context *ctx,
|
|||
_mesa_end_bufferobj_lookups(ctx);
|
||||
}
|
||||
|
||||
static void
|
||||
bind_xfb_buffers_range(struct gl_context *ctx,
|
||||
GLuint first, GLsizei count,
|
||||
const GLuint *buffers,
|
||||
const GLintptr *offsets,
|
||||
const GLsizeiptr *sizes)
|
||||
{
|
||||
struct gl_transform_feedback_object *tfObj =
|
||||
ctx->TransformFeedback.CurrentObject;
|
||||
GLuint i;
|
||||
|
||||
if (!error_check_bind_xfb_buffers(ctx, tfObj, first, count,
|
||||
"glBindBuffersRange"))
|
||||
return;
|
||||
|
||||
/* Assume that at least one binding will be changed */
|
||||
FLUSH_VERTICES(ctx, 0);
|
||||
ctx->NewDriverState |= ctx->DriverFlags.NewTransformFeedback;
|
||||
|
||||
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.
|
||||
* In this case, the offsets and sizes associated with the
|
||||
* binding points are set to default values, ignoring
|
||||
* <offsets> and <sizes>."
|
||||
*/
|
||||
unbind_xfb_buffers(ctx, tfObj, 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++) {
|
||||
const GLuint index = first + i;
|
||||
struct gl_buffer_object * const boundBufObj = tfObj->Buffers[index];
|
||||
struct gl_buffer_object *bufObj;
|
||||
|
||||
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:
|
||||
*
|
||||
* "┌───────────────────────────────────────────────────────────────┐
|
||||
* │ Transform feedback array bindings (see sec. 13.2.2) │
|
||||
* ├───────────────────────┬───────────────────────────────────────┤
|
||||
* │ ... │ ... │
|
||||
* │ offset restriction │ multiple of 4 │
|
||||
* │ ... │ ... │
|
||||
* │ size restriction │ multiple of 4 │
|
||||
* └───────────────────────┴───────────────────────────────────────┘"
|
||||
*/
|
||||
if (offsets[i] & 0x3) {
|
||||
_mesa_error(ctx, GL_INVALID_VALUE,
|
||||
"glBindBuffersRange(offsets[%u]=%lld is misaligned; "
|
||||
"it must be a multiple of 4 when "
|
||||
"target=GL_TRANSFORM_FEEDBACK_BUFFER)",
|
||||
i, (long long int) offsets[i]);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (sizes[i] & 0x3) {
|
||||
_mesa_error(ctx, GL_INVALID_VALUE,
|
||||
"glBindBuffersRange(sizes[%u]=%lld is misaligned; "
|
||||
"it must be a multiple of 4 when "
|
||||
"target=GL_TRANSFORM_FEEDBACK_BUFFER)",
|
||||
i, (long long int) sizes[i]);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (boundBufObj && boundBufObj->Name == buffers[i])
|
||||
bufObj = boundBufObj;
|
||||
else
|
||||
bufObj = _mesa_multi_bind_lookup_bufferobj(ctx, buffers, i,
|
||||
"glBindBuffersRange");
|
||||
|
||||
if (bufObj)
|
||||
_mesa_set_transform_feedback_binding(ctx, tfObj, index, bufObj,
|
||||
offsets[i], sizes[i]);
|
||||
}
|
||||
|
||||
_mesa_end_bufferobj_lookups(ctx);
|
||||
}
|
||||
|
||||
static bool
|
||||
error_check_bind_atomic_buffers(struct gl_context *ctx,
|
||||
GLuint first, GLsizei count,
|
||||
|
|
@ -3128,6 +3377,106 @@ bind_atomic_buffers_base(struct gl_context *ctx,
|
|||
_mesa_end_bufferobj_lookups(ctx);
|
||||
}
|
||||
|
||||
static void
|
||||
bind_atomic_buffers_range(struct gl_context *ctx,
|
||||
GLuint first,
|
||||
GLsizei count,
|
||||
const GLuint *buffers,
|
||||
const GLintptr *offsets,
|
||||
const GLsizeiptr *sizes)
|
||||
{
|
||||
GLuint i;
|
||||
|
||||
if (!error_check_bind_atomic_buffers(ctx, first, count,
|
||||
"glBindBuffersRange"))
|
||||
return;
|
||||
|
||||
/* Assume that at least one binding will be changed */
|
||||
FLUSH_VERTICES(ctx, 0);
|
||||
ctx->NewDriverState |= ctx->DriverFlags.NewAtomicBuffer;
|
||||
|
||||
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.
|
||||
* In this case, the offsets and sizes associated with the
|
||||
* binding points are set to default values, ignoring
|
||||
* <offsets> and <sizes>."
|
||||
*/
|
||||
unbind_atomic_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_atomic_buffer_binding *binding =
|
||||
&ctx->AtomicBufferBindings[first + i];
|
||||
struct gl_buffer_object *bufObj;
|
||||
|
||||
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:
|
||||
*
|
||||
* "┌───────────────────────────────────────────────────────────────┐
|
||||
* │ Atomic counter array bindings (see sec. 7.7.2) │
|
||||
* ├───────────────────────┬───────────────────────────────────────┤
|
||||
* │ ... │ ... │
|
||||
* │ offset restriction │ multiple of 4 │
|
||||
* │ ... │ ... │
|
||||
* │ size restriction │ none │
|
||||
* └───────────────────────┴───────────────────────────────────────┘"
|
||||
*/
|
||||
if (offsets[i] & (ATOMIC_COUNTER_SIZE - 1)) {
|
||||
_mesa_error(ctx, GL_INVALID_VALUE,
|
||||
"glBindBuffersRange(offsets[%u]=%lld is misaligned; "
|
||||
"it must be a multiple of %d when "
|
||||
"target=GL_ATOMIC_COUNTER_BUFFER)",
|
||||
i, (long long int) offsets[i], ATOMIC_COUNTER_SIZE);
|
||||
continue;
|
||||
}
|
||||
|
||||
if (binding->BufferObject && binding->BufferObject->Name == buffers[i])
|
||||
bufObj = binding->BufferObject;
|
||||
else
|
||||
bufObj = _mesa_multi_bind_lookup_bufferobj(ctx, buffers, i,
|
||||
"glBindBuffersRange");
|
||||
|
||||
if (bufObj)
|
||||
set_atomic_buffer_binding(ctx, binding, bufObj, offsets[i], sizes[i]);
|
||||
}
|
||||
|
||||
_mesa_end_bufferobj_lookups(ctx);
|
||||
}
|
||||
|
||||
void GLAPIENTRY
|
||||
_mesa_BindBufferRange(GLenum target, GLuint index,
|
||||
GLuint buffer, GLintptr offset, GLsizeiptr size)
|
||||
|
|
@ -3245,6 +3594,24 @@ _mesa_BindBuffersRange(GLenum target, GLuint first, GLsizei count,
|
|||
const GLuint *buffers,
|
||||
const GLintptr *offsets, const GLsizeiptr *sizes)
|
||||
{
|
||||
GET_CURRENT_CONTEXT(ctx);
|
||||
|
||||
switch (target) {
|
||||
case GL_TRANSFORM_FEEDBACK_BUFFER:
|
||||
bind_xfb_buffers_range(ctx, first, count, buffers, offsets, sizes);
|
||||
return;
|
||||
case GL_UNIFORM_BUFFER:
|
||||
bind_uniform_buffers_range(ctx, first, count, buffers, offsets, sizes);
|
||||
return;
|
||||
case GL_ATOMIC_COUNTER_BUFFER:
|
||||
bind_atomic_buffers_range(ctx, first, count, buffers,
|
||||
offsets, sizes);
|
||||
return;
|
||||
default:
|
||||
_mesa_error(ctx, GL_INVALID_ENUM, "glBindBuffersRange(target=%s)",
|
||||
_mesa_lookup_enum_by_nr(target));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void GLAPIENTRY
|
||||
|
|
|
|||
Loading…
Reference in New Issue