From: Brian Paul <brianp@vmware.com>
Date: Mon, 5 Oct 2009 20:42:08 +0000 (-0600)
Subject: Merge branch 'mesa_7_6_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=55770d09c18c4d33403abb97dfef4f897efbbe2a;p=mesa.git

Merge branch 'mesa_7_6_branch'

Conflicts:

	src/gallium/auxiliary/util/u_cpu_detect.c
---

55770d09c18c4d33403abb97dfef4f897efbbe2a
diff --cc src/gallium/drivers/softpipe/sp_fs_sse.c
index 9d3e4670eef,31ccc3bda9a..f9129506585
--- a/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;
  }