diff options
author | Brian Paul <brianp@vmware.com> | 2009-06-19 12:19:15 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-06-19 12:19:15 -0600 |
commit | 9d029e0e200eb97993c1b9fb8ab9046172e703e8 (patch) | |
tree | e69f18ad7039d4e3d5ecab12fe351fbdde2b908f /src/mesa | |
parent | 1ffd074436949f3958127cc5ae7c7c9e9e9e0bf8 (diff) |
st/mesa: remove redundant st_buffer_object::size field and error checks
Just use the gl_buffer_object::Size field. Remove unnecessary size/offset
error checks. Core Mesa will have already done these checks before these
functions are called.
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/state_tracker/st_cb_bufferobjects.c | 8 | ||||
-rw-r--r-- | src/mesa/state_tracker/st_cb_bufferobjects.h | 1 |
2 files changed, 0 insertions, 9 deletions
diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c index 7021d73208..1ecf7bf784 100644 --- a/src/mesa/state_tracker/st_cb_bufferobjects.c +++ b/src/mesa/state_tracker/st_cb_bufferobjects.c @@ -98,9 +98,6 @@ st_bufferobj_subdata(GLcontext *ctx, { struct st_buffer_object *st_obj = st_buffer_object(obj); - if (offset >= st_obj->size || size > (st_obj->size - offset)) - return; - st_cond_flush_pipe_buffer_write(st_context(ctx), st_obj->buffer, offset, size, data); } @@ -118,9 +115,6 @@ st_bufferobj_get_subdata(GLcontext *ctx, { struct st_buffer_object *st_obj = st_buffer_object(obj); - if (offset >= st_obj->size || size > (st_obj->size - offset)) - return; - st_cond_flush_pipe_buffer_read(st_context(ctx), st_obj->buffer, offset, size, data); } @@ -172,8 +166,6 @@ st_bufferobj_data(GLcontext *ctx, return; } - st_obj->size = size; - if (data) st_no_flush_pipe_buffer_write(st_context(ctx), st_obj->buffer, 0, size, data); diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.h b/src/mesa/state_tracker/st_cb_bufferobjects.h index 0adda5d460..fda6d05dd3 100644 --- a/src/mesa/state_tracker/st_cb_bufferobjects.h +++ b/src/mesa/state_tracker/st_cb_bufferobjects.h @@ -40,7 +40,6 @@ struct st_buffer_object { struct gl_buffer_object Base; struct pipe_buffer *buffer; - GLsizeiptrARB size; }; |