The branch, master has been updated
Commits at: http://cgit.freedesktop.org/mesa/mesa/log/?h=master
Summary of changes:
src/mesa/drivers/common/driverfuncs.c | 2 +
src/mesa/drivers/dri/intel/intel_tex.c | 20 +-----------------
src/mesa/drivers/dri/unichrome/via_tex.c | 4 +--
src/mesa/main/dd.h | 6 +++++
src/mesa/main/fbobject.c | 8 +------
src/mesa/main/mipmap.c | 1 -
src/mesa/main/mipmap.h | 1 -
src/mesa/main/texstore.c | 32 +++++++----------------------
src/mesa/swrast/s_texstore.c | 10 ++++----
9 files changed, 24 insertions(+), 60 deletions(-)
via 86bd98c6aa0d1a8533699af911c7c40c549b3965 (commit)
via 0449bab2f8722f277213e44da13de6a0b5ae7b5b (commit)
via d4e1d85dba8ec4a37f68a284b5a2be15b4f2987a (commit)
via a638676473bd7bf2d47275ed2fd708e5b9d47e0b (commit)
from c50ffc4cb89b67ae59208eb72cdb664c846ba987 (commit)
- Commits -----------------------------------------------
commit 86bd98c6aa0d1a8533699af911c7c40c549b3965
Author: Dave Airlie <[EMAIL PROTECTED]>
Date: Fri May 9 13:41:02 2008 +1000
swrast/dri: switch over users of generate_mipmap to new interface
commit 0449bab2f8722f277213e44da13de6a0b5ae7b5b
Author: Dave Airlie <[EMAIL PROTECTED]>
Date: Fri May 9 13:33:56 2008 +1000
Revert "mesa/intel: map/unmap texture objects around mipmap generation
function."
This reverts commit c50ffc4cb89b67ae59208eb72cdb664c846ba987.
I'll fix this using the mipmap hooks I just picked from gallium-0.1
commit d4e1d85dba8ec4a37f68a284b5a2be15b4f2987a
Author: Brian <[EMAIL PROTECTED]>
Date: Fri Feb 8 14:45:58 2008 -0700
Remove unused texunit parameter to ctx->Driver.GenerateMipmap()
(cherry picked from commit c3395f4473c8fdf75d04c0dd72e687bc8d8127a7)
commit a638676473bd7bf2d47275ed2fd708e5b9d47e0b
Author: Dave Airlie <[EMAIL PROTECTED]>
Date: Fri May 9 13:33:06 2008 +1000
Added ctx->Driver.GenerateMipmap() driver hook
(cherry picked from commit 4c2f3dbca940f289e67248682b84a3516d5a3031)
Conflicts:
src/mesa/drivers/common/driverfuncs.c
---------------------------------
_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
