Mesa (master): i915g: Fix assert

Stephane Marchesin marcheu at kemper.freedesktop.org
Sat Oct 12 18:41:18 UTC 2013


Module: Mesa
Branch: master
Commit: 5ceeeb360ea5d199263eeb20edc12a0f10b324cf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ceeeb360ea5d199263eeb20edc12a0f10b324cf

Author: Stephane Marchesin <stephane.marchesin at gmail.com>
Date:   Sat Oct 12 11:38:14 2013 -0700

i915g: Fix assert

Now that we support start, assert on start + num < max samplers

Reported by xexaxo

---

 src/gallium/drivers/i915/i915_state.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_state.c b/src/gallium/drivers/i915/i915_state.c
index a858a25..f722e2d 100644
--- a/src/gallium/drivers/i915/i915_state.c
+++ b/src/gallium/drivers/i915/i915_state.c
@@ -300,7 +300,7 @@ i915_bind_vertex_sampler_states(struct pipe_context *pipe,
    struct i915_context *i915 = i915_context(pipe);
    unsigned i;
 
-   assert(num <= Elements(i915->vertex_samplers));
+   assert(start + num <= Elements(i915->vertex_samplers));
 
    /* Check for no-op */
    if (num == i915->num_vertex_samplers &&




More information about the mesa-commit mailing list