Mesa (main): i915g: Fix off-by-one in constant count assertion.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 71617c33284f728167010f0af2c267a8b7fad271
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=71617c33284f728167010f0af2c267a8b7fad271

Author: Emma Anholt <emma at anholt.net>
Date:   Sun Jun 27 20:30:27 2021 -0700

i915g: Fix off-by-one in constant count assertion.

You can have up to C[31].

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11617>

---

 src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt | 2 +-
 src/gallium/drivers/i915/i915_state_emit.c            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt b/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
index d78d0f5db9d..a92eb5726ec 100644
--- a/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
+++ b/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
@@ -696,7 +696,7 @@ spec at glsl-1.10@execution at fs-sign-times-neg-abs,Fail
 spec at glsl-1.10@execution at fs-sign-times-sign,Fail
 spec at glsl-1.10@execution at gl_lightsource_indirect,Fail
 spec at glsl-1.10@execution at glsl-1.10-built-in-matrix-state,Fail
-spec at glsl-1.10@execution at glsl-1.10-built-in-uniform-state,Crash
+spec at glsl-1.10@execution at glsl-1.10-built-in-uniform-state,Fail
 spec at glsl-1.10@execution at glsl-clamp-vertex-color,Fail
 spec at glsl-1.10@execution at glsl-fs-convolution-1,Fail
 spec at glsl-1.10@execution at glsl-fs-convolution-2,Fail
diff --git a/src/gallium/drivers/i915/i915_state_emit.c b/src/gallium/drivers/i915/i915_state_emit.c
index 5190a47bfaa..7f6469b00d1 100644
--- a/src/gallium/drivers/i915/i915_state_emit.c
+++ b/src/gallium/drivers/i915/i915_state_emit.c
@@ -331,7 +331,7 @@ emit_constants(struct i915_context *i915)
     */
    const uint32_t nr = i915->fs->num_constants;
 
-   assert(nr < I915_MAX_CONSTANT);
+   assert(nr <= I915_MAX_CONSTANT);
    if (nr) {
       uint32_t i;