OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: merge bind_uniform_buffers_{base|range}

Browse Source 
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
2016-01-06 17:20:57 -05:00
parent b3ca26cded
commit e8dd7cc303
1 changed files with 50 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3128,72 +3128,6 @@ unbind_shader_storage_buffers(struct gl_context *ctx, GLuint first,
bufObj, -1, -1, GL_TRUE); bufObj, -1, -1, GL_TRUE);
} }
static void
bind_uniform_buffers_base(struct gl_context *ctx, GLuint first, GLsizei count,
const GLuint *buffers)
{
GLint i;
if (!error_check_bind_uniform_buffers(ctx, first, count, "glBindBuffersBase"))
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."
*/
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 (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_ubo_binding(ctx, binding, bufObj, -1, -1, GL_TRUE);
else
set_ubo_binding(ctx, binding, bufObj, 0, 0, GL_TRUE);
}
}
_mesa_end_bufferobj_lookups(ctx);
}
static void static void
bind_shader_storage_buffers_base(struct gl_context *ctx, GLuint first, bind_shader_storage_buffers_base(struct gl_context *ctx, GLuint first,
GLsizei count, const GLuint *buffers) GLsizei count, const GLuint *buffers)
@@ -3262,14 +3196,15 @@ bind_shader_storage_buffers_base(struct gl_context *ctx, GLuint first,
} }
static void static void
bind_uniform_buffers_range(struct gl_context *ctx, GLuint first, GLsizei count, bind_uniform_buffers(struct gl_context *ctx, GLuint first, GLsizei count,
const GLuint *buffers, const GLuint *buffers,
const GLintptr *offsets, const GLsizeiptr *sizes) bool range,
const GLintptr *offsets, const GLsizeiptr *sizes,
const char *caller)
{ {
GLint i; GLint i;
if (!error_check_bind_uniform_buffers(ctx, first, count, if (!error_check_bind_uniform_buffers(ctx, first, count, caller))
"glBindBuffersRange"))
return; return;
/* Assume that at least one binding will be changed */ /* Assume that at least one binding will be changed */
@@ -3314,52 +3249,57 @@ bind_uniform_buffers_range(struct gl_context *ctx, GLuint first, GLsizei count,
struct gl_uniform_buffer_binding *binding = struct gl_uniform_buffer_binding *binding =
&ctx->UniformBufferBindings[first + i]; &ctx->UniformBufferBindings[first + i];
struct gl_buffer_object *bufObj; struct gl_buffer_object *bufObj;
GLintptr offset = 0;
GLsizeiptr size = 0;
if (!bind_buffers_check_offset_and_size(ctx, i, offsets, sizes)) if (range) {
continue; if (!bind_buffers_check_offset_and_size(ctx, i, offsets, sizes))
continue;
/* The ARB_multi_bind spec says: /* The ARB_multi_bind spec says:
* *
* "An INVALID_VALUE error is generated by BindBuffersRange if any * "An INVALID_VALUE error is generated by BindBuffersRange if any
* pair of values in <offsets> and <sizes> does not respectively * pair of values in <offsets> and <sizes> does not respectively
* satisfy the constraints described for those parameters for the * satisfy the constraints described for those parameters for the
* specified target, as described in section 6.7.1 (per binding)." * specified target, as described in section 6.7.1 (per binding)."
* *
* Section 6.7.1 refers to table 6.5, which says: * Section 6.7.1 refers to table 6.5, which says:
* *
* "┌───────────────────────────────────────────────────────────────┐ * "┌───────────────────────────────────────────────────────────────┐
* │ Uniform buffer array bindings (see sec. 7.6) │ * │ Uniform buffer array bindings (see sec. 7.6) │
* ├─────────────────────┬─────────────────────────────────────────┤ * ├─────────────────────┬─────────────────────────────────────────┤
* │ ... │ ... │ * │ ... │ ... │
* │ offset restriction │ multiple of value of UNIFORM_BUFFER_- │ * │ offset restriction │ multiple of value of UNIFORM_BUFFER_- │
* │ │ OFFSET_ALIGNMENT │ * │ │ OFFSET_ALIGNMENT │
* │ ... │ ... │ * │ ... │ ... │
* │ size restriction │ none │ * │ size restriction │ none │
* └─────────────────────┴─────────────────────────────────────────┘" * └─────────────────────┴─────────────────────────────────────────┘"
*/ */
if (offsets[i] & (ctx->Const.UniformBufferOffsetAlignment - 1)) { if (offsets[i] & (ctx->Const.UniformBufferOffsetAlignment - 1)) {
_mesa_error(ctx, GL_INVALID_VALUE, _mesa_error(ctx, GL_INVALID_VALUE,
"glBindBuffersRange(offsets[%u]=%" PRId64 "glBindBuffersRange(offsets[%u]=%" PRId64
" is misaligned; it must be a multiple of the value of " " is misaligned; it must be a multiple of the value of "
"GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT=%u when " "GL_UNIFORM_BUFFER_OFFSET_ALIGNMENT=%u when "
"target=GL_UNIFORM_BUFFER)", "target=GL_UNIFORM_BUFFER)",
i, (int64_t) offsets[i], i, (int64_t) offsets[i],
ctx->Const.UniformBufferOffsetAlignment); ctx->Const.UniformBufferOffsetAlignment);
continue; continue;
}
offset = offsets[i];
size = sizes[i];
} }
if (binding->BufferObject && binding->BufferObject->Name == buffers[i]) if (binding->BufferObject && binding->BufferObject->Name == buffers[i])
bufObj = binding->BufferObject; bufObj = binding->BufferObject;
else else
bufObj = _mesa_multi_bind_lookup_bufferobj(ctx, buffers, i, bufObj = _mesa_multi_bind_lookup_bufferobj(ctx, buffers, i, caller);
"glBindBuffersRange");
if (bufObj) { if (bufObj) {
if (bufObj == ctx->Shared->NullBufferObj) if (bufObj == ctx->Shared->NullBufferObj)
set_ubo_binding(ctx, binding, bufObj, -1, -1, GL_FALSE); set_ubo_binding(ctx, binding, bufObj, -1, -1, !range);
else else
set_ubo_binding(ctx, binding, bufObj, set_ubo_binding(ctx, binding, bufObj, offset, size, !range);
offsets[i], sizes[i], GL_FALSE);
} }
} }
@@ -4016,7 +3956,8 @@ _mesa_BindBuffersRange(GLenum target, GLuint first, GLsizei count,
"glBindBuffersRange"); "glBindBuffersRange");
return; return;
case GL_UNIFORM_BUFFER: case GL_UNIFORM_BUFFER:
bind_uniform_buffers_range(ctx, first, count, buffers, offsets, sizes); bind_uniform_buffers(ctx, first, count, buffers, true, offsets, sizes,
"glBindBuffersRange");
return; return;
case GL_SHADER_STORAGE_BUFFER: case GL_SHADER_STORAGE_BUFFER:
bind_shader_storage_buffers_range(ctx, first, count, buffers, offsets, bind_shader_storage_buffers_range(ctx, first, count, buffers, offsets,
@@ -4050,7 +3991,8 @@ _mesa_BindBuffersBase(GLenum target, GLuint first, GLsizei count,
"glBindBuffersBase"); "glBindBuffersBase");
return; return;
case GL_UNIFORM_BUFFER: case GL_UNIFORM_BUFFER:
bind_uniform_buffers_base(ctx, first, count, buffers); bind_uniform_buffers(ctx, first, count, buffers, false, NULL, NULL,
"glBindBuffersBase");
return; return;
case GL_SHADER_STORAGE_BUFFER: case GL_SHADER_STORAGE_BUFFER:
bind_shader_storage_buffers_base(ctx, first, count, buffers); bind_shader_storage_buffers_base(ctx, first, count, buffers);