Jesse Hall
46a4cd12a7
am afaf14b9
: Use descriptive aliases instead of HWC_NUM_DISPLAY_TYPES
...
* commit 'afaf14b9fbfe8943d845e2f01e8a401ad7a4d854':
Use descriptive aliases instead of HWC_NUM_DISPLAY_TYPES
2013-03-22 22:36:56 +00:00
Jesse Hall
501553a055
am 13f01cbd
: Pass sp<Fence>s around instead of file descriptors
...
* commit '13f01cbdbd34779a234bc674df79e23672fd5c0b':
Pass sp<Fence>s around instead of file descriptors
2013-03-22 22:36:55 +00:00
Jesse Hall
afaf14b9fb
Use descriptive aliases instead of HWC_NUM_DISPLAY_TYPES
...
Bug: 8384764
Change-Id: Ia2563fab19dbc6e4a95bed03445e609334841cca
2013-03-22 09:56:58 -07:00
Jesse Hall
13f01cbdbd
Pass sp<Fence>s around instead of file descriptors
...
Change-Id: Iac70584a2207940730e8f803a543e4e9a4000c47
2013-03-22 09:56:58 -07:00
Jesse Hall
f09e6ea0e7
am 8d8c7597
: Merge "Release virtual display buffer immediately after HWC set" into jb-mr2-dev
...
* commit '8d8c75976171d194ca8f94727b22e3bf7676b9dd':
Release virtual display buffer immediately after HWC set
2013-03-22 16:54:12 +00:00
Jesse Hall
8d8c759761
Merge "Release virtual display buffer immediately after HWC set" into jb-mr2-dev
2013-03-22 16:51:32 +00:00
Mathias Agopian
d59a1da80e
am ed985574
: make sure screenshot are in a format supported by Bitmap.java
...
* commit 'ed985574148a938bc3af24442eead313cc62521c':
make sure screenshot are in a format supported by Bitmap.java
2013-03-22 07:32:17 +00:00
Mathias Agopian
ed98557414
make sure screenshot are in a format supported by Bitmap.java
...
Change-Id: I0fb9cc4088f9c1fd27e6c017b0a7c5617adb4660
2013-03-22 00:24:39 -07:00
Mathias Agopian
dbbf209e66
am 7133f863
: Merge "improved CallStack a bit" into jb-mr2-dev
...
* commit '7133f8638e105548f6cca66a0ba9a6951993b7de':
improved CallStack a bit
2013-03-22 04:33:20 +00:00
Mathias Agopian
30e5376bfd
am 50210b9a
: fix a typo that broke all screenshots
...
* commit '50210b9a8d19cb90fc283d8d99e46cd34ac17d2e':
fix a typo that broke all screenshots
2013-03-22 04:33:20 +00:00
Mathias Agopian
7133f8638e
Merge "improved CallStack a bit" into jb-mr2-dev
2013-03-22 04:15:33 +00:00
Mathias Agopian
50210b9a8d
fix a typo that broke all screenshots
...
Bug: 8450197
Change-Id: I5b986cc0ff9c5e689d06a51ba68ab537d03d1f3d
2013-03-21 21:14:10 -07:00
Mathias Agopian
5a120411f0
am 0188eeff
: Merge "only use glReadPixels() when needed when taking screenshots" into jb-mr2-dev
...
* commit '0188eeff1fecc3813ddb236be3e2b7a9ad156482':
only use glReadPixels() when needed when taking screenshots
2013-03-22 00:18:27 +00:00
Mathias Agopian
0188eeff1f
Merge "only use glReadPixels() when needed when taking screenshots" into jb-mr2-dev
2013-03-22 00:16:01 +00:00
Mathias Agopian
cab25d680e
improved CallStack a bit
...
- added a ctor that updates and dumps the stack immediately
- added a "logtag" parameter to dump()
Change-Id: Ie51c256071d282591752243bdb4f68cf9ff8829d
2013-03-21 17:12:40 -07:00
Mathias Agopian
d839908ecf
am 504e1f26
: Merge "initialize planeAlpha (to 0xFF) for the FB_TARGET" into jb-mr2-dev
...
* commit '504e1f2638f6a5d7ad7ce66a89eaaaba15b452db':
initialize planeAlpha (to 0xFF) for the FB_TARGET
2013-03-22 00:02:53 +00:00
Mathias Agopian
504e1f2638
Merge "initialize planeAlpha (to 0xFF) for the FB_TARGET" into jb-mr2-dev
2013-03-21 23:58:39 +00:00
Mathias Agopian
70a6e88dbd
initialize planeAlpha (to 0xFF) for the FB_TARGET
...
Bug: 8422625
Change-Id: I7b72456c2e01ed92e675cc1bfa0cfd0d2ce5064e
2013-03-21 16:25:12 -07:00
Jamie Gennis
0fa7ac9bec
am 43122e7e
: atrace: use creat instead of truncate
...
* commit '43122e7e672eb170334a4467dd41cf4bd545bae5':
atrace: use creat instead of truncate
2013-03-21 21:15:05 +00:00
Jamie Gennis
43122e7e67
atrace: use creat instead of truncate
...
Change-Id: Ie25c704f33c419c0c542249ae2841393862df0ab
2013-03-21 14:06:57 -07:00
Mathias Agopian
b4b1730abb
only use glReadPixels() when needed when taking screenshots
...
some drivers don't support this yet, so we use a system
property to enable the glReadPixels "workaround" for them:
ro.bq.gpu_to_cpu_unsupported=1
Change-Id: I74d6a3a8f0cee8d5a507b72c760cf247e39195e0
2013-03-21 14:01:53 -07:00
Eino-Ville Talvala
a010749b41
am aaebffd5
: Merge "CpuConsumer: Properly track acquired buffers" into jb-mr2-dev
...
* commit 'aaebffd52f1bfa3d239bba0d60b699c01c6d791c':
CpuConsumer: Properly track acquired buffers
2013-03-21 16:40:18 +00:00
Eino-Ville Talvala
aaebffd52f
Merge "CpuConsumer: Properly track acquired buffers" into jb-mr2-dev
2013-03-21 16:39:14 +00:00
Ramanan Rajeswaran
eda14c1bef
am ac006439
: Merge "Revert "Revert "Change SurfaceControl setPosition to take floats""" into jb-mr2-dev
...
* commit 'ac006439bb635cd99d8dcbefe95fa680e21519b5':
Revert "Revert "Change SurfaceControl setPosition to take floats""
2013-03-21 15:53:56 +00:00
Ramanan Rajeswaran
ac006439bb
Merge "Revert "Revert "Change SurfaceControl setPosition to take floats""" into jb-mr2-dev
2013-03-21 15:52:49 +00:00
Ramanan Rajeswaran
d6480c020b
Revert "Revert "Change SurfaceControl setPosition to take floats""
...
This reverts commit bbb57f3331
Change-Id: Ib8f039f530d6b8175b5205c6c0008b135d4001a2
2013-03-21 15:49:59 +00:00
Mathias Agopian
890b345f06
am 7c1a487b
: fix build. update test to new API
...
* commit '7c1a487ba8c0a3b591a77e2ddcb33ef9bdfaff64':
fix build. update test to new API
2013-03-20 22:58:52 +00:00
Mathias Agopian
7c1a487ba8
fix build. update test to new API
...
Change-Id: I31ca84c85edff3e2ff90c554769e058110f27d49
2013-03-20 15:56:04 -07:00
Mathias Agopian
89016cbf4f
am ff7c2342
: Merge "rework how we take screenshots for a CPU consumer" into jb-mr2-dev
...
* commit 'ff7c2342e246696defa121a984d9731d000adeaf':
rework how we take screenshots for a CPU consumer
2013-03-20 22:16:56 +00:00
Mathias Agopian
ff7c2342e2
Merge "rework how we take screenshots for a CPU consumer" into jb-mr2-dev
2013-03-20 22:14:56 +00:00
Jeff Sharkey
93628db30a
am a6c1ab52
: Merge "Move screenshots near beginning of dumpstate." into jb-mr2-dev
...
* commit 'a6c1ab52e30fc63c8822e1f0cc6c5aea6328a69b':
Move screenshots near beginning of dumpstate.
2013-03-20 19:12:44 +00:00
Jeff Sharkey
a6c1ab52e3
Merge "Move screenshots near beginning of dumpstate." into jb-mr2-dev
2013-03-20 19:09:45 +00:00
Jesse Hall
7414965606
Release virtual display buffer immediately after HWC set
...
Previously we only queued a virtual display buffer to the sink when
the next frame was about to be displayed. This may delay the "last"
frame of an animation indefinitely. Now we queue the buffer as soon as
HWC set() returns and gives us the release fence.
Bug: 8384764
Change-Id: I3844a188e0f6ef6ff28f3e11477cfa063a924b1a
2013-03-20 11:16:55 -07:00
Jeff Tinker
e507d46e72
am 30041bd3
: Merge "Updated MediaDrm API based on review input." into jb-mr2-dev
...
* commit '30041bd3a487c3bfe45a5b802a0d3443cfcc0c51':
Updated MediaDrm API based on review input.
2013-03-20 16:53:16 +00:00
Jeff Tinker
30041bd3a4
Merge "Updated MediaDrm API based on review input." into jb-mr2-dev
2013-03-20 16:47:34 +00:00
The Android Open Source Project
0371fd021f
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I9b1d766e6519a720cee8327d1ec71d9f69dd7387
2013-03-20 09:32:41 -07:00
The Android Automerger
dbff8227e2
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-20 05:55:54 -07:00
Mathias Agopian
abe815dd69
rework how we take screenshots for a CPU consumer
...
We're not using IMemoryHeap as a transport anymore,
instead we're providing a CpuConsumer and use the
IGraphicBufferProducer version of the screenshot API.
However, some GPU drivers don't support properly
a GPU to CPU path, to work around this, we use a
temporary BufferQueue on the server side for the
GL rendering, and we use glReadPixels into the
CpuConsumer (we're now using a CPU to CPU path
which is always supported).
Currently this "wrapping" is always performed,
but it can be bypassed on devices that support
the GPU to CPU path.
This also addresses a DoS attack vector on
SurfaceFlinger, where an application could
consume all of SF's filedescriptors by creating
a lot of screenshots in a row.
Bug: 8390553
Change-Id: I9e81514c2a7711b9bb393f74305be7d2abe08f1c
2013-03-19 22:22:21 -07:00
Mathias Agopian
656a6780b5
am 9cd766a5
: disable RefBase consistency checks (NDEBUG)
...
* commit '9cd766a517caeb58669722fad7fdf623a8c1b83c':
disable RefBase consistency checks (NDEBUG)
2013-03-20 00:42:21 +00:00
Mathias Agopian
9cd766a517
disable RefBase consistency checks (NDEBUG)
...
Bug: 8328715
Change-Id: Ib57646ff909fd8744610f37f3b50d90d884dff31
2013-03-19 17:36:57 -07:00
Mathias Agopian
dd3fcd2e58
am 4e37ddff
: Fix a crasher with RefBase debugging and vectors of wp<>
...
* commit '4e37ddff43784a5a784beb4b62ea3f3136e1634b':
Fix a crasher with RefBase debugging and vectors of wp<>
2013-03-20 00:27:46 +00:00
Mathias Agopian
4e37ddff43
Fix a crasher with RefBase debugging and vectors of wp<>
...
background:
we have some code to fix-up the IDs of references when
using RefBase's DEBUG_REFS when those refs are managed by
arrays wp<> or sp<> (this is because wp<> / sp<> don't have
a trivial ctor when DEBUG_REFS is enabled, and Vector
treats them as trivial for obvious performance reasons)
this is complicated by the fact that we don't want to have
to recompile everything when enabling DEBUG_REFs (i.e.: the
Vector code cannot know wheter it's enabled or not for its
template stuff).
problem:
there was a bug in the fix-up code for wp<> which was trying
to access the weakref_impl from the RefBase* however, this was
moronic since RefBase could have been destroyed if there wasn't
any more strong refs -- and this happned. Instead we need to get
the weakref_impl directly from the wp<>
Change-Id: Ie16e334204205fdbff142acb9faff8479a78450b
2013-03-19 16:41:56 -07:00
Mathias Agopian
364a1f9578
am ca987c87
: Merge "A few tweaks to RefBase debugging" into jb-mr2-dev
...
* commit 'ca987c877549b0d5472e91ded98f3ba6fea8a96d':
A few tweaks to RefBase debugging
2013-03-19 23:02:47 +00:00
Mathias Agopian
ca987c8775
Merge "A few tweaks to RefBase debugging" into jb-mr2-dev
2013-03-19 23:00:40 +00:00
Jeff Sharkey
5a93003d3f
Move screenshots near beginning of dumpstate.
...
Bug: 8420215
Change-Id: I6adffd1182ed8f99b8d11d43785a4eb4a388ceb5
2013-03-19 15:19:48 -07:00
Jesse Hall
4af2b42b58
am ef64b75a
: Don\'t log an error on HWC1.1+ devices with no FB HAL
...
* commit 'ef64b75a936ffd194673dbce6766995f86b42ba9':
Don't log an error on HWC1.1+ devices with no FB HAL
2013-03-19 20:49:09 +00:00
Jesse Hall
ef64b75a93
Don't log an error on HWC1.1+ devices with no FB HAL
...
Change-Id: I015e5a1a1f926181e51f82525f69beff71bd70cd
2013-03-19 11:22:57 -07:00
Jesse Hall
88f70a2167
am fae23b87
: Merge changes I61ae54f3,I57cb668e,I7a3f1e1a,Id28a2f9b into jb-mr2-dev
...
* commit 'fae23b8757a6e1b70997db28a2eaf34f9ddc9b84':
Add BufferQueueInterposer and use it for virtual displays
Add DisplaySurface abstraction
Fix argument types in IGraphicBufferProducer methods
Minor cleanups/fixes before virtual display refactoring
2013-03-19 17:47:30 +00:00
Jesse Hall
fae23b8757
Merge changes I61ae54f3,I57cb668e,I7a3f1e1a,Id28a2f9b into jb-mr2-dev
...
* changes:
Add BufferQueueInterposer and use it for virtual displays
Add DisplaySurface abstraction
Fix argument types in IGraphicBufferProducer methods
Minor cleanups/fixes before virtual display refactoring
2013-03-19 17:45:29 +00:00
The Android Automerger
7d2c10419a
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-03-19 05:55:29 -07:00