1 files changed, 339 insertions, 334 deletions

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_buffers.c b/src/mesa/drivers/dri/nouveau/nouveau_buffers.c
index d498f616c9..5c5c7932bb 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_buffers.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_buffers.c
@@ -14,423 +14,428 @@
 
 /* Unstrided blit using NV_MEMORY_TO_MEMORY_FORMAT */
 GLboolean
-nouveau_memformat_flat_emit(GLcontext *ctx,
-      			    nouveau_mem *dst, nouveau_mem *src,
+nouveau_memformat_flat_emit(GLcontext * ctx,
+			    nouveau_mem * dst, nouveau_mem * src,
 			    GLuint dst_offset, GLuint src_offset,
 			    GLuint size)
 {
-   nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
-   uint32_t src_handle, dst_handle;
-   GLuint count;
-
-   if (src_offset + size > src->size) {
-      MESSAGE("src out of nouveau_mem bounds\n");
-      return GL_FALSE;
-   }
-   if (dst_offset + size > dst->size) {
-      MESSAGE("dst out of nouveau_mem bounds\n");
-      return GL_FALSE;
-   }
-
-   src_handle = (src->type & NOUVEAU_MEM_FB) ? NvDmaFB : NvDmaTT;
-   dst_handle = (dst->type & NOUVEAU_MEM_FB) ? NvDmaFB : NvDmaTT;
-   src_offset += nouveau_mem_gpu_offset_get(ctx, src);
-   dst_offset += nouveau_mem_gpu_offset_get(ctx, dst);
-
-   BEGIN_RING_SIZE(NvSubMemFormat, NV_MEMORY_TO_MEMORY_FORMAT_OBJECT_IN, 2);
-   OUT_RING       (src_handle);
-   OUT_RING       (dst_handle);
-
-   count = (size / MAX_MEMFMT_LENGTH) + ((size % MAX_MEMFMT_LENGTH) ? 1 : 0);
-
-   while (count--) {
-      GLuint length = (size > MAX_MEMFMT_LENGTH) ? MAX_MEMFMT_LENGTH : size;
-
-      BEGIN_RING_SIZE(NvSubMemFormat, NV_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8);
-      OUT_RING       (src_offset);
-      OUT_RING       (dst_offset);
-      OUT_RING       (0); /* pitch in */
-      OUT_RING       (0); /* pitch out */
-      OUT_RING       (length); /* line length */
-      OUT_RING       (1); /* number of lines */
-      OUT_RING       ((1 << 8) /* dst_inc */ | (1 << 0) /* src_inc */);
-      OUT_RING       (0); /* buffer notify? */
-      FIRE_RING();
-
-      src_offset += length;
-      dst_offset += length;
-      size       -= length;
-   }
-
-   return GL_TRUE;
+	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+	uint32_t src_handle, dst_handle;
+	GLuint count;
+
+	if (src_offset + size > src->size) {
+		MESSAGE("src out of nouveau_mem bounds\n");
+		return GL_FALSE;
+	}
+	if (dst_offset + size > dst->size) {
+		MESSAGE("dst out of nouveau_mem bounds\n");
+		return GL_FALSE;
+	}
+
+	src_handle = (src->type & NOUVEAU_MEM_FB) ? NvDmaFB : NvDmaTT;
+	dst_handle = (dst->type & NOUVEAU_MEM_FB) ? NvDmaFB : NvDmaTT;
+	src_offset += nouveau_mem_gpu_offset_get(ctx, src);
+	dst_offset += nouveau_mem_gpu_offset_get(ctx, dst);
+
+	BEGIN_RING_SIZE(NvSubMemFormat,
+			NV_MEMORY_TO_MEMORY_FORMAT_OBJECT_IN, 2);
+	OUT_RING(src_handle);
+	OUT_RING(dst_handle);
+
+	count = (size / MAX_MEMFMT_LENGTH) + 
+		((size % MAX_MEMFMT_LENGTH) ? 1 : 0);
+
+	while (count--) {
+		GLuint length =
+		    (size > MAX_MEMFMT_LENGTH) ? MAX_MEMFMT_LENGTH : size;
+
+		BEGIN_RING_SIZE(NvSubMemFormat,
+				NV_MEMORY_TO_MEMORY_FORMAT_OFFSET_IN, 8);
+		OUT_RING(src_offset);
+		OUT_RING(dst_offset);
+		OUT_RING(0);	/* pitch in */
+		OUT_RING(0);	/* pitch out */
+		OUT_RING(length);	/* line length */
+		OUT_RING(1);	/* number of lines */
+		OUT_RING((1 << 8) /* dst_inc */ |(1 << 0) /* src_inc */ );
+		OUT_RING(0);	/* buffer notify? */
+		FIRE_RING();
+
+		src_offset += length;
+		dst_offset += length;
+		size -= length;
+	}
+
+	return GL_TRUE;
 }
 
-void
-nouveau_mem_free(GLcontext *ctx, nouveau_mem *mem)
+void nouveau_mem_free(GLcontext * ctx, nouveau_mem * mem)
 {
-   nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
-   struct drm_nouveau_mem_free memf;
-
-   if (NOUVEAU_DEBUG & DEBUG_MEM)  {
-      fprintf(stderr, "%s: type=0x%x, offset=0x%x, size=0x%x\n",
-	    __func__, mem->type, (GLuint)mem->offset, (GLuint)mem->size);
-   }
-
-   if (mem->map)
-      drmUnmap(mem->map, mem->size);
-   memf.flags  = mem->type;
-   memf.offset = mem->offset;
-   drmCommandWrite(nmesa->driFd, DRM_NOUVEAU_MEM_FREE, &memf, sizeof(memf));
-   FREE(mem);
+	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+	struct drm_nouveau_mem_free memf;
+
+	if (NOUVEAU_DEBUG & DEBUG_MEM) {
+		fprintf(stderr, "%s: type=0x%x, offset=0x%x, size=0x%x\n",
+			__func__, mem->type, (GLuint) mem->offset,
+			(GLuint) mem->size);
+	}
+
+	if (mem->map)
+		drmUnmap(mem->map, mem->size);
+	memf.flags = mem->type;
+	memf.offset = mem->offset;
+	drmCommandWrite(nmesa->driFd, DRM_NOUVEAU_MEM_FREE, &memf,
+			sizeof(memf));
+	FREE(mem);
 }
 
-nouveau_mem *
-nouveau_mem_alloc(GLcontext *ctx, int type, GLuint size, GLuint align)
+nouveau_mem *nouveau_mem_alloc(GLcontext * ctx, int type, GLuint size,
+			       GLuint align)
 {
-   nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
-   struct drm_nouveau_mem_alloc mema;
-   nouveau_mem *mem;
-   int ret;
-
-   if (NOUVEAU_DEBUG & DEBUG_MEM)  {
-      fprintf(stderr, "%s: requested: type=0x%x, size=0x%x, align=0x%x\n",
-	    __func__, type, (GLuint)size, align);
-   }
-
-   mem = CALLOC(sizeof(nouveau_mem));
-   if (!mem)
-      return NULL;
-
-   mema.flags     = type;
-   mema.size      = mem->size = size;
-   mema.alignment = align;
-   mem->map       = NULL;
-   ret = drmCommandWriteRead(nmesa->driFd, DRM_NOUVEAU_MEM_ALLOC,
-	 		     &mema, sizeof(mema));
-   if (ret) {
-      FREE(mem);
-      return NULL;
-   }
-   mem->offset = mema.offset;
-   mem->type   = mema.flags;
-
-   if (NOUVEAU_DEBUG & DEBUG_MEM)  {
-      fprintf(stderr, "%s: actual: type=0x%x, offset=0x%x, size=0x%x\n",
-	    __func__, mem->type, (GLuint)mem->offset, (GLuint)mem->size);
-   }
-
-   if (type & NOUVEAU_MEM_MAPPED)
-      ret = drmMap(nmesa->driFd, mema.map_handle, mem->size, &mem->map);
-   if (ret) {
-      mem->map = NULL;
-      nouveau_mem_free(ctx, mem);
-      mem = NULL;
-   }
-
-   return mem;
+	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+	struct drm_nouveau_mem_alloc mema;
+	nouveau_mem *mem;
+	int ret;
+
+	if (NOUVEAU_DEBUG & DEBUG_MEM) {
+		fprintf(stderr,
+			"%s: requested: type=0x%x, size=0x%x, align=0x%x\n",
+			__func__, type, (GLuint) size, align);
+	}
+
+	mem = CALLOC(sizeof(nouveau_mem));
+	if (!mem)
+		return NULL;
+
+	mema.flags = type;
+	mema.size = mem->size = size;
+	mema.alignment = align;
+	mem->map = NULL;
+	ret = drmCommandWriteRead(nmesa->driFd, DRM_NOUVEAU_MEM_ALLOC,
+				  &mema, sizeof(mema));
+	if (ret) {
+		FREE(mem);
+		return NULL;
+	}
+	mem->offset = mema.offset;
+	mem->type = mema.flags;
+
+	if (NOUVEAU_DEBUG & DEBUG_MEM) {
+		fprintf(stderr,
+			"%s: actual: type=0x%x, offset=0x%x, size=0x%x\n",
+			__func__, mem->type, (GLuint) mem->offset,
+			(GLuint) mem->size);
+	}
+
+	if (type & NOUVEAU_MEM_MAPPED)
+		ret =
+		    drmMap(nmesa->driFd, mema.map_handle, mem->size,
+			   &mem->map);
+	if (ret) {
+		mem->map = NULL;
+		nouveau_mem_free(ctx, mem);
+		mem = NULL;
+	}
+
+	return mem;
 }
 
-uint32_t
-nouveau_mem_gpu_offset_get(GLcontext *ctx, nouveau_mem *mem)
+uint32_t nouveau_mem_gpu_offset_get(GLcontext * ctx, nouveau_mem * mem)
 {
-   nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
 
-   return mem->offset;
+	return mem->offset;
 }
 
 static GLboolean
-nouveau_renderbuffer_pixelformat(nouveau_renderbuffer *nrb,
-      				 GLenum internalFormat)
+nouveau_renderbuffer_pixelformat(nouveau_renderbuffer * nrb,
+				 GLenum internalFormat)
 {
-      nrb->mesa.InternalFormat	= internalFormat;
-
-   /*TODO: We probably want to extend this a bit, and maybe make
-    *      card-specific? 
-    */
-      switch (internalFormat) {
-      case GL_RGBA:
-      case GL_RGBA8:
-	 nrb->mesa._BaseFormat	= GL_RGBA;
-	 nrb->mesa._ActualFormat= GL_RGBA8;
-	 nrb->mesa.DataType	= GL_UNSIGNED_BYTE;
-	 nrb->mesa.RedBits	= 8;
-	 nrb->mesa.GreenBits	= 8;
-	 nrb->mesa.BlueBits	= 8;
-	 nrb->mesa.AlphaBits	= 8;
-	 nrb->cpp		= 4;
-	 break;
-      case GL_RGB:
-      case GL_RGB5:
-	 nrb->mesa._BaseFormat	= GL_RGB;
-	 nrb->mesa._ActualFormat= GL_RGB5;
-	 nrb->mesa.DataType	= GL_UNSIGNED_BYTE;
-	 nrb->mesa.RedBits	= 5;
-	 nrb->mesa.GreenBits	= 6;
-	 nrb->mesa.BlueBits	= 5;
-	 nrb->mesa.AlphaBits	= 0;
-	 nrb->cpp		= 2;
-	 break;
-      case GL_DEPTH_COMPONENT16:
-	 nrb->mesa._BaseFormat	= GL_DEPTH_COMPONENT;
-	 nrb->mesa._ActualFormat= GL_DEPTH_COMPONENT16;
-	 nrb->mesa.DataType	= GL_UNSIGNED_SHORT;
-	 nrb->mesa.DepthBits	= 16;
-	 nrb->cpp		= 2;
-	 break;
-      case GL_DEPTH_COMPONENT24:
-	 nrb->mesa._BaseFormat	= GL_DEPTH_COMPONENT;
-	 nrb->mesa._ActualFormat= GL_DEPTH24_STENCIL8_EXT;
-	 nrb->mesa.DataType	= GL_UNSIGNED_INT_24_8_EXT;
-	 nrb->mesa.DepthBits	= 24;
-	 nrb->cpp		= 4;
-	 break;
-      case GL_STENCIL_INDEX8_EXT:
-	 nrb->mesa._BaseFormat	= GL_STENCIL_INDEX;
-	 nrb->mesa._ActualFormat= GL_DEPTH24_STENCIL8_EXT;
-	 nrb->mesa.DataType	= GL_UNSIGNED_INT_24_8_EXT;
-	 nrb->mesa.StencilBits	= 8;
-	 nrb->cpp		= 4;
-	 break;
-      case GL_DEPTH24_STENCIL8_EXT:
-	 nrb->mesa._BaseFormat	= GL_DEPTH_STENCIL_EXT;
-	 nrb->mesa._ActualFormat= GL_DEPTH24_STENCIL8_EXT;
-	 nrb->mesa.DataType	= GL_UNSIGNED_INT_24_8_EXT;
-	 nrb->mesa.DepthBits	= 24;
-	 nrb->mesa.StencilBits  = 8;
-	 nrb->cpp		= 4;
-	 break;
-      default:
-	 return GL_FALSE;
-	 break;
-      }
-
-      return GL_TRUE;
+	nrb->mesa.InternalFormat = internalFormat;
+
+	/*TODO: We probably want to extend this a bit, and maybe make
+	 *      card-specific? 
+	 */
+	switch (internalFormat) {
+	case GL_RGBA:
+	case GL_RGBA8:
+		nrb->mesa._BaseFormat = GL_RGBA;
+		nrb->mesa._ActualFormat = GL_RGBA8;
+		nrb->mesa.DataType = GL_UNSIGNED_BYTE;
+		nrb->mesa.RedBits = 8;
+		nrb->mesa.GreenBits = 8;
+		nrb->mesa.BlueBits = 8;
+		nrb->mesa.AlphaBits = 8;
+		nrb->cpp = 4;
+		break;
+	case GL_RGB:
+	case GL_RGB5:
+		nrb->mesa._BaseFormat = GL_RGB;
+		nrb->mesa._ActualFormat = GL_RGB5;
+		nrb->mesa.DataType = GL_UNSIGNED_BYTE;
+		nrb->mesa.RedBits = 5;
+		nrb->mesa.GreenBits = 6;
+		nrb->mesa.BlueBits = 5;
+		nrb->mesa.AlphaBits = 0;
+		nrb->cpp = 2;
+		break;
+	case GL_DEPTH_COMPONENT16:
+		nrb->mesa._BaseFormat = GL_DEPTH_COMPONENT;
+		nrb->mesa._ActualFormat = GL_DEPTH_COMPONENT16;
+		nrb->mesa.DataType = GL_UNSIGNED_SHORT;
+		nrb->mesa.DepthBits = 16;
+		nrb->cpp = 2;
+		break;
+	case GL_DEPTH_COMPONENT24:
+		nrb->mesa._BaseFormat = GL_DEPTH_COMPONENT;
+		nrb->mesa._ActualFormat = GL_DEPTH24_STENCIL8_EXT;
+		nrb->mesa.DataType = GL_UNSIGNED_INT_24_8_EXT;
+		nrb->mesa.DepthBits = 24;
+		nrb->cpp = 4;
+		break;
+	case GL_STENCIL_INDEX8_EXT:
+		nrb->mesa._BaseFormat = GL_STENCIL_INDEX;
+		nrb->mesa._ActualFormat = GL_DEPTH24_STENCIL8_EXT;
+		nrb->mesa.DataType = GL_UNSIGNED_INT_24_8_EXT;
+		nrb->mesa.StencilBits = 8;
+		nrb->cpp = 4;
+		break;
+	case GL_DEPTH24_STENCIL8_EXT:
+		nrb->mesa._BaseFormat = GL_DEPTH_STENCIL_EXT;
+		nrb->mesa._ActualFormat = GL_DEPTH24_STENCIL8_EXT;
+		nrb->mesa.DataType = GL_UNSIGNED_INT_24_8_EXT;
+		nrb->mesa.DepthBits = 24;
+		nrb->mesa.StencilBits = 8;
+		nrb->cpp = 4;
+		break;
+	default:
+		return GL_FALSE;
+		break;
+	}
+
+	return GL_TRUE;
 }
 
 static GLboolean
-nouveau_renderbuffer_storage(GLcontext *ctx, struct gl_renderbuffer *rb,
-      			     GLenum internalFormat,
-			     GLuint width,
-			     GLuint height)
+nouveau_renderbuffer_storage(GLcontext * ctx, struct gl_renderbuffer *rb,
+			     GLenum internalFormat,
+			     GLuint width, GLuint height)
 {
-   nouveau_renderbuffer *nrb = (nouveau_renderbuffer*)rb;
-
-   if (!nouveau_renderbuffer_pixelformat(nrb, internalFormat)) {
-      fprintf(stderr, "%s: unknown internalFormat\n", __func__);
-      return GL_FALSE;
-   }
-
-   /* If this buffer isn't statically alloc'd, we may need to ask the
-    * drm for more memory */
-   if (!nrb->dPriv && (rb->Width != width || rb->Height != height)) {
-      GLuint pitch;
-
-      /* align pitches to 64 bytes */
-      pitch = ((width * nrb->cpp) + 63) & ~63;
-
-      if (nrb->mem)
-	 nouveau_mem_free(ctx, nrb->mem);
-      nrb->mem = nouveau_mem_alloc(ctx,
-	    			   NOUVEAU_MEM_FB | NOUVEAU_MEM_MAPPED,
-				   pitch*height,
-				   0);
-      if (!nrb->mem)
-	 return GL_FALSE;
-
-      /* update nouveau_renderbuffer info */
-      nrb->offset = nouveau_mem_gpu_offset_get(ctx, nrb->mem);
-      nrb->pitch  = pitch;
-   }
-
-   rb->Width = width;
-   rb->Height = height;
-   rb->InternalFormat = internalFormat;
-   return GL_TRUE;
+	nouveau_renderbuffer *nrb = (nouveau_renderbuffer *) rb;
+
+	if (!nouveau_renderbuffer_pixelformat(nrb, internalFormat)) {
+		fprintf(stderr, "%s: unknown internalFormat\n", __func__);
+		return GL_FALSE;
+	}
+
+	/* If this buffer isn't statically alloc'd, we may need to ask the
+	 * drm for more memory */
+	if (!nrb->dPriv && (rb->Width != width || rb->Height != height)) {
+		GLuint pitch;
+
+		/* align pitches to 64 bytes */
+		pitch = ((width * nrb->cpp) + 63) & ~63;
+
+		if (nrb->mem)
+			nouveau_mem_free(ctx, nrb->mem);
+		nrb->mem = nouveau_mem_alloc(ctx,
+					     NOUVEAU_MEM_FB |
+					     NOUVEAU_MEM_MAPPED,
+					     pitch * height, 0);
+		if (!nrb->mem)
+			return GL_FALSE;
+
+		/* update nouveau_renderbuffer info */
+		nrb->offset = nouveau_mem_gpu_offset_get(ctx, nrb->mem);
+		nrb->pitch = pitch;
+	}
+
+	rb->Width = width;
+	rb->Height = height;
+	rb->InternalFormat = internalFormat;
+	return GL_TRUE;
 }
 
-static void
-nouveau_renderbuffer_delete(struct gl_renderbuffer *rb)
+static void nouveau_renderbuffer_delete(struct gl_renderbuffer *rb)
 {
-   GET_CURRENT_CONTEXT(ctx);
-   nouveau_renderbuffer *nrb = (nouveau_renderbuffer*)rb;
+	GET_CURRENT_CONTEXT(ctx);
+	nouveau_renderbuffer *nrb = (nouveau_renderbuffer *) rb;
 
-   if (nrb->mem)
-      nouveau_mem_free(ctx, nrb->mem);
-   FREE(nrb);
+	if (nrb->mem)
+		nouveau_mem_free(ctx, nrb->mem);
+	FREE(nrb);
 }
 
-nouveau_renderbuffer *
-nouveau_renderbuffer_new(GLenum internalFormat, GLvoid *map,
-      			 GLuint offset,  GLuint pitch,
-			 __DRIdrawablePrivate *dPriv)
+nouveau_renderbuffer *nouveau_renderbuffer_new(GLenum internalFormat,
+					       GLvoid * map, GLuint offset,
+					       GLuint pitch,
+					       __DRIdrawablePrivate *
+					       dPriv)
 {
-   nouveau_renderbuffer *nrb;
+	nouveau_renderbuffer *nrb;
 
-   nrb = CALLOC_STRUCT(nouveau_renderbuffer_t);
-   if (nrb) {
-      _mesa_init_renderbuffer(&nrb->mesa, 0);
+	nrb = CALLOC_STRUCT(nouveau_renderbuffer_t);
+	if (nrb) {
+		_mesa_init_renderbuffer(&nrb->mesa, 0);
 
-      nouveau_renderbuffer_pixelformat(nrb, internalFormat);
+		nouveau_renderbuffer_pixelformat(nrb, internalFormat);
 
-      nrb->mesa.AllocStorage	= nouveau_renderbuffer_storage;
-      nrb->mesa.Delete		= nouveau_renderbuffer_delete;
+		nrb->mesa.AllocStorage = nouveau_renderbuffer_storage;
+		nrb->mesa.Delete = nouveau_renderbuffer_delete;
 
-      nrb->dPriv  = dPriv;
-      nrb->offset = offset;
-      nrb->pitch  = pitch;
-      nrb->map    = map;
-   }
+		nrb->dPriv = dPriv;
+		nrb->offset = offset;
+		nrb->pitch = pitch;
+		nrb->map = map;
+	}
 
-   return nrb;
+	return nrb;
 }
 
 static void
 nouveau_cliprects_drawable_set(nouveauContextPtr nmesa,
-      			       nouveau_renderbuffer *nrb)
+			       nouveau_renderbuffer * nrb)
 {
-   __DRIdrawablePrivate *dPriv = nrb->dPriv;
-
-   nmesa->numClipRects	= dPriv->numClipRects;
-   nmesa->pClipRects	= dPriv->pClipRects;
-   nmesa->drawX		= dPriv->x;
-   nmesa->drawY		= dPriv->y;
-   nmesa->drawW		= dPriv->w;
-   nmesa->drawH		= dPriv->h;
+	__DRIdrawablePrivate *dPriv = nrb->dPriv;
+
+	nmesa->numClipRects = dPriv->numClipRects;
+	nmesa->pClipRects = dPriv->pClipRects;
+	nmesa->drawX = dPriv->x;
+	nmesa->drawY = dPriv->y;
+	nmesa->drawW = dPriv->w;
+	nmesa->drawH = dPriv->h;
 }
 
 static void
 nouveau_cliprects_renderbuffer_set(nouveauContextPtr nmesa,
-      				   nouveau_renderbuffer *nrb)
+				   nouveau_renderbuffer * nrb)
 {
-   nmesa->numClipRects	= 1;
-   nmesa->pClipRects	= &nmesa->osClipRect;
-   nmesa->osClipRect.x1	= 0;
-   nmesa->osClipRect.y1	= 0;
-   nmesa->osClipRect.x2	= nrb->mesa.Width;
-   nmesa->osClipRect.y2	= nrb->mesa.Height;
-   nmesa->drawX		= 0;
-   nmesa->drawY		= 0;
-   nmesa->drawW		= nrb->mesa.Width;
-   nmesa->drawH		= nrb->mesa.Height;
+	nmesa->numClipRects = 1;
+	nmesa->pClipRects = &nmesa->osClipRect;
+	nmesa->osClipRect.x1 = 0;
+	nmesa->osClipRect.y1 = 0;
+	nmesa->osClipRect.x2 = nrb->mesa.Width;
+	nmesa->osClipRect.y2 = nrb->mesa.Height;
+	nmesa->drawX = 0;
+	nmesa->drawY = 0;
+	nmesa->drawW = nrb->mesa.Width;
+	nmesa->drawH = nrb->mesa.Height;
 }
 
-void
-nouveau_window_moved(GLcontext *ctx)
+void nouveau_window_moved(GLcontext * ctx)
 {
-   nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
-   nouveau_renderbuffer *nrb;
-
-   nrb = (nouveau_renderbuffer *)ctx->DrawBuffer->_ColorDrawBuffers[0][0];
-   if (!nrb)
-      return;
-
-   if (!nrb->dPriv)
-      nouveau_cliprects_renderbuffer_set(nmesa, nrb);
-   else
-      nouveau_cliprects_drawable_set(nmesa, nrb);
-
-   /* Viewport depends on window size/position, nouveauCalcViewport
-    * will take care of calling the hw-specific WindowMoved
-    */
-   ctx->Driver.Viewport(ctx, ctx->Viewport.X, ctx->Viewport.Y,
-	 		     ctx->Viewport.Width, ctx->Viewport.Height);
-   /* Scissor depends on window position */
-   ctx->Driver.Scissor(ctx, ctx->Scissor.X, ctx->Scissor.Y,
-	 		    ctx->Scissor.Width, ctx->Scissor.Height);
+	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+	nouveau_renderbuffer *nrb;
+
+	nrb = (nouveau_renderbuffer *)ctx->DrawBuffer->_ColorDrawBuffers[0][0];
+	if (!nrb)
+		return;
+
+	if (!nrb->dPriv)
+		nouveau_cliprects_renderbuffer_set(nmesa, nrb);
+	else
+		nouveau_cliprects_drawable_set(nmesa, nrb);
+
+	/* Viewport depends on window size/position, nouveauCalcViewport
+	 * will take care of calling the hw-specific WindowMoved
+	 */
+	ctx->Driver.Viewport(ctx, ctx->Viewport.X, ctx->Viewport.Y,
+			     ctx->Viewport.Width, ctx->Viewport.Height);
+	/* Scissor depends on window position */
+	ctx->Driver.Scissor(ctx, ctx->Scissor.X, ctx->Scissor.Y,
+			    ctx->Scissor.Width, ctx->Scissor.Height);
 }
 
 GLboolean
-nouveau_build_framebuffer(GLcontext *ctx, struct gl_framebuffer *fb)
+nouveau_build_framebuffer(GLcontext * ctx, struct gl_framebuffer *fb)
 {
-   nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
-   nouveau_renderbuffer *color[MAX_DRAW_BUFFERS];
-   nouveau_renderbuffer *depth;
+	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+	nouveau_renderbuffer *color[MAX_DRAW_BUFFERS];
+	nouveau_renderbuffer *depth;
 
-   _mesa_update_framebuffer(ctx);
-   _mesa_update_draw_buffer_bounds(ctx);
+	_mesa_update_framebuffer(ctx);
+	_mesa_update_draw_buffer_bounds(ctx);
 
-   color[0] = (nouveau_renderbuffer *)fb->_ColorDrawBuffers[0][0];
-   if (fb->_DepthBuffer && fb->_DepthBuffer->Wrapped)
-      depth = (nouveau_renderbuffer *)fb->_DepthBuffer->Wrapped;
-   else
-      depth = (nouveau_renderbuffer *)fb->_DepthBuffer;
+	color[0] = (nouveau_renderbuffer *) fb->_ColorDrawBuffers[0][0];
+	if (fb->_DepthBuffer && fb->_DepthBuffer->Wrapped)
+		depth = (nouveau_renderbuffer *) fb->_DepthBuffer->Wrapped;
+	else
+		depth = (nouveau_renderbuffer *) fb->_DepthBuffer;
 
-   if (!nmesa->hw_func.BindBuffers(nmesa, 1, color, depth))
-      return GL_FALSE;
-   nouveau_window_moved(ctx);
+	if (!nmesa->hw_func.BindBuffers(nmesa, 1, color, depth))
+		return GL_FALSE;
+	nouveau_window_moved(ctx);
 
-   return GL_TRUE;
+	return GL_TRUE;
 }
 
