Mesa (7.9): glsl: fix off by one in register index assertion

Ian Romanick idr at kemper.freedesktop.org
Wed Dec 15 23:15:09 UTC 2010


Module: Mesa
Branch: 7.9
Commit: e0dbd44a00fa6a6c8e533c1e66a241f8dac9103e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=e0dbd44a00fa6a6c8e533c1e66a241f8dac9103e

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Nov 22 15:06:47 2010 -0700

glsl: fix off by one in register index assertion
(cherry picked from commit 50fd99d1723a6c7f3bd2dedffeeadf7d5e33b83b)

---

 src/mesa/program/ir_to_mesa.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp
index aa660af..6ab6c61 100644
--- a/src/mesa/program/ir_to_mesa.cpp
+++ b/src/mesa/program/ir_to_mesa.cpp
@@ -2210,7 +2210,7 @@ mesa_src_reg_from_ir_src_reg(ir_to_mesa_src_reg reg)
    struct prog_src_register mesa_reg;
 
    mesa_reg.File = reg.file;
-   assert(reg.index < (1 << INST_INDEX_BITS) - 1);
+   assert(reg.index < (1 << INST_INDEX_BITS));
    mesa_reg.Index = reg.index;
    mesa_reg.Swizzle = reg.swizzle;
    mesa_reg.RelAddr = reg.reladdr != NULL;




More information about the mesa-commit mailing list