From ca75853f9d9e7d131f25daeaa7c646894ab4807e Mon Sep 17 00:00:00 2001
From: Patrice Mandin <patrice@manoir.racoon.city>
Date: Sat, 13 Jan 2007 13:22:03 +0100
Subject: nv10 has alpha color mask

---
 src/mesa/drivers/dri/nouveau/nv10_state.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index c028be2867..162a5e2718 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -106,13 +106,12 @@ static void nv10ClipPlane(GLcontext *ctx, GLenum plane, const GLfloat *equation)
 	OUT_RING_CACHEf(equation[3]);
 }
 
-/* Seems does not support alpha in color mask */
 static void nv10ColorMask(GLcontext *ctx, GLboolean rmask, GLboolean gmask,
 		GLboolean bmask, GLboolean amask )
 {
 	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
 	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_COLOR_MASK, 1);
-	OUT_RING_CACHE(/*((amask && 0x01) << 24) |*/ ((rmask && 0x01) << 16) | ((gmask && 0x01)<< 8) | ((bmask && 0x01) << 0));
+	OUT_RING_CACHE(((amask && 0x01) << 24) | ((rmask && 0x01) << 16) | ((gmask && 0x01)<< 8) | ((bmask && 0x01) << 0));
 }
 
 static void nv10ColorMaterial(GLcontext *ctx, GLenum face, GLenum mode)
-- 
cgit v1.2.3


From fb5f359b93073d85f4cae05cd89ff1012fafeda6 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <patrice@manoir.racoon.city>
Date: Sat, 13 Jan 2007 14:14:19 +0100
Subject: nouveau: update nv10 state

---
 src/mesa/drivers/dri/nouveau/nv10_state.c | 116 +++++++++++++++---------------
 1 file changed, 56 insertions(+), 60 deletions(-)

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index 162a5e2718..d65eb94e42 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -61,40 +61,42 @@ static void nv10BlendColor(GLcontext *ctx, const GLfloat color[4])
 
 static void nv10BlendEquationSeparate(GLcontext *ctx, GLenum modeRGB, GLenum modeA)
 {
-	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
-	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_BLEND_EQUATION, 1);
-	OUT_RING_CACHE((modeA<<16) | modeRGB);
+	/* Not for NV10 */
 }
 
 
 static void nv10BlendFuncSeparate(GLcontext *ctx, GLenum sfactorRGB, GLenum dfactorRGB,
 		GLenum sfactorA, GLenum dfactorA)
 {
-	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
-	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_BLEND_FUNC_SRC, 2);
-	OUT_RING_CACHE((sfactorA<<16) | sfactorRGB);
-	OUT_RING_CACHE((dfactorA<<16) | dfactorRGB);
+	/* Not for NV10 */
+}
+
+static void nv10Clear(GLcontext *ctx, GLbitfield mask)
+{
+	/* TODO */
 }
 
-/*
 static void nv10ClearColor(GLcontext *ctx, const GLfloat color[4])
 {
+	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+	GLubyte c[4];
+	UNCLAMPED_FLOAT_TO_RGBA_CHAN(c,color);
+	nmesa->clear_color_value = PACK_COLOR_8888(c[3],c[0],c[1],c[2]);
 }
 
 static void nv10ClearDepth(GLcontext *ctx, GLclampd d)
 {
+	/* FIXME: check if 16 or 24/32 bits depth buffer */
+	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+	nmesa->clear_value=((nmesa->clear_value&0x000000FF)|(((uint32_t)(d*0xFFFFFF))<<8));
 }
-*/
 
-/* we're don't support indexed buffers
-   void (*ClearIndex)(GLcontext *ctx, GLuint index)
- */
-
-/*
 static void nv10ClearStencil(GLcontext *ctx, GLint s)
 {
+	/* FIXME: not valid for 16 bits depth buffer (0 stencil bits) */
+	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+	nmesa->clear_value=((nmesa->clear_value&0xFFFFFF00)|(s&0x000000FF));
 }
-*/
 
 static void nv10ClipPlane(GLcontext *ctx, GLenum plane, const GLfloat *equation)
 {
@@ -116,7 +118,7 @@ static void nv10ColorMask(GLcontext *ctx, GLboolean rmask, GLboolean gmask,
 
 static void nv10ColorMaterial(GLcontext *ctx, GLenum face, GLenum mode)
 {
-	// TODO I need love
+	/* TODO I need love */
 }
 
 static void nv10CullFace(GLcontext *ctx, GLenum mode)
@@ -320,7 +322,7 @@ static void nv10Fogfv(GLcontext *ctx, GLenum pname, const GLfloat *params)
    
 static void nv10Hint(GLcontext *ctx, GLenum target, GLenum mode)
 {
-	// TODO I need love (fog and line_smooth hints)
+	/* TODO I need love (fog and line_smooth hints) */
 }
 
 // void (*IndexMask)(GLcontext *ctx, GLuint mask);
@@ -448,6 +450,7 @@ static void (*LightModelfv)(GLcontext *ctx, GLenum pname, const GLfloat *params)
 
 static void nv10LineStipple(GLcontext *ctx, GLint factor, GLushort pattern )
 {
+	/* Not for NV10 */
 }
 
 static void nv10LineWidth(GLcontext *ctx, GLfloat width)
@@ -471,7 +474,6 @@ static void nv10PointParameterfv(GLcontext *ctx, GLenum pname, const GLfloat *pa
 	
 }
 
-/** Specify the diameter of rasterized points */
 static void nv10PointSize(GLcontext *ctx, GLfloat size)
 {
 	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
@@ -479,7 +481,6 @@ static void nv10PointSize(GLcontext *ctx, GLfloat size)
 	OUT_RING_CACHE(((int) (size * 8.0)) & -4);
 }
 
-/** Select a polygon rasterization mode */
 static void nv10PolygonMode(GLcontext *ctx, GLenum face, GLenum mode)
 {
 	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
@@ -495,9 +496,20 @@ static void nv10PolygonMode(GLcontext *ctx, GLenum face, GLenum mode)
 }
 
 /** Set the scale and units used to calculate depth values */
-void (*PolygonOffset)(GLcontext *ctx, GLfloat factor, GLfloat units);
+static void nv10PolygonOffset(GLcontext *ctx, GLfloat factor, GLfloat units)
+{
+        nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+        BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_POLYGON_OFFSET_FACTOR, 2);
+        OUT_RING_CACHEf(factor);
+        OUT_RING_CACHEf(units);
+}
+
 /** Set the polygon stippling pattern */
-void (*PolygonStipple)(GLcontext *ctx, const GLubyte *mask );
+static void nv10PolygonStipple(GLcontext *ctx, const GLubyte *mask )
+{
+	/* Not for NV10 */
+}
+
 /* Specifies the current buffer for reading */
 void (*ReadBuffer)( GLcontext *ctx, GLenum buffer );
 /** Set rasterization mode */
@@ -517,37 +529,21 @@ static void nv10ShadeModel(GLcontext *ctx, GLenum mode)
 	OUT_RING_CACHE(mode);
 }
 
