Mesa (master): vbo: don' t call twice _mesa_valid_to_render in DrawArraysInstancedBaseInstance

[Marek Olšák]

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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Wed Jun 27 05:45:47 2012 +0200

vbo: don't call twice _mesa_valid_to_render in DrawArraysInstancedBaseInstance

It's called in _mesa_validate_DrawArraysInstanced already.

Reviewed-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/vbo/vbo_exec_array.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/mesa/vbo/vbo_exec_array.c b/src/mesa/vbo/vbo_exec_array.c
index 6f6a298..b70ddb3 100644
--- a/src/mesa/vbo/vbo_exec_array.c
+++ b/src/mesa/vbo/vbo_exec_array.c
@@ -724,13 +724,10 @@ vbo_exec_DrawArraysInstancedBaseInstance(GLenum mode, GLint first, GLsizei count
                   _mesa_lookup_enum_by_nr(mode), first, count,
                   numInstances, baseInstance);
 
-   if (!_mesa_validate_DrawArraysInstanced(ctx, mode, first, count,
-                                           numInstances))
-      return;
-
    FLUSH_CURRENT(ctx, 0);
 
-   if (!_mesa_valid_to_render(ctx, "glDrawArraysInstancedBaseInstance"))
+   if (!_mesa_validate_DrawArraysInstanced(ctx, mode, first, count,
+                                           numInstances))
       return;
 
    if (0)