From: Zack Rusin <zack@tungstengraphics.com>
Date: Thu, 20 Dec 2007 12:05:52 +0000 (-0500)
Subject: 965: fix the constant buffers
X-Git-Tag: mesa-7.8~4139^2~390^2~3072
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ebf78c0dcccbe2c458b945e014f2bd53ab137e91;p=platform%2Fupstream%2Fmesa.git

965: fix the constant buffers
---

diff --git a/src/mesa/pipe/i965simple/brw_curbe.c b/src/mesa/pipe/i965simple/brw_curbe.c
index 411263f..ee20e00 100644
--- a/src/mesa/pipe/i965simple/brw_curbe.c
+++ b/src/mesa/pipe/i965simple/brw_curbe.c
@@ -175,7 +175,7 @@ static void upload_constant_buffer(struct brw_context *brw)
 {
    struct brw_mem_pool *pool = &brw->pool[BRW_GS_POOL];
    unsigned sz = brw->curbe.total_size;
-   unsigned bufsz = sz * 16 * sizeof(float);
+   unsigned bufsz = sz * sizeof(float);
    float *buf;
    unsigned i;
 
@@ -261,7 +261,7 @@ static void upload_constant_buffer(struct brw_context *brw)
    }
 
    if (1) {
-      for (i = 0; i < sz*16; i+=4)
+      for (i = 0; i < sz; i+=4)
 	 _mesa_printf("curbe %d.%d: %f %f %f %f\n", i/8, i&4,
 		      buf[i+0], buf[i+1], buf[i+2], buf[i+3]);
 
diff --git a/src/mesa/pipe/xlib/xm_winsys_aub.c b/src/mesa/pipe/xlib/xm_winsys_aub.c
index bedfcab..b207638 100644
--- a/src/mesa/pipe/xlib/xm_winsys_aub.c
+++ b/src/mesa/pipe/xlib/xm_winsys_aub.c
@@ -165,7 +165,7 @@ static int aub_buffer_data(struct pipe_winsys *winsys,
    sbo->size = size;
 
    if (data != NULL) {
-      memcpy(iws->pool, data, size);
+      memcpy(sbo->data, data, size);
 
       brw_aub_gtt_data( iws->aubfile, 
 			sbo->offset,