-/** OpenGL 2.0 two-sided StencilFunc */
 static void nv10StencilFuncSeparate(GLcontext *ctx, GLenum face, GLenum func,
 		GLint ref, GLuint mask)
 {
-	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
-
-	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_STENCIL_FUNC_FUNC, 3);
-	OUT_RING_CACHE(func);
-	OUT_RING_CACHE(ref);
-	OUT_RING_CACHE(mask);
+	/* Not for NV10 */
 }
 
-/** OpenGL 2.0 two-sided StencilMask */
 static void nv10StencilMaskSeparate(GLcontext *ctx, GLenum face, GLuint mask)
 {
-	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
-
-	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_STENCIL_MASK, 1);
-	OUT_RING_CACHE(mask);
+	/* Not for NV10 */
 }
 
-/** OpenGL 2.0 two-sided StencilOp */
 static void nv10StencilOpSeparate(GLcontext *ctx, GLenum face, GLenum fail,
 		GLenum zfail, GLenum zpass)
 {
-	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
-
-	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_STENCIL_OP_FAIL, 1);
-	OUT_RING_CACHE(fail);
-	OUT_RING_CACHE(zfail);
-	OUT_RING_CACHE(zpass);
+	/* Not for NV10 */
 }
 
 /** Control the generation of texture coordinates */
@@ -560,7 +556,14 @@ void (*TexEnv)(GLcontext *ctx, GLenum target, GLenum pname,
 void (*TexParameter)(GLcontext *ctx, GLenum target,
 		struct gl_texture_object *texObj,
 		GLenum pname, const GLfloat *params);
-void (*TextureMatrix)(GLcontext *ctx, GLuint unit, const GLmatrix *mat);
+
+static void nv10TextureMatrix(GLcontext *ctx, GLuint unit, const GLmatrix *mat)
+{
+        nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+        BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_TX_MATRIX(unit, 0), 16);
+        /*XXX: This SHOULD work.*/
+        OUT_RING_CACHEp(mat->m, 16);
+}
 
 /** Set the viewport */
 static void nv10Viewport(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
@@ -597,13 +600,12 @@ void nv10InitStateFuncs(GLcontext *ctx, struct dd_function_table *func)
 
 	func->AlphaFunc			= nv10AlphaFunc;
 	func->BlendColor		= nv10BlendColor;
-	func->BlendEquationSeparate	= nv10BlendEquationSeparate;
-	func->BlendFuncSeparate		= nv10BlendFuncSeparate;
-#if 0
+	func->BlendEquationSeparate	= nv10BlendEquationSeparate;	/* Not for NV10 */
+	func->BlendFuncSeparate		= nv10BlendFuncSeparate;	/* Not for NV10 */
+	func->Clear			= nv10Clear;
 	func->ClearColor		= nv10ClearColor;
 	func->ClearDepth		= nv10ClearDepth;
 	func->ClearStencil		= nv10ClearStencil;
-#endif
 	func->ClipPlane			= nv10ClipPlane;
 	func->ColorMask			= nv10ColorMask;
 	func->ColorMaterial		= nv10ColorMaterial;
@@ -617,32 +619,26 @@ void nv10InitStateFuncs(GLcontext *ctx, struct dd_function_table *func)
 	func->Hint			= nv10Hint;
 	func->Lightfv			= nv10Lightfv;
 /*	func->LightModelfv		= nv10LightModelfv; */
-	func->LineStipple		= nv10LineStipple;
+	func->LineStipple		= nv10LineStipple;		/* Not for NV10 */
 	func->LineWidth			= nv10LineWidth;
 	func->LogicOpcode		= nv10LogicOpcode;
 	func->PointParameterfv		= nv10PointParameterfv;
 	func->PointSize			= nv10PointSize;
 	func->PolygonMode		= nv10PolygonMode;
-#if 0
 	func->PolygonOffset		= nv10PolygonOffset;
-	func->PolygonStipple		= nv10PolygonStipple;
-	func->ReadBuffer		= nv10ReadBuffer;
-	func->RenderMode		= nv10RenderMode;
-#endif
+	func->PolygonStipple		= nv10PolygonStipple;		/* Not for NV10 */
+/*	func->ReadBuffer		= nv10ReadBuffer;*/
+/*	func->RenderMode		= nv10RenderMode;*/
 	func->Scissor			= nv10Scissor;
 	func->ShadeModel		= nv10ShadeModel;
-	func->StencilFuncSeparate	= nv10StencilFuncSeparate;
-	func->StencilMaskSeparate	= nv10StencilMaskSeparate;
-	func->StencilOpSeparate		= nv10StencilOpSeparate;
-#if 0
-	func->TexGen			= nv10TexGen;
-	func->TexParameter		= nv10TexParameter;
+	func->StencilFuncSeparate	= nv10StencilFuncSeparate;	/* Not for NV10 */
+	func->StencilMaskSeparate	= nv10StencilMaskSeparate;	/* Not for NV10 */
+	func->StencilOpSeparate		= nv10StencilOpSeparate;	/* Not for NV10 */
+/*	func->TexGen			= nv10TexGen;*/
+/*	func->TexParameter		= nv10TexParameter;*/
 	func->TextureMatrix		= nv10TextureMatrix;
-#endif
-	func->Viewport			= nv10Viewport;
 
 	nmesa->hw_func.InitCard		= nv10InitCard;
 	nmesa->hw_func.BindBuffers	= nv10BindBuffers;
 	nmesa->hw_func.WindowMoved	= nv10WindowMoved;
 }
