From f6963f57d9d1e9bf630c05c1c89f188091b12fc5 Mon Sep 17 00:00:00 2001
From: Stephane Marchesin <marchesin@icps.u-strasbg.fr>
Date: Thu, 14 Jun 2007 00:44:16 +0200
Subject: nouveau: remove useless viewport xform with id matrix.

---
 src/mesa/drivers/dri/nouveau/nv10_swtcl.c | 45 ++++++++++---------------------
 1 file changed, 14 insertions(+), 31 deletions(-)

(limited to 'src/mesa')

diff --git a/src/mesa/drivers/dri/nouveau/nv10_swtcl.c b/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
index 3bc84d862d3..4576c1ede4d 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
@@ -392,15 +392,6 @@ static inline void nv10OutputVertexFormat(struct nouveau_context* nmesa)
 	int i;
 	int slots=0;
 	int total_size=0;
-	/* t_vertex_generic dereferences a NULL pointer if we
-	 * pass NULL as the vp transform...
-	 */
-	const GLfloat ident_vp[16] = {
-	   1.0, 0.0, 0.0, 0.0,
-	   0.0, 1.0, 0.0, 0.0,
-	   0.0, 0.0, 1.0, 0.0,
-	   0.0, 0.0, 0.0, 1.0
-	};
 
 	nmesa->vertex_attr_count = 0;
 	RENDERINPUTS_COPY(index, nmesa->render_inputs_bitset);
@@ -431,28 +422,20 @@ static inline void nv10OutputVertexFormat(struct nouveau_context* nmesa)
 		if (RENDERINPUTS_TEST(index, i))
 		{
 			slots=i+1;
-			if (i==_TNL_ATTRIB_POS)
-			{
-				/* special-case POS */
-				EMIT_ATTR(_TNL_ATTRIB_POS,EMIT_3F_VIEWPORT);
-			}
-			else
+			switch(attr_size[i])
 			{
-				switch(attr_size[i])
-				{
-					case 1:
-						EMIT_ATTR(i,EMIT_1F);
-						break;
-					case 2:
-						EMIT_ATTR(i,EMIT_2F);
-						break;
-					case 3:
-						EMIT_ATTR(i,EMIT_3F);
-						break;
-					case 4:
-						EMIT_ATTR(i,EMIT_4F);
-						break;
-				}
+				case 1:
+					EMIT_ATTR(i,EMIT_1F);
+					break;
+				case 2:
+					EMIT_ATTR(i,EMIT_2F);
+					break;
+				case 3:
+					EMIT_ATTR(i,EMIT_3F);
+					break;
+				case 4:
+					EMIT_ATTR(i,EMIT_4F);
+					break;
 			}
 			if (i==_TNL_ATTRIB_COLOR0)
 				nmesa->color_offset=total_size;
@@ -465,7 +448,7 @@ static inline void nv10OutputVertexFormat(struct nouveau_context* nmesa)
 	nmesa->vertex_size=_tnl_install_attrs( ctx,
 			nmesa->vertex_attrs, 
 			nmesa->vertex_attr_count,
-			ident_vp, 0 );
+			NULL, 0 );
 	assert(nmesa->vertex_size==total_size*4);
 
 	/* 
-- 
cgit v1.2.3


From 9cde7fb61dd26cd98a26dcb0a54197e8d28ac3be Mon Sep 17 00:00:00 2001
From: Michel Dänzer <michel@tungstengraphics.com>
Date: Fri, 15 Jun 2007 15:24:35 +0200
Subject: i915tex: Missing piece of SetTexOffset hook implementation for I830
 generation.

---
 src/mesa/drivers/dri/i915tex/i830_vtbl.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/mesa')

diff --git a/src/mesa/drivers/dri/i915tex/i830_vtbl.c b/src/mesa/drivers/dri/i915tex/i830_vtbl.c
index dd0670dec37..e432648ada0 100644
--- a/src/mesa/drivers/dri/i915tex/i830_vtbl.c
+++ b/src/mesa/drivers/dri/i915tex/i830_vtbl.c
@@ -490,11 +490,13 @@ i830_emit_state(struct intel_context *intel)
                       DRM_BO_MASK_MEM | DRM_BO_FLAG_READ,
                       state->tex_offset[i] | TM0S0_USE_FENCE);
          }
-         else {
-            assert(i == 0);
-            assert(state == &i830->meta);
-            OUT_BATCH(0);
-         }
+	 else if (state == &i830->meta) {
+	    assert(i == 0);
+	    OUT_BATCH(0);
+	 }
+	 else {
+	    OUT_BATCH(state->tex_offset[i]);
+	 }
 
          OUT_BATCH(state->Tex[i][I830_TEXREG_TM0S1]);
          OUT_BATCH(state->Tex[i][I830_TEXREG_TM0S2]);
-- 
cgit v1.2.3