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

6209 Commits

Author SHA1 Message Date
John Reck
e39f788950 am 0d4ab958: am 4e3404d9: am dec3f138: Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev 
* commit '0d4ab958c11801f5453e999f930416c87c63d100':
  Force-use the pbuffer surface for destroy
 2014-11-26 12:09:42 +00:00
Chris Craik
3c96a2b8fe am 1fb141f8: am 9c5b7b09: am ee660651: Merge "Improve DisplayList state output" into lmp-mr1-dev 
* commit '1fb141f83bad3884e2199c7acdc23932afaefe0c':
  Improve DisplayList state output
 2014-11-26 12:09:28 +00:00
John Reck
0d4ab958c1 am 4e3404d9: am dec3f138: Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev 
* commit '4e3404d90fe33a0ff790aff4a97b6bb55e4c0e8f':
  Force-use the pbuffer surface for destroy
 2014-11-26 12:02:19 +00:00
Chris Craik
1fb141f83b am 9c5b7b09: am ee660651: Merge "Improve DisplayList state output" into lmp-mr1-dev 
* commit '9c5b7b094254cad0a8a90ece5ea650c49694087d':
  Improve DisplayList state output
 2014-11-26 12:01:46 +00:00
Chris Craik
47414be761 am ab1a53c5: am bf62d307: am af5bd75b: Merge "Enable stencil clipping within clearLayerRegions" 
* commit 'ab1a53c509edbc8bacd944233335587dffd95999':
  Enable stencil clipping within clearLayerRegions
 2014-11-26 00:14:29 +00:00
Chris Craik
ab1a53c509 am bf62d307: am af5bd75b: Merge "Enable stencil clipping within clearLayerRegions" 
* commit 'bf62d3070c1653b79f4edcc0729b6a1a833d3ca1':
  Enable stencil clipping within clearLayerRegions
 2014-11-26 00:08:05 +00:00
John Reck
dec3f138c2 Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev 2014-11-25 19:52:53 +00:00
John Reck
fb7ff703e0 am 5ab86ba0: am 89a63f02: am 0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev 
* commit '5ab86ba05decf12e8ee3f693aab6b265905049c6':
  Switch TextureCache to SkPixelRef::fStableId
 2014-11-25 18:51:29 +00:00
John Reck
5ab86ba05d am 89a63f02: am 0c31d97a: Merge "Switch TextureCache to SkPixelRef::fStableId" into lmp-mr1-dev 
* commit '89a63f02f5d0814435e72b515b792bc6737014dc':
  Switch TextureCache to SkPixelRef::fStableId
 2014-11-25 18:45:48 +00:00
Chris Craik
ee6606519d Merge "Improve DisplayList state output" into lmp-mr1-dev 2014-11-25 18:45:11 +00:00
Dan Stoza
031cfc8f3f Merge "Cast buffer width and height to int" 2014-11-25 18:33:34 +00:00
John Reck
b945f2313a Force-use the pbuffer surface for destroy 
Bug: 18518580

If CanvasContext is being destroyed() the Surface
is probably no longer valid as well, so make sure to
makeCurrent() to the pbuffer surface so that the
subsequent GL operations are not using an invalid
EGLSurface

Change-Id: Ica5d6a065841772c47e00ad65aa7894c7e27e043
 2014-11-25 09:54:13 -08:00
John Reck
71d08a0718 Switch TextureCache to SkPixelRef::fStableId 
Bug: 18245805
Change-Id: I08e6792dbeed86b13e569c7f2137de0e50dc2763
 2014-11-24 15:24:02 -08:00
Dohyun Lee
adc0d9da86 Enable stencil clipping within clearLayerRegions 
Previously stencil clipping within clearLayerRegions is disabled by commit
62d307c2402777d5e53b4590af5f32f8c55afd81. However, clearing whole layer
regions causes black-colored triangle regions when a TextView has
RotateAnimation because the draw within clearLayerRegions does not
affected by the current stencil clip.

Change-Id: Id32a0b16754b109905f833e063ebfa156bd953f2
Signed-off-by: Dohyun Lee <dohyun.lee@lge.com>
 2014-11-24 21:08:15 +09:00
Elliott Hughes
476edb5701 am ee46d162: am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN." 
* commit 'ee46d1621f817d626e8dd42e9ffe7051f4a829eb':
  We HAVE_LITTLE_ENDIAN.
 2014-11-22 08:04:38 +00:00
Elliott Hughes
ee46d1621f am 08e2fd72: am ff4dd15c: Merge "We HAVE_LITTLE_ENDIAN." 
* commit '08e2fd7238c50b5d06af41bc944ee08acb023d51':
  We HAVE_LITTLE_ENDIAN.
 2014-11-22 07:56:46 +00:00
