i965: Delete the intel_regions.c code.

[mesa.git] / src / mesa / drivers / dri / i965 / brw_curbe.c

diff --git a/src/mesa/drivers/dri/i965/brw_curbe.c b/src/mesa/drivers/dri/i965/brw_curbe.c
index 9e556fb6361822d81a566a2b9f1bd5f82feafdb2..e5ca2ce6b666bb76040c1a1e5bcf882f391a95f4 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_curbe.c
+++ b/src/mesa/drivers/dri/i965/brw_curbe.c
@@ -39,7 +39,6 @@
 #include "program/prog_print.h"
 #include "program/prog_statevars.h"
 #include "intel_batchbuffer.h"
-#include "intel_regions.h"
 #include "brw_context.h"
 #include "brw_defines.h"
 #include "brw_state.h"
@@ -57,10 +56,10 @@ static void calculate_curbe_offsets( struct brw_context *brw )
 {
    struct gl_context *ctx = &brw->ctx;
    /* CACHE_NEW_WM_PROG */
-   const GLuint nr_fp_regs = (brw->wm.prog_data->nr_params + 15) / 16;
+   const GLuint nr_fp_regs = (brw->wm.prog_data->base.nr_params + 15) / 16;
 
    /* BRW_NEW_VERTEX_PROGRAM */
-   const GLuint nr_vp_regs = (brw->vs.prog_data->base.nr_params + 15) / 16;
+   const GLuint nr_vp_regs = (brw->vs.prog_data->base.base.nr_params + 15) / 16;
    GLuint nr_clip_regs = 0;
    GLuint total_regs;
 
@@ -114,13 +113,13 @@ static void calculate_curbe_offsets( struct brw_context *brw )
       brw->curbe.total_size = reg;
 
       if (0)
-        printf("curbe wm %d+%d clip %d+%d vs %d+%d\n",
-               brw->curbe.wm_start,
-               brw->curbe.wm_size,
-               brw->curbe.clip_start,
-               brw->curbe.clip_size,
-               brw->curbe.vs_start,
-               brw->curbe.vs_size );
+        fprintf(stderr, "curbe wm %d+%d clip %d+%d vs %d+%d\n",
+                 brw->curbe.wm_start,
+                 brw->curbe.wm_size,
+                 brw->curbe.clip_start,
+                 brw->curbe.clip_size,
+                 brw->curbe.vs_start,
+                 brw->curbe.vs_size );
 
       brw->state.dirty.brw |= BRW_NEW_CURBE_OFFSETS;
    }
@@ -161,7 +160,7 @@ void brw_upload_cs_urb_state(struct brw_context *brw)
       assert(brw->urb.nr_cs_entries);
       OUT_BATCH((brw->urb.csize - 1) << 4 | brw->urb.nr_cs_entries);
    }
-   CACHED_BATCH();
+   ADVANCE_BATCH();
 }
 
 static GLfloat fixed_plane[6][4] = {
@@ -199,8 +198,8 @@ brw_upload_constant_buffer(struct brw_context *brw)
       GLuint offset = brw->curbe.wm_start * 16;
 
       /* copy float constants */
-      for (i = 0; i < brw->wm.prog_data->nr_params; i++) {
-        buf[offset + i] = *brw->wm.prog_data->param[i];
+      for (i = 0; i < brw->wm.prog_data->base.nr_params; i++) {
+        buf[offset + i] = *brw->wm.prog_data->base.param[i];
       }
    }
 
@@ -237,20 +236,20 @@ brw_upload_constant_buffer(struct brw_context *brw)
    if (brw->curbe.vs_size) {
       GLuint offset = brw->curbe.vs_start * 16;
 
-      for (i = 0; i < brw->vs.prog_data->base.nr_params; i++) {
-         buf[offset + i] = *brw->vs.prog_data->base.param[i];
+      for (i = 0; i < brw->vs.prog_data->base.base.nr_params; i++) {
+         buf[offset + i] = *brw->vs.prog_data->base.base.param[i];
       }
    }
 
    if (0) {
       for (i = 0; i < sz*16; i+=4)
-        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]);
+        fprintf(stderr, "curbe %d.%d: %f %f %f %f\n", i/8, i&4,
+                 buf[i+0], buf[i+1], buf[i+2], buf[i+3]);
 
-      printf("last_buf %p buf %p sz %d/%d cmp %d\n",
-            brw->curbe.last_buf, buf,
-            bufsz, brw->curbe.last_bufsz,
-            brw->curbe.last_buf ? memcmp(buf, brw->curbe.last_buf, bufsz) : -1);
+      fprintf(stderr, "last_buf %p buf %p sz %d/%d cmp %d\n",
+              brw->curbe.last_buf, buf,
+              bufsz, brw->curbe.last_bufsz,
+              brw->curbe.last_buf ? memcmp(buf, brw->curbe.last_buf, bufsz) : -1);
    }
 
    if (brw->curbe.curbe_bo != NULL &&