Some compile fixes.

[mesa.git] / src / mesa / drivers / dri / nouveau / nouveau_context.c

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
index e42aecefe8aaf17ba0673b7ed248ddebdfe3cd3f..9e025a52318c2f3306eaa4e730c5df8e7993c0ce 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
@@ -44,7 +44,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 //#include "nouveau_state.h"
 #include "nouveau_span.h"
 #include "nouveau_tex.h"
-#include "nv30_tris.h"
+#include "nv10_swtcl.h"
 
 #include "vblank.h"
 #include "utils.h"
@@ -55,6 +55,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 int NOUVEAU_DEBUG = 0;
 #endif
 
+#define NOUVEAU_FALLBACK_DISABLE 1
+
 static const struct dri_debug_control debug_control[] =
 {
        { NULL,    0 }
@@ -131,14 +133,14 @@ GLboolean nouveauCreateContext( const __GLcontextModes *glVisual,
                case NV_03:
                case NV_04:
                case NV_05:
-               case NV_10:
-               case NV_20:
                default:
                        break;
+               case NV_10:
+               case NV_20:
                case NV_30:
                case NV_40:
                case G_70:
-                       nv30TriInitFunctions( ctx );
+                       nv10TriInitFunctions( ctx );
                        break;
        }
        nouveauDDInitStateFuncs( ctx );