From: Xiang, Haihao <haihao.xiang@intel.com>
Date: Tue, 20 May 2008 05:28:42 +0000 (+0800)
Subject: i965: Check fallback before accounting for index/vertex buffer size. fix #16028.
X-Git-Tag: android-x86-1.6~1180
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c6b36e5498cf6593daf001123cacec4ccaf305ca;p=android-x86%2Fexternal-mesa.git

i965: Check fallback before accounting for index/vertex buffer size. fix #16028.
---

diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index 5ccf4f4128b..f90c5f7b082 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -318,6 +318,14 @@ static GLboolean brw_try_draw_prims( GLcontext *ctx,
          goto flush;
       }
 
+      /* Various fallback checks:
+       */
+      if (brw->intel.Fallback) 
+	 goto out;
+
+      if (check_fallbacks( brw, prim, nr_prims ))
+	 goto out;
+
       /* need to account for index buffer and vertex buffer */
       if (ib) {
          ret = brw_prepare_indices( brw, ib , &ib_bo, &ib_offset);
@@ -335,16 +343,6 @@ static GLboolean brw_try_draw_prims( GLcontext *ctx,
          force_flush = GL_TRUE;
          goto flush;
       }
-
-
-
-      /* Various fallback checks:
-       */
-      if (brw->intel.Fallback) 
-	 goto out;
-
-      if (check_fallbacks( brw, prim, nr_prims ))
-	 goto out;
 	  
       /* Upload index, vertex data: 
        */