mesa: Branch 'master'

[Patrice Mandin]

 src/mesa/drivers/dri/nouveau/nv20_state.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)

New commits:
diff-tree 0fccb646e0c83f6bb4c8b453cc2e915e8cee21f1 (from 66d8e55184ff8ebfdfef174336dbb5560c45e735)
Author: Patrice Mandin <pmandin at caramail.com>
Date:   Fri Feb 16 22:09:42 2007 +0100

    nouveau: nv20: texture matrix

diff --git a/src/mesa/drivers/dri/nouveau/nv20_state.c b/src/mesa/drivers/dri/nouveau/nv20_state.c
index bcca69d..417590d 100644
--- a/src/mesa/drivers/dri/nouveau/nv20_state.c
+++ b/src/mesa/drivers/dri/nouveau/nv20_state.c
@@ -617,7 +617,10 @@ void (*TexParameter)(GLcontext *ctx, GLe
 
 static void nv20TextureMatrix(GLcontext *ctx, GLuint unit, const GLmatrix *mat)
 {
-	/* TODO */
+        nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
+        BEGIN_RING_CACHE(NvSub3D, NV20_TCL_PRIMITIVE_3D_TX_MATRIX(unit, 0), 16);
+        /*XXX: This SHOULD work.*/
+        OUT_RING_CACHEp(mat->m, 16);
 }
 
 /* Update anything that depends on the window position/size */