3ff48e5e69
EGL: add the EGL_ANDROID_framebuffer_target enum
...
Change-Id: Id8b1b114e2a7a88956b857c63a0429e9b33fdb5c
2012-09-24 13:45:33 -07:00
09b11432b6
EGL: expose the EXT_create_context_robustness ext
...
Change-Id: I1db43e96aa5e9e91a6176a4a3e5aa9d1f3ee4a7e
2012-09-24 13:45:32 -07:00
ded296a111
am 2cee285a: am ff5c4aa6: Merge "ConsumerBase: make fence names meaningful" into jb-mr1-dev
...
* commit '2cee285a97900cccd0992a274228ca806ba70884':
ConsumerBase: make fence names meaningful
2012-09-24 13:39:54 -07:00
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
ff5c4aa676
Merge "ConsumerBase: make fence names meaningful" into jb-mr1-dev
2012-09-24 13:36:56 -07:00
7aff4a5de4
ConsumerBase: make fence names meaningful
...
Change-Id: I3580120cb63c027c327e80ec70e68650b75395de
2012-09-24 12:25:53 -07:00
b285c18e8f
am 1dde9c32: (-s ours) Reconcile with jb-mr1-release - do not merge
...
* commit '1dde9c32f2ee61fc4043bebaae14a906ed4d26f7':
2012-09-24 10:15:00 -07:00
1dde9c32f2
Reconcile with jb-mr1-release - do not merge
...
Change-Id: Id330f9144f47c1a9e314ac85b7b867cbfc7c27e8
2012-09-24 10:12:21 -07:00
d84bbc094e
am 4214402a: am 33baee5d: Merge "Add android.hardware.camera.any feature to camera permissions." into jb-mr1-dev
...
* commit '4214402aa22cfa9aa672045abab6b0a62a636722':
Add android.hardware.camera.any feature to camera permissions.
2012-09-24 09:33:52 -07:00
4f3ad78093
am 511572b4: am 9e2463e7: add/remove displays properly on hotplug events
...
* commit '511572b465d981bbfe74969f879ee0ce042fa4bb':
add/remove displays properly on hotplug events
2012-09-24 09:33:51 -07:00
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
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
7420665587
am 69954332: am ff28e201: Display events now always carry the display id they happened on
...
* commit '699543321402bcf908b41913aabceb72cd0bb618':
Display events now always carry the display id they happened on
2012-09-24 00:49:28 -07:00
1d4bfef7cc
am 98cffd5c: am b4d18ed3: fix an issue where hotplug events were not dispatched
...
* commit '98cffd5cf9a248927ef8abfeb2bbd786b3f71fa4':
fix an issue where hotplug events were not dispatched
2012-09-24 00:49:27 -07:00
cb8156e003
am f83c2720: am 16cfa2e3: Merge "SurfaceTexture: fix an out of bounds array write" into jb-mr1-dev
...
* commit 'f83c2720c1aab9c361e8240575386081d5f496af':
SurfaceTexture: fix an out of bounds array write
2012-09-24 00:49:26 -07:00
6a2f058458
am 849df8cd: am e0606e29: Merge "Add a spec for EGL_ANDROID_framebuffer_target." into jb-mr1-dev
...
* commit '849df8cd6baa26ef431404d1b1eea1e141eb5030':
Add a spec for EGL_ANDROID_framebuffer_target.
2012-09-24 00:48:43 -07:00
7fd6694905
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-23 18:59:59 -07:00
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
33baee5d88
Merge "Add android.hardware.camera.any feature to camera permissions." into jb-mr1-dev
2012-09-23 10:20:54 -07:00
e95822715e
Add android.hardware.camera.any feature to camera permissions.
...
Bug: 6847310
Change-Id: I9283932a7c211cd08b3b9fe6a93d8f219e6c9767
2012-09-23 09:53:51 -07:00
0615c8aba8
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-22 09:41:58 -07:00
9e2463e717
add/remove displays properly on hotplug events
...
Bug: 7191563
Change-Id: I8f0fbf3b29658c9479443141798e6f288a1f2d52
2012-09-21 18:26:16 -07:00
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
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
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
ff28e201ec
Display events now always carry the display id they happened on
...
Change-Id: I12de1d883c23927722bc3a71b782f0079de4e831
2012-09-21 14:20:35 -07:00
b4d18ed34e
fix an issue where hotplug events were not dispatched
...
Change-Id: I527eec77f338cd6f1a9021aa4c9d384dbddd6d2a
2012-09-21 14:20:35 -07:00
16cfa2e38b
Merge "SurfaceTexture: fix an out of bounds array write" into jb-mr1-dev
2012-09-21 13:43:24 -07:00
849df8cd6b
am e0606e29: Merge "Add a spec for EGL_ANDROID_framebuffer_target." into jb-mr1-dev
...
* commit 'e0606e29875a55dedc1a4f0a738d5eb40fe1eb41':
Add a spec for EGL_ANDROID_framebuffer_target.
2012-09-21 12:17:46 -07:00
e0606e2987
Merge "Add a spec for EGL_ANDROID_framebuffer_target." into jb-mr1-dev
2012-09-21 12:16:38 -07:00
d1b330de41
SurfaceTexture: fix an out of bounds array write
...
This change fixes an issue causing the mEglContext member of a SurfaceTexture
to get incorrectly zeroed out. This would happen when a call to
ConsumerBase::releaseBufferLocked resulted in the current buffer being freed.
Freeing the current buffer would set SurfaceTexture::mCurrentTexture to -1,
which would then be used by SurfaceTexture::releaseBufferLocked to reset the
current slot's EGLSyncKHR to EGL_NO_SYNC_KHR (= 0). This would overwrite the
mEglContext field, resulting in context mismatch errors in
SurfaceTexture::doGLFenceWaitLocked.
The fix is to simply use the buffer slot that's passed in to
SurfaceTexture::releaseBufferLocked rather than mCurrentTexture.
Change-Id: I0e5e2bd88fcbb354c35a3744f317716fff3e0e41
2012-09-21 12:15:22 -07:00
aaf421c465
Add a spec for EGL_ANDROID_framebuffer_target.
...
This change adds a new extension for EGL implementations to indicate the
EGLConfigs that support use as a HWComposer framebuffer target layer.
Change-Id: Ia7c8fbe8da09d57b4ec8bf1d9ddb67ca21aa2885
2012-09-21 12:15:22 -07:00
ae18e61481
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-09-21 06:59:47 -07:00
a685c8f632
am 7afa3dce: am 4c0751a1: return an error, as expected, when querying a disconnected display
...
* commit '7afa3dce092741b63932b901e93216f29e4fa634':
return an error, as expected, when querying a disconnected display
2012-09-20 21:43:16 -07:00
7afa3dce09
am 4c0751a1: return an error, as expected, when querying a disconnected display
...
* commit '4c0751a1f6e4ee941791012b31f9dbc65601e1d6':
return an error, as expected, when querying a disconnected display
2012-09-20 21:33:56 -07:00
4c0751a1f6
return an error, as expected, when querying a disconnected display
...
Change-Id: I405a3a7bb42b9bbd2ec7bfe09e60e1b7acf7389d
2012-09-20 21:28:12 -07:00
ca1137bca1
am 245cfe06: am 38e623bc: fix a typo preventing pre hwc-1.1 devices from booting
...
* commit '245cfe066fd9f3ba4cfc4a89c257930483e8d557':
fix a typo preventing pre hwc-1.1 devices from booting
2012-09-20 20:31:17 -07:00
a27df48e22
am 5c1180df: am f5a33928: we now correctly set-up connected screens during boot
...
* commit '5c1180dfe8feb7c673b57cab72f920a0bb1e0bdf':
we now correctly set-up connected screens during boot
2012-09-20 20:31:16 -07:00
7d6f20ef2a
am 8e52ccbe: am 148994e5: We now report hotplug events to the framework
...
* commit '8e52ccbe3738839440ff68dd6d5a911234fdece1':
We now report hotplug events to the framework
2012-09-20 20:31:15 -07:00
ad47bbcecd
am f2fe3932: am 1604f777: one more step toward HDMI support
...
* commit 'f2fe3932323988167c2695b204167a688b4f85a6':
one more step toward HDMI support
2012-09-20 20:31:14 -07:00
a173bb035a
am 29c286ee: am eba8c688: calculate wether we filter on a per-display basis
...
* commit '29c286ee9e300400cdf814f9088a8b3c88bd11da':
calculate wether we filter on a per-display basis
2012-09-20 20:31:13 -07:00
15c67a5fca
am 488978de: am f33e4b6f: GraphicBufferAlloc class was declared twice
...
* commit '488978deda3490056d1d9f6bbeb2c838114c329b':
GraphicBufferAlloc class was declared twice
2012-09-20 20:31:13 -07:00
245cfe066f
am 38e623bc: fix a typo preventing pre hwc-1.1 devices from booting
...
* commit '38e623bc5c2d7224ebd5b82efaea401bc8e5367a':
fix a typo preventing pre hwc-1.1 devices from booting
2012-09-20 20:24:15 -07:00
5c1180dfe8
am f5a33928: we now correctly set-up connected screens during boot
...
* commit 'f5a33928349bebc8eebc9f466618997e98c24e68':
we now correctly set-up connected screens during boot
2012-09-20 20:22:58 -07:00
8e52ccbe37
am 148994e5: We now report hotplug events to the framework
...
* commit '148994e5f33ce240ff24ceb5bc0500b7f2001959':
We now report hotplug events to the framework
2012-09-20 20:22:57 -07:00
f2fe393232
am 1604f777: one more step toward HDMI support
...
* commit '1604f777d11c40daae8ec91d8ea75625996bfbac':
one more step toward HDMI support
2012-09-20 20:22:56 -07:00
29c286ee9e
am eba8c688: calculate wether we filter on a per-display basis
...
* commit 'eba8c688f633f3f3f1b75c2bc64faf799dd2b5f2':
calculate wether we filter on a per-display basis
2012-09-20 20:22:55 -07:00
488978deda
am f33e4b6f: GraphicBufferAlloc class was declared twice
...
* commit 'f33e4b6f13bc3ee2d2a4e1abd1ada171c70d3492':
GraphicBufferAlloc class was declared twice
2012-09-20 20:22:54 -07:00
38e623bc5c
fix a typo preventing pre hwc-1.1 devices from booting
...
Change-Id: Icf01254689633d04967872749ac947a671e47ed8
2012-09-20 19:27:07 -07:00
f5a3392834
we now correctly set-up connected screens during boot
...
Change-Id: Ie8b1a3b97ad1821cc970e43abe96c8cec7135b66
2012-09-20 17:13:58 -07:00
Jamie Gennis