nouveau: Convert to use GLbitfield64 directly.

[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 db80e44fb3ff5433a251d5569ee764ba0b2b49d1..0e3321e96f4e48fb2a14ab88bf8e47d83c8176e5 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.c
@@ -58,7 +58,7 @@ nouveau_context_create(gl_api api,
                       void *share_ctx)
 {
        __DRIscreen *dri_screen = dri_ctx->driScreenPriv;
-       struct nouveau_screen *screen = dri_screen->private;
+       struct nouveau_screen *screen = dri_screen->driverPrivate;
        struct nouveau_context *nctx;
        struct gl_context *ctx;
 
@@ -117,10 +117,8 @@ nouveau_context_init(struct gl_context *ctx, struct nouveau_screen *screen,
        nctx->hw.chan->user_private = nctx;
 
        /* Enable any supported extensions. */
-       ctx->Extensions.ARB_texture_mirrored_repeat = true;
        ctx->Extensions.EXT_blend_color = true;
        ctx->Extensions.EXT_blend_minmax = true;
-       ctx->Extensions.EXT_blend_subtract = true;
        ctx->Extensions.EXT_fog_coord = true;
        ctx->Extensions.EXT_framebuffer_blit = true;
        ctx->Extensions.EXT_framebuffer_object = true;
@@ -179,9 +177,9 @@ nouveau_update_renderbuffers(__DRIcontext *dri_ctx, __DRIdrawable *draw)
        __DRIbuffer *buffers = NULL;
        int i = 0, count, ret;
 
-       if (draw->lastStamp == *draw->pStamp)
+       if (draw->lastStamp == draw->dri2.stamp)
                return;
-       draw->lastStamp = *draw->pStamp;
+       draw->lastStamp = draw->dri2.stamp;
 
        if (nfb->need_front)
                attachments[i++] = __DRI_BUFFER_FRONT_LEFT;
@@ -259,7 +257,7 @@ update_framebuffer(__DRIcontext *dri_ctx, __DRIdrawable *draw,
        struct gl_context *ctx = dri_ctx->driverPrivate;
        struct gl_framebuffer *fb = draw->driverPrivate;
 
-       *stamp = *draw->pStamp;
+       *stamp = draw->dri2.stamp;
 
        nouveau_update_renderbuffers(dri_ctx, draw);
        _mesa_resize_framebuffer(ctx, fb, draw->w, draw->h);
@@ -339,7 +337,7 @@ validate_framebuffer(__DRIcontext *dri_ctx, __DRIdrawable *draw,
                dri2InvalidateDrawable(draw);
        }
 
-       if (*draw->pStamp != *stamp)
+       if (draw->dri2.stamp != *stamp)
                update_framebuffer(dri_ctx, draw, stamp);
 }