Mesa (master): r300: Also respect shared radeon fallback flags.

[Michel Dänzer]

Module: Mesa
Branch: master
Commit: 292888e60d66c015b3dc4886c4c457b7d902908f
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=292888e60d66c015b3dc4886c4c457b7d902908f

Author: Michel Dänzer <daen...@vmware.com>
Date:   Sun Aug 30 12:37:12 2009 +0200

r300: Also respect shared radeon fallback flags.

---

 src/mesa/drivers/dri/r300/r300_draw.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/r300/r300_draw.c 
b/src/mesa/drivers/dri/r300/r300_draw.c
index 9c791c7..7826e8c 100644
--- a/src/mesa/drivers/dri/r300/r300_draw.c
+++ b/src/mesa/drivers/dri/r300/r300_draw.c
@@ -463,7 +463,7 @@ static void r300SetVertexFormat(GLcontext *ctx, const 
struct gl_client_array *ar
        }
 
        r300SwitchFallback(ctx, R300_FALLBACK_AOS_LIMIT, vbuf->num_attribs > 
R300_MAX_AOS_ARRAYS);
-       if (r300->fallback)
+       if (r300->fallback || r300->radeon.Fallback)
                return;
 }
 
@@ -624,7 +624,7 @@ static GLboolean r300TryDrawPrims(GLcontext *ctx,
 
        r300SetVertexFormat(ctx, arrays, max_index + 1);
 
-       if (r300->fallback)
+       if (r300->fallback || r300->radeon.Fallback)
                return GL_FALSE;
 
        r300SetupVAP(ctx, r300->selected_vp->code.InputsRead, 
r300->selected_vp->code.OutputsWritten);

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit