Mesa (master): st/mesa: move/consolidate an assignment

Brian Paul brianp at kemper.freedesktop.org
Sun Jan 16 00:41:52 UTC 2011


Module: Mesa
Branch: master
Commit: d1e284407cf67f9a83e147914ed5a67d8c55e87e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d1e284407cf67f9a83e147914ed5a67d8c55e87e

Author: Brian Paul <brianp at vmware.com>
Date:   Sat Jan 15 17:23:13 2011 -0700

st/mesa: move/consolidate an assignment

---

 src/mesa/state_tracker/st_draw.c |    3 +--
 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 db70daa..b3256a3 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




More information about the mesa-commit mailing list