commit 2442665f698304300aa454739cd2e5c7a8bc4044
author Chih-Chung Chang <chihchung@google.com> Tue Aug 17 19:54:46 2010 +0800
committer Chih-Chung Chang <chihchung@google.com> Wed Aug 18 13:17:22 2010 +0800
tree 881ee191affd22a8c3838564930498709f24e1a2
parent e0327809e36f3de41dd2b121d04e20927a3bb255

Add debugging drawing flag.

Change-Id: Id54737cea2e83da757f288537418859f3006246d

new3d/src/com/android/gallery3d/ui/GLCanvasImp.java

diff --git a/new3d/src/com/android/gallery3d/ui/GLCanvasImp.java b/new3d/src/com/android/gallery3d/ui/GLCanvasImp.java
index 2acb05f..0fe08fb 100644
--- a/new3d/src/com/android/gallery3d/ui/GLCanvasImp.java
+++ b/new3d/src/com/android/gallery3d/ui/GLCanvasImp.java
@@ -78,6 +78,13 @@
     private final float[] mTempMatrix = new float[32];
     private final IntArray mUnboundIds = new IntArray();
 
+    // Drawing statistics
+    int mCountDrawLine;
+    int mCountFillRect;
+    int mCountDrawMesh;
+    int mCountTextureRect;
+    int mCountTextureOES;
+
     GLCanvasImp(GL11 gl) {
         mGL = gl;
         mGLState = new GLState(gl);
@@ -174,6 +181,7 @@
         buffer[3] = y2;
         mXyPointer.put(buffer, 0, 4).position(0);
         gl.glDrawArrays(GL11.GL_LINE_STRIP, 0, 2);
+        mCountDrawLine++;
     }
 
     public void fillRect(float x, float y, float width, float height, int color) {
@@ -182,6 +190,7 @@
         gl.glLoadMatrixf(mMatrixValues, 0);
         putRectangle(x, y, width, height, mXyBuffer, mXyPointer);
         gl.glDrawArrays(GL11.GL_TRIANGLE_STRIP, 0, 4);
+        mCountFillRect++;
     }
 
     public void translate(float x, float y, float z) {
@@ -204,6 +213,7 @@
         gl.glLoadMatrixf(mMatrixValues, 0);
         putRectangle(x, y, width, height, mXyBuffer, mXyPointer);
         gl.glDrawArrays(GL11.GL_TRIANGLE_STRIP, 0, 4);
+        mCountTextureRect++;
     }
 
     public void drawNinePatch(
@@ -377,6 +387,7 @@
 
         mGL.glDrawElements(GL11.GL_TRIANGLE_STRIP,
                 idxCount, GL11.GL_UNSIGNED_BYTE, mIndexPointer);
+        mCountDrawMesh++;
     }
 
     private float[] mapPoints(float matrix[], int x1, int y1, int x2, int y2) {
@@ -450,6 +461,7 @@
             height = (int) points[3] - y;
             if (width > 0 && height > 0) {
                 ((GL11Ext) mGL).glDrawTexiOES(x, y, 0, width, height);
+                mCountTextureOES++;
             }
         }
     }
@@ -861,4 +873,17 @@
             }
         }
     }
+
+    public void dumpStatisticsAndClear() {
+        String line = String.format(
+                "MESH:%d, TEX_OES:%d, TEX_RECT:%d, FILL_RECT:%d, LINE:%d",
+                mCountDrawMesh, mCountTextureRect, mCountTextureOES,
+                mCountFillRect, mCountDrawLine);
+        mCountDrawMesh = 0;
+        mCountTextureRect = 0;
+        mCountTextureOES = 0;
+        mCountFillRect = 0;
+        mCountDrawLine = 0;
+        Log.v(TAG, line);
+    }
 }

new3d/src/com/android/gallery3d/ui/GLRootView.java

diff --git a/new3d/src/com/android/gallery3d/ui/GLRootView.java b/new3d/src/com/android/gallery3d/ui/GLRootView.java
index ce2ebce..0917b53 100644
--- a/new3d/src/com/android/gallery3d/ui/GLRootView.java
+++ b/new3d/src/com/android/gallery3d/ui/GLRootView.java
@@ -56,6 +56,8 @@
     private final boolean DEBUG_INVALIDATE = false;
     private int mInvalidateColor = 0;
 
+    private final boolean DEBUG_DRAWING_STAT = false;
+
     private static final int FLAG_INITIALIZED = 1;
     private static final int FLAG_NEED_LAYOUT = 2;
 
@@ -290,6 +292,10 @@
             mCanvas.fillRect(10, 10, 5, 5, mInvalidateColor);
             mInvalidateColor = ~mInvalidateColor;
         }
+
+        if (DEBUG_DRAWING_STAT) {
+            mCanvas.dumpStatisticsAndClear();
+        }
     }
 
     @Override