Merge branch 'const-buffer-changes'

Conflicts:

	src/mesa/drivers/dri/i965/brw_curbe.c
	src/mesa/drivers/dri/i965/brw_vs_emit.c
	src/mesa/drivers/dri/i965/brw_wm_glsl.c

diff --cc src/mesa/drivers/dri/i915/i915_context.c
Simple merge

diff --cc src/mesa/drivers/dri/i965/brw_curbe.c
index 9197fede2d85dd147fa918edab76ae82ab2049b3,f6d2014fb1e028d259ea8b34b82cc296582054a7..05a685af3dab53315944836084a020c8c8b97a40
--- 1/src/mesa/drivers/dri/i965/brw_curbe.c
--- 2/src/mesa/drivers/dri/i965/brw_curbe.c
+++ b/src/mesa/drivers/dri/i965/brw_curbe.c
@@@ -353,21 -347,13 +347,17 @@@ update_constant_buffer(struct brw_conte
        assert(const_buffer);
        assert(const_buffer->size >= size);
  
 -      dri_bo_map(const_buffer, GL_TRUE);
 -      map = const_buffer->virtual;
 -      memcpy(map, params->ParameterValues, size);
 -      dri_bo_unmap(const_buffer);
 +      if (intel->intelScreen->kernel_exec_fencing) {
 +         drm_intel_gem_bo_map_gtt(const_buffer);
 +         memcpy(const_buffer->virtual, params->ParameterValues, size);
 +         drm_intel_gem_bo_unmap_gtt(const_buffer);
 +      }
 +      else {
 +         dri_bo_subdata(const_buffer, 0, size, params->ParameterValues);
 +      }
  
        if (0) {
-          int i;
-          for (i = 0; i < params->NumParameters; i++) {
-             float *p = params->ParameterValues[i];
-             printf("%d: %f %f %f %f\n", i, p[0], p[1], p[2], p[3]);
-          }
+          _mesa_print_parameter_list(params);
        }
     }
  }

diff --cc src/mesa/drivers/dri/i965/brw_vs_emit.c
index b69616d6e5217b106e4cd0e240cac213e686588d,b9a338b1cd89c98691c061154c237724a90dfe20..3fdc48583bf1321978b04c2d33bd8398218683eb
--- 1/src/mesa/drivers/dri/i965/brw_vs_emit.c
--- 2/src/mesa/drivers/dri/i965/brw_vs_emit.c
+++ b/src/mesa/drivers/dri/i965/brw_vs_emit.c
@@@ -69,13 -69,18 +69,18 @@@ static void brw_vs_alloc_regs( struct b
  {
     GLuint i, reg = 0, mrf;
  
- #if 0
-    if (c->vp->program.Base.Parameters->NumParameters >= 6)
-       c->vp->use_const_buffer = 1;
+    /* Determine whether to use a real constant buffer or use a block
+     * of GRF registers for constants.  The later is faster but only
+     * works if everything fits in the GRF.
+     * XXX this heuristic/check may need some fine tuning...
+     */
+    if (c->vp->program.Base.Parameters->NumParameters +
+        c->vp->program.Base.NumTemporaries + 20 > BRW_MAX_GRF)
+       c->vp->use_const_buffer = GL_TRUE;
     else
- #endif
        c->vp->use_const_buffer = GL_FALSE;
-    /*printf("use_const_buffer = %d\n", c->use_const_buffer);*/
+ 
 -   /*printf("use_const_buffer = %d\n", c->use_const_buffer);*/
++   /*printf("use_const_buffer = %d\n", c->vp->use_const_buffer);*/
  
     /* r0 -- reserved as usual
      */

diff --cc src/mesa/drivers/dri/i965/brw_wm_glsl.c
index 117460842a30fcaf71ff8ac026c342e042a367f8,eca4ca2c8213ceb701855db1e2b59ebfd347cd60..39ea95f6fc2badfe0302a04aadca701db172c403
--- 1/src/mesa/drivers/dri/i965/brw_wm_glsl.c
--- 2/src/mesa/drivers/dri/i965/brw_wm_glsl.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_glsl.c
@@@ -191,10 -305,16 +305,16 @@@ static void prealloc_reg(struct brw_wm_
  
      /* constants */
      {
-         const int nr_params = c->fp->program.Base.Parameters->NumParameters;
+         const GLuint nr_params = c->fp->program.Base.Parameters->NumParameters;
+         const GLuint nr_temps = c->fp->program.Base.NumTemporaries;
  
          /* use a real constant buffer, or just use a section of the GRF? */
-         c->fp->use_const_buffer = GL_FALSE; /* (nr_params > 8);*/
+         /* XXX this heuristic may need adjustment... */
+         if ((nr_params + nr_temps) * 4 + reg_index > 80)
+            c->fp->use_const_buffer = GL_TRUE;
+         else
+            c->fp->use_const_buffer = GL_FALSE;
 -        /*printf("WM use_const_buffer = %d\n", c->use_const_buffer);*/
++        /*printf("WM use_const_buffer = %d\n", c->fp->use_const_buffer);*/
  
          if (c->fp->use_const_buffer) {
             /* We'll use a real constant buffer and fetch constants from

diff --cc src/mesa/drivers/dri/i965/brw_wm_surface_state.c
Simple merge

diff --cc src/mesa/drivers/dri/r300/r300_state.c
Simple merge