From 9610f635e81d630d9e24daa1d868078e578ed91d Mon Sep 17 00:00:00 2001 From: Jack Palevich Date: Mon, 19 Jul 2010 18:01:39 -0700 Subject: Fix extraMath state variable. Change-Id: Iba76d3e4e3bab0b993d176755f588201c8a967cd --- opengl/tests/gl_perfapp/jni/gl_code.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'opengl') diff --git a/opengl/tests/gl_perfapp/jni/gl_code.cpp b/opengl/tests/gl_perfapp/jni/gl_code.cpp index eafb665..020d848 100644 --- a/opengl/tests/gl_perfapp/jni/gl_code.cpp +++ b/opengl/tests/gl_perfapp/jni/gl_code.cpp @@ -384,14 +384,18 @@ void doTest(uint32_t w, uint32_t h) { int texCount; int extraMath; int testSubState; - if ( testState < 5 * 2) { - texCount = 0; // Only 10 tests for texCout 0 - extraMath = testState / 2; - testSubState = testState % 2; + const int extraMathCount = 5; + const int texCount0SubTestCount = 2; + const int texCountNSubTestCount = 8; + + if ( testState < extraMathCount * texCount0SubTestCount) { + texCount = 0; // Only 10 tests for texCount 0 + extraMath = (testState / texCount0SubTestCount) % extraMathCount; + testSubState = testState % texCount0SubTestCount; } else { - texCount = 1 + (testState - 10) / (5 * 8); - extraMath = testState / 8; - testSubState = testState % 8; + texCount = 1 + (testState - extraMathCount * texCount0SubTestCount) / (extraMathCount * texCountNSubTestCount); + extraMath = (testState / texCountNSubTestCount) % extraMathCount; + testSubState = testState % texCountNSubTestCount; } if (texCount >= 3) { LOGI("done\n"); -- cgit v1.1