Module: Mesa Branch: mesa_7_7_branch Commit: 13cd4298fb8fd447f86ca92d7571e5c13b5ff9f6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=13cd4298fb8fd447f86ca92d7571e5c13b5ff9f6
Author: José Fonseca <jfons...@vmware.com> Date: Wed Feb 17 20:02:32 2010 +0000 mesa: Take back some assertions. It seems there are still some places where draw can happen with mapped buffers... Remove the assertions since there is not much more than can be done at this moment. This partially reverts commit af2023e31cde5ad2cf8ce740e20a98c4cbab37ce. --- src/mesa/state_tracker/st_draw.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c index 823c72d..d3b22db 100644 --- a/src/mesa/state_tracker/st_draw.c +++ b/src/mesa/state_tracker/st_draw.c @@ -404,7 +404,6 @@ setup_interleaved_attribs(GLcontext *ctx, vbuffer->buffer_offset = 0; } else { - assert(!bufobj->Pointer); vbuffer->buffer = NULL; pipe_buffer_reference(&vbuffer->buffer, stobj->buffer); vbuffer->buffer_offset = pointer_to_offset(low); @@ -461,7 +460,6 @@ setup_non_interleaved_attribs(GLcontext *ctx, assert(stobj->buffer); /*printf("stobj %u = %p\n", attr, (void*) stobj);*/ - assert(!bufobj->Pointer); vbuffer[attr].buffer = NULL; pipe_buffer_reference(&vbuffer[attr].buffer, stobj->buffer); vbuffer[attr].buffer_offset = pointer_to_offset(arrays[mesaAttr]->Ptr); _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit