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

2320 Commits

Author SHA1 Message Date
Stephen Hines
0fe8ea2096 am 697e3dd6: am ee144b1e: resolved conflicts for bd57dac5 to stage-aosp-master 
* commit '697e3dd6b9a8be4451e19ab7c03ced310602b92a':
  Don't unregister Fonts from renderer at destruction
 2015-10-03 00:52:32 +00:00
Stephen Hines
697e3dd6b9 am ee144b1e: resolved conflicts for bd57dac5 to stage-aosp-master 
* commit 'ee144b1e60a88e8f097113e046813f0b61c38b9b':
  Don't unregister Fonts from renderer at destruction
 2015-10-03 00:46:17 +00:00
Stephen Hines
ee144b1e60 resolved conflicts for bd57dac5 to stage-aosp-master 
Change-Id: I5107af13712d7cc908d8699e5c15a002f0a3ec85
 2015-10-02 17:34:05 -07:00
Chris Craik
bd57dac5d5 Merge "Don't unregister Fonts from renderer at destruction" 2015-10-02 22:30:09 +00:00
Chris Craik
148c78f825 Don't unregister Fonts from renderer at destruction 
bug:24584749

Fonts are only destroyed when the renderer is destroyed, this prevents
modifying the FontRenderer's LruCache while it's being iterated through
in FontRenderer::~FontRenderer.

Change-Id: I0e2c9f87981bfa50454ec8689df05851839e288e
 2015-10-02 14:21:46 -07:00
Tenghui Zhu
117e6daa42 Merge "Early return when the scale is 0." 2015-10-02 17:32:59 +00:00
Chris Craik
f6049a5c55 Merge "Move more utils into paintutils" 2015-10-02 17:28:36 +00:00
Chris Craik
56ce58ee6e Merge "Move ortho matrix out of glop" 2015-10-02 17:28:01 +00:00
Teng-Hui Zhu
8d0ec38953 Early return when the scale is 0. 
b/24534579

Change-Id: Ib3581ec99387ca70ca036026f64857a49657d94b
 2015-10-02 10:23:32 -07:00
Stefan Kuhne
150c5ae28d Merge "Rendering the window frame with a second thread" 2015-10-02 14:12:42 +00:00
Skuhne
b816087962 Rendering the window frame with a second thread 
Using a multi threaded render node to render the window frame
asynchronously from the application relayout.

Bug: 22527834
Bug: 24400680
Bug: 24459827
Bug: 24409773
Bug: 24537510
Change-Id: I1010fc6a8b6e38424178140afa3ca124433ab7e4
 2015-10-02 07:11:45 -07:00
Chris Craik
0e26fc471d Merge "Simplify DeferredDisplayList construction" 2015-10-01 23:20:30 +00:00
Chris Craik
bf6f0f2608 Move more utils into paintutils 
Change-Id: I1eb3fd52386bc61a592da235533e40b509eeec24
 2015-10-01 15:26:06 -07:00
Sergio Giro
f236d7ffad resolved conflicts for 31e5ded6 to master 
Change-Id: Iae4e1abe697f1c00a82b54c17afa7d4edddc006b
 2015-10-01 11:19:34 +00:00
Sergio Giro
31e5ded687 am 6706b71d: am 86e67d70: Merge "frameworks/base: delete TinyHashMap" 
* commit '6706b71d7cfb9a916fd482189c04a0d59c19c103':
  frameworks/base: delete TinyHashMap
 2015-10-01 10:22:39 +00:00
Sergio Giro
6706b71d7c am 86e67d70: Merge "frameworks/base: delete TinyHashMap" 
* commit '86e67d708d738807c843850a3b6c9170e514ff8f':
  frameworks/base: delete TinyHashMap
 2015-10-01 10:16:44 +00:00
Sene Gales
1673035f05 frameworks/base: delete TinyHashMap 
In DeferredDisplayList use std::unordered_map instead of TinyHashMap

Towards deprecation of BasicHashTable

Change-Id: I91b8d5dc80444c88fecff9c362fa610cca253973
 2015-09-30 20:37:01 +01:00
Chris Craik
12efe649d3 Move ortho matrix out of glop 
It's fbo-global, so don't bother stashing/restoring it repeatedly.

Change-Id: Icb32e3eda5d2086aaae07140f8ff40e038dad5fe
 2015-09-28 15:52:14 -07:00
Chris Craik
b45c6aa665 Simplify DeferredDisplayList construction 
Change-Id: I385bd894fda097e35abb8f8d5eb8271f10bd163b
 2015-09-28 15:41:27 -07:00
Chris Craik
f44b980e95 Merge "Remove lookup3 gamma code" 2015-09-23 17:59:44 +00:00
Chris Craik
c08820f587 Remove lookup3 gamma code 
Also clean up gamma / glyph cache properties

Change-Id: I75b1ac0cb55638bf787ffd3cf457483ae314f03b
 2015-09-22 14:40:35 -07:00
Chris Craik
e56b376027 Merge "Remove shader based gamma approach" 2015-09-22 20:41:38 +00:00
Chris Craik
11718bc17b Remove shader based gamma approach 
Also fixes some INIT_LOGD logs

Change-Id: I212a71a1e7b366aea41f7c3c8cc169d509d6e4a2
 2015-09-22 11:58:32 -07:00
