diff options
| author | Brian Paul <[email protected]> | 2009-10-05 14:42:08 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2009-10-05 14:42:08 -0600 |
| commit | 55770d09c18c4d33403abb97dfef4f897efbbe2a (patch) | |
| tree | 3f3cb2ea42c511c11e134c2d414367df82268cea /src/gallium/drivers | |
| parent | f00da2a3ff59c1a7104ac25a1c6eba5a6050ad68 (diff) | |
| parent | 79892e7976fbb91ae426f5868d5f453e977c1f17 (diff) | |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/gallium/auxiliary/util/u_cpu_detect.c
Diffstat (limited to 'src/gallium/drivers')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_fs_sse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/softpipe/sp_fs_sse.c b/src/gallium/drivers/softpipe/sp_fs_sse.c index 9d3e4670eef..f9129506585 100644 --- a/src/gallium/drivers/softpipe/sp_fs_sse.c +++ b/src/gallium/drivers/softpipe/sp_fs_sse.c @@ -138,7 +138,7 @@ fs_sse_run( const struct sp_fragment_shader *base, machine->Consts, (const float (*)[4])shader->immediates, machine->InterpCoefs - // , &machine->QuadPos + /*, &machine->QuadPos*/ ); quad->inout.mask &= ~(machine->Temps[TGSI_EXEC_TEMP_KILMASK_I].xyzw[TGSI_EXEC_TEMP_KILMASK_C].u[0]); |