From: Mathias Fröhlich <mathias.froehl...@web.de>
Switch over to use the CoordsReplaceBits bitmask.
Reviewed-by: Brian Paul <bri...@vmware.com>
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
Signed-off-by: Mathias Fröhlich <mathias.froehl...@web.de>
---
src/mesa/drivers/dri/i915/i915_state.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/mesa/drivers/dri/i915/i915_state.c
b/src/mesa/drivers/dri/i915/i915_state.c
index 4c83073..4c4bb09 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
--
2.5.5
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