-static void
-nouveauDrawBuffer(GLcontext *ctx, GLenum buffer)
+static void nouveauDrawBuffer(GLcontext * ctx, GLenum buffer)
 {
-   nouveau_build_framebuffer(ctx, ctx->DrawBuffer);
+	nouveau_build_framebuffer(ctx, ctx->DrawBuffer);
 }
 
-static struct gl_framebuffer *
-nouveauNewFramebuffer(GLcontext *ctx, GLuint name)
+static struct gl_framebuffer *nouveauNewFramebuffer(GLcontext * ctx,
+						    GLuint name)
 {
-   return _mesa_new_framebuffer(ctx, name);
+	return _mesa_new_framebuffer(ctx, name);
 }
 
-static struct gl_renderbuffer *
-nouveauNewRenderbuffer(GLcontext *ctx, GLuint name)
+static struct gl_renderbuffer *nouveauNewRenderbuffer(GLcontext * ctx,
+						      GLuint name)
 {
-   nouveau_renderbuffer *nrb;
+	nouveau_renderbuffer *nrb;
 
-   nrb = CALLOC_STRUCT(nouveau_renderbuffer_t);
-   if (nrb) {
-      _mesa_init_renderbuffer(&nrb->mesa, name);
+	nrb = CALLOC_STRUCT(nouveau_renderbuffer_t);
+	if (nrb) {
+		_mesa_init_renderbuffer(&nrb->mesa, name);
 
-      nrb->mesa.AllocStorage	= nouveau_renderbuffer_storage;
-      nrb->mesa.Delete		= nouveau_renderbuffer_delete;
-   }
-   return &nrb->mesa;
+		nrb->mesa.AllocStorage = nouveau_renderbuffer_storage;
+		nrb->mesa.Delete = nouveau_renderbuffer_delete;
+	}
+	return &nrb->mesa;
 }
 
 static void
