ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
48,548 Commits 2 Branches 0 Tags 54 MiB
2cad801d0d
Commit Graph

48548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jesse Hall
b1196e6356 Remove unused clz.cpp 
Change-Id: Ieed91a45ba0e865a0d47d84effe9439aaab4371f
 2013-03-28 12:27:01 -07:00
Duane Sand
46b4253b76 [MIPS] Add MIPS architecture support to opengl framework 
Change-Id: Id7704d35bed14d96a85dc1f29db0566cd03872b5
 2013-03-28 12:09:36 -07:00
Jamie Gennis
3fbced6ace am 9794f903: Merge "atrace: fix tracing on user builds" into jb-mr2-dev 
* commit '9794f90368550dba8693a30c61c4bea5c4fb2993':
  atrace: fix tracing on user builds
 2013-03-28 11:17:05 -07:00
Jamie Gennis
9794f90368 Merge "atrace: fix tracing on user builds" into jb-mr2-dev 2013-03-28 18:14:14 +00:00
Jamie Gennis
6f6f3f710b atrace: fix tracing on user builds 
Change-Id: Idef15d514f0bd1e117362c6a06a2ea24314feb7f
 2013-03-27 15:50:30 -07:00
Jesse Hall
02d86567d9 Clean up HWC state when releasing a DisplayDevice 
DisplayDevices can be released when DisplayManager removes them from
the display list, or (for virtual displays) when the surface is set to
NULL. We were only cleaning up HWC resources associated with the
display in the first case.

Bug: 8384764
Change-Id: Id3d226dd7178fbe6d0a2ac4e2660b864ee073de3
 2013-03-27 14:58:09 -07:00
Duane Sand
b43722c3dd [MIPS] Add MIPS architecture support to libagl 
Change-Id: I30eb92857a2a6ea867fe0ee45109f17609043aae
 2013-03-27 10:53:14 -07:00
Bernhard Rosenkränzer
0f036d43b0 gl_code.cpp: Remove a DOS style newline 
Change-Id: Id3edd6e511371fa8b0afef2e90baed4662ed76c4
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2013-03-27 14:06:47 +01:00
Bernhard Rosenkränzer
c80fae6e85 frameworks/native/opengl: Fix build with gcc 4.8 
In gcc 4.8, the warning for unused parameters (such as JNIEnv* pointers
in JNI functions that don't need it) is enabled by default - causing
-Werror to break the build.

Change-Id: Ib91721f2cb9912b79c2ac19b4210b1309b08304f
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2013-03-27 14:06:39 +01:00
The Android Automerger
aee1d0a4fb merge in jb-mr2-release history after reset to jb-mr2-dev 2013-03-27 05:56:03 -07:00
Mathias Agopian
4fbb8191d8 am caa81f0e: Merge "make sure to unlock the screenshot\'s buffer on destruction" into jb-mr2-dev 
* commit 'caa81f0ed8a4471c210956d0343458b3bca922de':
  make sure to unlock the screenshot's buffer on destruction
 2013-03-26 18:32:39 -07:00
Mathias Agopian
caa81f0ed8 Merge "make sure to unlock the screenshot's buffer on destruction" into jb-mr2-dev 2013-03-27 01:30:36 +00:00