fix mesa fb binding

[mesa.git] / src / mesa / drivers / dri / nouveau / nouveau_context.h

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_context.h b/src/mesa/drivers/dri/nouveau/nouveau_context.h
index 87e4479da341092a3bf853ecc776ba6e399cc5d6..9a0be2cb2a57dee36d38c7611e31a899333b7bea 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_context.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_context.h
@@ -99,19 +99,22 @@ typedef struct nouveau_context {
        /* The read-only regs */
        volatile unsigned char* mmio;
 
+       /* The per-channel notifier block */
+       volatile void *notifier_block;
+
        /* Physical addresses of AGP/VRAM apertures */
        uint64_t vram_phys;
        uint64_t vram_size;
-       uint64_t agp_phys;
-       uint64_t agp_size;
+       uint64_t gart_phys;
+       uint64_t gart_size;
 
        /* Channel synchronisation */
-       nouveau_notifier *syncNotifier;
+       struct drm_nouveau_notifier_alloc *syncNotifier;
 
        /* ARB_occlusion_query / EXT_timer_query */
        GLuint            query_object_max;
        GLboolean *       query_alloc;
-       nouveau_notifier *queryNotifier;
+       struct drm_nouveau_notifier_alloc *queryNotifier;
 
        /* Additional hw-specific functions */
        nouveau_hw_func hw_func;
@@ -150,7 +153,7 @@ typedef struct nouveau_context {
        GLuint numClipRects;
        drm_clip_rect_t *pClipRects;
        drm_clip_rect_t osClipRect;
-       GLuint drawX, drawY;
+       GLuint drawX, drawY, drawW, drawH;
 
        /* The rendering context information */
        GLenum current_primitive; /* the current primitive enum */
@@ -165,7 +168,7 @@ typedef struct nouveau_context {
        nouveauShader *passthrough_fp;
 
        nouveauScreenRec *screen;
-       drm_nouveau_sarea_t *sarea;
+       struct drm_nouveau_sarea *sarea;
 
        __DRIcontextPrivate  *driContext;    /* DRI context */
        __DRIscreenPrivate   *driScreen;     /* DRI screen */