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
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
The Android Automerger
88b0605f2e
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-28 06:59:31 -07:00
Iliyan Malchev
51af710d3b
Revert "Compatibility work around for bad graphics driver dependency."
...
This reverts commit a50b51c03a
Change-Id: Ibdcd776a7f241dbb2475403ea04f939249774c41
2012-09-27 17:58:20 -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
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
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
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
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
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
Mathias Agopian
c4a8daaa99
Merge "add support for EGL_FRAMEBUFFER_TARGET_ANDROID" into jb-mr1-dev
2012-09-25 22:56:30 -07:00
Mathias Agopian
e272b25aa9
only abort when errors happen on the main display
...
Bug: 7232690
Change-Id: I2c4b35a82f131da26deea738ef294e100e536d15
2012-09-25 20:47:29 -07:00
Mathias Agopian
b06fbffbde
am 32341381
: only abort when errors happen on the main display
...
* commit '32341381c9493d7953e40f7f79653cfc52868863':
only abort when errors happen on the main display
2012-09-25 19:22:01 -07:00
Mathias Agopian
32341381c9
only abort when errors happen on the main display
...
Bug: 7232690
Change-Id: I2c4b35a82f131da26deea738ef294e100e536d15
2012-09-25 19:16:28 -07:00
Mathias Agopian
722b98f9df
add support for EGL_FRAMEBUFFER_TARGET_ANDROID
...
we now try first with EGL_FRAMEBUFFER_TARGET_ANDROID, and
pick the first config we find. Otherwise, we revert to
the old algorithm.
Bug: 7232584
Change-Id: I8d5c5a4ce48420832c2e2828718a8f53325effb0
2012-09-25 18:38:09 -07:00
Mathias Agopian
57fcc92e2c
am 7b190511
: fix a crasher when running out of memory
...
* commit '7b1905113712281c777b230648d3fbb69ae4f42c':
fix a crasher when running out of memory
2012-09-25 15:55:24 -07:00
Mathias Agopian
7b19051137
fix a crasher when running out of memory
...
MemoryHeapBase::getBase() returns MAP_FAILED in case or
OOM, not null which is what SF was checking against.
This addresses one of the issues of bug 7230543.
Bug: 7230543
Change-Id: I763a88f64a2f9ff75eb139cfbaf9a1a9746c5577
2012-09-25 15:30:38 -07:00
Mathias Agopian
40e627c5b0
am bb53b0e4
: When "show visible regions" is enabled we were missing a call to HWC
...
* commit 'bb53b0e4b97634bc31808965f81b3ab4193d0e84':
When "show visible regions" is enabled we were missing a call to HWC
2012-09-25 14:42:07 -07:00
Mathias Agopian
bb53b0e4b9
When "show visible regions" is enabled we were missing a call to HWC
...
Bug: 7204034
Change-Id: I64dd78362fa75149513a7d9ff92dde175e9b4958
2012-09-25 14:40:22 -07:00
Andy McFadden
e43bc405b7
am f68c825c
: Merge "Show build config in dumpsys SurfaceFlinger" into jb-mr1-dev
...
* commit 'f68c825c75198e7b3296532db9352631f18983b7':
Show build config in dumpsys SurfaceFlinger
2012-09-25 13:49:47 -07:00
Andy McFadden
f68c825c75
Merge "Show build config in dumpsys SurfaceFlinger" into jb-mr1-dev
2012-09-25 13:48:16 -07:00
Ian Rogers
de64dc2573
am ad901448
: Merge "Configure GC free to be 8MB for devices with >512MB RAM." into jb-mr1-dev
...
* commit 'ad901448d7b92cd0a6493ae9d043110e41522291':
Configure GC free to be 8MB for devices with >512MB RAM.
2012-09-25 12:32:04 -07:00
Ian Rogers
ad901448d7
Merge "Configure GC free to be 8MB for devices with >512MB RAM." into jb-mr1-dev
2012-09-25 11:36:23 -07:00
Andy McFadden
4803b74e2a
Show build config in dumpsys SurfaceFlinger
...
This adds a line to the "dumpsys SurfaceFlinger" output that shows
build-time configuration values.
Example:
Build configuration: [sf HAS_CONTEXT_PRIORITY] [libui] \
[libgui USE_FENCE_SYNC]
Bug 7206633
Change-Id: Ibe1856b459d34a4be6ee83a4ebfd2807e6cc68a0
2012-09-25 11:31:46 -07:00
The Android Automerger
52d3d4de88
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-25 06:59:51 -07:00
Mathias Agopian
2d038bda20
am a046dd97
: fix Layer croping in SurfaceFlinger
...
* commit 'a046dd9772cd8da4ead9edc7a89d9992ff0d38cf':
fix Layer croping in SurfaceFlinger
2012-09-24 22:18:18 -07:00
Mathias Agopian
a046dd9772
fix Layer croping in SurfaceFlinger
...
Bug: 7224628
Change-Id: I9421f0a06b9a27fe00eefaa1dfab8c4309c380c9
2012-09-24 22:15:47 -07:00
Mathias Agopian
2c0a5e68aa
am e96e9e10
: fix a crasher in SurfaceTexture\'s setFilteringEnabled
...
* commit 'e96e9e1093b5700e9f403a6e2479da7dc36d3b71':
fix a crasher in SurfaceTexture's setFilteringEnabled
2012-09-24 20:56:05 -07:00
Mathias Agopian
e96e9e1093
fix a crasher in SurfaceTexture's setFilteringEnabled
...
bug: 7211067
Change-Id: Id8658a8df429d76c20ab9112858b38e52343dc9c
2012-09-24 19:26:11 -07:00
Mathias Agopian
e41c2e1714
am 13de3699
: Merge changes I47cd25c9,I7638ffe8 into jb-mr1-dev
...
* commit '13de3699807f3260cfbabd196a08191d6a80a99a':
don't call eglMakeCurrent() before calling HWC commit() on HWC 1.1
handle EGL errors
2012-09-24 18:33:54 -07:00
Mathias Agopian
13de369980
Merge changes I47cd25c9,I7638ffe8 into jb-mr1-dev
...
* changes:
don't call eglMakeCurrent() before calling HWC commit() on HWC 1.1
handle EGL errors
2012-09-24 18:31:48 -07:00
Jamie Gennis
483ab74243
am 2f45d746
: Merge "EGL: add the EGL_ANDROID_framebuffer_target enum" into jb-mr1-dev
...
* commit '2f45d7464a55d7a91da6fcd6f8cf1b11e395d029':
EGL: add the EGL_ANDROID_framebuffer_target enum
2012-09-24 18:23:05 -07:00
Jamie Gennis
ca5f79c2bb
am 363847d4
: Merge "EGL: expose the EXT_create_context_robustness ext" into jb-mr1-dev
...
* commit '363847d498bffe0e2d8e7b8aba693bb402513413':
EGL: expose the EXT_create_context_robustness ext
2012-09-24 18:23:04 -07:00
Jamie Gennis
2f45d7464a
Merge "EGL: add the EGL_ANDROID_framebuffer_target enum" into jb-mr1-dev
2012-09-24 18:21:14 -07:00
Jamie Gennis
363847d498
Merge "EGL: expose the EXT_create_context_robustness ext" into jb-mr1-dev
2012-09-24 18:20:51 -07:00