drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,952 Commits 1 Branch 0 Tags
Commit Graph

5063 Commits

Author SHA1 Message Date
Chris Craik
d3979bc5a7 am bb451bda: am 0d3c52d3: Merge "Fix merged operation clipping" into klp-dev 
* commit 'bb451bda4a08f79b60f84242647bdb40962f01b5':
  Fix merged operation clipping
 2013-09-13 17:32:06 -07:00
Chris Craik
5af5fc50c2 Fix merged operation clipping 
bug:10745870

Missing 'const' meant MergingDrawBatch would never clip anything.

Change-Id: Ia6367eff94cf5f437efafbc3ba7f0da102ffd956
 2013-09-13 14:44:08 -07:00
Romain Guy
b1c53942f1 am 0885b291: am 4801a4f9: Merge "Always disable the clip for layers Bug #8149344" into klp-dev 
* commit '0885b291650c1b85220645943c9eab3080170aca':
  Always disable the clip for layers Bug #8149344
 2013-09-12 21:42:25 -07:00
Chris Craik
7cca88352f am 3f30e67a: am 88ee0dac: Merge "Move DeferredDisplayState out of ops" into klp-dev 
* commit '3f30e67afbceb185c52833cec539cc0199716ef0':
  Move DeferredDisplayState out of ops
 2013-09-12 16:45:16 -07:00
Romain Guy
1de466fc91 Always disable the clip for layers 
Bug #8149344

Change-Id: Ifd413cadb171232eb846b3d91b05b2d2457b9f35
 2013-09-12 23:13:38 +00:00
Chris Craik
88ee0dac81 Merge "Move DeferredDisplayState out of ops" into klp-dev 2013-09-12 22:08:54 +00:00
Chris Craik
c1c5f08702 Move DeferredDisplayState out of ops 
bug:9969358

Instead of storing DeferredDisplayState within an op (thus forcing ops
to be tied to a single state instance), associate each op with a new
state at DeferredDisplayList insertion time.

Now, DisplayLists (and the ops within) can be reused in a single
DeferredDisplayList draw call, as ops will use different state
instances at different points in the frame.

Change-Id: I525ab2abe0c3883679f2fa00b219b293e9ec53d9
 2013-09-12 13:33:01 -07:00
Kenny Root
b203dc138e am efbfe81d: am 931f6f87: Merge "Fix another off-by-one error in ZipFileRO" into klp-dev 
* commit 'efbfe81d2607221170a7fcb1d22a82c198e789f4':
  Fix another off-by-one error in ZipFileRO
 2013-09-11 17:24:17 -07:00
Kenny Root
317c602f0e am d9141d93: am d292f790: Merge "Reconcile differences between zip implementations" into klp-dev 
* commit 'd9141d939eff2e53c95f92a6a2c34116fd7a868b':
  Reconcile differences between zip implementations
 2013-09-11 17:23:15 -07:00
Kenny Root
fa34d2ccba Revert "Reconcile differences between zip implementations" 
This reverts commit 9ffddc7eb50653cf60ce6b27a0e1945eed5b5ce1.

(cherry picked from commit 0c4b3646b0feb1bed89bf374ff03af797834d8c3)

Change-Id: Ifeba63511211bfc2b375f2205e319e91403b7d06
 2013-09-11 22:42:02 +00:00
Kenny Root
1c7cf90af4 Fix another off-by-one error in ZipFileRO 
Bug: 10424836
Change-Id: I491458bd31ef39e87127d061427b32a3d59ac807
 2013-09-11 15:28:39 -07:00
Kenny Root
0d6c2d7b9d Reconcile differences between zip implementations 
Reconcile the difference between ZipFileRO and java.util.ZipFile to have
the same behavior.

Bug: 10424836
Change-Id: I6bde1bad7e20065ee650945fd43a913c05ce5ac7
 2013-09-11 11:44:40 -07:00
Kenny Root
0c4b3646b0 Revert "Reconcile differences between zip implementations" 
This reverts commit 9ffddc7eb50653cf60ce6b27a0e1945eed5b5ce1.

Change-Id: Ifeba63511211bfc2b375f2205e319e91403b7d06
 2013-09-11 18:10:09 +00:00
Kenny Root
ef60bdaa96 am feaa3be3: am 139ae547: Merge "Reconcile differences between zip implementations" into klp-dev 
* commit 'feaa3be34fae96f00d672b4be8b5cdc90126de76':
  Reconcile differences between zip implementations
 2013-09-11 10:45:24 -07:00
Kenny Root
9ffddc7eb5 Reconcile differences between zip implementations 
Reconcile the difference between ZipFileRO and java.util.ZipFile to have
the same behavior.

Bug: 10424836
Change-Id: Iff159c9e1a91b59f6c5346dc0278cb9e4bbc1a39
 2013-09-11 00:29:18 +00:00
John Reck
2f93af4574 am 53760b4a: am 874ae2ad: Merge "Fix scissor for functor invocation" into klp-dev 
* commit '53760b4a97fb2f88e94da73d647ff80221b3c454':
  Fix scissor for functor invocation
 2013-09-10 14:08:12 -07:00