-
-- 
cgit v1.2.3


From f1ad10b338996275a376809d98c420cda4d6d05a Mon Sep 17 00:00:00 2001
From: Patrice Mandin <patrice@manoir.racoon.city>
Date: Sun, 14 Jan 2007 12:45:15 +0100
Subject: nouveau: nv10 blending done, remove nv10Viewport

---
 src/mesa/drivers/dri/nouveau/nv10_state.c | 38 +++++++++++++++++++------------
 1 file changed, 24 insertions(+), 14 deletions(-)

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index d65eb94e42..518ceb31f1 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -45,6 +45,14 @@ static void nv10AlphaFunc(GLcontext *ctx, GLenum func, GLfloat ref)
 	OUT_RING_CACHE(ubRef);    /* NV10_TCL_PRIMITIVE_3D_ALPHA_FUNC_REF  */
 }
 
+/*
+	Supported blend extensions on NV10
+		EXT_blend_color
+		EXT_blend_minmax
+		EXT_blend_subtract
+		NV_blend_square
+*/
+
 static void nv10BlendColor(GLcontext *ctx, const GLfloat color[4])
 {
 	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx); 
@@ -61,14 +69,26 @@ static void nv10BlendColor(GLcontext *ctx, const GLfloat color[4])
 
 static void nv10BlendEquationSeparate(GLcontext *ctx, GLenum modeRGB, GLenum modeA)
 {
-	/* Not for NV10 */
+	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+
+	assert( modeRGB == modeA );
+
+	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_BLEND_EQUATION, 1);
+	OUT_RING_CACHE(modeRGB);
 }
 
 
 static void nv10BlendFuncSeparate(GLcontext *ctx, GLenum sfactorRGB, GLenum dfactorRGB,
 		GLenum sfactorA, GLenum dfactorA)
 {
-	/* Not for NV10 */
+	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+
+	assert( sfactorRGB == sfactorA );
+	assert( dfactorRGB == dfactorA );
+
+	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_BLEND_FUNC_SRC, 2);
+	OUT_RING_CACHE(sfactorRGB);
+	OUT_RING_CACHE(dfactorRGB);	/* NV10_TCL_PRIMITIVE_3D_BLEND_FUNC_DST */
 }
 
 static void nv10Clear(GLcontext *ctx, GLbitfield mask)
@@ -565,16 +585,6 @@ static void nv10TextureMatrix(GLcontext *ctx, GLuint unit, const GLmatrix *mat)
         OUT_RING_CACHEp(mat->m, 16);
 }
 
-/** Set the viewport */
-static void nv10Viewport(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
-{
-    /* TODO: Where do the VIEWPORT_XFRM_* regs come in? */
-    nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
-    BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_VIEWPORT_HORIZ, 2);
-    OUT_RING_CACHE((w << 16) | x);
-    OUT_RING_CACHE((h << 16) | y);
-}
-
 /* Initialise any card-specific non-GL related state */
 static GLboolean nv10InitCard(nouveauContextPtr nmesa)
 {
@@ -600,8 +610,8 @@ void nv10InitStateFuncs(GLcontext *ctx, struct dd_function_table *func)
 
 	func->AlphaFunc			= nv10AlphaFunc;
 	func->BlendColor		= nv10BlendColor;
-	func->BlendEquationSeparate	= nv10BlendEquationSeparate;	/* Not for NV10 */
-	func->BlendFuncSeparate		= nv10BlendFuncSeparate;	/* Not for NV10 */
+	func->BlendEquationSeparate	= nv10BlendEquationSeparate;
+	func->BlendFuncSeparate		= nv10BlendFuncSeparate;
 	func->Clear			= nv10Clear;
 	func->ClearColor		= nv10ClearColor;
 	func->ClearDepth		= nv10ClearDepth;
-- 
cgit v1.2.3


From 29484f24fb2c21772c6a3ddf33a77ec83d415fdc Mon Sep 17 00:00:00 2001
From: Patrice Mandin <patrice@manoir.racoon.city>
Date: Sun, 14 Jan 2007 12:51:30 +0100
Subject: nouveau: nv10: currently fails initcard and bindbuffers, till done

---
 src/mesa/drivers/dri/nouveau/nv10_state.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index 518ceb31f1..17336a7b2a 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -588,7 +588,7 @@ static void nv10TextureMatrix(GLcontext *ctx, GLuint unit, const GLmatrix *mat)
 /* Initialise any card-specific non-GL related state */
 static GLboolean nv10InitCard(nouveauContextPtr nmesa)
 {
-   return GL_TRUE;
+   return GL_FALSE;
 }
 
 /* Update buffer offset/pitch/format */
@@ -596,7 +596,7 @@ static GLboolean nv10BindBuffers(nouveauContextPtr nmesa, int num_color,
 				 nouveau_renderbuffer **color,
 				 nouveau_renderbuffer *depth)
 {
-   return GL_TRUE;
+   return GL_FALSE;
 }
 
 /* Update anything that depends on the window position/size */
-- 
cgit v1.2.3


From faada2485a864298562b5e59b0703748c6f6f9d5 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <patrice@manoir.racoon.city>
Date: Sun, 14 Jan 2007 14:03:42 +0100
Subject: nouveau: nv10: stencil functions

---
 src/mesa/drivers/dri/nouveau/nv10_state.c | 45 +++++++++++++++++++------------
 1 file changed, 28 insertions(+), 17 deletions(-)

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index 17336a7b2a..a9cce932d8 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -41,18 +41,10 @@ static void nv10AlphaFunc(GLcontext *ctx, GLenum func, GLfloat ref)
 	CLAMPED_FLOAT_TO_UBYTE(ubRef, ref);
 
 	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_ALPHA_FUNC_FUNC, 2);
