diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2007-12-11 10:01:59 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2007-12-11 10:01:59 +1100 |
| commit | fe9f4f49ef1c86938f75ab598d63d9ddce850f32 (patch) | |
| tree | 530c340a5ac1aa43aacdfea49f4bb1b3ffe1bce9 /src/mesa/pipe/softpipe/sp_tile_cache.c | |
| parent | 18fe9776b4977af092582630b181893b2bc6de40 (diff) | |
| parent | 0a79c65073db7dbeb9a83e40a4516edcb4f25ee5 (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Conflicts:
src/mesa/drivers/dri/Makefile.template
Diffstat (limited to 'src/mesa/pipe/softpipe/sp_tile_cache.c')
| -rw-r--r-- | src/mesa/pipe/softpipe/sp_tile_cache.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/pipe/softpipe/sp_tile_cache.c b/src/mesa/pipe/softpipe/sp_tile_cache.c index fadd169f5d..25c6dd4d17 100644 --- a/src/mesa/pipe/softpipe/sp_tile_cache.c +++ b/src/mesa/pipe/softpipe/sp_tile_cache.c @@ -141,7 +141,7 @@ sp_tile_cache_set_surface(struct softpipe_tile_cache *tc, assert(!tc->texture); if (tc->surface && tc->surface->map) { - assert(tc->surface != ps); + /*assert(tc->surface != ps);*/ pipe_surface_unmap(tc->surface); } |