Some small changes

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
index d84e73c015be5d09dc40c75708b92ac62a0cd772..3ca5edf7826e642b3f6bfad2f8d9ccebe0e042df 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
@@ -71,7 +71,6 @@ GLboolean nouveauCreateContext( const __GLcontextModes *glVisual,
        struct dd_function_table functions;
        nouveauContextPtr nmesa;
        nouveauScreenPtr screen;
-       int i;
 
        /* Allocate the context */
        nmesa = (nouveauContextPtr) CALLOC( sizeof(*nmesa) );
@@ -129,16 +128,18 @@ GLboolean nouveauCreateContext( const __GLcontextModes *glVisual,
        switch(nmesa->screen->card_type)
        {
                case NV_03:
+                       //nv03TriInitFunctions( ctx );
+                       break;
                case NV_04:
                case NV_05:
-               default:
-                       //nv03TriInitFunctions( ctx );
+                       //nv04TriInitFunctions( ctx );
                        break;
                case NV_10:
                case NV_20:
                case NV_30:
                case NV_40:
                case G_70:
+               default:
                        nv10TriInitFunctions( ctx );
                        break;
        }

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_ioctl.c b/src/mesa/drivers/dri/nouveau/nouveau_ioctl.c
index 46ac527f8322c802275def24b551cee305be1245..ce55373934dae1cd9c0b9b3483c3454ba157ac0d 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_ioctl.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_ioctl.c
@@ -44,8 +44,13 @@ void nouveauIoctlInitFifo(nouveauContextPtr nmesa)
        ret = drmCommandWriteRead(nmesa->driFd, DRM_NOUVEAU_FIFO_INIT, &fifo_init, sizeof(fifo_init));
        if (ret)
                FATAL("Fifo initialization ioctl failed (returned %d)\n",ret);
-       MESSAGE("Fifo init ok. Channel %d\n", fifo_init.channel);
-       // XXX needs more stuff
+       MESSAGE("Fifo init ok. Using context %d\n", fifo_init.channel);
+
+       // XXX needs more stuff :
+       // - map the command buffer
+       // - map the fifo control regs
+       // - create the 3D object
+
 }
 
 void nouveauIoctlInitFunctions(struct dd_function_table *functions)

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_lock.c b/src/mesa/drivers/dri/nouveau/nouveau_lock.c
index 1bd2ee4ca989c896a93a15436813b7b466e77f68..7dd67a143a9ae2c4945650cff0a8af263260cf89 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_lock.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_lock.c
@@ -44,7 +44,6 @@ void nouveauGetLock( nouveauContextPtr nmesa, GLuint flags )
    __DRIdrawablePrivate *dPriv = nmesa->driDrawable;
    __DRIscreenPrivate *sPriv = nmesa->driScreen;
    drm_nouveau_sarea_t *sarea = nmesa->sarea;
-   int i;
 
    drmGetLock( nmesa->driFd, nmesa->hHWContext, flags );