Fix compile errors. Add vblank_seq to nouveau_context.

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
index 3ca5edf7826e642b3f6bfad2f8d9ccebe0e042df..4bb4116026ba6087ab31fdf6a1fc7588882bc998 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
@@ -188,7 +188,7 @@ GLboolean nouveauMakeCurrent( __DRIcontextPrivate *driContextPriv,
                nouveauContextPtr oldNOUVEAUCtx = ctx ? NOUVEAU_CONTEXT(ctx) : NULL;
                nouveauContextPtr newNOUVEAUCtx = (nouveauContextPtr) driContextPriv->driverPrivate;
 
-               driDrawableInitVBlank( driDrawPriv, newNOUVEAUCtx->vblank_flags );
+               driDrawableInitVBlank(driDrawPriv, newNOUVEAUCtx->vblank_flags, &newNOUVEAUCtx->vblank_seq );
                newNOUVEAUCtx->driDrawable = driDrawPriv;
 
                _mesa_make_current( newNOUVEAUCtx->glCtx,

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_ioctl.c b/src/mesa/drivers/dri/nouveau/nouveau_ioctl.c
index ce55373934dae1cd9c0b9b3483c3454ba157ac0d..3f6e3076e2b0ac3994eeba640bb7333567ca5105 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_ioctl.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_ioctl.c
@@ -39,9 +39,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 void nouveauIoctlInitFifo(nouveauContextPtr nmesa)
 {
        int ret;
-       drm_nouveau_fifo_init_t fifo_init;
+       drm_nouveau_fifo_alloc_t fifo_init;
 
-       ret = drmCommandWriteRead(nmesa->driFd, DRM_NOUVEAU_FIFO_INIT, &fifo_init, sizeof(fifo_init));
+       ret = drmCommandWriteRead(nmesa->driFd, DRM_NOUVEAU_FIFO_ALLOC, &fifo_init, sizeof(fifo_init));
        if (ret)
                FATAL("Fifo initialization ioctl failed (returned %d)\n",ret);
        MESSAGE("Fifo init ok. Using context %d\n", fifo_init.channel);