-	OUT_RING_CACHE(func);     /* NV10_TCL_PRIMITIVE_3D_ALPHA_FUNC_FUNC */
-	OUT_RING_CACHE(ubRef);    /* NV10_TCL_PRIMITIVE_3D_ALPHA_FUNC_REF  */
+	OUT_RING_CACHE(func);
+	OUT_RING_CACHE(ubRef);
 }
 
-/*
-	Supported blend extensions on NV10
-		EXT_blend_color
-		EXT_blend_minmax
-		EXT_blend_subtract
-		NV_blend_square
-*/
-
 static void nv10BlendColor(GLcontext *ctx, const GLfloat color[4])
 {
 	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx); 
@@ -88,7 +80,7 @@ static void nv10BlendFuncSeparate(GLcontext *ctx, GLenum sfactorRGB, GLenum dfac
 
 	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_BLEND_FUNC_SRC, 2);
 	OUT_RING_CACHE(sfactorRGB);
-	OUT_RING_CACHE(dfactorRGB);	/* NV10_TCL_PRIMITIVE_3D_BLEND_FUNC_DST */
+	OUT_RING_CACHE(dfactorRGB);
 }
 
 static void nv10Clear(GLcontext *ctx, GLbitfield mask)
@@ -549,21 +541,40 @@ static void nv10ShadeModel(GLcontext *ctx, GLenum mode)
 	OUT_RING_CACHE(mode);
 }
 
+/** OpenGL 2.0 two-sided StencilFunc */
 static void nv10StencilFuncSeparate(GLcontext *ctx, GLenum face, GLenum func,
 		GLint ref, GLuint mask)
 {
-	/* Not for NV10 */
+	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+
+	/* NV10 do not have separate FRONT and BACK stencils */
+	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_STENCIL_FUNC_FUNC, 3);
+	OUT_RING_CACHE(func);
+	OUT_RING_CACHE(ref);
+	OUT_RING_CACHE(mask);
 }
 
+/** OpenGL 2.0 two-sided StencilMask */
 static void nv10StencilMaskSeparate(GLcontext *ctx, GLenum face, GLuint mask)
 {
-	/* Not for NV10 */
+	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+
+	/* NV10 do not have separate FRONT and BACK stencils */
+	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_STENCIL_MASK, 1);
+	OUT_RING_CACHE(mask);
 }
 
+/** OpenGL 2.0 two-sided StencilOp */
 static void nv10StencilOpSeparate(GLcontext *ctx, GLenum face, GLenum fail,
 		GLenum zfail, GLenum zpass)
 {
-	/* Not for NV10 */
+	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+
+	/* NV10 do not have separate FRONT and BACK stencils */
+	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_STENCIL_OP_FAIL, 3);
+	OUT_RING_CACHE(fail);
+	OUT_RING_CACHE(zfail);
+	OUT_RING_CACHE(zpass);
 }
 
 /** Control the generation of texture coordinates */
@@ -641,9 +652,9 @@ void nv10InitStateFuncs(GLcontext *ctx, struct dd_function_table *func)
 /*	func->RenderMode		= nv10RenderMode;*/
 	func->Scissor			= nv10Scissor;
 	func->ShadeModel		= nv10ShadeModel;
-	func->StencilFuncSeparate	= nv10StencilFuncSeparate;	/* Not for NV10 */
-	func->StencilMaskSeparate	= nv10StencilMaskSeparate;	/* Not for NV10 */
-	func->StencilOpSeparate		= nv10StencilOpSeparate;	/* Not for NV10 */
+	func->StencilFuncSeparate	= nv10StencilFuncSeparate;
+	func->StencilMaskSeparate	= nv10StencilMaskSeparate;
+	func->StencilOpSeparate		= nv10StencilOpSeparate;
 /*	func->TexGen			= nv10TexGen;*/
 /*	func->TexParameter		= nv10TexParameter;*/
 	func->TextureMatrix		= nv10TextureMatrix;
-- 
cgit v1.2.3


From 8aabd636f5dd303774a07f8705068d812f7feef8 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <patrice@manoir.racoon.city>
Date: Sun, 14 Jan 2007 19:55:45 +0100
Subject: nouveau: nv10: added missing functions

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

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index a9cce932d8..8785879d9d 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -596,10 +596,67 @@ static void nv10TextureMatrix(GLcontext *ctx, GLuint unit, const GLmatrix *mat)
         OUT_RING_CACHEp(mat->m, 16);
 }
 
