fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 22:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source 
This reverts commit 8810b8f671.

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...
This commit is contained in:
Brian Paul 2009-10-27 09:27:44 -06:00
parent 42732611d3
commit f9e334cb32
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/drivers/dri/i965/brw_context.h
View file

@ -116,8 +116,6 @@
*/
#define BRW_FALLBACK_DRAW (INTEL_FALLBACK_DRIVER << 0)
#define BRW_MAX_CURBE (32*16)
struct brw_context;

6
src/mesa/drivers/dri/i965/brw_draw_upload.c
View file

@ -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;