mesa: Branch 'master'

[Brian Paul]

 src/mesa/main/state.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree b7f5b8af65603002f73b5f83b34d090536df6e00 (from 4099531a0af5717087dca993ba780ec98936c4fc)
Author: Brian <brian at yutani.localnet.net>
Date:   Thu Apr 26 10:45:44 2007 -0600

    Unconditionally update _TriangleCaps bits.  Fixes software fallback bugs, such as #10687.

diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 32af3cc..96ee512 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1060,7 +1060,7 @@ update_tricaps(GLcontext *ctx, GLbitfiel
    /*
     * Points
     */
-   if (new_state & _NEW_POINT) {
+   if (1/*new_state & _NEW_POINT*/) {
       if (ctx->Point.SmoothFlag)
          ctx->_TriangleCaps |= DD_POINT_SMOOTH;
       if (ctx->Point._Size != 1.0F)
@@ -1072,7 +1072,7 @@ update_tricaps(GLcontext *ctx, GLbitfiel
    /*
     * Lines
     */
-   if (new_state & _NEW_LINE) {
+   if (1/*new_state & _NEW_LINE*/) {
       if (ctx->Line.SmoothFlag)
          ctx->_TriangleCaps |= DD_LINE_SMOOTH;
       if (ctx->Line.StippleFlag)
@@ -1084,7 +1084,7 @@ update_tricaps(GLcontext *ctx, GLbitfiel
    /*
     * Polygons
     */
-   if (new_state & _NEW_POLYGON) {
+   if (1/*new_state & _NEW_POLYGON*/) {
       if (ctx->Polygon.SmoothFlag)
          ctx->_TriangleCaps |= DD_TRI_SMOOTH;
       if (ctx->Polygon.StippleFlag)