965: fix the constant buffers

diff --git a/src/mesa/pipe/i965simple/brw_curbe.c b/src/mesa/pipe/i965simple/brw_curbe.c
index 411263f565c1094129b7935656ec9175872ef75c..ee20e003624780a080712f18200579f07bf34486 100644 (file)
--- 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 bedfcab40f4d73ba8a0abd7b583b160b7171f2a4..b207638390612626b9e7dade09c52401011f6246 100644 (file)
--- 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,