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
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
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
Mathias Agopian
2a23184e41
don't call eglMakeCurrent() before calling HWC commit() on HWC 1.1
...
this call is not needed and misleading on HWC 1.1; it can also have
a negative performance impact when multiple displays are used.
Bug: 7124069
Change-Id: I47cd25c9d6e69abcc9333b9ecd5044e8fb1919ec
2012-09-24 18:12:35 -07:00
Mathias Agopian
0d45d71197
am 500407a2
: log an error when eglCreateContext() fails in an inconsistant way
...
* commit '500407a2c07ced40c36e7356574a47bcec9c2fd9':
log an error when eglCreateContext() fails in an inconsistant way
2012-09-24 18:09:21 -07:00
Mathias Agopian
52e21483fa
handle EGL errors
...
for now we just restart the runtime.
bug: 7225248
Change-Id: I7638ffe82075a4db9e7e6f9e35cf48afcb5a387a
2012-09-24 18:07:21 -07:00
Mathias Agopian
500407a2c0
log an error when eglCreateContext() fails in an inconsistant way
...
this will help debugging bug: 7216919
Change-Id: I54ac65f20c5ed55cc93a5cbc5350fadfb0fcb804
2012-09-24 17:57:48 -07:00
Mathias Agopian
81b316aa53
am 98838aa0
: am 77af25b6
: Merge "Return back-end result from eglDestroyImageKHR"
...
* commit '98838aa0836518b7397cbfe763f34305e3387a5f':
Return back-end result from eglDestroyImageKHR
2012-09-24 15:43:54 -07:00
Mathias Agopian
98838aa083
am 77af25b6
: Merge "Return back-end result from eglDestroyImageKHR"
...
* commit '77af25b6dd41e76052b5b0ec6aaeebca896a4dbe':
Return back-end result from eglDestroyImageKHR
2012-09-24 15:42:06 -07:00
Mathias Agopian
77af25b6dd
Merge "Return back-end result from eglDestroyImageKHR"
2012-09-24 14:56:03 -07:00
Jamie Gennis
3ff48e5e69
EGL: add the EGL_ANDROID_framebuffer_target enum
...
Change-Id: Id8b1b114e2a7a88956b857c63a0429e9b33fdb5c
2012-09-24 13:45:33 -07:00
Jamie Gennis
09b11432b6
EGL: expose the EXT_create_context_robustness ext
...
Change-Id: I1db43e96aa5e9e91a6176a4a3e5aa9d1f3ee4a7e
2012-09-24 13:45:32 -07:00
Jamie Gennis
2cee285a97
am ff5c4aa6
: Merge "ConsumerBase: make fence names meaningful" into jb-mr1-dev
...
* commit 'ff5c4aa676d157f4911ef06e328e687725e8b9f9':
ConsumerBase: make fence names meaningful
2012-09-24 13:38:46 -07:00
Jamie Gennis
ff5c4aa676
Merge "ConsumerBase: make fence names meaningful" into jb-mr1-dev
2012-09-24 13:36:56 -07:00
Jamie Gennis
7aff4a5de4
ConsumerBase: make fence names meaningful
...
Change-Id: I3580120cb63c027c327e80ec70e68650b75395de
2012-09-24 12:25:53 -07:00
The Android Open Source Project
1dde9c32f2
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Id330f9144f47c1a9e314ac85b7b867cbfc7c27e8
2012-09-24 10:12:21 -07:00
Eino-Ville Talvala
4214402aa2
am 33baee5d
: Merge "Add android.hardware.camera.any feature to camera permissions." into jb-mr1-dev
...
* commit '33baee5d88974a3b668f9d7f0716eed815966773':
Add android.hardware.camera.any feature to camera permissions.
2012-09-24 09:26:03 -07:00
Mathias Agopian
511572b465
am 9e2463e7
: add/remove displays properly on hotplug events
...
* commit '9e2463e71796964cfaa06bf09a880875ac3537bc':
add/remove displays properly on hotplug events
2012-09-24 09:26:02 -07:00
The Android Automerger
7fd6694905
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-23 18:59:59 -07:00
Ian Rogers
720501c8ef
Configure GC free to be 8MB for devices with >512MB RAM.
...
b/6606849
Change-Id: Idad46032b4b5d309db0319caeb7a1dfc0550f9f7
2012-09-23 16:41:57 -07:00
Eino-Ville Talvala
33baee5d88
Merge "Add android.hardware.camera.any feature to camera permissions." into jb-mr1-dev
2012-09-23 10:20:54 -07:00
Eino-Ville Talvala
e95822715e
Add android.hardware.camera.any feature to camera permissions.
...
Bug: 6847310
Change-Id: I9283932a7c211cd08b3b9fe6a93d8f219e6c9767
2012-09-23 09:53:51 -07:00
The Android Automerger
0615c8aba8
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-22 09:41:58 -07:00
Mathias Agopian
9e2463e717
add/remove displays properly on hotplug events
...
Bug: 7191563
Change-Id: I8f0fbf3b29658c9479443141798e6f288a1f2d52
2012-09-21 18:26:16 -07:00
Mathias Agopian
6995433214
am ff28e201
: Display events now always carry the display id they happened on
...
* commit 'ff28e201ec0c6d620eaaa29814ab52958487dc31':
Display events now always carry the display id they happened on
2012-09-21 14:55:43 -07:00
Mathias Agopian
98cffd5cf9
am b4d18ed3
: fix an issue where hotplug events were not dispatched
...
* commit 'b4d18ed34e3513f3a14ea0876c7e330bee72a529':
fix an issue where hotplug events were not dispatched
2012-09-21 14:55:42 -07:00
Jamie Gennis
f83c2720c1
am 16cfa2e3
: Merge "SurfaceTexture: fix an out of bounds array write" into jb-mr1-dev
...
* commit '16cfa2e38bfbdafdba21af7f9f1c4d1418cbe1d3':
SurfaceTexture: fix an out of bounds array write
2012-09-21 14:55:41 -07:00
Mathias Agopian
ff28e201ec
Display events now always carry the display id they happened on
...
Change-Id: I12de1d883c23927722bc3a71b782f0079de4e831
2012-09-21 14:20:35 -07:00
Mathias Agopian
b4d18ed34e
fix an issue where hotplug events were not dispatched
...
Change-Id: I527eec77f338cd6f1a9021aa4c9d384dbddd6d2a
2012-09-21 14:20:35 -07:00