Mathias Agopian
eb26471c24
am dff2f699
: am 39c24a20
: fix local include paths
...
* commit 'dff2f699e16635c44472b0e4f2a3176e4f061367':
fix local include paths
2013-04-04 23:35:37 -07:00
Mathias Agopian
dff2f699e1
am 39c24a20
: fix local include paths
...
* commit '39c24a20bbc697630d2b92c251b70c04d6f9d00c':
fix local include paths
2013-04-04 23:34:04 -07:00
Mathias Agopian
39c24a20bb
fix local include paths
...
Change-Id: Icb921fa796ec08612dbb2feb7e7161bcb0cf4a99
2013-04-04 23:30:18 -07:00
Jeff Tinker
0434eead53
am c809d2c7
: am 18bd1d6d
: Merge "Implement async event callout from drm plugin to Java app" into jb-mr2-dev
...
* commit 'c809d2c7219958bcb38b34060498f94d7812eb36':
Implement async event callout from drm plugin to Java app
2013-04-04 18:22:51 -07:00
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
4bcef4fdbe
am 8123a227
: am 6d5b8e60
: Merge "Clean up HWC state when releasing a DisplayDevice" into jb-mr2-dev
...
* commit '8123a2270d5893f9357ec18f9af4f3258406e468':
Clean up HWC state when releasing a DisplayDevice
2013-04-04 15:43:23 -07: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
d2006981e4
am a22f783b
: am 2ca79399
: latch transparent region hint only when we get a new frame
...
* commit 'a22f783b141a9da1950f8426bbf87535495856eb':
latch transparent region hint only when we get a new frame
2013-04-03 18:05:45 -07:00
The Android Open Source Project
29e4e06dbc
am 5adde8db
: Reconcile with jb-mr2-release - do not merge
...
* commit '5adde8dbb826f0e15db4c9a64768a693245a7ee5':
2013-04-03 18:05:28 -07: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
d93dd2e920
am b7648000
: am 128fcea1
: Merge "Fix include paths" into jb-mr2-dev
...
* commit 'b7648000c387437f8e86188688f578f280540c8a':
Fix include paths
2013-04-02 16:45:16 -07:00
Jeff Tinker
ae7aa5e067
am f71fb8dd
: am 263e8cb2
: Merge "MediaDrm API update" into jb-mr2-dev
...
* commit 'f71fb8ddcfb0cf132ac42a0e30cbdb7931ede19b':
MediaDrm API update
2013-04-02 16:45:15 -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 Open Source Project
6b8aa63507
am d92f9427
: Reconcile with jb-mr2-release - do not merge
...
* commit 'd92f942712dad500296525e9124b94554ed5f6ff':
2013-04-02 11:04:14 -07:00
Jamie Gennis
98aa64ffb7
am 6f28cebf
: am 83a3ad4d
: Merge "EGL_ANDROID_presentation_time: initial spec draft" into jb-mr2-dev
...
* commit '6f28cebf7afac1a16d1427989a7a31c0868e1348':
EGL_ANDROID_presentation_time: initial spec draft
2013-04-02 11:03:50 -07: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
3fb4552efe
am 1d923a08
: am 441f6946
: Fix MIPS assembly variable names to not conflict with GL API parameter names
...
* commit '1d923a085379a757dcf470f151b605e82f608130':
Fix MIPS assembly variable names to not conflict with GL API parameter names
2013-03-30 23:32:30 -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
b1ca30a609
am 46c21a6d
: am 86e392e9
: Merge "don\'t use compile-time configuration of libgui as much as possible" into jb-mr2-dev
...
* commit '46c21a6d89286abe9fae6f39db9da138dcfee0a8':
don't use compile-time configuration of libgui as much as possible
2013-03-29 16:39:45 -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
9d6eaef46f
am 4f649fba
: (-s ours) Reconcile with jb-mr2-release - do not merge
...
* commit '4f649fbafaa98fdbd26340d5e50c8a5429cf4a8a':
2013-03-29 09:54:38 -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
b75009e49f
am 85b8fb58
: am 7fd5ef3e
: am e3a396b2
: am 906bd042
: Merge "[MIPS] Add MIPS architecture support to libagl"
...
* commit '85b8fb58e7363f4dde31ab7fd12d3df51910785b':
[MIPS] Add MIPS architecture support to libagl
2013-03-29 00:18:56 -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
bb877049a4
am bbf282a7
: am ea116f1a
: am 111d920b
: am d3b2c029
: Merge "[MIPS] Add MIPS architecture support to opengl framework"
...
* commit 'bbf282a738d2fd940554a8a4d0979079126973fc':
[MIPS] Add MIPS architecture support to opengl framework
2013-03-28 23:14:01 -07: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