Elliott Hughes
9d074a1fb7 We HAVE_LITTLE_ENDIAN. 
Change-Id: I5b5d0ef3f91fe84d629d2ddac436bd22019edfd4
 2014-11-21 23:36:45 -08:00
Andreas Gampe
64bb413a66 Revert "resolved conflicts for merge of 220c3f4f to master" 
Reverted as hwui doesn't agree.

This reverts commit 8a902d9f24e83c87b054adb5836b4a5b8a257be9.

Change-Id: I109e7b02bee2921e2155ded6df36f52e6f574b5a
 2014-11-22 00:35:09 +00:00
Chris Craik
b5a5435a77 Improve DisplayList state output 
bug:17991451

Log hardware layers and shadow casting

Change-Id: I2ae40f270d18f5b2a5af985513e0f5e8841216c2
 2014-11-21 16:23:00 -08:00
John Reck
8b59a528b5 Revert "Frameworks/base: Unused parameters in hwui" 
This reverts commit 42ddc18d108f789705ad4eb697ce9599ad322507.

Change-Id: I3574a936a39a96314db6437d0a1eb58d260d893d
 2014-11-22 00:10:02 +00:00
Andreas Gampe
8a902d9f24 resolved conflicts for merge of 220c3f4f to master 
Change-Id: I37ecce8fddecdff82b0eace16f1ee75152f7171e
 2014-11-21 15:51:04 -08:00
Dan Stoza
32d2e769ea Cast buffer width and height to int 
GraphicBuffer::get{Width,Height} are going to start returning uint32_t
values soon, so add the cast now to avoid breaking the build later.

Change-Id: Ied33700fdf81e8aecbad95d66583818d15987b93
 2014-11-21 14:48:04 -08:00
Chris Craik
90102e1009 am 1ae8a98e: am 29dc496a: Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 
* commit '1ae8a98e8a6ba82396955c0b6ab0e02568a3494b':
  Revert "Add a way to override Xfermode DO NOT MERGE"
 2014-11-21 22:21:02 +00:00
Andreas Gampe
2ab8298dc3 resolved conflicts for merge of 99377df1 to lmp-mr1-dev-plus-aosp 
Change-Id: I3a98f55832ac447b1ed0dd129c7a93d088025943
 2014-11-21 14:19:06 -08:00
Chris Craik
6bcf223bf6 Merge "Revert "Add a way to override Xfermode"" 2014-11-21 22:11:14 +00:00
Chris Craik
29dc496a42 Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-dev 2014-11-21 22:11:13 +00:00
Chris Craik
da3198a550 Revert "Add a way to override Xfermode" 
Feature no longer needed.

bug:18448377

This reverts commit c495e611b9fa1fc6b47a647c714bbbf94dd63461.

Change-Id: Ia3e37f06953ffd81ca3fac367ee790d26b1b5d29
 2014-11-21 22:05:46 +00:00
Chris Craik
69e65019b0 Revert "Add a way to override Xfermode DO NOT MERGE" 
Feature no longer needed.

bug:18448377

This reverts commit 4678dcc5524258908eadc5fe1e5e1874768967eb.

Change-Id: Ib0a19946e966a54857165555827b5fa7b34b6bea
 2014-11-21 22:05:33 +00:00
Andreas Gampe
42ddc18d10 Frameworks/base: Unused parameters in hwui 
Remove Clang cutout for unused parameters. Fix warnings.

Remove Clang cutout for deprecated Skia function usage. Has been
fixed in the L push.

Change-Id: I7ea073ff67127cc1e14e798b655e2c50615fe8e7
 2014-11-21 10:39:21 -08:00
Chris Craik
06e7fe5a70 resolve merge conflicts of f2235b6 to master. 
Change-Id: Ibcef3a37ca0749931d509b53bd52e53a7d30ddbb
 2014-11-20 17:27:36 -08:00
Chris Craik
f2235b6a48 resolve merge conflicts of 57b641a to lmp-mr1-dev-plus-aosp. 
Change-Id: I1be708f5a0cd4d64021a57f1063d54330f1d2d7e
 2014-11-20 16:38:06 -08:00
Dan Albert
47249598cb am 582bdf9a: am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." 
* commit '582bdf9a5961a32de27556832e23e0611c4d1cbb':
  Add appropriate casts for char16_t.
 2014-11-20 23:19:06 +00:00
Dan Albert
582bdf9a59 am d8c169fe: am 0c437fd3: Merge "Add appropriate casts for char16_t." 
* commit 'd8c169fedf883491e46b354484909694fd52cfaf':
  Add appropriate casts for char16_t.
 2014-11-20 23:00:56 +00:00