John Reck
874ae2adf8 Merge "Fix scissor for functor invocation" into klp-dev 2013-09-10 21:03:48 +00:00
Tim Murray
efb6beb438 am 19c727bb: am 895a4375: Merge "Fix FontRenderer bug." into klp-dev 
* commit '19c727bbc6371924bfd2f85e804b5b6b093a8413':
  Fix FontRenderer bug.
 2013-09-10 14:03:39 -07:00
Tim Murray
7a454ba5fe Fix FontRenderer bug. 
bug 10691313

Change-Id: Icd5341a3c2066e337911f040ddc935c48c8d7cd1
 2013-09-10 13:46:49 -07:00
John Reck
25d2f7bc1f Fix scissor for functor invocation 
Bug: 10677765
 enableScissor() must precede setScissorFromClip() as
 otherwise setScissorFromClip() doesn't do anything.
 Also make sure to call setScissorFromClip() if
 enableScissor() returns true as enableScissor() calls
 resetScissor() if the scissor state has changed.

Change-Id: I9226b20bb256c92066aae344e4e6407540b6eae9
 2013-09-10 20:45:29 +00:00
Tim Murray
86ebf2876d am 9163b1d9: am 23ae1461: Merge "Add flags word to initialization." into klp-dev 
* commit '9163b1d9ceeca3e956218dda1ca19a748dc48d8d':
  Add flags word to initialization.
 2013-09-09 16:58:12 -07:00
Tim Murray
9578e64240 Add flags word to initialization. 
bug 10427951

Change-Id: I1356b9b96315ead44aa3898de5604d75f9bb8be5
 2013-09-09 16:23:27 -07:00
Chris Craik
0ff8c5f33c am 9b824560: am 9b40bdf6: Merge "Dump the right matrix when logging display lists" into klp-dev 
* commit '9b824560726eab653a1044eecdb0bfe5ff804865':
  Dump the right matrix when logging display lists
 2013-09-06 13:32:45 -07:00
Chris Craik
66063ae2d6 Dump the right matrix when logging display lists 
bug:10631274
Change-Id: I6b32bfcb3e207321da60807091d7ac0ecf6112ab
 2013-09-05 16:11:18 -07:00
Chris Craik
815fbbdfca am 7ff37ada: am ff2c22e2: Merge "Move functor GL setup to just before functor" into klp-dev 
* commit '7ff37ada138d9023e9d646f7195ae761a7b83ff2':
  Move functor GL setup to just before functor
 2013-08-26 15:12:06 -07:00
Chris Craik
54f574acf4 Move functor GL setup to just before functor 
bug:10399469

Because the stencil setup can issue draws, it *must* come before the
GL state setup.

Change-Id: I52a36213549fc60b091a90cbb923a1f0d35f9a65
 2013-08-26 11:23:46 -07:00
Romain Guy
0a57d65872 am c1acf799: am 243a026b: Merge "Second attempt at avoiding infinite loop in PathCache::trim() Bug #10347089" into klp-dev 
* commit 'c1acf7994a975903320ec8146c62118b651debc4':
  Second attempt at avoiding infinite loop in PathCache::trim() Bug #10347089
 2013-08-21 20:16:12 -07:00
Romain Guy
5d92320084 Second attempt at avoiding infinite loop in PathCache::trim() 
Bug #10347089

Change-Id: I70f5a3933e848632473acc6636c88be5dc6ac430
 2013-08-21 18:42:46 -07:00
Romain Guy
880d6fecfc am b7db6d73: am e0a2435c: Merge "Properly account for created paths in the cache" into klp-dev 
* commit 'b7db6d73a4a7fc2c2ec189780e1532cb0e2c638b':
  Properly account for created paths in the cache
 2013-08-21 17:42:26 -07:00
Romain Guy
0a8c51b1d0 Properly account for created paths in the cache 
Change-Id: I47b89b3085cefab6daac9194e7bfd3c140b37fa2
 2013-08-21 17:35:38 -07:00
Romain Guy
2f7c6f04cc am dfb79408: am 5b8efc47: Merge "Add overdraw debugging that accounts for Deuteranomaly" into klp-dev 
* commit 'dfb79408892b3f168204c54a9b81d813921fb0f9':
  Add overdraw debugging that accounts for Deuteranomaly
 2013-08-21 12:02:35 -07:00
Romain Guy
627c6fd913 Add overdraw debugging that accounts for Deuteranomaly 
Change-Id: I31f68a07aa7cf0490d2572e24e4c5ac2066a1151
 2013-08-21 11:53:18 -07:00
Tim Murray
ede1deaa88 am 816f3058: am cf8e6778: Merge "Handle updates to C++ API." into klp-dev 
* commit '816f3058bdd7b888965022888e4a789ea967f444':
  Handle updates to C++ API.
 2013-08-20 11:34:04 -07:00
Tim Murray
d8c8aaa82e Handle updates to C++ API. 
Change-Id: I8ab17cbae3a9a4cc3c3202b8277d49f27bdf1fec
 2013-08-19 12:07:52 -07:00
