Commit Graph

48633 Commits

Author SHA1 Message Date
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
Keun-young Park
d3b2c029eb Merge "[MIPS] Add MIPS architecture support to opengl framework" 2013-03-29 05:26:28 +00:00
Mathias Agopian
b9e78641e6 am 0b003fab: am 8171aece: fix uninitialized attribute in SurfaceFlinger
* commit '0b003fab82d16df9e5569b3d1d3ef1dfda95647c':
  fix uninitialized attribute in SurfaceFlinger
2013-03-28 17:57:27 -07: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
2906075a95 am a6e3962f: am bf667e31: Merge changes I22f1b358,I5496d0de,Ifd98966b into jb-mr2-dev
* commit 'a6e3962f539e287ffe7f03c67654e50214ff1404':
  replace eglWaitSyncANDROID by eglWaitSyncKHR
  update EGL headers to most recent
  cleanup EGL extensions strings and entry-points
2013-03-28 15:55:53 -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
bdf168fef3 am e1254d42: am 94ebadf4: Merge "Remove unused clz.cpp" into jb-mr2-dev
* commit 'e1254d420739b83014ddd27b23f1f633c73ffc16':
  Remove unused clz.cpp
2013-03-28 15:22:47 -07: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
0802137ecc am cbf4cf0e: am f7f29c8f: atrace: add support for app tracing
* commit 'cbf4cf0eb30c666fc2544de44cef8d77a7eef101':
  atrace: add support for app tracing
2013-03-28 14:08:17 -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
ef91e89921 am 13c62dad: am c9a4e2f7: am 4194b389: am 0b6c4157: Merge "frameworks/native/opengl: Fix build with gcc 4.8"
* commit '13c62dad56ca06842fc658343f13eb6080cd231e':
  frameworks/native/opengl: Fix build with gcc 4.8
2013-03-28 13:25:53 -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
4e13d03b25 am 3fbced6a: am 9794f903: Merge "atrace: fix tracing on user builds" into jb-mr2-dev
* commit '3fbced6acea98a87f15896b32e8433442d05de86':
  atrace: fix tracing on user builds
2013-03-28 11:19:42 -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
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
018c4e19b7 am 4fbb8191: am caa81f0e: Merge "make sure to unlock the screenshot\'s buffer on destruction" into jb-mr2-dev
* commit '4fbb8191d8f92230e39f1c4541938d5f18247579':
  make sure to unlock the screenshot's buffer on destruction
2013-03-26 18:34:12 -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
Mathias Agopian
8000d0694b make sure to unlock the screenshot's buffer on destruction
this fixes a memory leak on various devices

Bug: 8475134
Change-Id: I25924674c803a0cb22371a95c60664c36acb0340
2013-03-26 18:15:35 -07:00
Keun-young Park
4e06e0bcb9 am adb6aa13: am 9dd8d897: am 1cd763f1: am cd91024c: Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."
* commit 'adb6aa130aa6e3a343c0fb1a1e1cfdf6f86cca52':
  [MIPS] Avoid unaligned load/store for 64-bit doubles.
2013-03-26 12:17:56 -07:00
The Android Open Source Project
c8d7b21319 am 6a77fb58: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '6a77fb589cedf0d678ef3baa024fb6600c956c4b':
2013-03-26 12:17:45 -07:00
Keun-young Park
adb6aa130a am 9dd8d897: am 1cd763f1: am cd91024c: Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."
* commit '9dd8d897d350897eb04e60987bb59b846ea0f154':
  [MIPS] Avoid unaligned load/store for 64-bit doubles.
2013-03-26 11:46:40 -07:00
Keun-young Park
9dd8d897d3 am 1cd763f1: am cd91024c: Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."
* commit '1cd763f123b9f1a2772ddff15ace81ec07b7660c':
  [MIPS] Avoid unaligned load/store for 64-bit doubles.
2013-03-26 11:45:01 -07:00