Dianne Hackborn
290f3f3130
am 9c63cdd6
: am ec0f5e5f
: Merge "Fix issue #7257947 : Need to fix heap limits on Mako" into jb-mr1-dev
...
* commit '9c63cdd6b0ff28d3a371aa8c6121411fbf7f0a76':
Fix issue #7257947 : Need to fix heap limits on Mako
2012-10-01 13:47:56 -07:00
Mathias Agopian
4c5158639b
am f8e5c37b
: am 135e5899
: save/restore viewport properly when taking screenshot
...
* commit 'f8e5c37bc59c70b0a0388f8a690d0d4bead9cc6f':
save/restore viewport properly when taking screenshot
2012-10-01 13:46:10 -07:00
Dianne Hackborn
9c63cdd6b0
am ec0f5e5f
: Merge "Fix issue #7257947 : Need to fix heap limits on Mako" into jb-mr1-dev
...
* commit 'ec0f5e5f0c433666698fa55c2e38ccdc9cf0df44':
Fix issue #7257947 : Need to fix heap limits on Mako
2012-10-01 11:42:49 -07:00
Dianne Hackborn
ec0f5e5f0c
Merge "Fix issue #7257947 : Need to fix heap limits on Mako" into jb-mr1-dev
2012-10-01 11:38:19 -07:00
Mathias Agopian
f8e5c37bc5
am 135e5899
: save/restore viewport properly when taking screenshot
...
* commit '135e5899f70a67e62baaf6dbec7ba2ce611ca16a':
save/restore viewport properly when taking screenshot
2012-10-01 10:16:47 -07:00
Mathias Agopian
135e5899f7
save/restore viewport properly when taking screenshot
...
Bug: 7241739
Change-Id: Iba8b9ffc75ab47fbc56169e65da26d96850a9297
2012-09-30 16:43:20 -07:00
Dianne Hackborn
c84e9844d6
Fix issue #7257947 : Need to fix heap limits on Mako
...
Change-Id: Id8014b19195b8740bccf000ab66c1b599ba3a1a0
2012-09-30 16:26:49 -07:00
Mathias Agopian
8321181496
am f00c34ba
: am bae92d0d
: reset GL viewport and project when caputring the screen
...
* commit 'f00c34babbaacd3b9f27e1a447979a061cab629f':
reset GL viewport and project when caputring the screen
2012-09-28 13:41:09 -07:00
Mathias Agopian
f00c34babb
am bae92d0d
: reset GL viewport and project when caputring the screen
...
* commit 'bae92d0d605e99a14731add4f11b72413b2835e5':
reset GL viewport and project when caputring the screen
2012-09-28 13:38:51 -07:00
Mathias Agopian
bae92d0d60
reset GL viewport and project when caputring the screen
...
Bug: 7241739
Change-Id: I3bb5214b070384de9be2026647865c6c236a4331
2012-09-28 13:34:26 -07:00
Andy McFadden
61cec18008
am bcc1cd16
: am c01a79d7
: Pass display arg to blank/unblank
...
* commit 'bcc1cd161f2bebc9682a3c99ec3c1e53c6cb9bbd':
Pass display arg to blank/unblank
2012-09-28 13:10:50 -07:00
Andy McFadden
bcc1cd161f
am c01a79d7
: Pass display arg to blank/unblank
...
* commit 'c01a79d77b829e7de86ef137694e8ad708470ca1':
Pass display arg to blank/unblank
2012-09-28 13:08:42 -07:00
Andy McFadden
c01a79d77b
Pass display arg to blank/unblank
...
This allows us to blank and unblank displays other than the built-in
display (e.g. HDMI).
Bug: 7240511
Change-Id: I89ea13f9e497be74c3e1231d0c62fb558e93e0f8
2012-09-28 13:04:16 -07:00
Chet Haase
4cb9e0062e
am bba6bb81
: am 4c273277
: Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-dev
...
* commit 'bba6bb81373b285b456bb851d37f7f2ecfc742ad':
Re-enable FAST_TLS in gl2 code
2012-09-28 12:42:21 -07:00
Chet Haase
bba6bb8137
am 4c273277
: Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-dev
...
* commit '4c2732779a11c92222958e7150162d4eaaab7b66':
Re-enable FAST_TLS in gl2 code
2012-09-28 12:41:24 -07:00
Chet Haase
4c2732779a
Merge "Re-enable FAST_TLS in gl2 code" into jb-mr1-dev
2012-09-28 12:38:29 -07:00
Andreas Huber
66548bce83
am 916ce16e
: am 589e2e74
: Merge "Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames." into jb-mr1-dev
...
* commit '916ce16ed41e051c2c443149b2f39bbc3b6b27bd':
Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames.
2012-09-28 12:34:50 -07:00
Andreas Huber
916ce16ed4
am 589e2e74
: Merge "Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames." into jb-mr1-dev
...
* commit '589e2e74e429f2116f18463aeda9a0954cfd70ca':
Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames.
2012-09-28 12:33:29 -07:00
Andreas Huber
589e2e74e4
Merge "Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames." into jb-mr1-dev
2012-09-28 12:31:32 -07:00
Chet Haase
e8b0fac720
Re-enable FAST_TLS in gl2 code
...
Temporarily changed USE_FAST_TLS_KEY ifdef during debugging. Changing it
back now.
Change-Id: I7c2fcf7265b3d545e31ff7683bd7614100fad3e5
2012-09-28 11:56:48 -07:00
Andreas Huber
7682a9c35a
Add a way to configure an OMX encoder to emit SPS/PPS before IDR frames.
...
Change-Id: I71ce254533c8e99bc54d199d8a9828397fe3d99d
related-to-bug: 7245308
2012-09-28 11:33:17 -07:00
Jamie Gennis
8891dc7c14
am f6760786
: am a4310c8b
: SurfaceFlinger: don\'t always set HWC_GEOM_CHGD
...
* commit 'f6760786136ed46bcc9f71b6211e57a730bd9bf5':
SurfaceFlinger: don't always set HWC_GEOM_CHGD
2012-09-28 11:16:59 -07:00
Jamie Gennis
f676078613
am a4310c8b
: SurfaceFlinger: don\'t always set HWC_GEOM_CHGD
...
* commit 'a4310c8be2dc3406a668ee99020d52187173232f':
SurfaceFlinger: don't always set HWC_GEOM_CHGD
2012-09-28 11:14:48 -07:00
Romain Guy
f51c798c03
am e1549fcb
: am cb094a78
: Merge "New compile-time flags to make debugging easier for us poor souls Bug #7195815 " into jb-mr1-dev
...
* commit 'e1549fcb4493fe84deb488d85fc626d635153eb8':
New compile-time flags to make debugging easier for us poor souls Bug #7195815
2012-09-28 00:35:10 -07:00
Iliyan Malchev
9d33333edb
am 76d4bd3e
: am 38b65726
: Revert "Compatibility work around for bad graphics driver dependency."
...
* commit '76d4bd3e4232c045f48afc0d4b6ca75dbbd2a148':
Revert "Compatibility work around for bad graphics driver dependency."
2012-09-28 00:35:00 -07:00
The Android Open Source Project
7cd393f12a
am f76c31ce
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit 'f76c31ce58ad02e50af916d9e47cce1b68f85edf':
2012-09-28 00:32:38 -07:00
Jamie Gennis
a4310c8be2
SurfaceFlinger: don't always set HWC_GEOM_CHGD
...
This change fixes a bug in SurfaceFlinger that caused the HWC_GEOMETRY_CHANGED
flag to be set every flip.
Change-Id: I4f395a2883bcbb53b23b3d14941aff108739c9f0
Bug: 7234237
2012-09-27 17:27:20 -07:00
Romain Guy
e1549fcb44
am cb094a78
: Merge "New compile-time flags to make debugging easier for us poor souls Bug #7195815 " into jb-mr1-dev
...
* commit 'cb094a783f14daae3378ac8aa7dc509980f037b2':
New compile-time flags to make debugging easier for us poor souls Bug #7195815
2012-09-27 16:05:31 -07:00
Romain Guy
cb094a783f
Merge "New compile-time flags to make debugging easier for us poor souls Bug #7195815 " into jb-mr1-dev
2012-09-27 16:04:04 -07:00
Iliyan Malchev
76d4bd3e42
am 38b65726
: Revert "Compatibility work around for bad graphics driver dependency."
...
* commit '38b657265ccc5ae45bd7860a68b0d9373b47a2f3':
Revert "Compatibility work around for bad graphics driver dependency."
2012-09-27 15:54:09 -07:00
Iliyan Malchev
38b657265c
Revert "Compatibility work around for bad graphics driver dependency."
...
This reverts commit a50b51c03a
Change-Id: Ibdcd776a7f241dbb2475403ea04f939249774c41
2012-09-27 15:52:12 -07:00
Romain Guy
f12fe43e8c
New compile-time flags to make debugging easier for us poor souls
...
Bug #7195815
Change-Id: I23e7ac991891b9586cb8ed20b1305c8b1b3e2b43
2012-09-27 15:47:10 -07:00
The Android Open Source Project
f76c31ce58
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I4e21c53aec26d5503f1640cf06acbadcf9eedb59
2012-09-27 09:58:04 -07:00
The Android Automerger
6c729ef4b5
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-27 06:59:44 -07:00
Mathias Agopian
b428bf60a3
am 2ac41948
: am 1e83690c
: Merge "assert -eng builds when calling a GL function without a context" into jb-mr1-dev
...
* commit '2ac4194854a70c6e319b1b3b647344e595082b38':
assert -eng builds when calling a GL function without a context
2012-09-26 18:51:49 -07:00
Mathias Agopian
2ac4194854
am 1e83690c
: Merge "assert -eng builds when calling a GL function without a context" into jb-mr1-dev
...
* commit '1e83690c6030b33c7776fa65cb57132d5e2d0b40':
assert -eng builds when calling a GL function without a context
2012-09-26 18:50:13 -07:00
Mathias Agopian
1e83690c60
Merge "assert -eng builds when calling a GL function without a context" into jb-mr1-dev
2012-09-26 18:48:54 -07:00
Mathias Agopian
455e360149
assert -eng builds when calling a GL function without a context
...
Bug: 7241626
Change-Id: I0f1f9361e75e9186af8cff8d98a7d2224b266765
2012-09-26 17:37:53 -07:00
Andy McFadden
f10272b12b
am 9030333a
: am e206549c
: Merge "Recompute visible regions more vigorously" into jb-mr1-dev
...
* commit '9030333a4ec170baf90a7c62cc7c19970f12a5f5':
Recompute visible regions more vigorously
2012-09-26 17:31:22 -07:00
Andy McFadden
9030333a4e
am e206549c
: Merge "Recompute visible regions more vigorously" into jb-mr1-dev
...
* commit 'e206549ccf23ec5ba95062f944674e58569c8065':
Recompute visible regions more vigorously
2012-09-26 17:28:51 -07:00
Andy McFadden
e206549ccf
Merge "Recompute visible regions more vigorously" into jb-mr1-dev
2012-09-26 17:27:43 -07:00
Andy McFadden
ab10c5804c
Recompute visible regions more vigorously
...
Some of the code in latchBuffer was calling invalidateHwcGeometry,
but that didn't cause the SurfaceFlinger visible region code to
re-evaluate the layer's visibility. Set the recomputeVisibleRegions
"out" parameter instead.
Bug 7235797
Change-Id: If6ba33fbd1a594cd64cc5253aebf752d6ceda1c9
2012-09-26 16:19:12 -07:00
Jesse Hall
6bb791274b
am 975424a7
: am a8026d21
: Stop using transparent region for computing visible regions
...
* commit '975424a767912a2291113d6ae774873eaf3ebf55':
Stop using transparent region for computing visible regions
2012-09-26 14:49:49 -07:00
Jesse Hall
975424a767
am a8026d21
: Stop using transparent region for computing visible regions
...
* commit 'a8026d21f3f2f09e3416cbd33c277fbd15d8cf4e':
Stop using transparent region for computing visible regions
2012-09-26 14:48:22 -07:00
Jesse Hall
a8026d21f3
Stop using transparent region for computing visible regions
...
The transparent region hint is computed only from view layout
locations, ignoring post-layout translation. If a SurfaceView is layed
out with no other views above it, but a view is moved above it
post-layout, that view's layout bounds would be subtracted from the
window's transparent region instead of its drawing bounds. Prior to
this change, the view would not be visible (except where its layout
bounds and drawing bounds overlap).
With this change, composition uses visible regions computed without
regard to the transparent regions. However, if all of a layer's
visible region is transparent, it will be removed from the list of
layers to composite. This doesn't fix the root problem of incorrect
transparent regions, and doesn't prevent bad composition in all cases.
But it does avoid it for some existing apps, whiel still allowing the
transparent region hint to save power in the important
fullscreen-video-in-a-SurfaceView case.
Bug: 7179570
Change-Id: I47cf939e12129b167afa344b8b036e8827103ac8
2012-09-26 14:41:51 -07:00
The Android Open Source Project
ded29dea7d
am 4152d3f4
: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '4152d3f4c8332bbac3284283656b49661ad21b04':
only abort when errors happen on the main display
2012-09-26 10:07:53 -07:00
The Android Open Source Project
4152d3f4c8
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I2b5dfee2bfbe21b2d7f5a313c5c5e89bcb5379c1
2012-09-26 09:07:02 -07:00
The Android Automerger
08351c8f82
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-26 06:59:39 -07:00
Mathias Agopian
008cc14e90
am abee8d40
: am c4a8daaa
: Merge "add support for EGL_FRAMEBUFFER_TARGET_ANDROID" into jb-mr1-dev
...
* commit 'abee8d40c430eb8137240f2635db32148a05f3fc':
add support for EGL_FRAMEBUFFER_TARGET_ANDROID
2012-09-25 23:00:08 -07:00
Mathias Agopian
abee8d40c4
am c4a8daaa
: Merge "add support for EGL_FRAMEBUFFER_TARGET_ANDROID" into jb-mr1-dev
...
* commit 'c4a8daaa998ea524c9aaa9817021ff7c4467c3dd':
add support for EGL_FRAMEBUFFER_TARGET_ANDROID
2012-09-25 22:58:43 -07:00