diff options
| author | Paul Berry <stereotype441@gmail.com> | 2013-02-23 09:00:58 -0800 |
|---|---|---|
| committer | Paul Berry <stereotype441@gmail.com> | 2013-03-15 09:26:17 -0700 |
| commit | eed6baf7621fa94e7888f8079b155fc67a08540c (patch) | |
| tree | 216270e7f3222fcb11b8b3fa1def330908f05a21 /src/mesa/drivers/dri/i965/gen7_sf_state.c | |
| parent | f117abe66414e25be4f7bc61ca0df9e83ddaf543 (diff) | |
| download | external_mesa3d-eed6baf7621fa94e7888f8079b155fc67a08540c.zip external_mesa3d-eed6baf7621fa94e7888f8079b155fc67a08540c.tar.gz external_mesa3d-eed6baf7621fa94e7888f8079b155fc67a08540c.tar.bz2 | |
Replace gl_frag_attrib enum with gl_varying_slot.
This patch makes the following search-and-replace changes:
gl_frag_attrib -> gl_varying_slot
FRAG_ATTRIB_* -> VARYING_SLOT_*
FRAG_BIT_* -> VARYING_BIT_*
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Eric Anholt <eric@anholt.net>
Tested-by: Brian Paul <brianp@vmware.com>
Diffstat (limited to 'src/mesa/drivers/dri/i965/gen7_sf_state.c')
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_sf_state.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/i965/gen7_sf_state.c b/src/mesa/drivers/dri/i965/gen7_sf_state.c index 9171eff..86809a1 100644 --- a/src/mesa/drivers/dri/i965/gen7_sf_state.c +++ b/src/mesa/drivers/dri/i965/gen7_sf_state.c @@ -42,7 +42,7 @@ upload_sbe_state(struct brw_context *brw) int i; int attr = 0, input_index = 0; int urb_entry_read_offset = 1; - uint16_t attr_overrides[FRAG_ATTRIB_MAX]; + uint16_t attr_overrides[VARYING_SLOT_MAX]; /* _NEW_BUFFERS */ bool render_to_fbo = _mesa_is_user_fbo(ctx->DrawBuffer); uint32_t point_sprite_origin; @@ -70,21 +70,21 @@ upload_sbe_state(struct brw_context *brw) * they source from. */ uint32_t max_source_attr = 0; - for (; attr < FRAG_ATTRIB_MAX; attr++) { + for (; attr < VARYING_SLOT_MAX; attr++) { enum glsl_interp_qualifier interp_qualifier = brw->fragment_program->InterpQualifier[attr]; - bool is_gl_Color = attr == FRAG_ATTRIB_COL0 || attr == FRAG_ATTRIB_COL1; + bool is_gl_Color = attr == VARYING_SLOT_COL0 || attr == VARYING_SLOT_COL1; if (!(brw->fragment_program->Base.InputsRead & BITFIELD64_BIT(attr))) continue; if (ctx->Point.PointSprite && - attr >= FRAG_ATTRIB_TEX0 && attr <= FRAG_ATTRIB_TEX7 && - ctx->Point.CoordReplace[attr - FRAG_ATTRIB_TEX0]) { + attr >= VARYING_SLOT_TEX0 && attr <= VARYING_SLOT_TEX7 && + ctx->Point.CoordReplace[attr - VARYING_SLOT_TEX0]) { dw10 |= (1 << input_index); } - if (attr == FRAG_ATTRIB_PNTC) + if (attr == VARYING_SLOT_PNTC) dw10 |= (1 << input_index); /* flat shading */ @@ -123,7 +123,7 @@ upload_sbe_state(struct brw_context *brw) dw1 |= urb_entry_read_length << GEN7_SBE_URB_ENTRY_READ_LENGTH_SHIFT | urb_entry_read_offset << GEN7_SBE_URB_ENTRY_READ_OFFSET_SHIFT; - for (; input_index < FRAG_ATTRIB_MAX; input_index++) + for (; input_index < VARYING_SLOT_MAX; input_index++) attr_overrides[input_index] = 0; BEGIN_BATCH(14); |