diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/main/api_validate.c | 9 | ||||
| -rw-r--r-- | src/mesa/main/objectlabel.c | 6 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/mesa/main/api_validate.c b/src/mesa/main/api_validate.c index 9d29f8d6249..a714c0a2146 100644 --- a/src/mesa/main/api_validate.c +++ b/src/mesa/main/api_validate.c @@ -665,6 +665,15 @@ _mesa_validate_DrawTransformFeedback(struct gl_context *ctx, return GL_FALSE; } + /* From the GL 4.5 specification, page 429: + * "An INVALID_VALUE error is generated if id is not the name of a + * transform feedback object." + */ + if (!obj->EverBound) { + _mesa_error(ctx, GL_INVALID_VALUE, "glDrawTransformFeedback*(name)"); + return GL_FALSE; + } + if (stream >= ctx->Const.MaxVertexStreams) { _mesa_error(ctx, GL_INVALID_VALUE, "glDrawTransformFeedbackStream*(index>=MaxVertexStream)"); diff --git a/src/mesa/main/objectlabel.c b/src/mesa/main/objectlabel.c index 5070b008792..974abbcc6f5 100644 --- a/src/mesa/main/objectlabel.c +++ b/src/mesa/main/objectlabel.c @@ -176,9 +176,13 @@ get_label_pointer(struct gl_context *ctx, GLenum identifier, GLuint name, break; case GL_TRANSFORM_FEEDBACK: { + /* From the GL 4.5 specification, page 536: + * "An INVALID_VALUE error is generated if name is not the name of a + * valid object of the type specified by identifier." + */ struct gl_transform_feedback_object *tfo = _mesa_lookup_transform_feedback_object(ctx, name); - if (tfo) + if (tfo && tfo->EverBound) labelPtr = &tfo->Label; } break; |