nouveau: Don't fill nrb->dPriv for private buffers

4 files changed, 9 insertions, 9 deletions

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_buffers.c b/src/mesa/drivers/dri/nouveau/nouveau_buffers.c
index f30e59323d..0a5efa8c2e 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_buffers.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_buffers.c
@@ -152,7 +152,7 @@ nouveau_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
 
    /* If this buffer isn't statically alloc'd, we may need to ask the
     * drm for more memory */
-   if (!nrb->map && (rb->Width != width || rb->Height != height)) {
+   if (!nrb->dPriv && (rb->Width != width || rb->Height != height)) {
       GLuint pitch;
 
       /* align pitches to 64 bytes */
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
index 140db496b2..99992b838a 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
@@ -152,7 +152,7 @@ nouveauCreateBuffer(__DRIscreenPrivate *driScrnPriv,
 		if (mesaVis->doubleBufferMode) {
 			nrb = nouveau_renderbuffer_new(color_format, NULL,
 						       0, 0,
-						       driDrawPriv);
+						       NULL);
 			nouveauSpanSetFunctions(nrb, mesaVis);
 			_mesa_add_renderbuffer(fb, BUFFER_BACK_LEFT, &nrb->mesa);
 		}
@@ -160,20 +160,20 @@ nouveauCreateBuffer(__DRIscreenPrivate *driScrnPriv,
 		if (mesaVis->depthBits == 24 && mesaVis->stencilBits == 8) {
 			nrb = nouveau_renderbuffer_new(GL_DEPTH24_STENCIL8_EXT, NULL,
 						       0, 0,
-						       driDrawPriv);
+						       NULL);
 			nouveauSpanSetFunctions(nrb, mesaVis);
 			_mesa_add_renderbuffer(fb, BUFFER_DEPTH, &nrb->mesa);
 			_mesa_add_renderbuffer(fb, BUFFER_STENCIL, &nrb->mesa);
 		} else if (mesaVis->depthBits == 24) {
 			nrb = nouveau_renderbuffer_new(GL_DEPTH_COMPONENT24, NULL,
 						       0, 0,
-						       driDrawPriv);
+						       NULL);
 			nouveauSpanSetFunctions(nrb, mesaVis);
 			_mesa_add_renderbuffer(fb, BUFFER_DEPTH, &nrb->mesa);
 		} else if (mesaVis->depthBits == 16) {
 			nrb = nouveau_renderbuffer_new(GL_DEPTH_COMPONENT16, NULL,
 						       0, 0,
-						       driDrawPriv);
+						       NULL);
 			nouveauSpanSetFunctions(nrb, mesaVis);
 			_mesa_add_renderbuffer(fb, BUFFER_DEPTH, &nrb->mesa);
 		}
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_state.c b/src/mesa/drivers/dri/nouveau/nouveau_state.c
index cec7120d43..d3c233eb13 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_state.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_state.c
@@ -68,7 +68,7 @@ static void nouveauCalcViewport(GLcontext *ctx)
     nrb = nouveau_current_draw_buffer(ctx);
     nmesa->depth_scale = 1.0 / ctx->DrawBuffer->_DepthMaxF;
 
-    if (nrb && nrb->map) {
+    if (nrb && nrb->dPriv) {
        /* Window */
        xoffset = nrb->dPriv->x;
        yoffset = nrb->dPriv->y;
diff --git a/src/mesa/drivers/dri/nouveau/nv30_state.c b/src/mesa/drivers/dri/nouveau/nv30_state.c
index 4169dad661..35b428b37c 100644
--- a/src/mesa/drivers/dri/nouveau/nv30_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv30_state.c
@@ -577,7 +577,7 @@ static void nv30Scissor(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
 
 	/* Adjust offsets if drawing to a window */
 	nrb = nouveau_current_draw_buffer(ctx);
-	if (nrb && nrb->map) {
+	if (nrb && nrb->dPriv) {
 	   x += nrb->dPriv->x;
 	   y += nrb->dPriv->y;
 	}
@@ -690,7 +690,7 @@ static void nv30WindowMoved(nouveauContextPtr nmesa)
 
 	/* Adjust offsets if drawing to a window */
 	nrb = nouveau_current_draw_buffer(ctx);
-	if (nrb && nrb->map) {
+	if (nrb && nrb->dPriv) {
 	   x += nrb->dPriv->x;
 	   y += nrb->dPriv->y;
 	}
@@ -777,7 +777,7 @@ static GLboolean nv30BindBuffers(nouveauContextPtr nmesa, int num_color,
    nrb = nouveau_current_draw_buffer(nmesa->glCtx);
    w = nrb->mesa.Width;
    h = nrb->mesa.Height;
-   if (nrb && nrb->map) {
+   if (nrb && nrb->dPriv) {
       x = nrb->dPriv->x;
       y = nrb->dPriv->y;
    } else {