+/* Update anything that depends on the window position/size */
+static void nv10WindowMoved(nouveauContextPtr nmesa)
+{
+	GLcontext *ctx = nmesa->glCtx;
+	GLfloat *v = nmesa->viewport.m;
+	GLuint w = ctx->Viewport.Width;
+	GLuint h = ctx->Viewport.Height;
+	GLuint x = ctx->Viewport.X + nmesa->drawX;
+	GLuint y = ctx->Viewport.Y + nmesa->drawY;
+	int i;
+
+        BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_VIEWPORT_HORIZ, 2);
+        OUT_RING_CACHE((w << 16) | x);
+        OUT_RING_CACHE((h << 16) | y);
+
+	/* something to do with clears, possibly doesn't belong here */
+	BEGIN_RING_CACHE(NvSub3D,
+	      NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(0), 2);
+        OUT_RING_CACHE(((w+x) << 16) | x | 0x800);
+        OUT_RING_CACHE(((h+y) << 16) | y | 0x800);
+	for (i=1; i<7; i++) {
+		BEGIN_RING_CACHE(NvSub3D,
+		      NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(i), 2);
+        	OUT_RING_CACHE(0);
+	        OUT_RING_CACHE(0);
+	}
+
+	/* viewport transform */
+	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_VIEWPORT_ORIGIN_X, 4);
+	OUT_RING_CACHEf ((GLfloat) x);
+	OUT_RING_CACHEf ((GLfloat) (y+h));
+	OUT_RING_CACHEf (0.0);
+	OUT_RING_CACHEf (0.0);
+
+	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_VIEWPORT_SCALE_X, 4);
+	OUT_RING_CACHEf ((((GLfloat) w) * 0.5) - 2048.0);
+	OUT_RING_CACHEf ((((GLfloat) h) * 0.5) - 2048.0);
+	OUT_RING_CACHEf (16777215.0 * 0.5);
+	OUT_RING_CACHEf (0.0);
+}
+
 /* Initialise any card-specific non-GL related state */
 static GLboolean nv10InitCard(nouveauContextPtr nmesa)
 {
-   return GL_FALSE;
+	nouveauObjectOnSubchannel(nmesa, NvSub3D, Nv3D);
+
+	BEGIN_RING_SIZE(NvSub3D, NV10_TCL_PRIMITIVE_3D_SET_DMA_IN_MEMORY0, 2);
+	OUT_RING(NvDmaFB);	/* 184 dma_in_memory0 */
+	OUT_RING(NvDmaFB);	/* 188 dma_in_memory1 */
+	BEGIN_RING_SIZE(NvSub3D, NV10_TCL_PRIMITIVE_3D_SET_DMA_IN_MEMORY2, 2);
+	OUT_RING(NvDmaFB);	/* 194 dma_in_memory2 */
+	OUT_RING(NvDmaFB);	/* 198 dma_in_memory3 */
+
+	BEGIN_RING_SIZE(NvSub3D, 0x02b4, 1);
+	OUT_RING(0);
+	BEGIN_RING_SIZE(NvSub3D, 0x0290, 1);
+	OUT_RING(0x00100001);
+	BEGIN_RING_SIZE(NvSub3D, 0x03f4, 1);
+	OUT_RING(0);
+
+	return GL_FALSE;
 }
 
 /* Update buffer offset/pitch/format */
@@ -607,12 +664,34 @@ static GLboolean nv10BindBuffers(nouveauContextPtr nmesa, int num_color,
 				 nouveau_renderbuffer **color,
 				 nouveau_renderbuffer *depth)
 {
-   return GL_FALSE;
-}
+	GLuint x, y, w, h;
+	GLuint pitch, format;
 
-/* Update anything that depends on the window position/size */
-static void nv10WindowMoved(nouveauContextPtr nmesa)
-{
+	w = color[0]->mesa.Width;
+	h = color[0]->mesa.Height;
+	x = nmesa->drawX;
+	y = nmesa->drawY;
+
+	if (num_color != 1)
+		return GL_FALSE;
+
+        BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_VIEWPORT_HORIZ, 6);
+        OUT_RING_CACHE((w << 16) | x);
+        OUT_RING_CACHE((h << 16) | y);
+	pitch = color[0]->pitch;
+	if (depth) {
+		pitch |= (depth->pitch << 16);
+	}
+	format = 0x108;
+	if (color[0]->mesa._ActualFormat != GL_RGBA8) {
+		/* FIXME: set 16 bits format */
+	}
+	OUT_RING(format);
+	OUT_RING(pitch);
+	OUT_RING(color[0]->offset);
+	OUT_RING(depth ? depth->offset : color[0]->offset);
+
+	return GL_TRUE;
 }
 
 void nv10InitStateFuncs(GLcontext *ctx, struct dd_function_table *func)
-- 
cgit v1.2.3


From 81bd826de8897f3784ad301023bde6e7eb77b5b2 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <patrice@manoir.racoon.city>
Date: Sun, 14 Jan 2007 20:14:58 +0100
Subject: nouveau: nv10: 16 bits color buffer format

---
 src/mesa/drivers/dri/nouveau/nv10_state.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index 8785879d9d..dbd8bf306e 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -684,7 +684,7 @@ static GLboolean nv10BindBuffers(nouveauContextPtr nmesa, int num_color,
 	}
 	format = 0x108;
 	if (color[0]->mesa._ActualFormat != GL_RGBA8) {
-		/* FIXME: set 16 bits format */
+		format = 0x103; /* R5G6B5 color buffer */
 	}
 	OUT_RING(format);
 	OUT_RING(pitch);
-- 
cgit v1.2.3


From 7520478eb055350702d09e533db02258187d8c74 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <patrice@manoir.racoon.city>
Date: Mon, 15 Jan 2007 18:58:24 +0100
Subject: nouveau:nv10: fix setting clip region

---
 src/mesa/drivers/dri/nouveau/nv10_state.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index dbd8bf306e..0e912e73ff 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -618,8 +618,10 @@ static void nv10WindowMoved(nouveauContextPtr nmesa)
         OUT_RING_CACHE(((h+y) << 16) | y | 0x800);
 	for (i=1; i<7; i++) {
 		BEGIN_RING_CACHE(NvSub3D,
-		      NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(i), 2);
+		      NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(i), 1);
         	OUT_RING_CACHE(0);
+		BEGIN_RING_CACHE(NvSub3D,
+		      NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_VERT(i), 1);
 	        OUT_RING_CACHE(0);
 	}
 
-- 
cgit v1.2.3


From c7c0a6ddcddc8d91fde0a7cb5a2bce85c708d438 Mon Sep 17 00:00:00 2001
From: Matthieu Castet <castet.matthieu@free.fr>
Date: Sun, 28 Jan 2007 23:26:21 +0100
Subject: nouveau : nv10 mixing cached stuff with not cached stuff is bad.

---
 src/mesa/drivers/dri/nouveau/nv10_state.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index 0e912e73ff..4e9bccb243 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -688,10 +688,10 @@ static GLboolean nv10BindBuffers(nouveauContextPtr nmesa, int num_color,
 	if (color[0]->mesa._ActualFormat != GL_RGBA8) {
 		format = 0x103; /* R5G6B5 color buffer */
 	}
-	OUT_RING(format);
-	OUT_RING(pitch);
-	OUT_RING(color[0]->offset);
-	OUT_RING(depth ? depth->offset : color[0]->offset);
+	OUT_RING_CACHE(format);
+	OUT_RING_CACHE(pitch);
+	OUT_RING_CACHE(color[0]->offset);
+	OUT_RING_CACHE(depth ? depth->offset : color[0]->offset);
 
 	return GL_TRUE;
 }
