CVS commit: xsrc/external/mit/MesaLib/dist/src/mesa

[matthew green]

Module Name:    xsrc
Committed By:   mrg
Date:           Mon Nov  9 03:02:47 UTC 2009

Modified Files:
        xsrc/external/mit/MesaLib/dist/src/mesa/main: texstate.c
        xsrc/external/mit/MesaLib/dist/src/mesa/vbo: vbo_exec_draw.c

Log Message:
merge MesaLib 7.4.4.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
    xsrc/external/mit/MesaLib/dist/src/mesa/main/texstate.c
cvs rdiff -u -r1.2 -r1.3 \
    xsrc/external/mit/MesaLib/dist/src/mesa/vbo/vbo_exec_draw.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: xsrc/external/mit/MesaLib/dist/src/mesa/main/texstate.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/main/texstate.c:1.2 xsrc/external/mit/MesaLib/dist/src/mesa/main/texstate.c:1.3
--- xsrc/external/mit/MesaLib/dist/src/mesa/main/texstate.c:1.2	Wed Jun 17 01:06:29 2009
+++ xsrc/external/mit/MesaLib/dist/src/mesa/main/texstate.c	Mon Nov  9 03:02:47 2009
@@ -429,7 +429,7 @@
       }
       if (texObj->_Complete) {
          texUnit->_ReallyEnabled = textureBit;
-	 _mesa_reference_texobj(&texUnit->_Current, texObj);
+         _mesa_reference_texobj(&texUnit->_Current, texObj);
          update_texture_compare_function(ctx, texObj);
       }
    }

Index: xsrc/external/mit/MesaLib/dist/src/mesa/vbo/vbo_exec_draw.c
diff -u xsrc/external/mit/MesaLib/dist/src/mesa/vbo/vbo_exec_draw.c:1.2 xsrc/external/mit/MesaLib/dist/src/mesa/vbo/vbo_exec_draw.c:1.3
--- xsrc/external/mit/MesaLib/dist/src/mesa/vbo/vbo_exec_draw.c:1.2	Fri Jun 12 01:55:07 2009
+++ xsrc/external/mit/MesaLib/dist/src/mesa/vbo/vbo_exec_draw.c	Mon Nov  9 03:02:47 2009
@@ -184,6 +184,7 @@
           (ctx->VertexProgram._Current->Base.InputsRead & VERT_BIT_GENERIC0)) {
          exec->vtx.inputs[16] = exec->vtx.inputs[0];
          exec->vtx.attrsz[16] = exec->vtx.attrsz[0];
+         exec->vtx.attrptr[16] = exec->vtx.attrptr[0];
          exec->vtx.attrsz[0] = 0;
       }
       break;