summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-09-08 19:04:07 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-09-08 19:04:07 -0700
commit515d2c1e95a95aa4502e318762d149adff57b6d3 (patch)
tree25b2d0c35356704991d75c6c13744709af3596e9 /opengl
parent54ceb6e68e3510730dc92f9ed2a929b21351405b (diff)
parent099aa9a1b4eaf6536decbcafac43476c4908ef24 (diff)
downloadframeworks_base-515d2c1e95a95aa4502e318762d149adff57b6d3.zip
frameworks_base-515d2c1e95a95aa4502e318762d149adff57b6d3.tar.gz
frameworks_base-515d2c1e95a95aa4502e318762d149adff57b6d3.tar.bz2
am 099aa9a1: am edbb8083: Merge "add a fps counter to sanangeles demo" into gingerbread
Merge commit '099aa9a1b4eaf6536decbcafac43476c4908ef24' * commit '099aa9a1b4eaf6536decbcafac43476c4908ef24': add a fps counter to sanangeles demo
Diffstat (limited to 'opengl')
-rw-r--r--opengl/tests/angeles/app-linux.cpp27
1 files changed, 18 insertions, 9 deletions
diff --git a/opengl/tests/angeles/app-linux.cpp b/opengl/tests/angeles/app-linux.cpp
index 06fa0c2..9f80ed4 100644
--- a/opengl/tests/angeles/app-linux.cpp
+++ b/opengl/tests/angeles/app-linux.cpp
@@ -190,24 +190,33 @@ int main(int argc, char *argv[])
}
appInit();
+
+ struct timeval timeTemp;
+ int frameCount = 0;
+ gettimeofday(&timeTemp, NULL);
+ double totalTime = timeTemp.tv_usec/1000000.0 + timeTemp.tv_sec;
while (gAppAlive)
{
struct timeval timeNow;
- if (gAppAlive)
- {
- gettimeofday(&timeNow, NULL);
- appRender(timeNow.tv_sec * 1000 + timeNow.tv_usec / 1000,
- sWindowWidth, sWindowHeight);
- checkGLErrors();
- eglSwapBuffers(sEglDisplay, sEglSurface);
- checkEGLErrors();
- }
+ gettimeofday(&timeNow, NULL);
+ appRender(timeNow.tv_sec * 1000 + timeNow.tv_usec / 1000,
+ sWindowWidth, sWindowHeight);
+ checkGLErrors();
+ eglSwapBuffers(sEglDisplay, sEglSurface);
+ checkEGLErrors();
+ frameCount++;
}
+ gettimeofday(&timeTemp, NULL);
+
appDeinit();
deinitGraphics();
+ totalTime = (timeTemp.tv_usec/1000000.0 + timeTemp.tv_sec) - totalTime;
+ printf("totalTime=%f s, frameCount=%d, %.2f fps\n",
+ totalTime, frameCount, frameCount/totalTime);
+
return EXIT_SUCCESS;
}