Mesa (gallium-mesa-7.4): mesa: fix merge glitch

Alan Hourihane alanh at kemper.freedesktop.org
Fri Feb 20 01:41:03 UTC 2009


Module: Mesa
Branch: gallium-mesa-7.4
Commit: 51bc9b83b99c7c8a21b8419e520d6a5c9086e985
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=51bc9b83b99c7c8a21b8419e520d6a5c9086e985

Author: Alan Hourihane <alanh at vmware.com>
Date:   Fri Feb 20 01:38:31 2009 +0000

mesa: fix merge glitch

---

 src/mesa/vbo/vbo_exec_api.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 84e9b40..2078fd7 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -143,6 +143,8 @@ static void vbo_exec_copy_to_current( struct vbo_exec_context *exec )
 
    for (i = VBO_ATTRIB_POS+1 ; i < VBO_ATTRIB_MAX ; i++) {
       if (exec->vtx.attrsz[i]) {
+         GLfloat *current = (GLfloat *)vbo->currval[i].Ptr;
+
          /* Note: the exec->vtx.current[i] pointers point into the
           * ctx->Current.Attrib and ctx->Light.Material.Attrib arrays.
           */




More information about the mesa-commit mailing list