projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: create copyteximage_err() helper and always inline copyteximage()
[mesa.git]
/
src
/
mesa
/
main
/
bufferobj.c
diff --git
a/src/mesa/main/bufferobj.c
b/src/mesa/main/bufferobj.c
index e66a3a566889f3ee6cf9da5be2abe15298b65e94..6e2979f6db93e2d9340fc17365954605c515136a 100644
(file)
--- a/
src/mesa/main/bufferobj.c
+++ b/
src/mesa/main/bufferobj.c
@@
-1562,7
+1562,7
@@
validate_buffer_storage(struct gl_context *ctx,
return false;
}
return false;
}
- if (bufObj->Immutable) {
+ if (bufObj->Immutable
|| bufObj->HandleAllocated
) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(immutable)", func);
return false;
}
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(immutable)", func);
return false;
}
@@
-1579,7
+1579,7
@@
buffer_storage(struct gl_context *ctx, struct gl_buffer_object *bufObj,
/* Unmap the existing buffer. We'll replace it now. Not an error. */
_mesa_buffer_unmap_all_mappings(ctx, bufObj);
/* Unmap the existing buffer. We'll replace it now. Not an error. */
_mesa_buffer_unmap_all_mappings(ctx, bufObj);
- FLUSH_VERTICES(ctx,
_NEW_BUFFER_OBJECT
);
+ FLUSH_VERTICES(ctx,
0
);
bufObj->Written = GL_TRUE;
bufObj->Immutable = GL_TRUE;
bufObj->Written = GL_TRUE;
bufObj->Immutable = GL_TRUE;
@@
-1726,7
+1726,7
@@
_mesa_buffer_data(struct gl_context *ctx, struct gl_buffer_object *bufObj,
return;
}
return;
}
- if (bufObj->Immutable) {
+ if (bufObj->Immutable
|| bufObj->HandleAllocated
) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(immutable)", func);
return;
}
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(immutable)", func);
return;
}
@@
-1734,7
+1734,7
@@
_mesa_buffer_data(struct gl_context *ctx, struct gl_buffer_object *bufObj,
/* Unmap the existing buffer. We'll replace it now. Not an error. */
_mesa_buffer_unmap_all_mappings(ctx, bufObj);
/* Unmap the existing buffer. We'll replace it now. Not an error. */
_mesa_buffer_unmap_all_mappings(ctx, bufObj);
- FLUSH_VERTICES(ctx,
_NEW_BUFFER_OBJECT
);
+ FLUSH_VERTICES(ctx,
0
);
bufObj->Written = GL_TRUE;
bufObj->MinMaxCacheDirty = true;
bufObj->Written = GL_TRUE;
bufObj->MinMaxCacheDirty = true;