diff options
| author | Keith Whitwell <[email protected]> | 2009-09-23 17:37:28 +0100 |
|---|---|---|
| committer | Keith Whitwell <[email protected]> | 2009-09-23 17:37:28 +0100 |
| commit | 890679d4322e7ba4f12f32532a3fdd277edff886 (patch) | |
| tree | 37df5e8a53f7da9fdcaf2e9660c694e28e14b5bc /src/gallium/drivers/softpipe/sp_quad.h | |
| parent | a1fa770c01d913658900de1c267fb4c41bc6300d (diff) | |
| parent | 75276ea316610a5737f2115326482024aa09d02a (diff) | |
Merge branch 'softpipe-opt'
Conflicts:
progs/demos/cubemap.c
src/gallium/drivers/softpipe/sp_tex_sample.c
src/gallium/drivers/softpipe/sp_texture.c
Diffstat (limited to 'src/gallium/drivers/softpipe/sp_quad.h')
| -rw-r--r-- | src/gallium/drivers/softpipe/sp_quad.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/softpipe/sp_quad.h b/src/gallium/drivers/softpipe/sp_quad.h index bd6c6cb9123..a3236bd1169 100644 --- a/src/gallium/drivers/softpipe/sp_quad.h +++ b/src/gallium/drivers/softpipe/sp_quad.h @@ -97,10 +97,10 @@ struct quad_header { struct quad_header_inout inout; struct quad_header_output output; - const struct tgsi_interp_coef *coef; + /* Redundant/duplicated: + */ const struct tgsi_interp_coef *posCoef; - - unsigned nr_attrs; + const struct tgsi_interp_coef *coef; }; #endif /* SP_QUAD_H */ |