Romain Guy
cb39785dd7 am 725617f6: am 83aec80f: Merge "Fix hardware layers lifecycle Bug #10075732" into klp-dev 
* commit '725617f66a07488f8cafda24c517e257e9eb2bc2':
  Fix hardware layers lifecycle Bug #10075732
 2013-08-16 18:47:09 -07:00
Romain Guy
46bfc48110 Fix hardware layers lifecycle 
Bug #10075732

Hardware layers could survive across EGL terminate events.

Change-Id: Ie8565d55cb29fe6625fa1584d695edfecd37ab5e
 2013-08-16 18:38:29 -07:00
Romain Guy
fa017cd3db am 34d89c6b: am 836d335f: Merge "Prevent ANR in apps using drawPath() Bug #10347089" into klp-dev 
* commit '34d89c6b052ad8812c2c1a6eb55da64ee0dc67ee':
  Prevent ANR in apps using drawPath() Bug #10347089
 2013-08-16 15:07:37 -07:00
Romain Guy
b0a41ed3dc Prevent ANR in apps using drawPath() 
Bug #10347089

If an app clears its path cache before stopping background tasks, it could
get into an infinite loop in PathCache::trim().

Change-Id: Ieb865b762e7b00aebaba0c023769c2db286a94f5
 2013-08-16 14:44:38 -07:00
Romain Guy
3b0ca9c13c am bd3c2c3d: am 88105179: Merge "Clear FBO cache on full memory flush" into klp-dev 
* commit 'bd3c2c3d704fe5348ae9501f52cf9591a17e1a1e':
  Clear FBO cache on full memory flush
 2013-08-16 14:05:29 -07:00
Romain Guy
b746371de7 Clear FBO cache on full memory flush 
Change-Id: I44e06d5d15cd899a0522c62d7c0d042170665abb
 2013-08-16 13:55:29 -07:00
Romain Guy
3380cfdc77 Replace float arrays with readable names 
Change-Id: I32a8be560b60a4ac5cbee2fec4574b2c5df9f825
 2013-08-15 17:00:10 -07:00
Victoria Lease
723b2feb92 fix kBW_Format glyphs 
Oops! kBW_Format was omitted from a couple of switch statements,
resulting in glyphs in that format being invisible.

Bug: 10206452
Change-Id: Ib2aa52250aeeecc0de1b1b78e3d0f568f368c73e
 2013-08-12 15:12:49 -07:00
Romain Guy
9b5a1a28c3 Take shadow bounds into account for quick rejects 
Bug #8634346

Change-Id: I995c5205c2959d8e4da638ae47fedcda92eb1b36
 2013-08-09 14:06:29 -07:00
Romain Guy
003123004f Remove an unnecessary allocation 
Also remove dead code from OpenGLRenderer.cpp

Change-Id: I7eb54ca19e77ee3c32f1fe9513a031e6b2e115cf
(cherry picked from commit 5c7d5ab878b26f855175a3305a14ac12fcacf25e)
 2013-08-09 03:52:29 +00:00
Romain Guy
7f6d6b0370 Split assets atlas batches 
Bug #10185769

The assets atlas contains assets that need to be blended and assets
that do not need to be blended. With a single merge id, currently
set to be the pointer to the atlas itself, draw ops merging could
generate batches of commands containing both opaque and translucent
assets. The blend state was chosen from only one of the assets in
the batch, leading either to inefficiencies (blending large opaque
assets) or incorrect behaviors (not blending translucent assets.)

This change introduces two new merge ids in the atlas: an opaque
key and a blend key. These keys are simple booleans set to false
and true respectively (the values do not matter really.) Their
memory addresses are used as the merge ids when createing draw ops
batches, allowing all opaque ops to be batched together and all
translucent ops to be batched together.

Change-Id: I114dba0533c44987e53864b471ccb28c811f2025
 2013-08-06 18:35:01 -07:00
Elliott Hughes
83ad4e393a Remove an unused C zip API. 
Change-Id: I10ae849bdedf3e3bb97547c4f9e5a20742e9d6b1
 2013-08-05 14:12:50 -07:00
Tim Murray
250b1cfc83 Handle updates to RS C++ API. 
Change-Id: I73127fc7369643b94d4a49f31a516b50c74b54ac
 2013-08-02 15:31:29 -07:00
Chris Craik
b213cec0ce Merge "Fix quickReject's handling of AA ramp geometry" 2013-08-02 20:34:38 +00:00
Chris Craik
5e49b307eb Fix quickReject's handling of AA ramp geometry 
By having quickReject round out the window-space geometry bounds, we
prevent the AA perimeter (which falls outside the local bounds passed
in) from drawing outside the clip.

Change-Id: I8ee36be9039a9c47906815ee2f0dbaa5eb910b82
 2013-08-02 11:29:22 -07:00
Romain Guy
b7b93e0089 Fix region clipping bugs 
See external bug #58344

Change-Id: Iecd6c41fc8076cd76add2335d3442a6dd8878f12
 2013-08-01 15:35:24 -07:00