Mesa (master): mesa: another transform feedback error check, 80-col wrapping

[Brian Paul]

Module: Mesa
Branch: master
Commit: 39c13a115eb45fb6c711cd86cda3a0c178975b52
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=39c13a115eb45fb6c711cd86cda3a0c178975b52

Author: Brian Paul <brianp at vmware.com>
Date:   Fri May 14 08:03:42 2010 -0600

mesa: another transform feedback error check, 80-col wrapping

---

 src/mesa/main/transformfeedback.c |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/mesa/main/transformfeedback.c b/src/mesa/main/transformfeedback.c
index cd3dd9b..050ebf0 100644
--- a/src/mesa/main/transformfeedback.c
+++ b/src/mesa/main/transformfeedback.c
@@ -190,7 +190,8 @@ _mesa_free_transform_feedback(GLcontext *ctx)
 
    /* Delete the default feedback object */
    assert(ctx->Driver.DeleteTransformFeedback);
-   ctx->Driver.DeleteTransformFeedback(ctx, ctx->TransformFeedback.DefaultObject);
+   ctx->Driver.DeleteTransformFeedback(ctx,
+                                       ctx->TransformFeedback.DefaultObject);
 
    ctx->TransformFeedback.CurrentObject = NULL;
 }
@@ -749,7 +750,7 @@ _mesa_BindTransformFeedback(GLenum target, GLuint name)
    if (ctx->TransformFeedback.CurrentObject->Active &&
        !ctx->TransformFeedback.CurrentObject->Paused) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glBindTransformFeedback(transform is active, or not paused)");
+              "glBindTransformFeedback(transform is active, or not paused)");
       return;
    }
 
@@ -844,7 +845,7 @@ _mesa_ResumeTransformFeedback(void)
 
    if (!obj->Active || !obj->Paused) {
       _mesa_error(ctx, GL_INVALID_OPERATION,
-                  "glPauseTransformFeedback(feedback not active or not paused)");
+               "glPauseTransformFeedback(feedback not active or not paused)");
       return;
    }
 
@@ -871,6 +872,11 @@ _mesa_DrawTransformFeedback(GLenum mode, GLuint name)
    struct gl_transform_feedback_object *obj =
       lookup_transform_feedback_object(ctx, name);
 
+   if (mode > GL_POLYGON) {
+      _mesa_error(ctx, GL_INVALID_ENUM,
+                  "glDrawTransformFeedback(mode=0x%x)", mode);
+      return;
+   }
    if (!obj) {
       _mesa_error(ctx, GL_INVALID_VALUE,
                   "glDrawTransformFeedback(name = %u)", name);