#include "program/program.h"
#include "program/prog_parameter.h"
+#include "util/u_memory.h"
+
struct using_program_tuple
{
struct gl_program *prog;
ctx->TransformFeedback.Objects = _mesa_NewHashTable();
_mesa_reference_buffer_object(ctx,
- &ctx->TransformFeedback.CurrentBuffer,
- ctx->Shared->NullBufferObj);
+ &ctx->TransformFeedback.CurrentBuffer, NULL);
}
return false;
}
- if (size <= 0 && (dsa || bufObj != ctx->Shared->NullBufferObj)) {
+ if (size <= 0 && (dsa || bufObj)) {
/* OpenGL 4.5 core profile, 6.1, pdf page 82: "An INVALID_VALUE error is
* generated by BindBufferRange if buffer is non-zero and size is less
* than or equal to zero."
*/
static struct gl_buffer_object *
lookup_transform_feedback_bufferobj_err(struct gl_context *ctx,
- GLuint buffer, const char* func)
+ GLuint buffer, const char* func,
+ bool *error)
{
- struct gl_buffer_object *bufObj;
+ struct gl_buffer_object *bufObj = NULL;
+
+ *error = false;
/* OpenGL 4.5 core profile, 13.2, pdf page 444: buffer must be zero or the
* name of an existing buffer object.
*/
- if (buffer == 0) {
- bufObj = ctx->Shared->NullBufferObj;
- } else {
+ if (buffer) {
bufObj = _mesa_lookup_bufferobj(ctx, buffer);
if (!bufObj) {
_mesa_error(ctx, GL_INVALID_VALUE, "%s(invalid buffer=%u)", func,
buffer);
+ *error = true;
}
}
return;
}
+ bool error;
bufObj = lookup_transform_feedback_bufferobj_err(ctx, buffer,
- "glTransformFeedbackBufferBase");
- if (!bufObj) {
+ "glTransformFeedbackBufferBase",
+ &error);
+ if (error) {
return;
}
return;
}
+ bool error;
bufObj = lookup_transform_feedback_bufferobj_err(ctx, buffer,
- "glTransformFeedbackBufferRange");
- if (!bufObj) {
+ "glTransformFeedbackBufferRange",
+ &error);
+ if (error) {
return;
}
struct gl_buffer_object *bufObj;
if (buffer == 0) {
- bufObj = ctx->Shared->NullBufferObj;
+ bufObj = NULL;
} else {
bufObj = _mesa_lookup_bufferobj(ctx, buffer);
if (!no_error && !bufObj) {