From: Mathias Fröhlich Date: Sun, 22 May 2016 12:10:19 +0000 (+0200) Subject: i915: Convert i915 to use CoordsReplaceBits. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=97f67be0a7562cc477531675170c52fd7b17f899;p=mesa.git i915: Convert i915 to use CoordsReplaceBits. Switch over to use the CoordsReplaceBits bitmask. Reviewed-by: Brian Paul Reviewed-by: Ian Romanick Signed-off-by: Mathias Fröhlich --- diff --git a/src/mesa/drivers/dri/i915/i915_state.c b/src/mesa/drivers/dri/i915/i915_state.c index 4c83073e692..4c4bb090590 100644 --- a/src/mesa/drivers/dri/i915/i915_state.c +++ b/src/mesa/drivers/dri/i915/i915_state.c @@ -653,17 +653,14 @@ i915_update_sprite_point_enable(struct gl_context *ctx) const GLbitfield64 inputsRead = p->FragProg.Base.InputsRead; struct i915_context *i915 = i915_context(ctx); GLuint s4 = i915->state.Ctx[I915_CTXREG_LIS4] & ~S4_VFMT_MASK; - int i; GLuint coord_replace_bits = 0x0; - GLuint tex_coord_unit_bits = 0x0; - - for (i = 0; i < ctx->Const.MaxTextureCoordUnits; i++) { - /* _NEW_POINT */ - if (ctx->Point.CoordReplace[i] && ctx->Point.PointSprite) - coord_replace_bits |= (1 << i); - if (inputsRead & VARYING_BIT_TEX(i)) - tex_coord_unit_bits |= (1 << i); - } + + /* _NEW_POINT */ + if (ctx->Point.PointSprite) + coord_replace_bits = ctx->Point.CoordReplaceBits; + + GLuint tex_coord_unit_bits = + (GLuint)((inputsRead & VARYING_BITS_TEX_ANY) >> VARYING_SLOT_TEX0); /* * Here we can't enable the SPRITE_POINT_ENABLE bit when the mis-match