Mesa (master): svga: replace out-of-temps assertion with debug warning

Brian Paul brianp at kemper.freedesktop.org
Wed Feb 12 20:37:44 UTC 2014


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

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Feb 10 16:12:32 2014 -0700

svga: replace out-of-temps assertion with debug warning

Signed-off-by: Brian Paul <brianp at vmware.com>

---

 src/gallium/drivers/svga/svga_tgsi_insn.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/svga/svga_tgsi_insn.c b/src/gallium/drivers/svga/svga_tgsi_insn.c
index 4d78e96..73303e3 100644
--- a/src/gallium/drivers/svga/svga_tgsi_insn.c
+++ b/src/gallium/drivers/svga/svga_tgsi_insn.c
@@ -287,8 +287,10 @@ static SVGA3dShaderDestToken
 get_temp( struct svga_shader_emitter *emit )
 {
    int i = emit->nr_hw_temp + emit->internal_temp_count++;
-   assert(i < SVGA3D_TEMPREG_MAX);
-   i = MIN2(i, SVGA3D_TEMPREG_MAX - 1);
+   if (i >= SVGA3D_TEMPREG_MAX) {
+      debug_warn_once("svga: Too many temporary registers used in shader\n");
+      i = SVGA3D_TEMPREG_MAX - 1;
+   }
    return dst_register( SVGA3DREG_TEMP, i );
 }
 




More information about the mesa-commit mailing list