Dan Albert
6698749dd4 Add appropriate casts for char16_t. 
C++11 defines a real char16_t, which is not implicitly convertible to
uint16_t (and by extension jchar). Add casts as needed.

Bug: 18300613
Change-Id: I00752002ef2e938bdb57f70947e8fd53ec103293
 2014-11-20 11:47:40 -08:00
Chris Craik
3b2ba44be3 Merge "Improve logging around performance critical events" into lmp-mr1-dev 2014-11-20 17:36:26 +00:00
Chris Craik
70850ea258 Improve logging around performance critical events 
bug:17702227

Add details useful to developers (such as layer size/View name), and
switch away from logging implementation names/details, since they
are generally not relevant to developers.

Change-Id: Iee605d182f241450f7e75a6d0c283d51fa1312f5
 2014-11-19 17:24:30 -08:00
John Reck
27eaec2388 am 842697a3: am decc26df: am f0f68117: Merge "Trace some interesting events" into lmp-mr1-dev 
* commit '842697a3602204036e991cfea8b74da3df6e7f14':
  Trace some interesting events
 2014-11-18 21:37:59 +00:00
John Reck
842697a360 am decc26df: am f0f68117: Merge "Trace some interesting events" into lmp-mr1-dev 
* commit 'decc26df39b734ca1cbaccda1cbe3b355eba6898':
  Trace some interesting events
 2014-11-18 21:33:19 +00:00
John Reck
f0f68117c4 Merge "Trace some interesting events" into lmp-mr1-dev 2014-11-18 21:23:50 +00:00
Chih-hung Hsieh
f7d0b20e9e am cb82b7f1: am a58336f6: Merge "Use fabsf() rather than abs()" 
* commit 'cb82b7f1824dc7f9fa73c2bada7107c48290af8b':
  Use fabsf() rather than abs()
 2014-11-17 23:07:29 +00:00
Chih-hung Hsieh
cb82b7f182 am a58336f6: Merge "Use fabsf() rather than abs()" 
* commit 'a58336f6c8aa44373485e5a6d7ec32677387a935':
  Use fabsf() rather than abs()
 2014-11-17 22:59:11 +00:00
Bernhard Rosenkränzer
c44958c786 Use fabsf() rather than abs() 
abs() operates on integers -- to check floats accurately, fabsf
should be used.

Change-Id: I1a4e85f8f5e0d08ff38d307c5c31e2b6783ab7af
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-11-17 23:12:18 +01:00
Rob Tsuk
4f2e052f3d Merge "Fix uninitialized member warning" 2014-11-17 21:43:29 +00:00
Rob Tsuk
a5f2e07074 Fix uninitialized member warning 
The fact that mHasDeferredTranslate was unitialized couldn't cause any
problems, since mTranslateX and mTranslateY are intialized to zero and
the only use of mHasDeferredTranslate, in
DisplayListRenderer::flushTranslate(), doesn't do anything if those
values are both zero and then sets mHasDeferredTranslate to false.

Change-Id: Ia5aa2590b3ab956eaf74c90515353600253873f5
 2014-11-17 12:57:32 -08:00
Adam Lesinski
d97237071d am 11bdd5b1: Merge commit \'06d8b7b8\' into manualmerge 
* commit '11bdd5b10b5f921b657283fa94463263171218d5':
  Implement back-tracking when searching for attributes in XML or resource bag
 2014-11-17 20:27:32 +00:00
Adam Lesinski
11bdd5b10b Merge commit '06d8b7b8' into manualmerge 
Conflicts:
	core/jni/android_util_AssetManager.cpp

Change-Id: I77b72d0d3ec8184ccd97419e4c76b7d55b1a52ca
 2014-11-17 12:17:16 -08:00
Adam Lesinski
cd6f00c3a0 Merge "Implement back-tracking when searching for attributes in XML or resource bag" into lmp-mr1-dev 2014-11-17 19:39:17 +00:00
Marco Nelissen
e726680652 am 52e2b6f7: Merge "Update calls to IInterface::asBinder()" 
* commit '52e2b6f79d44ff289c97653edea0548352c2f55b':
  Update calls to IInterface::asBinder()
 2014-11-17 18:24:54 +00:00
John Reck
fbc8df03e4 Trace some interesting events 
Bug: 18337099
Change-Id: Ie2e60da2b9f06e0368061c944d8123ab6903355c
 2014-11-17 10:18:31 -08:00
Marco Nelissen
97069dd4fd Update calls to IInterface::asBinder() 
to use the new static version.

Change-Id: Ia7b10eb38ca55b72278bfd33d3bf647f338b4e6a
 2014-11-17 10:05:31 -08:00