summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/i965/gen6_sf_state.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen6_sf_state.c')
-rw-r--r--src/mesa/drivers/dri/i965/gen6_sf_state.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/src/mesa/drivers/dri/i965/gen6_sf_state.c b/src/mesa/drivers/dri/i965/gen6_sf_state.c
index 5bb731dc8fd..714914aa6bb 100644
--- a/src/mesa/drivers/dri/i965/gen6_sf_state.c
+++ b/src/mesa/drivers/dri/i965/gen6_sf_state.c
@@ -35,19 +35,12 @@
uint32_t
get_attr_override(struct brw_context *brw, int fs_attr, int two_side_color)
{
- int attr_index = 0, i, vs_attr;
+ int attr_index = 0, i;
int bfc = 0;
+ int vs_attr = frag_attrib_to_vert_result(fs_attr);
- if (fs_attr <= FRAG_ATTRIB_TEX7)
- vs_attr = fs_attr;
- else if (fs_attr == FRAG_ATTRIB_FACE)
- vs_attr = 0; /* XXX */
- else if (fs_attr == FRAG_ATTRIB_PNTC)
- vs_attr = 0; /* XXX */
- else {
- assert(fs_attr >= FRAG_ATTRIB_VAR0);
- vs_attr = fs_attr - FRAG_ATTRIB_VAR0 + VERT_RESULT_VAR0;
- }
+ if (vs_attr < 0)
+ vs_attr = 0;
/* Find the source index (0 = first attribute after the 4D position)
* for this output attribute. attr is currently a VERT_RESULT_* but should