projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa/glsl: add bitmask to track stages a program was linked against
[mesa.git]
/
src
/
mesa
/
main
/
bufferobj.c
diff --git
a/src/mesa/main/bufferobj.c
b/src/mesa/main/bufferobj.c
index 885a99decf436e377827c37eb8fcefae14fc327b..eca86aae98ce8e17439d868c821045bc99a2f21a 100644
(file)
--- a/
src/mesa/main/bufferobj.c
+++ b/
src/mesa/main/bufferobj.c
@@
-1203,10
+1203,10
@@
unbind(struct gl_context *ctx,
struct gl_vertex_array_object *vao, unsigned index,
struct gl_buffer_object *obj)
{
struct gl_vertex_array_object *vao, unsigned index,
struct gl_buffer_object *obj)
{
- if (vao->
Vertex
Binding[index].BufferObj == obj) {
+ if (vao->
Buffer
Binding[index].BufferObj == obj) {
_mesa_bind_vertex_buffer(ctx, vao, index, ctx->Shared->NullBufferObj,
_mesa_bind_vertex_buffer(ctx, vao, index, ctx->Shared->NullBufferObj,
- vao->
Vertex
Binding[index].Offset,
- vao->
Vertex
Binding[index].Stride);
+ vao->
Buffer
Binding[index].Offset,
+ vao->
Buffer
Binding[index].Stride);
}
}
}
}
@@
-1304,7
+1304,7
@@
_mesa_DeleteBuffers(GLsizei n, const GLuint *ids)
_mesa_buffer_unmap_all_mappings(ctx, bufObj);
/* unbind any vertex pointers bound to this buffer */
_mesa_buffer_unmap_all_mappings(ctx, bufObj);
/* unbind any vertex pointers bound to this buffer */
- for (j = 0; j < ARRAY_SIZE(vao->
Vertex
Binding); j++) {
+ for (j = 0; j < ARRAY_SIZE(vao->
Buffer
Binding); j++) {
unbind(ctx, vao, j, bufObj);
}
unbind(ctx, vao, j, bufObj);
}
@@
-3075,11
+3075,11
@@
bind_buffers_check_offset_and_size(struct gl_context *ctx,
const GLsizeiptr *sizes)
{
if (offsets[index] < 0) {
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)."
- */
+
/* 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]=%" PRId64 " < 0)",
index, (int64_t) offsets[index]);
_mesa_error(ctx, GL_INVALID_VALUE,
"glBindBuffersRange(offsets[%u]=%" PRId64 " < 0)",
index, (int64_t) offsets[index]);
@@
-3087,11
+3087,11
@@
bind_buffers_check_offset_and_size(struct gl_context *ctx,
}
if (sizes[index] <= 0) {
}
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)."
- */
+
/* 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]=%" PRId64 " <= 0)",
index, (int64_t) sizes[index]);
_mesa_error(ctx, GL_INVALID_VALUE,
"glBindBuffersRange(sizes[%u]=%" PRId64 " <= 0)",
index, (int64_t) sizes[index]);