mesa: Branch 'master'

[Patrice Mandin]

 src/mesa/drivers/dri/nouveau/nv10_state.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

New commits:
diff-tree 440759c2cdfdd9a7fbc6500fca2afa519126c1a7 (from 79870d100f90555b520af342cf59496236ff8f20)
Author: Patrice Mandin <pmandin at caramail.com>
Date:   Tue Feb 20 23:17:09 2007 +0100

    nouveau: nv10: grr, ctx->DrawBuffer invalid?

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index e204eba..5f304cc 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -41,7 +41,7 @@ static void nv10ViewportScale(nouveauCon
 	GLuint h = ctx->Viewport.Height;
 
 	GLfloat max_depth = (ctx->Viewport.Near + ctx->Viewport.Far) * 0.5;
-	if (ctx->DrawBuffer) {
+/*	if (ctx->DrawBuffer) {
 		switch (ctx->DrawBuffer->_DepthBuffer->DepthBits) {
 			case 16:
 				max_depth *= 32767.0;
@@ -50,10 +50,10 @@ static void nv10ViewportScale(nouveauCon
 				max_depth *= 16777215.0;
 				break;
 		}
-	} else {
+	} else {*/
 		/* Default to 24 bits range */	
 		max_depth *= 16777215.0;
-	}
+/*	}*/
 
 	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_VIEWPORT_SCALE_X, 4);
 	OUT_RING_CACHEf ((((GLfloat) w) * 0.5) - 2048.0);