summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2011-01-15 17:23:13 -0700
committerBrian Paul <brianp@vmware.com>2011-01-15 17:37:40 -0700
commitd1e284407cf67f9a83e147914ed5a67d8c55e87e (patch)
treec0cefa345125e85f6880e105a33aff90fb1b4c8d /src
parent889f44bc900c6dac9eb8552b478a4a5f7d40aa65 (diff)
st/mesa: move/consolidate an assignment
Diffstat (limited to 'src')
-rw-r--r--src/mesa/state_tracker/st_draw.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/mesa/state_tracker/st_draw.c b/src/mesa/state_tracker/st_draw.c
index db70daacc4..b3256a3cb0 100644
--- a/src/mesa/state_tracker/st_draw.c
+++ b/src/mesa/state_tracker/st_draw.c
@@ -440,7 +440,6 @@ setup_non_interleaved_attribs(struct gl_context *ctx,
vbuffer[attr].buffer = NULL;
pipe_resource_reference(&vbuffer[attr].buffer, stobj->buffer);
vbuffer[attr].buffer_offset = pointer_to_offset(arrays[mesaAttr]->Ptr);
- velements[attr].src_offset = 0;
}
else {
/* attribute data is in user-space memory, not a VBO */
@@ -476,7 +475,6 @@ setup_non_interleaved_attribs(struct gl_context *ctx,
}
vbuffer[attr].buffer_offset = 0;
- velements[attr].src_offset = 0;
}
assert(velements[attr].src_offset <= 2048); /* 11-bit field */
@@ -484,6 +482,7 @@ setup_non_interleaved_attribs(struct gl_context *ctx,
/* common-case setup */
vbuffer[attr].stride = stride; /* in bytes */
vbuffer[attr].max_index = max_index;
+ velements[attr].src_offset = 0;
velements[attr].instance_divisor = 0;
velements[attr].vertex_buffer_index = attr;
velements[attr].src_format