Merge branch 'mesa_7_6_branch'

Conflicts:

	src/gallium/auxiliary/util/u_cpu_detect.c

diff --cc src/gallium/auxiliary/draw/draw_pt_post_vs.c
Simple merge

diff --cc src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c
Simple merge

diff --cc src/gallium/drivers/softpipe/sp_fs_sse.c
index 9d3e467,31ccc3b..f912950
--- 1/src/gallium/drivers/softpipe/sp_fs_sse.c
--- 2/src/gallium/drivers/softpipe/sp_fs_sse.c
+++ b/src/gallium/drivers/softpipe/sp_fs_sse.c
@@@ -138,42 -101,10 +138,42 @@@ fs_sse_run( const struct sp_fragment_sh
                 machine->Consts,
                   (const float (*)[4])shader->immediates,
                 machine->InterpCoefs
-                //      , &machine->QuadPos
+                /*, &machine->QuadPos*/
        );
  
 -   return ~(machine->Temps[TGSI_EXEC_TEMP_KILMASK_I].xyzw[TGSI_EXEC_TEMP_KILMASK_C].u[0]);
 +   quad->inout.mask &= ~(machine->Temps[TGSI_EXEC_TEMP_KILMASK_I].xyzw[TGSI_EXEC_TEMP_KILMASK_C].u[0]);
 +   if (quad->inout.mask == 0)
 +      return FALSE;
 +
 +   /* store outputs */
 +   {
 +      const ubyte *sem_name = base->info.output_semantic_name;
 +      const ubyte *sem_index = base->info.output_semantic_index;
 +      const uint n = base->info.num_outputs;
 +      uint i;
 +      for (i = 0; i < n; i++) {
 +         switch (sem_name[i]) {
 +         case TGSI_SEMANTIC_COLOR:
 +            {
 +               uint cbuf = sem_index[i];
 +               memcpy(quad->output.color[cbuf],
 +                      &machine->Outputs[i].xyzw[0].f[0],
 +                      sizeof(quad->output.color[0]) );
 +            }
 +            break;
 +         case TGSI_SEMANTIC_POSITION:
 +            {
 +               uint j;
 +               for (j = 0; j < 4; j++) {
 +                  quad->output.depth[j] = machine->Outputs[0].xyzw[2].f[j];
 +               }
 +            }
 +            break;
 +         }
 +      }
 +   }
 +
 +   return TRUE;
  }
  
  

diff --cc src/mesa/drivers/dri/intel/intel_context.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_pixel_read.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_tex_copy.c
Simple merge

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

diff --cc src/mesa/main/context.c
Simple merge

diff --cc src/mesa/main/dlist.c
Simple merge

diff --cc src/mesa/main/texobj.c
Simple merge

diff --cc src/mesa/state_tracker/st_cb_drawpixels.c
Simple merge

diff --cc src/mesa/state_tracker/st_cb_fbo.c
Simple merge