Jeff Tinker
c809d2c721
am 18bd1d6d
: Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
...
* commit '18bd1d6d55a275d23188251169dfe3cc74882665':
Implement async event callout from drm plugin to Java app
2013-04-04 18:19:32 -07:00
Jeff Tinker
18bd1d6d55
Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
2013-04-05 01:16:21 +00:00
Jesse Hall
8123a2270d
am 6d5b8e60
: Merge "Clean up HWC state when releasing a DisplayDevice" into jb-mr2-dev
...
* commit '6d5b8e600e77164d3b5e51b89bf9c940fd7b4ea2':
Clean up HWC state when releasing a DisplayDevice
2013-04-04 15:40:02 -07:00
Jesse Hall
6d5b8e600e
Merge "Clean up HWC state when releasing a DisplayDevice" into jb-mr2-dev
2013-04-04 22:36:10 +00:00
Mathias Agopian
a22f783b14
am 2ca79399
: latch transparent region hint only when we get a new frame
...
* commit '2ca79399b933935eb1b6c0ec1f746f8c4475369c':
latch transparent region hint only when we get a new frame
2013-04-03 17:33:16 -07:00
The Android Open Source Project
5adde8dbb8
Reconcile with jb-mr2-release - do not merge
...
Change-Id: Ib4728c3dd9e0c91c67a086ca229831495d5fef4c
2013-04-03 16:43:28 -07:00
Jeff Tinker
7eafcae5ff
Implement async event callout from drm plugin to Java app
...
Change-Id: I83a7757a7b83676ce1a9ffa6ff0a8e495e31b859
2013-04-03 12:02:59 -07:00
The Android Automerger
72ebaf115a
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-03 06:02:33 -07:00
Mathias Agopian
2ca79399b9
latch transparent region hint only when we get a new frame
...
since the transparent region hint really depends on the
content of the window containing the SurfaceView
(it's calculated by the view hierarchy based on
overlapping views), it makes sense to latch it only when
the content of the window (the app) changes.
This should help fixing drawing artifacts when changing the
layout of a window containing a SurfaceView.
Bug: 8511430
Change-Id: Ic3aa668495293cb4d82a2cd7dcf3b6a337287678
2013-04-02 18:30:32 -07:00
Mathias Agopian
b7648000c3
am 128fcea1
: Merge "Fix include paths" into jb-mr2-dev
...
* commit '128fcea1c6f8b5f66a5d88a80789e65aac798416':
Fix include paths
2013-04-02 16:40:45 -07:00
Jeff Tinker
f71fb8ddcf
am 263e8cb2
: Merge "MediaDrm API update" into jb-mr2-dev
...
* commit '263e8cb29ce9b3c02dd417b9ee57d6d64d895e7f':
MediaDrm API update
2013-04-02 16:40:44 -07:00
Mathias Agopian
128fcea1c6
Merge "Fix include paths" into jb-mr2-dev
2013-04-02 23:20:15 +00:00
Jeff Tinker
263e8cb29c
Merge "MediaDrm API update" into jb-mr2-dev
2013-04-02 22:49:23 +00:00
The Android Automerger
061e945f52
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-02 09:18:52 -07:00
The Android Open Source Project
d92f942712
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I84ec0a95b1f215197352bf76b467325d5687ff62
2013-04-02 08:39:36 -07:00
Jamie Gennis
6f28cebf7a
am 83a3ad4d
: Merge "EGL_ANDROID_presentation_time: initial spec draft" into jb-mr2-dev
...
* commit '83a3ad4d579b514dfeff43008254d05922e5e324':
EGL_ANDROID_presentation_time: initial spec draft
2013-04-02 08:24:08 -07:00
Jeff Tinker
bcbd78bd24
MediaDrm API update
...
Clarify offline usage of sessions and keys and implement
implement CryptoSession to support additional crypto use
cases.
Change-Id: I418ffbb37e3036a2b5eea5a86ac88a5af1a9da07
2013-04-01 22:01:10 -07:00
Mathias Agopian
33ceeb3258
Fix include paths
...
Change-Id: If5350a3de995cc0cb1afea067e7ce168bc00d3f5
2013-04-01 16:54:58 -07:00
Jamie Gennis
83a3ad4d57
Merge "EGL_ANDROID_presentation_time: initial spec draft" into jb-mr2-dev
2013-04-01 23:27:38 +00:00
Jamie Gennis
6730acb681
EGL_ANDROID_presentation_time: initial spec draft
...
Change-Id: I1cd174a08c499e5bde19e7ecd449da8266e7e66e
2013-04-01 15:29:06 -07:00
The Android Automerger
cbf37675d7
merge in jb-mr2-release history after reset to jb-mr2-dev
2013-04-01 05:55:50 -07:00
Jesse Hall
1d923a0853
am 441f6946
: Fix MIPS assembly variable names to not conflict with GL API parameter names
...
* commit '441f69463ec595ad42fdaad1bbfbb0f7a932437c':
Fix MIPS assembly variable names to not conflict with GL API parameter names
2013-03-30 23:30:24 -07:00
Jesse Hall
441f69463e
Fix MIPS assembly variable names to not conflict with GL API parameter names
...
Change-Id: I8e93fb55018de53a596cb176d48dbfdf1fd396e4
2013-03-30 23:22:19 -07:00
Mathias Agopian
46c21a6d89
am 86e392e9
: Merge "don\'t use compile-time configuration of libgui as much as possible" into jb-mr2-dev
...
* commit '86e392e9b3b92e3a58d2fb65eef1552108941a76':
don't use compile-time configuration of libgui as much as possible
2013-03-29 16:34:23 -07:00
Mathias Agopian
86e392e9b3
Merge "don't use compile-time configuration of libgui as much as possible" into jb-mr2-dev
2013-03-29 23:31:23 +00:00
Mathias Agopian
ca08833d5e
don't use compile-time configuration of libgui as much as possible
...
We now detect at runtime which sync features to use, which
allows us to remove a lot of the compile-time configuration
options. There is still one option though, to disable
KHR_fence_sync on some devices (which are more efficient
without it).
- added a backdoor to get the vendor's EGL strings
the new logic is:
- use always ANDROID_native_fence_sync if available
- fallback to KHR_fence_sync if available and not disabled
by the compile-time option
- use KHR_wait_sync if available and either of the above is
enabled
Change-Id: I9c4b49d9ff1151faf902cc93bd53ea5f205aaabf
2013-03-29 15:33:47 -07:00
The Android Open Source Project
4f649fbafa
Reconcile with jb-mr2-release - do not merge
...
Change-Id: I90d8d0cd290854e97f9919ef58bda3ca9ac3fd07
2013-03-29 09:49:05 -07:00
Keun-young Park
85b8fb58e7
am 7fd5ef3e
: am e3a396b2
: am 906bd042
: Merge "[MIPS] Add MIPS architecture support to libagl"
...
* commit '7fd5ef3ecad09e71756720bc0666cd4552508d9c':
[MIPS] Add MIPS architecture support to libagl
2013-03-29 00:16:25 -07:00
Keun-young Park
7fd5ef3eca
am e3a396b2
: am 906bd042
: Merge "[MIPS] Add MIPS architecture support to libagl"
...
* commit 'e3a396b25d53cc9ae61e3a2f0daeaa68ac1ba5a1':
[MIPS] Add MIPS architecture support to libagl
2013-03-29 00:14:16 -07:00
Keun-young Park
e3a396b25d
am 906bd042
: Merge "[MIPS] Add MIPS architecture support to libagl"
...
* commit '906bd0422a99b37663a1cb130bf061fdbb3ea189':
[MIPS] Add MIPS architecture support to libagl
2013-03-29 00:12:14 -07:00
Keun-young Park
906bd0422a
Merge "[MIPS] Add MIPS architecture support to libagl"
2013-03-29 06:15:58 +00:00
Keun-young Park
bbf282a738
am ea116f1a
: am 111d920b
: am d3b2c029
: Merge "[MIPS] Add MIPS architecture support to opengl framework"
...
* commit 'ea116f1acb911963751d72515714803aeae95d59':
[MIPS] Add MIPS architecture support to opengl framework
2013-03-28 23:11:59 -07:00
Keun-young Park
ea116f1acb
am 111d920b
: am d3b2c029
: Merge "[MIPS] Add MIPS architecture support to opengl framework"
...
* commit '111d920bb588669006bdd8699e786d6305f14c36':
[MIPS] Add MIPS architecture support to opengl framework
2013-03-28 23:09:44 -07:00
Keun-young Park
111d920bb5
am d3b2c029
: Merge "[MIPS] Add MIPS architecture support to opengl framework"
...
* commit 'd3b2c029eba356e7bed3754d60ade556c216348e':
[MIPS] Add MIPS architecture support to opengl framework
2013-03-28 23:08:17 -07:00
Keun-young Park
d3b2c029eb
Merge "[MIPS] Add MIPS architecture support to opengl framework"
2013-03-29 05:26:28 +00:00
Mathias Agopian
0b003fab82
am 8171aece
: fix uninitialized attribute in SurfaceFlinger
...
* commit '8171aece3d89a2107eda02c0e9daf79518b40174':
fix uninitialized attribute in SurfaceFlinger
2013-03-28 17:55:24 -07:00
Mathias Agopian
8171aece3d
fix uninitialized attribute in SurfaceFlinger
...
Change-Id: I8277f67e297a8b6a99195387060d03154a2cd929
2013-03-28 17:52:36 -07:00
Mathias Agopian
a6e3962f53
am bf667e31
: Merge changes I22f1b358,I5496d0de,Ifd98966b into jb-mr2-dev
...
* commit 'bf667e31558d14d75076e45da665288d6fa2ed3c':
replace eglWaitSyncANDROID by eglWaitSyncKHR
update EGL headers to most recent
cleanup EGL extensions strings and entry-points
2013-03-28 15:53:16 -07:00
Mathias Agopian
bf667e3155
Merge changes I22f1b358,I5496d0de,Ifd98966b into jb-mr2-dev
...
* changes:
replace eglWaitSyncANDROID by eglWaitSyncKHR
update EGL headers to most recent
cleanup EGL extensions strings and entry-points
2013-03-28 22:51:06 +00:00
Jesse Hall
e1254d4207
am 94ebadf4
: Merge "Remove unused clz.cpp" into jb-mr2-dev
...
* commit '94ebadf433ae9d0e7c1c18bc85e15579d3a9818c':
Remove unused clz.cpp
2013-03-28 15:18:59 -07:00
Jesse Hall
94ebadf433
Merge "Remove unused clz.cpp" into jb-mr2-dev
2013-03-28 22:16:50 +00:00
Mathias Agopian
2bb716871c
replace eglWaitSyncANDROID by eglWaitSyncKHR
...
Change-Id: I22f1b3588011c88389e249f738f1e6915cc97e72
2013-03-28 14:31:09 -07:00
Mathias Agopian
12af3f6665
update EGL headers to most recent
...
- add ANDROID extensions missing from official headers:
EGL_ANDROID_wait_sync
EGL_ANDROID_presentation_time
Change-Id: I5496d0de123a6279234098c19f9a12220adec876
2013-03-28 14:17:54 -07:00
Mathias Agopian
e9b3dfb7d5
cleanup EGL extensions strings and entry-points
...
- move all the code related to EGL extensions in one place
- add missing extension strings:
EGL_KHR_lock_surface
EGL_KHR_reusable_sync
- add public extensions strings and entry-points
EGL_ANDROID_wait_sync
EGL_ANDROID_presentation_time
- add missing entry-points for EGL_KHR_reusable_sync
Change-Id: Ifd98966b549e8efd8ef5385eba0efde8c4cbc77b
2013-03-28 14:17:54 -07:00
Jamie Gennis
cbf4cf0eb3
am f7f29c8f
: atrace: add support for app tracing
...
* commit 'f7f29c8f9d56dc908e501ae789e418a9974b6bce':
atrace: add support for app tracing
2013-03-28 14:06:12 -07:00
Jamie Gennis
f7f29c8f9d
atrace: add support for app tracing
...
This change adds support for the -a command line argument to atrace. This
argument sets the comma separated list of application names (i.e.
/proc/self/cmdline values) for which to enable application-level tracing.
Change-Id: I812d57c4cdc581943247229413f09b7e1adc10d0
2013-03-28 13:53:45 -07:00
Jesse Hall
13c62dad56
am c9a4e2f7
: am 4194b389
: am 0b6c4157
: Merge "frameworks/native/opengl: Fix build with gcc 4.8"
...
* commit 'c9a4e2f7dc6cc0843d1b029a9860f4786bb6dbd8':
frameworks/native/opengl: Fix build with gcc 4.8
2013-03-28 13:23:40 -07:00
Jesse Hall
c9a4e2f7dc
am 4194b389
: am 0b6c4157
: Merge "frameworks/native/opengl: Fix build with gcc 4.8"
...
* commit '4194b3898df867a5c4377de49ddc72ad3e51122b':
frameworks/native/opengl: Fix build with gcc 4.8
2013-03-28 13:22:34 -07:00
Jesse Hall
4194b3898d
am 0b6c4157
: Merge "frameworks/native/opengl: Fix build with gcc 4.8"
...
* commit '0b6c41571b636cc9b47005fa971db19430cedc09':
frameworks/native/opengl: Fix build with gcc 4.8
2013-03-28 13:21:05 -07:00
Jesse Hall
0b6c41571b
Merge "frameworks/native/opengl: Fix build with gcc 4.8"
2013-03-28 19:28:36 +00:00