-- 
cgit v1.2.3


From c97540065c6dce20dd6ace9a15d9872a3a66f71c Mon Sep 17 00:00:00 2001
From: Matthieu Castet <castet.matthieu@free.fr>
Date: Mon, 29 Jan 2007 23:19:12 +0100
Subject: nouveau : nv10 comment icomplete command

---
 src/mesa/drivers/dri/nouveau/nv10_state.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index 4e9bccb243..f6e47b7f48 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -322,7 +322,7 @@ static void nv10Fogfv(GLcontext *ctx, GLenum pname, const GLfloat *params)
     switch(pname)
     {
         case GL_FOG_MODE:
-            BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_FOG_MODE, 1);
+            //BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_FOG_MODE, 1);
             //OUT_RING_CACHE (params);
             break;
             /* TODO: unsure about the rest.*/
-- 
cgit v1.2.3


From 1c25561e30ada8036d00aa84344377aa2a4f791a Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Sat, 3 Feb 2007 13:20:16 +0100
Subject: nouveau: use color pitch as depth pitch if depth disabled

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

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index f6e47b7f48..055f538a3a 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -667,7 +667,7 @@ static GLboolean nv10BindBuffers(nouveauContextPtr nmesa, int num_color,
 				 nouveau_renderbuffer *depth)
 {
 	GLuint x, y, w, h;
-	GLuint pitch, format;
+	GLuint pitch, format, depth_pitch;
 
 	w = color[0]->mesa.Width;
 	h = color[0]->mesa.Height;
@@ -680,10 +680,8 @@ static GLboolean nv10BindBuffers(nouveauContextPtr nmesa, int num_color,
         BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_VIEWPORT_HORIZ, 6);
         OUT_RING_CACHE((w << 16) | x);
         OUT_RING_CACHE((h << 16) | y);
-	pitch = color[0]->pitch;
-	if (depth) {
-		pitch |= (depth->pitch << 16);
-	}
+	depth_pitch = (depth ? depth->pitch : color[0]->pitch);
+	pitch = (depth_pitch<<16) | color[0]->pitch;
 	format = 0x108;
 	if (color[0]->mesa._ActualFormat != GL_RGBA8) {
 		format = 0x103; /* R5G6B5 color buffer */
-- 
cgit v1.2.3


From de24b01b05d4c7402c06851dd7dbbb5854b1ff41 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Sat, 3 Feb 2007 13:22:42 +0100
Subject: nouveau: fix viewport clipping initialization

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

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index 055f538a3a..88c1d7d9e1 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -612,10 +612,13 @@ static void nv10WindowMoved(nouveauContextPtr nmesa)
         OUT_RING_CACHE((h << 16) | y);
 
 	/* something to do with clears, possibly doesn't belong here */
+	BEGIN_RING_SIZE(NvSub3D, 0x02b4, 1);
+	OUT_RING(0);
+
 	BEGIN_RING_CACHE(NvSub3D,
 	      NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(0), 2);
-        OUT_RING_CACHE(((w+x) << 16) | x | 0x800);
-        OUT_RING_CACHE(((h+y) << 16) | y | 0x800);
+        OUT_RING_CACHE(((w+x-1) << 16) | x | 0x08000800);
+        OUT_RING_CACHE(((h+y-1) << 16) | y | 0x08000800);
 	for (i=1; i<7; i++) {
 		BEGIN_RING_CACHE(NvSub3D,
 		      NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(i), 1);
@@ -651,14 +654,12 @@ static GLboolean nv10InitCard(nouveauContextPtr nmesa)
 	OUT_RING(NvDmaFB);	/* 194 dma_in_memory2 */
 	OUT_RING(NvDmaFB);	/* 198 dma_in_memory3 */
 
-	BEGIN_RING_SIZE(NvSub3D, 0x02b4, 1);
-	OUT_RING(0);
 	BEGIN_RING_SIZE(NvSub3D, 0x0290, 1);
 	OUT_RING(0x00100001);
 	BEGIN_RING_SIZE(NvSub3D, 0x03f4, 1);
 	OUT_RING(0);
 
-	return GL_FALSE;
+	return GL_TRUE;
 }
 
 /* Update buffer offset/pitch/format */
-- 
cgit v1.2.3


From 296eeb882fa9fd7528f33ed307f87171dff7ee1c Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Sun, 4 Feb 2007 13:10:23 +0100
Subject: nouveau: nv10: add init for unknown 0x120

---
 src/mesa/drivers/dri/nouveau/nv10_state.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index 88c1d7d9e1..8fbc76c308 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -659,6 +659,14 @@ static GLboolean nv10InitCard(nouveauContextPtr nmesa)
 	BEGIN_RING_SIZE(NvSub3D, 0x03f4, 1);
 	OUT_RING(0);
 
+	/* not for nv10, only for >= nv11 */
+	if ((nmesa->screen->card->id>>4) >= 0x11) {
+	        BEGIN_RING_SIZE(NvSub3D, 0x120, 3);
+        	OUT_RING(0);
+	        OUT_RING(1);
+	        OUT_RING(2);
+	}
+
 	return GL_TRUE;
 }
 
-- 
cgit v1.2.3


From 83cf4ce6e40ed1841b94f528dc89838e875c720d Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Wed, 14 Feb 2007 20:28:31 +0100
Subject: nouveau: nv10: there are 8 clipping regions

---
 src/mesa/drivers/dri/nouveau/nv10_state.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index 8fbc76c308..d69c6824ed 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -619,7 +619,7 @@ static void nv10WindowMoved(nouveauContextPtr nmesa)
 	      NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(0), 2);
         OUT_RING_CACHE(((w+x-1) << 16) | x | 0x08000800);
         OUT_RING_CACHE(((h+y-1) << 16) | y | 0x08000800);
