OSDN Git Service
(root)
/
android-x86
/
external-mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8b34b7d
)
minor clean-ups in _mesa_execute_program()
author
Brian
<brian@nostromo.localnet.net>
Mon, 26 Feb 2007 01:30:45 +0000
(18:30 -0700)
committer
Brian
<brian@nostromo.localnet.net>
Mon, 26 Feb 2007 01:30:45 +0000
(18:30 -0700)
src/mesa/shader/prog_execute.c
patch
|
blob
|
history
diff --git
a/src/mesa/shader/prog_execute.c
b/src/mesa/shader/prog_execute.c
index
b3d017b
..
1b7ed4c
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 */