-nouveauBindFramebuffer(GLcontext *ctx, GLenum target,
-                       struct gl_framebuffer *fb, struct gl_framebuffer *fbread)
+nouveauBindFramebuffer(GLcontext * ctx, GLenum target,
+		       struct gl_framebuffer *fb,
+		       struct gl_framebuffer *fbread)
 {
-   if (target == GL_FRAMEBUFFER_EXT || target == GL_DRAW_FRAMEBUFFER_EXT) {
-      nouveau_build_framebuffer(ctx, fb);
-   }
+	if (target == GL_FRAMEBUFFER_EXT || target == GL_DRAW_FRAMEBUFFER_EXT) {
+		nouveau_build_framebuffer(ctx, fb);
+	}
 }
 
 static void
-nouveauFramebufferRenderbuffer(GLcontext *ctx,
-      			       struct gl_framebuffer *fb,
-      			       GLenum attachment,
+nouveauFramebufferRenderbuffer(GLcontext * ctx,
+			       struct gl_framebuffer *fb,
+			       GLenum attachment,
 			       struct gl_renderbuffer *rb)
 {
-   _mesa_framebuffer_renderbuffer(ctx, fb, attachment, rb);
-   nouveau_build_framebuffer(ctx, fb);
+	_mesa_framebuffer_renderbuffer(ctx, fb, attachment, rb);
+	nouveau_build_framebuffer(ctx, fb);
 }
 
 static void
-nouveauRenderTexture(GLcontext *ctx,
-      		     struct gl_framebuffer *fb,
-      		     struct gl_renderbuffer_attachment *att)
+nouveauRenderTexture(GLcontext * ctx,
+		     struct gl_framebuffer *fb,
+		     struct gl_renderbuffer_attachment *att)
 {
 }
 
 static void
-nouveauFinishRenderTexture(GLcontext *ctx,
-      			   struct gl_renderbuffer_attachment *att)
+nouveauFinishRenderTexture(GLcontext * ctx,
+			   struct gl_renderbuffer_attachment *att)
 {
 }
 
-void
-nouveauInitBufferFuncs(struct dd_function_table *func)
+void nouveauInitBufferFuncs(struct dd_function_table *func)
 {
-   func->DrawBuffer		 = nouveauDrawBuffer;
-
-   func->NewFramebuffer		 = nouveauNewFramebuffer;
-   func->NewRenderbuffer	 = nouveauNewRenderbuffer;
-   func->BindFramebuffer	 = nouveauBindFramebuffer;
-   func->FramebufferRenderbuffer = nouveauFramebufferRenderbuffer;
-   func->RenderTexture		 = nouveauRenderTexture;
-   func->FinishRenderTexture	 = nouveauFinishRenderTexture;
+	func->DrawBuffer = nouveauDrawBuffer;
+
+	func->NewFramebuffer = nouveauNewFramebuffer;
+	func->NewRenderbuffer = nouveauNewRenderbuffer;
+	func->BindFramebuffer = nouveauBindFramebuffer;
+	func->FramebufferRenderbuffer = nouveauFramebufferRenderbuffer;
+	func->RenderTexture = nouveauRenderTexture;
+	func->FinishRenderTexture = nouveauFinishRenderTexture;
 }
-