-	for (i=1; i<7; i++) {
+	for (i=1; i<8; i++) {
 		BEGIN_RING_CACHE(NvSub3D,
 		      NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(i), 1);
         	OUT_RING_CACHE(0);
-- 
cgit v1.2.3


From 252d1de05430cbed532b5a716cbd7da0ee7dd0d1 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Fri, 16 Feb 2007 19:46:54 +0100
Subject: nouveau: nv10: fix viewport scale and origin

---
 src/mesa/drivers/dri/nouveau/nv10_state.c | 45 ++++++++++++++++++++++---------
 1 file changed, 33 insertions(+), 12 deletions(-)

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index d69c6824ed..e64fcb12f5 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -34,6 +34,29 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "mtypes.h"
 #include "colormac.h"
 
+static void nv10ViewportScale(nouveauContextPtr nmesa)
+{
+	GLcontext *ctx = nmesa->glCtx;
+	GLuint w = ctx->Viewport.Width;
+	GLuint h = ctx->Viewport.Height;
+
+	GLfloat max_depth = (ctx->Viewport.Near + ctx->Viewport.Far) * 0.5;
+	switch (ctx->DrawBuffer->_DepthBuffer->DepthBits) {
+		case 16:
+			max_depth *= 32767.0;
+			break;
+		case 24:
+			max_depth *= 16777215.0;
+			break;
+	}
+
+	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_VIEWPORT_SCALE_X, 4);
+	OUT_RING_CACHEf ((((GLfloat) w) * 0.5) - 2048.0);
+	OUT_RING_CACHEf ((((GLfloat) h) * 0.5) - 2048.0);
+	OUT_RING_CACHEf (max_depth);
+	OUT_RING_CACHEf (0.0);
+}
+
 static void nv10AlphaFunc(GLcontext *ctx, GLenum func, GLfloat ref)
 {
 	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
@@ -167,6 +190,8 @@ static void nv10DepthRange(GLcontext *ctx, GLclampd nearval, GLclampd farval)
 	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_DEPTH_RANGE_NEAR, 2);
 	OUT_RING_CACHEf(nearval);
 	OUT_RING_CACHEf(farval);
+
+	nv10ViewportScale(nmesa);
 }
 
 /** Specify the current buffer for writing */
@@ -628,18 +653,7 @@ static void nv10WindowMoved(nouveauContextPtr nmesa)
 	        OUT_RING_CACHE(0);
 	}
 
-	/* viewport transform */
-	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_VIEWPORT_ORIGIN_X, 4);
-	OUT_RING_CACHEf ((GLfloat) x);
-	OUT_RING_CACHEf ((GLfloat) (y+h));
-	OUT_RING_CACHEf (0.0);
-	OUT_RING_CACHEf (0.0);
-
-	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_VIEWPORT_SCALE_X, 4);
-	OUT_RING_CACHEf ((((GLfloat) w) * 0.5) - 2048.0);
-	OUT_RING_CACHEf ((((GLfloat) h) * 0.5) - 2048.0);
-	OUT_RING_CACHEf (16777215.0 * 0.5);
-	OUT_RING_CACHEf (0.0);
+	nv10ViewportScale(nmesa);
 }
 
 /* Initialise any card-specific non-GL related state */
@@ -700,6 +714,13 @@ static GLboolean nv10BindBuffers(nouveauContextPtr nmesa, int num_color,
 	OUT_RING_CACHE(color[0]->offset);
 	OUT_RING_CACHE(depth ? depth->offset : color[0]->offset);
 
+	/* Always set to bottom left of buffer */
+	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_VIEWPORT_ORIGIN_X, 4);
+	OUT_RING_CACHEf (0.0);
+	OUT_RING_CACHEf ((GLfloat) h);
+	OUT_RING_CACHEf (0.0);
+	OUT_RING_CACHEf (0.0);
+
 	return GL_TRUE;
 }
 
-- 
cgit v1.2.3


From 9131536f00cca586be7dfc1cfbc47188c78e4920 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Fri, 16 Feb 2007 19:54:55 +0100
Subject: nouveau: nv10: rescale depth near and far

---
 src/mesa/drivers/dri/nouveau/nv10_state.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index e64fcb12f5..803dd962b5 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -187,9 +187,15 @@ static void nv10DepthMask(GLcontext *ctx, GLboolean flag)
 static void nv10DepthRange(GLcontext *ctx, GLclampd nearval, GLclampd farval)
 {
 	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+
+	GLfloat depth_scale = 16777216.0;
+	if (ctx->DrawBuffer->_DepthBuffer->DepthBits == 16) {
+		depth_scale = 32768.0;
+	}
+
 	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_DEPTH_RANGE_NEAR, 2);
-	OUT_RING_CACHEf(nearval);
-	OUT_RING_CACHEf(farval);
+	OUT_RING_CACHEf(nearval * depth_scale);
+	OUT_RING_CACHEf(farval * depth_scale);
 
 	nv10ViewportScale(nmesa);
 }
-- 
cgit v1.2.3


From f942dc5522682b70fb05df5b2d5d732bb65e6fe2 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Fri, 16 Feb 2007 20:26:57 +0100
Subject: nouveau: nv10: set clear value for 16 and 24 bits depth

---
 src/mesa/drivers/dri/nouveau/nv10_state.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index 803dd962b5..cc0f5a7220 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -121,16 +121,27 @@ static void nv10ClearColor(GLcontext *ctx, const GLfloat color[4])
 
 static void nv10ClearDepth(GLcontext *ctx, GLclampd d)
 {
-	/* FIXME: check if 16 or 24/32 bits depth buffer */
 	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
-	nmesa->clear_value=((nmesa->clear_value&0x000000FF)|(((uint32_t)(d*0xFFFFFF))<<8));
+
+	switch (ctx->DrawBuffer->_DepthBuffer->DepthBits) {
+		case 16:
+			nmesa->clear_value = (uint32_t)(d*0x7FFF);
+			break;
+		case 24:
+			nmesa->clear_value = ((nmesa->clear_value&0x000000FF) |
+				(((uint32_t)(d*0xFFFFFF))<<8));
+			break;
+	}
 }
 
 static void nv10ClearStencil(GLcontext *ctx, GLint s)
 {
-	/* FIXME: not valid for 16 bits depth buffer (0 stencil bits) */
 	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
-	nmesa->clear_value=((nmesa->clear_value&0xFFFFFF00)|(s&0x000000FF));
+
+	if (ctx->DrawBuffer->_DepthBuffer->DepthBits == 24) {
+		nmesa->clear_value = ((nmesa->clear_value&0xFFFFFF00)|
+			(s&0x000000FF));
+	}
 }
 
 static void nv10ClipPlane(GLcontext *ctx, GLenum plane, const GLfloat *equation)
