From 5572de8e7e71a15cefe6425b3e082c721052ef1e Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Tue, 30 Aug 2011 19:10:06 +0200 Subject: mesa: handle zero-size buffers in MapBuffer and ranges in MapBufferRange (v3) Reviewed-by: Brian Paul --- src/mesa/state_tracker/st_cb_bufferobjects.c | 32 +++++++--------------------- 1 file changed, 8 insertions(+), 24 deletions(-) (limited to 'src/mesa/state_tracker/st_cb_bufferobjects.c') diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c index a451b44049e..aab7444e201 100644 --- a/src/mesa/state_tracker/st_cb_bufferobjects.c +++ b/src/mesa/state_tracker/st_cb_bufferobjects.c @@ -228,13 +228,6 @@ st_bufferobj_data(struct gl_context *ctx, } -/** - * Dummy data whose's pointer is used for zero size buffers or ranges. - */ -static long st_bufferobj_zero_length = 0; - - - /** * Called via glMapBufferRange(). */ @@ -280,24 +273,15 @@ st_bufferobj_map_range(struct gl_context *ctx, assert(offset < obj->Size); assert(offset + length <= obj->Size); - /* - * We go out of way here to hide the degenerate yet valid case of zero - * length range from the pipe driver. - */ - if (!length) { - obj->Pointer = &st_bufferobj_zero_length; - } - else { - obj->Pointer = pipe_buffer_map_range(pipe, - st_obj->buffer, - offset, length, - flags, - &st_obj->transfer); - if (obj->Pointer) { - obj->Pointer = (ubyte *) obj->Pointer + offset; - } + obj->Pointer = pipe_buffer_map_range(pipe, + st_obj->buffer, + offset, length, + flags, + &st_obj->transfer); + if (obj->Pointer) { + obj->Pointer = (ubyte *) obj->Pointer + offset; } - + if (obj->Pointer) { obj->Offset = offset; obj->Length = length; -- cgit v1.2.3