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

6665 Commits

Author SHA1 Message Date
Chris Craik
011550e1f2 am 3699c603: am 62a2696c: am fbd2d949: am b6e41a08: am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev 
* commit '3699c60323aca45eb0e385d6b4a27bd5861fadf2':
  Fix AssetAtlas usage in BitmapShaders
 2015-07-18 01:05:25 +00:00
Chris Craik
3699c60323 am 62a2696c: am fbd2d949: am b6e41a08: am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev 
* commit '62a2696cd2b7387ce20ec9cb9805563f313da86a':
  Fix AssetAtlas usage in BitmapShaders
 2015-07-18 00:51:34 +00:00
Chris Craik
b6e41a0882 am 0bb5c26b: Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev 
* commit '0bb5c26bcea4b171583e57134b9717c77fbdcb14':
  Fix AssetAtlas usage in BitmapShaders
 2015-07-18 00:07:13 +00:00
Chris Craik
0bb5c26bce Merge "Fix AssetAtlas usage in BitmapShaders" into mnc-dev 2015-07-17 23:59:17 +00:00
Chris Craik
6ad690e16f Fix AssetAtlas usage in BitmapShaders 
bug:22521999

Change-Id: I60859748ceee19ebc89ec98845e550ea26e36ecd
 2015-07-17 15:53:24 -07:00
Chris Craik
86c96504be am 8f587bfb: am 4c935068: am 41b43d7c: am 7b0fa466: am 0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev 
* commit '8f587bfb05c0db2d48692c9701ac2d97e43acdc1':
  Fix clip area behavior for REPLACE op
 2015-07-16 23:20:39 +00:00
Chris Craik
8f587bfb05 am 4c935068: am 41b43d7c: am 7b0fa466: am 0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev 
* commit '4c93506881fa710d69557a592f3fc7759b3ec9c4':
  Fix clip area behavior for REPLACE op
 2015-07-16 23:05:36 +00:00
Chris Craik
7b0fa466b5 am 0f724601: Merge "Fix clip area behavior for REPLACE op" into mnc-dev 
* commit '0f724601d78d8f36a297333227d9c460e10b3203':
  Fix clip area behavior for REPLACE op
 2015-07-16 22:23:34 +00:00
Chris Craik
8ce8f3f4d6 Fix clip area behavior for REPLACE op 
bug:22291400

Work around clippath-clipped-to-view-bounds behavior by
implementing REPLACE op fast path, avoiding the transition to
SkRegion/SkPath.

Change-Id: I63c1cf961db2d6e3759d83914de1036c9ac7497a
 2015-07-16 13:31:41 -07:00
Chris Craik
1d5d34624b Merge "Clean up unncessary defines" 2015-07-16 20:11:05 +00:00
John Reck
7f9c7b7694 am be7e2a47: am 599287b1: am b4d49a4d: am d5612d06: am ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev 
* commit 'be7e2a476fd8f3e25710a96a391a2d9ca2ddad99':
  Don't crash on makeCurrent fail
 2015-07-16 19:20:46 +00:00
John Reck
be7e2a476f am 599287b1: am b4d49a4d: am d5612d06: am ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev 
* commit '599287b14d32bbe6b5eea4e610cc14d8224362b6':
  Don't crash on makeCurrent fail
 2015-07-16 17:43:53 +00:00
John Reck
d5612d06c4 am ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev 
* commit 'ba4f0757779d6e91e52ebee0fd4c847b673a69e2':
  Don't crash on makeCurrent fail
 2015-07-16 17:01:22 +00:00
John Reck
f2dcc2aecb Don't crash on makeCurrent fail 
Bug: 22444755

WindowManager may decide to yank the surface at any point, so
attempt to kinda handle this

Change-Id: Id2f665d2f0f93bccd4ec977fbf52dca4dc1ec891
 2015-07-16 09:17:59 -07:00
Chris Craik
5a4690bf26 Clean up unncessary defines 
LOG_TAG and TRACE_TAG are already defined in the makefile

Change-Id: I9e53e3dacbe018441edd74cb7c8c90846defee74
 2015-07-14 13:25:38 -07:00
Chris Craik
401415d35e am cd843caa: am 230d8243: am 9f43ac77: am e2a5c184: am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev 
* commit 'cd843caa3704a14d02a2b8df6e72be8a2f53049c':
  Fix unsafety in SkiaShader storage, and texture unit accounting
 2015-07-14 18:47:39 +00:00
Chris Craik
cd843caa37 am 230d8243: am 9f43ac77: am e2a5c184: am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev 
* commit '230d8243de5ef33a18c610a7b2f21fb6caa8e277':
  Fix unsafety in SkiaShader storage, and texture unit accounting
 2015-07-14 18:21:45 +00:00
Chris Craik
e2a5c184e3 am 941bcedb: Merge "Fix unsafety in SkiaShader storage, and texture unit accounting" into mnc-dev 
* commit '941bcedb4c03832cd54225217697c7b8cba6e07c':
  Fix unsafety in SkiaShader storage, and texture unit accounting
 2015-07-14 17:35:50 +00:00
Chris Craik
e310f83d59 Fix unsafety in SkiaShader storage, and texture unit accounting 
bug:22390304

Fixes two issues:

1) The max texture unit wasn't large enough to handle the most complex
ComposeShader case (1 for draw primitive, 2 for gradient shader, 1 for
bitmap shader).

2) If a shader isn't supported by SkiaShader::store, the shader data
needs to be explicitly disabled, so we won't read uninitilized data
from it when trying to read shader information out.

Change-Id: I29ee7b7c1e07f67db88c1707bdc857daa305e713
 2015-07-13 13:34:07 -07:00
Derek Sollenberger
94394b3fb0 Move drawRegion from DisplayList to Canvas 
Change-Id: I9f401dc5b24732938ac2ca7ed829796e2d7ef3e8
 2015-07-13 13:48:08 -04:00
Derek Sollenberger
cc882b6518 Remove unused functions and variables from DisplayListCanvas 
This also moves some functions that are only called when creating/completing
a displayList into the appropriate constructors and endRecording calls.

Change-Id: I9f6add156d7f476a52766934af713b0f852c8dea
 2015-07-10 19:32:30 +00:00
Tom Hudson
0f6cb32c75 am a5e2946f: am b9d7bba5: am 434b577f: am 8ac76504: am 9613e9b7: Merge "New setLocalMatrix() operation for HWUI" into mnc-dev 
* commit 'a5e2946f5ab7618997fb317ad9f5f56c160ebee5':
  New setLocalMatrix() operation for HWUI
 2015-07-10 13:35:27 +00:00
Tom Hudson
a5e2946f5a am b9d7bba5: am 434b577f: am 8ac76504: am 9613e9b7: Merge "New setLocalMatrix() operation for HWUI" into mnc-dev 
* commit 'b9d7bba5c5453f894608971fed44aed023dcd6ba':
  New setLocalMatrix() operation for HWUI
 2015-07-10 13:22:39 +00:00
Tom Hudson
8ac76504fe am 9613e9b7: Merge "New setLocalMatrix() operation for HWUI" into mnc-dev 
* commit '9613e9b76410b15b7f2700080a17476bf9f3461c':
  New setLocalMatrix() operation for HWUI
 2015-07-10 12:46:24 +00:00
Tom Hudson
9613e9b764 Merge "New setLocalMatrix() operation for HWUI" into mnc-dev 2015-07-10 12:35:12 +00:00
Tom Hudson
ac7b6d33d2 New setLocalMatrix() operation for HWUI 
Concats any matrix passed through from DisplayListCanvas with the
initialTransform of the containing RenderNode.

BUG:22189925

Change-Id: I5ea54a6e2a29520c79a8860bde7682694e8595d2
 2015-07-09 16:15:31 -04:00
John Reck
a25ecac971 am ea103a9f: am 0ea996cf: am 62a65071: am dcf8837d: Merge "Restrict number of hwuiTask threads" into mnc-dr-dev 
* commit 'ea103a9f7fb94b2d6cd290df648e50417a0c1c76':
  Restrict number of hwuiTask threads
 2015-07-08 16:32:59 +00:00
John Reck
ea103a9f7f am 0ea996cf: am 62a65071: am dcf8837d: Merge "Restrict number of hwuiTask threads" into mnc-dr-dev 
* commit '0ea996cfe257785dfcb65724fcb270361f1e8ea0':
  Restrict number of hwuiTask threads
 2015-07-08 16:20:02 +00:00
John Reck
dcf8837d49 Merge "Restrict number of hwuiTask threads" into mnc-dr-dev 2015-07-08 15:40:44 +00:00
Chris Craik
43b42d8bdb am 41e4d8b3: am 0c218e43: am 9ca926ad: am fdb87b76: am 127b478a: Merge "Remove all usage of fmin and fmax" into mnc-dev 
* commit '41e4d8b3ed044ed724bc340b77d3f9ca60105407':
  Remove all usage of fmin and fmax
 2015-07-08 03:15:47 +00:00
Chris Craik
41e4d8b3ed am 0c218e43: am 9ca926ad: am fdb87b76: am 127b478a: Merge "Remove all usage of fmin and fmax" into mnc-dev 
* commit '0c218e43b8126eaffb38aa24af8e46e22835c3cb':
  Remove all usage of fmin and fmax
 2015-07-08 03:00:28 +00:00
Chris Craik
127b478ac6 Merge "Remove all usage of fmin and fmax" into mnc-dev 2015-07-08 01:53:57 +00:00
Chris Craik
e6a15ee3d0 Remove all usage of fmin and fmax 
bug:22208220

Removes needless call, and upconversion to doubles in multiple places.

Change-Id: I1b949fa5f206446ac34de800154c0147d6bd8034
 2015-07-07 18:42:42 -07:00
