Module Name: xsrc
Committed By: mrg
Date: Wed Jun 17 01:06:29 UTC 2009
Modified Files:
xsrc/external/mit/MesaLib/dist/src/mesa/main: texstate.c
Log Message:
pull across the patches resulting from
https://bugs.freedesktop.org/show_bug.cgi?id=21756
which fixes this assert:
Mesa 7.4.2 implementation error: invalid reference to a deleted texture object
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.2 -r1.2 \
xsrc/external/mit/MesaLib/dist/src/mesa/main/texstate.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.1.1.2 xsrc/external/mit/MesaLib/dist/src/mesa/main/texstate.c:1.2
--- xsrc/external/mit/MesaLib/dist/src/mesa/main/texstate.c:1.1.1.2 Thu Jun 11 00:50:16 2009
+++ xsrc/external/mit/MesaLib/dist/src/mesa/main/texstate.c Wed Jun 17 01:06:29 2009
@@ -429,7 +429,7 @@
}
if (texObj->_Complete) {
texUnit->_ReallyEnabled = textureBit;
- texUnit->_Current = texObj;
+ _mesa_reference_texobj(&texUnit->_Current, texObj);
update_texture_compare_function(ctx, texObj);
}
}
@@ -485,7 +485,6 @@
GLbitfield enableBits;
GLuint tex;
- texUnit->_Current = NULL;
texUnit->_ReallyEnabled = 0;
texUnit->_GenFlags = 0;
