summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-10-27 09:27:44 -0600
committerBrian Paul <brianp@vmware.com>2009-10-27 09:31:53 -0600
commitf9e334cb32152fd342ac6b1dd4776215af6e1d49 (patch)
tree2b3417544950fd864133534b1919b84c83a46bfb /src/mesa
parent42732611d3bd3c428b376089a58c40537bbfe180 (diff)
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...
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/i965/brw_context.h2
-rw-r--r--src/mesa/drivers/dri/i965/brw_draw_upload.c6
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 b1e7ec8465..da0e091bfd 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 4f8ceb37bd..9d089e113e 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;