Fix compile errors. Add vblank_seq to nouveau_context.

This commit is contained in:
Jeremy Kolb 2006-11-01 02:44:27 +00:00
parent a05db7f505
commit 2581ba7f1e
2 changed files with 3 additions and 3 deletions

View file

@ -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,

View file

@ -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);