Revert "i965: fix hacked Fallback usage in brw_prepare_vertices()"

This reverts commit 8810b8f67135185d1044746bb861fe2ff997626c.

It turns out the i965 driver uses the intel->Fallback field as a boolean,
not as a bitmask.  The intelFallback() function is a no-op in the i965
driver.  It would have been nice if there were some comments about this.
I'll fix that next...

diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index 01b6a4a168c400708888ed71b4f42436521ea9cc..783456976131d39a27284d32e5e6786bf4ec488f 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_context.h
+++ b/src/mesa/drivers/dri/i965/brw_context.h
@@ -116,8 +116,6 @@
  */
 
 
-#define BRW_FALLBACK_DRAW  (INTEL_FALLBACK_DRIVER << 0)
-
 #define BRW_MAX_CURBE                    (32*16)
 
 struct brw_context;

diff --git a/src/mesa/drivers/dri/i965/brw_draw_upload.c b/src/mesa/drivers/dri/i965/brw_draw_upload.c
index 375afadcbeac860f0875669a4ce378be5270a039..a3ff6c58d89867205f5b133b5a58fc794c96d0bf 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_draw_upload.c
+++ b/src/mesa/drivers/dri/i965/brw_draw_upload.c
@@ -375,10 +375,9 @@ static void brw_prepare_vertices(struct brw_context *brw)
     * isn't an issue at this point.
     */
    if (brw->vb.nr_enabled >= BRW_VEP_MAX) {
-      FALLBACK(intel, BRW_FALLBACK_DRAW, GL_TRUE);
+      intel->Fallback = 1;
       return;
    }
-   FALLBACK(intel, BRW_FALLBACK_DRAW, GL_FALSE);
 
    for (i = 0; i < brw->vb.nr_enabled; i++) {
       struct brw_vertex_element *input = brw->vb.enabled[i];
@@ -428,10 +427,9 @@ static void brw_prepare_vertices(struct brw_context *brw)
            /* Position array not properly enabled:
             */
             if (input->glarray->StrideB == 0) {
-               FALLBACK(intel, BRW_FALLBACK_DRAW, GL_TRUE);
+               intel->Fallback = 1;
                return;
             }
-            FALLBACK(intel, BRW_FALLBACK_DRAW, GL_FALSE);
 
            interleave = input->glarray->StrideB;
            ptr = input->glarray->Ptr;