minor clean-ups in _mesa_execute_program()

diff --git a/src/mesa/shader/prog_execute.c b/src/mesa/shader/prog_execute.c
index b3d017bd9bbd2419169f0c9bd23ea59ab091b9d8..1b7ed4c5d0e3d6df5d70fc11141cb31ae2405c82 100644 (file)
--- a/src/mesa/shader/prog_execute.c
+++ b/src/mesa/shader/prog_execute.c
@@ -643,8 +643,8 @@ _mesa_execute_program(GLcontext * ctx,
                       struct gl_program_machine *machine)
 {
    const GLuint numInst = program->NumInstructions;
-   const GLuint MAX_EXEC = 10000;
-   GLint pc, total = 0;
+   const GLuint maxExec = 10000;
+   GLint pc, numExec = 0;
 
    machine->CurProgram = program;
 
@@ -1666,11 +1666,10 @@ _mesa_execute_program(GLcontext * ctx,
 
       }
 
-      total++;
-      if (total > MAX_EXEC) {
+      numExec++;
+      if (numExec > maxExec) {
          _mesa_problem(ctx, "Infinite loop detected in fragment program");
          return GL_TRUE;
-         abort();
       }
 
    } /* for pc */