From: Marek Olšák <maraeo@gmail.com>
Date: Wed, 27 Jun 2012 03:45:47 +0000 (+0200)
Subject: vbo: don't call twice _mesa_valid_to_render in DrawArraysInstancedBaseInstance
X-Git-Tag: mesa-9.0~1383
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d9eb1a12254add75f6842fdebe5b78512855d04d;p=platform%2Fupstream%2Fmesa.git

vbo: don't call twice _mesa_valid_to_render in DrawArraysInstancedBaseInstance

It's called in _mesa_validate_DrawArraysInstanced already.

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

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)