Chris Craik
3b8e25afd1 Merge "Remove legacy enable/disable methods from Blend" 2015-09-21 23:21:04 +00:00
Chris Craik
571b9da84f Merge "Remove unnecessary glop color storage" 2015-09-21 23:19:42 +00:00
Chris Craik
6c2c62c1ed Remove unnecessary glop color storage 
Change-Id: I68817449d2e0d593dccb7e9be8c8ca45b7ab2fc2
 2015-09-21 16:16:22 -07:00
Chris Craik
8e5ca2a990 Remove legacy enable/disable methods from Blend 
Change-Id: I147f96d1fbdd34b9d056620e7259a9f96b13fea7
 2015-09-21 16:00:14 -07:00
Stefan Kuhne
fe1f99c2b2 Merge "MultiThreaded rendering of different renderNodes" 2015-09-21 22:08:30 +00:00
Chris Craik
6e6646c037 Unify extensions parsing behavior 
Removes remnants of EGL extension support, and persistence of
GL extension list.

Change-Id: I35aec12d900bdb33549ea47654bb8146f350ef48
 2015-09-21 13:14:20 -07:00
Skuhne
ea7a7fb75a MultiThreaded rendering of different renderNodes 
This is adding the renderer side infrastructure to allow
rendering multiple render nodes with different threads.
This is a pre-step for decoupling a non client decor
resize reder from a content resize render.

Multiple render nodes can be added to be drawn, and to
prevent overdrawing, a content bounds area can be set

Bug: 22527834

Change-Id: Ie7271e20895bf38957e5a84aeefc883e282039ad
 2015-09-21 07:18:00 -07:00
Chris Craik
0e35962e6d Merge "Move texture upload behavior to TextureState" 2015-09-14 19:46:13 +00:00
Chris Craik
68f5b8a781 Move texture upload behavior to TextureState 
Change-Id: If1cb32bbc04f437fa0d079084de832de9fd777c2
 2015-09-09 14:11:03 -07:00
Chris Craik
75e38f4e75 Merge "CanvasState frame init refactor" 2015-09-09 20:51:41 +00:00
Chris Craik
524a5af063 Merge "Fix pointer math in page start calculation" 2015-09-02 23:35:25 +00:00
Chris Craik
25c8d5b1c2 Fix pointer math in page start calculation 
Change-Id: I1582e52f358fece647e35b13e93e56fd96b9a227
 2015-09-02 16:20:56 -07:00
Chris Craik
64e445bf74 CanvasState frame init refactor 
bug:23760482

Change-Id: Idc0802b4b8a6a3cebd20797350f4eb01bcc3fe77
 2015-09-02 15:15:56 -07:00
Chris Craik
9557106c6f Add CanvasState tests 
Change-Id: Idcd022f6e4015e074d8e73b4c116e0788fd4f045
 2015-09-02 12:55:52 -07:00
John Reck
e248bd1b2c Serializing display lists 
This is a WIP prototype

Change-Id: Id4bfcf2b7bf905221c3734b7b6887c9b2efd37e6
 2015-08-26 16:29:15 -07:00
Chris Craik
8adc30a805 Merge "Add static asserts around assumed-static skia enum values" 2015-08-21 23:09:24 +00:00
Chris Craik
71c10ee8be Merge "Switch several enums to enum classes" 2015-08-21 23:08:39 +00:00
Chris Craik
b9ce116dac Switch several enums to enum classes 
Change-Id: I00ecd0b61657196b51704f70ca31a9d1c1ac254e
 2015-08-21 23:05:44 +00:00
Chris Craik
216048ffb0 Add static asserts around assumed-static skia enum values 
Protects assumptions around enums value built into LUTs

Change-Id: Ica0692e4309d50b4d3897e0f3f47809d14f786fe
 2015-08-21 15:32:58 -07:00
Chris Craik
3aadd60521 Revert "Revert "Simplify TextureView draw path"" 
Fixed build breakage

This reverts commit d35dcb13115ca1dd8c07e397f43a186cd7fd1a01.

Change-Id: Id3a103fbaac15a05f558bce2161ce17b6e8d2ea3
 2015-08-21 10:33:02 -07:00
Chris Craik
2f967f3e41 Merge "Remove return values from clipping operations" 2015-08-21 16:50:22 +00:00
Chris Craik
4d3e704b04 Remove return values from clipping operations 
bug:22530947

Also switch mode to enum class

Change-Id: Iabb38634c01f2e3203b1b715967d8828d95da190
 2015-08-20 15:00:11 -07:00
Derek Sollenberger
6e03543f63 Add transitive dependency to enable refactoring within Skia 
Change-Id: Iaf9841a2f74f927bb7aac6bbc9fc3cdfe0312fd5
 2015-08-20 16:12:01 -04:00
Chris Craik
1858541add Merge "Define GLSL version" 2015-08-20 19:58:08 +00:00
Ben Wagner
b03198de9f Merge "Use static_assert instead of SK_COMPILE_ASSERT." 2015-08-20 14:56:10 +00:00
Bart Sears
3b1c32eb5d Merge "Revert "Simplify TextureView draw path"" 2015-08-20 02:25:30 +00:00
Bart Sears
d35dcb1311 Revert "Simplify TextureView draw path" 
This reverts commit 20a248934c67b19c8734362dba76a5cc94254686.

Change-Id: Iaa3ebb1d868acbe184080087aec312b43e87e3c7
 2015-08-20 02:23:39 +00:00