commit 9f68c096263b36f59c383435e587bd8bd279af34
author Chris Craik <ccraik@google.com> Fri Jan 10 10:30:57 2014 -0800
committer Chris Craik <ccraik@google.com> Tue Jan 14 12:52:41 2014 -0800
tree 363496397fec346cad702a06277fa40f9cad3869
parent 8a1b1e6fcd792d04139d1755dc83dd3f552a78a0

Simplify Z reordering logic

Change-Id: I9e36f68d7be5cfd4d69a84a51824cb9a642fe18d

libs/hwui/DisplayList.h

diff --git a/libs/hwui/DisplayList.h b/libs/hwui/DisplayList.h
index 204a131..d3113a3 100644
--- a/libs/hwui/DisplayList.h
+++ b/libs/hwui/DisplayList.h
@@ -90,7 +90,8 @@
 class DeferStateStruct : public PlaybackStateStruct {
 public:
     DeferStateStruct(DeferredDisplayList& deferredList, OpenGLRenderer& renderer, int replayFlags)
-            : PlaybackStateStruct(renderer, replayFlags, &(deferredList.mAllocator)), mDeferredList(deferredList) {}
+            : PlaybackStateStruct(renderer, replayFlags, &(deferredList.mAllocator)),
+            mDeferredList(deferredList) {}
 
     DeferredDisplayList& mDeferredList;
 };
@@ -143,7 +144,6 @@
         kReplayFlag_ClipChildren = 0x1
     };
 
-
     ANDROID_API size_t getSize();
     ANDROID_API static void destroyDisplayListDeferred(DisplayList* displayList);
     ANDROID_API static void outputLogBuffer(int fd);
@@ -501,6 +501,8 @@
     }
 
 private:
+    typedef key_value_pair_t<float, DrawDisplayListOp*> ZDrawDisplayListOpPair;
+
     enum ChildrenSelectMode {
         kNegativeZChildren,
         kPositiveZChildren
@@ -520,7 +522,7 @@
     void applyViewPropertyTransforms(mat4& matrix);
 
     void computeOrderingImpl(DrawDisplayListOp* opState,
-            KeyedVector<float, Vector<DrawDisplayListOp*> >* compositedChildrenOf3dRoot,
+            Vector<ZDrawDisplayListOpPair>* compositedChildrenOf3dRoot,
             const mat4* transformFromRoot);
 
     template <class T>
@@ -607,7 +609,7 @@
      */
 
     // for 3d roots, contains a z sorted list of all children items
-    KeyedVector<float, Vector<DrawDisplayListOp*> > m3dNodes; // TODO: good data structure
+    Vector<ZDrawDisplayListOpPair> m3dNodes;
 }; // class DisplayList
 
 }; // namespace uirenderer