John Reck
c452654a45 Restrict number of hwuiTask threads 
Bug: 22324907
Change-Id: I0013557ede15949a5bd6f3f75bc5dd023a9f945b
 2015-07-07 16:19:57 -07:00
Chris Craik
4a067fb999 am 9d080ff6: am ab614e54: am 30eaf590: am df134e87: am 54d1f043: Merge "Simplify matrix copy constructor/load" into mnc-dev 
* commit '9d080ff64162da9772974400c53566659ab28eec':
  Simplify matrix copy constructor/load
 2015-07-07 20:38:06 +00:00
Chris Craik
9d080ff641 am ab614e54: am 30eaf590: am df134e87: am 54d1f043: Merge "Simplify matrix copy constructor/load" into mnc-dev 
* commit 'ab614e540a343ea820f8d6d30fa06d92bfe20e74':
  Simplify matrix copy constructor/load
 2015-07-07 19:57:36 +00:00
Chris Craik
54d1f0439e Merge "Simplify matrix copy constructor/load" into mnc-dev 2015-07-07 19:09:43 +00:00
John Reck
d67db081a3 am 7772b03d: am 6ac3b54d: am 8e5d4761: am dfbae1f9: am 15b64099: Merge "Adjust for pipeline stalls" into mnc-dev 
* commit '7772b03d5e3a8bce01cac511197afc52c9e56f5f':
  Adjust for pipeline stalls
 2015-07-07 19:08:46 +00:00
John Reck
7772b03d5e am 6ac3b54d: am 8e5d4761: am dfbae1f9: am 15b64099: Merge "Adjust for pipeline stalls" into mnc-dev 
* commit '6ac3b54df6151edf25560bce7b9efc388e47f8de':
  Adjust for pipeline stalls
 2015-07-07 17:34:28 +00:00
Chris Craik
d2bfcc74fc Simplify matrix copy constructor/load 
bug:22208220

Change-Id: Id096eb8de8da0dd1687d6af9456b16ce2a1a589b
 2015-07-07 10:09:35 -07:00
John Reck
be3fba05e8 Adjust for pipeline stalls 
Bug: 20853441

Calculating duration that crosses the UI-RT
sync point will now subtract out the time spent waiting
in queue under the assumption that this time will be
accounted for in the previous frame's metrics

Change-Id: Ia8213f4410638840613f5ae439e98dfb77532a6a
 2015-07-06 16:12:46 -07:00
John Reck
6b6ba748f0 am e463f28e: am 1826da24: am f70a5a78: Merge "Set go-faster arguments" into mnc-dev 
* commit 'e463f28eae88d0433a7bb41f5534b86000578900':
  Set go-faster arguments
 2015-07-04 07:28:02 +00:00
John Reck
0606a04136 am 91d01e5d: am 0cec5293: am d7580333: Merge "Use std::sort instead of quickSortX" into mnc-dev 
* commit '91d01e5d8b9a50ad04f0d0b5d6e35885f5d878a3':
  Use std::sort instead of quickSortX
 2015-07-04 07:26:47 +00:00
Chris Craik
7b293b5556 am c3988e0a: am b4c02e8f: am d3ecb3e6: Merge "Switch from fminf/fmaxf to std::min/max" into mnc-dev 
* commit 'c3988e0aa337b74693feb0abb898eb87fbb61b58':
  Switch from fminf/fmaxf to std::min/max
 2015-07-03 20:35:50 +00:00
John Reck
e463f28eae am 1826da24: am f70a5a78: Merge "Set go-faster arguments" into mnc-dev 
* commit '1826da24d84539960ed0959c9af2eea58c8b1668':
  Set go-faster arguments
 2015-07-02 01:01:49 +00:00
John Reck
91d01e5d8b am 0cec5293: am d7580333: Merge "Use std::sort instead of quickSortX" into mnc-dev 
* commit '0cec52933306b0e268bb6b4f8bf73648addf0df6':
  Use std::sort instead of quickSortX
 2015-07-02 01:00:52 +00:00
Chris Craik
c3988e0aa3 am b4c02e8f: am d3ecb3e6: Merge "Switch from fminf/fmaxf to std::min/max" into mnc-dev 
* commit 'b4c02e8ffd0c37b645fa8bb9fc03918a8cfc9a81':
  Switch from fminf/fmaxf to std::min/max
 2015-07-02 00:59:49 +00:00
John Reck
f70a5a78bb Merge "Set go-faster arguments" into mnc-dev 2015-07-01 23:52:20 +00:00
John Reck
d758033368 Merge "Use std::sort instead of quickSortX" into mnc-dev 2015-07-01 20:55:23 +00:00
John Reck
5600d579b9 Set go-faster arguments 
Bug: 22208220

Increases performance of shadows by yet another
15% by using more aggressive math optimizations

Change-Id: Ie3fabeae3647632a19ff573bf6b2d7f7a7cef555
 2015-07-01 13:51:44 -07:00