mesa: Branch 'master'

[Patrice Mandin]

 src/mesa/drivers/dri/nouveau/nouveau_state.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

New commits:
diff-tree be85770f148a0b3cac1720f843b2fa34dd74295f (from 49a17a45fb893f0b2e93f27b16d54fe86f51c08c)
Author: Patrice Mandin <pmandin at caramail.com>
Date:   Sat Feb 3 23:32:12 2007 +0100

    nouveau: nv50: use nv50 state

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_state.c b/src/mesa/drivers/dri/nouveau/nouveau_state.c
index aef1f63..e9fd188 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_state.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_state.c
@@ -170,9 +170,11 @@ void nouveauDDInitState(nouveauContextPt
         case NV_30:
         case NV_40:
         case NV_44:
-        case NV_50:
             nv30InitStateFuncs(nmesa->glCtx, &nmesa->glCtx->Driver);
             break;
+        case NV_50:
+            nv50InitStateFuncs(nmesa->glCtx, &nmesa->glCtx->Driver);
+            break;
         default:
             break;
     }