Mesa (master): Revert "i965: fix hacked Fallback usage in brw_prepare_vertices()"
Brian Paul
brianp at kemper.freedesktop.org
Wed Oct 28 17:33:45 UTC 2009
Module: Mesa
Branch: master
Commit: f9e334cb32152fd342ac6b1dd4776215af6e1d49
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f9e334cb32152fd342ac6b1dd4776215af6e1d49
Author: Brian Paul <brianp at vmware.com>
Date: Tue Oct 27 09:27:44 2009 -0600
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...
---
src/mesa/drivers/dri/i965/brw_context.h | 2 --
src/mesa/drivers/dri/i965/brw_draw_upload.c | 6 ++----
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_context.h b/src/mesa/drivers/dri/i965/brw_context.h
index b1e7ec8..da0e091 100644
--- 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 4f8ceb3..9d089e1 100644
--- 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;
More information about the mesa-commit
mailing list