From: Brian <brian@yutani.localnet.net>
Date: Tue, 27 Mar 2007 17:02:20 +0000 (-0600)
Subject: fix off by one error in OPCODE_RET
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a0275b0d2c071ed8254c2af3a0c53eec9d3561a6;p=mesa.git

fix off by one error in OPCODE_RET
---

diff --git a/src/mesa/shader/prog_execute.c b/src/mesa/shader/prog_execute.c
index f881d477caa..37240820e79 100644
--- a/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@ -752,8 +752,8 @@ _mesa_execute_program(GLcontext * ctx,
             if (machine->StackDepth >= MAX_PROGRAM_CALL_DEPTH) {
                return GL_TRUE;  /* Per GL_NV_vertex_program2 spec */
             }
-            machine->CallStack[machine->StackDepth++] = pc + 1;
-            pc = inst->BranchTarget;    /* XXX - 1 ??? */
+            machine->CallStack[machine->StackDepth++] = pc + 1; /* next inst */
+            pc = inst->BranchTarget;
          }
          break;
       case OPCODE_CMP:
@@ -1305,7 +1305,8 @@ _mesa_execute_program(GLcontext * ctx,
             if (machine->StackDepth == 0) {
                return GL_TRUE;  /* Per GL_NV_vertex_program2 spec */
             }
-            pc = machine->CallStack[--machine->StackDepth];
+            /* subtract one because of pc++ in the for loop */
+            pc = machine->CallStack[--machine->StackDepth] - 1;
          }
          break;
       case OPCODE_RFL:         /* reflection vector */