summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Kolb <jkolb@freedesktop.org>2006-11-01 02:44:27 +0000
committerJeremy Kolb <jkolb@freedesktop.org>2006-11-01 02:44:27 +0000
commit2581ba7f1e0352ad7ed5e863647a545a0eec851c (patch)
tree216e3dd87f522527dc2427bdbd63554ae488b2f6
parenta05db7f505caef75296170bcb6884ba287b1ab25 (diff)
Fix compile errors. Add vblank_seq to nouveau_context.
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_context.c2
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_ioctl.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.c b/src/mesa/drivers/dri/nouveau/nouveau_context.c
index 3ca5edf782..4bb4116026 100644
--- 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 ce55373934..3f6e3076e2 100644
--- 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);