-- 
cgit v1.2.3


From 4cc4a753fa3c41e5ef1890a9a03c97d3c39b6535 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Fri, 16 Feb 2007 22:39:12 +0100
Subject: nouveau: nv10,20: wrong viewport clip setup

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

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index cc0f5a7220..e0475bb3da 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -658,8 +658,10 @@ static void nv10WindowMoved(nouveauContextPtr nmesa)
 	OUT_RING(0);
 
 	BEGIN_RING_CACHE(NvSub3D,
-	      NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(0), 2);
+	      NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(0), 1);
         OUT_RING_CACHE(((w+x-1) << 16) | x | 0x08000800);
+	BEGIN_RING_CACHE(NvSub3D,
+	      NV10_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_VERT(0), 1);
         OUT_RING_CACHE(((h+y-1) << 16) | y | 0x08000800);
 	for (i=1; i<8; i++) {
 		BEGIN_RING_CACHE(NvSub3D,
diff --git a/src/mesa/drivers/dri/nouveau/nv20_state.c b/src/mesa/drivers/dri/nouveau/nv20_state.c
index 417590d729..030713c0db 100644
--- a/src/mesa/drivers/dri/nouveau/nv20_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_state.c
@@ -642,8 +642,10 @@ static void nv20WindowMoved(nouveauContextPtr nmesa)
 	OUT_RING(0);
 
 	BEGIN_RING_CACHE(NvSub3D,
-	      NV20_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(0), 2);
+	      NV20_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_HORIZ(0), 1);
         OUT_RING_CACHE((4095 << 16) | 0);
+	BEGIN_RING_CACHE(NvSub3D,
+	      NV20_TCL_PRIMITIVE_3D_VIEWPORT_CLIP_VERT(0), 1);
         OUT_RING_CACHE((4095 << 16) | 0);
 	for (i=1; i<8; i++) {
 		BEGIN_RING_CACHE(NvSub3D,
-- 
cgit v1.2.3


From 102ad2e066b7a6fcd893db58c64ca685e49a3dfd Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Tue, 20 Feb 2007 23:04:21 +0100
Subject: nouveau: nv10: keep 24/8 depth/stencil value, don't check for depth
 bits

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

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index e0475bb3da..09fc07556d 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -123,25 +123,25 @@ static void nv10ClearDepth(GLcontext *ctx, GLclampd d)
 {
 	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
 
-	switch (ctx->DrawBuffer->_DepthBuffer->DepthBits) {
+/*	switch (ctx->DrawBuffer->_DepthBuffer->DepthBits) {
 		case 16:
 			nmesa->clear_value = (uint32_t)(d*0x7FFF);
 			break;
-		case 24:
+		case 24:*/
 			nmesa->clear_value = ((nmesa->clear_value&0x000000FF) |
 				(((uint32_t)(d*0xFFFFFF))<<8));
-			break;
-	}
+/*			break;
+	}*/
 }
 
 static void nv10ClearStencil(GLcontext *ctx, GLint s)
 {
 	nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
 
-	if (ctx->DrawBuffer->_DepthBuffer->DepthBits == 24) {
+/*	if (ctx->DrawBuffer->_DepthBuffer->DepthBits == 24) {*/
 		nmesa->clear_value = ((nmesa->clear_value&0xFFFFFF00)|
 			(s&0x000000FF));
-	}
+/*	}*/
 }
 
 static void nv10ClipPlane(GLcontext *ctx, GLenum plane, const GLfloat *equation)
-- 
cgit v1.2.3


From 79870d100f90555b520af342cf59496236ff8f20 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Tue, 20 Feb 2007 23:13:48 +0100
Subject: nouveau: nv10: also check ctx->DrawBuffer in nv10ViewportScale

---
 src/mesa/drivers/dri/nouveau/nv10_state.c | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index 09fc07556d..e204eba6ba 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_state.c
@@ -41,13 +41,18 @@ static void nv10ViewportScale(nouveauContextPtr nmesa)
 	GLuint h = ctx->Viewport.Height;
 
 	GLfloat max_depth = (ctx->Viewport.Near + ctx->Viewport.Far) * 0.5;
-	switch (ctx->DrawBuffer->_DepthBuffer->DepthBits) {
-		case 16:
-			max_depth *= 32767.0;
-			break;
-		case 24:
-			max_depth *= 16777215.0;
-			break;
+	if (ctx->DrawBuffer) {
+		switch (ctx->DrawBuffer->_DepthBuffer->DepthBits) {
+			case 16:
+				max_depth *= 32767.0;
+				break;
+			case 24:
+				max_depth *= 16777215.0;
+				break;
+		}
+	} else {
+		/* Default to 24 bits range */	
+		max_depth *= 16777215.0;
 	}
 
 	BEGIN_RING_CACHE(NvSub3D, NV10_TCL_PRIMITIVE_3D_VIEWPORT_SCALE_X, 4);
-- 
cgit v1.2.3


From 440759c2cdfdd9a7fbc6500fca2afa519126c1a7 Mon Sep 17 00:00:00 2001
From: Patrice Mandin <pmandin@caramail.com>
Date: Tue, 20 Feb 2007 23:17:09 +0100
Subject: nouveau: nv10: grr, ctx->DrawBuffer invalid?

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

(limited to 'src/mesa/drivers/dri/nouveau/nv10_state.c')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_state.c b/src/mesa/drivers/dri/nouveau/nv10_state.c
index e204eba6ba..5f304ccab9 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(nouveauContextPtr nmesa)
 	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(nouveauContextPtr nmesa)
 				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);
-- 
cgit v1.2.3