OSDN Git Service

Fix merged bitmap mesh generation and reenable merging
authorChris Craik <ccraik@google.com>
Wed, 2 Mar 2016 20:29:56 +0000 (12:29 -0800)
committerChris Craik <ccraik@google.com>
Wed, 2 Mar 2016 23:34:02 +0000 (15:34 -0800)
commitf6c20e4b4232e30901676bcdf1aed64801d50c7e
tree785ef569e7416e4ab6d96b54c65f8c364f8dd4b9
parentc9a91cc050d9a1aa7e5a65cf104352e4be75cd25
Fix merged bitmap mesh generation and reenable merging

bug:26793764
bug:26569206
Change-Id: I54628e99b61f58f5726a387ea3599c29695c0efc
libs/hwui/BakedOpDispatcher.cpp
libs/hwui/FrameBuilder.cpp
libs/hwui/tests/unit/FrameBuilderTests.cpp