Mathias Agopian
002e1e58df
libutils clean-up
...
Change-Id: I6ff4cfc736751de2912c697f954e45e275f2d386
2013-05-07 18:28:11 -07:00
Todd Poynor
b4f1a027cb
Merge "String8: ensure static init done prior to empty string reference"
2013-05-07 23:30:22 +00:00
Dianne Hackborn
ffad7d1fdc
Add new Looper API to check whether the looper is idle.
...
This is just to support the watchdog to give it a faster
way to determine if a thread is deadlocked without having
to post a message to it.
Change-Id: I068dc8b9387caf94fe5811fb4aeb0f9b57b1a080
2013-05-07 15:05:34 -07:00
Todd Poynor
1bf3b4a06d
String8: ensure static init done prior to empty string reference
...
Avoid NULL deref on static initialization of empty String8 objects prior
to libutils static init.
Change-Id: I3d420041ba62b97ed8c2dfd2532a2dcd72b84ff1
2013-05-07 12:09:46 -07:00
Marco Nelissen
98b50774ae
am 3755dbec: am 3d3cc6e1: Merge "Report actual disk space used" into jb-mr2-dev
...
* commit '3755dbec6f16330fb57b18c09319d209a3f8474f':
Report actual disk space used
2013-05-06 13:56:06 -07:00
Marco Nelissen
7719b85bf8
Report actual disk space used
...
Report size based on blocks used, not the "nominal" size.
b/8744465
Change-Id: Idbb72f47af6d475b51305a14be291bf01acb14bb
2013-05-01 10:10:59 -07:00
Bjorn Bringert
b1b307ec3f
Merge "Build a static device libutils"
2013-04-29 10:10:41 +00:00
Bjorn Bringert
f19c4ae816
Build a static device libutils
...
This is needed to make tools such as aapt more compatible when
built for the device.
Change-Id: I1261d47b6e24595f1be547b9202892863f66a1de
2013-04-26 15:12:47 +01:00
Jamie Gennis
748b696c05
am 83ad8957: am 5b6ebd71: Merge "libgui_test: fix a couple minor test issues" into jb-mr2-dev
...
* commit '83ad89579e22228c1a48a2a488b86fc0d41057a6':
libgui_test: fix a couple minor test issues
2013-04-25 13:50:38 -07:00
Mathias Agopian
bdcf1fe2ba
Merge changes I0d9f18d1,Ib96c9161
...
* changes:
Add a --color option to dumpsys SurfaceFlinger
clean-up/simplify all dump() APIs
2013-04-24 10:25:34 +00:00
Jamie Gennis
ea2d942dda
libgui_test: fix a couple minor test issues
...
This change fixes how the MultiTextureConsumerTest.EGLImageTargetWorks checks
for pixels. It removes the call to eglSwapBuffers so that the test does not
rely on EGL swap-preserve behavior, and it makes the test use checkPixel()
rather than doing glReadPixels itself.
Bug: 8349336
Change-Id: I0f446a0083eebd07af6fd208762878b4e367725a
2013-04-24 01:08:02 +00:00
Mathias Agopian
6bbd8e30b5
am 3cf76aff: am e692ab9a: fix uninitialized variables in GLConsumer
...
* commit '3cf76affd3ef28759789622e9e0134bdb045418b':
fix uninitialized variables in GLConsumer
2013-04-23 11:16:44 -07:00
Mathias Agopian
74d211ae26
clean-up/simplify all dump() APIs
...
remove the scratch buffer parameter and use
String8::appendFormat() instead.
Change-Id: Ib96c91617c8e7292de87433d15cf6232b7d591b0
2013-04-22 21:51:28 +02:00
Mathias Agopian
e692ab9a6b
fix uninitialized variables in GLConsumer
...
mDefaultWidth, mDefaultHeight and mCurrentScallingMode are now
initialized to the same default value that BufferQueue uses.
Change-Id: I0d4da2022b06419d12745716d8ddbd48c8869953
2013-04-22 11:24:02 +02:00
Igor Murashkin
6ca04ca755
am f3d93d43: am 187edf93: Merge "BufferItemConsumer: add functions to set default buffer format/size" into jb-mr2-dev
...
* commit 'f3d93d436373dcc39ff0b7f4aac938f4619421a2':
BufferItemConsumer: add functions to set default buffer format/size
2013-04-17 12:48:23 -07:00
Igor Murashkin
187edf93c6
Merge "BufferItemConsumer: add functions to set default buffer format/size" into jb-mr2-dev
2013-04-17 19:39:53 +00:00
Mathias Agopian
e7e37a97a1
am cf73e1fd: am f31510a2: Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES
...
* commit 'cf73e1fd8a0a3372ff91e0485b37680262f5df95':
Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES
2013-04-16 23:40:05 -07:00
Mathias Agopian
f31510a2ac
Add a test that checks multi-texturing works with GL_TEXTURE_EXTERNAL_OES
...
Bug: 8395618
Change-Id: I160d29699593b11058533ca753e275d5deeb3b54
2013-04-16 23:32:38 -07:00
Igor Murashkin
87d1e3427b
BufferItemConsumer: add functions to set default buffer format/size
...
Bug: 8629088
Change-Id: I06f2e26a70d6dbcfcd70b08b4461e8e401f6e83f
2013-04-16 11:24:40 -07:00
Andy McFadden
91f056e4a9
am 12ff91b0: am 53dc9044: Merge "Updated comments" into jb-mr2-dev
...
* commit '12ff91b05a055e6adffaad9bf7661a5d251c5b6c':
Updated comments
2013-04-11 10:23:27 -07:00
Andy McFadden
53dc9044bf
Merge "Updated comments" into jb-mr2-dev
2013-04-11 17:15:52 +00:00
Ying Wang
63e13c8545
am 46f19772: resolved conflicts for merge of c76e8a20
to jb-mr2-dev-plus-aosp
...
* commit '46f19772ae5659c1659a0ac8f1f72389e94a85d4':
Add liblog
2013-04-09 22:33:16 -07:00
Ying Wang
c76e8a20e2
Merge "Add liblog" into jb-mr2-dev
2013-04-10 05:17:07 +00:00
Ying Wang
8a0cb4ee0b
Add liblog
...
Bug: 8580410
Change-Id: I2ca4fa00dde0b574df3619134836bcb9315bd506
2013-04-09 21:55:39 -07:00
Jamie Gennis
e3808ed677
am 13c9a949: am 8758a3e3: Merge changes I82e361a6,I83694682 into jb-mr2-dev
...
* commit '13c9a949b5d74f36edbdbfda764fe554cdbaefa9':
libgui_test: increase the tolerance for a YUV test
libgui: fix an EGLImage leak
2013-04-09 14:49:54 -07:00
Jamie Gennis
8758a3e394
Merge changes I82e361a6,I83694682 into jb-mr2-dev
...
* changes:
libgui_test: increase the tolerance for a YUV test
libgui: fix an EGLImage leak
2013-04-09 21:43:20 +00:00
Jamie Gennis
e6a0f5028b
libgui_test: increase the tolerance for a YUV test
...
This change increases the pixel difference tolerance of the
SurfaceTextureGLTest.TexturingFromCpuFilledYV12BufferNpot test from 2 to 3.
Bug: 8349135
Change-Id: I82e361a689335f49065cacd8a3fc145d67b125f1
2013-04-08 14:42:22 -07:00
Jamie Gennis
ad669b04f4
libgui: fix an EGLImage leak
...
This moves the call to ConsumerBase::abandon from the ConsumerBase dtor to
ConsumerBase::onLastStrongRef. The abandon call relies on virtual methods to
perform the clean-up, so calling it from the ConsumerBase dtor after the
derived classes dtors ran was skipping some of the clean-up. The
onLastStrongRef method should get called just before the most derived class's
dtor gets called.
Bug: 8349135
Change-Id: I836946826927cc1ed69c049049f525f92b17a269
2013-04-08 14:42:22 -07:00
Andy McFadden
753e3415cd
Updated comments
...
Updated many comments. Added one minor error check.
Change-Id: Ib935dd99d417bada91d2e198008a50dd94269316
2013-04-05 10:44:23 -07: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
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
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
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
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
2bb716871c
replace eglWaitSyncANDROID by eglWaitSyncKHR
...
Change-Id: I22f1b3588011c88389e249f738f1e6915cc97e72
2013-03-28 14:31:09 -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
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
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
Keun-young Park
cd91024ca1
Merge "[MIPS] Avoid unaligned load/store for 64-bit doubles."
2013-03-26 17:47:19 +00:00
Jesse Hall
1e2c3a9037
am 501553a0: am 13f01cbd: Pass sp<Fence>s around instead of file descriptors
...
* commit '501553a055d4891760aee161a771fa55f0817a57':
Pass sp<Fence>s around instead of file descriptors
2013-03-22 22:38:19 +00:00
Jesse Hall
13f01cbdbd
Pass sp<Fence>s around instead of file descriptors
...
Change-Id: Iac70584a2207940730e8f803a543e4e9a4000c47
2013-03-22 09:56:58 -07:00
Mathias Agopian
2342085d3c
am dbbf209e: am 7133f863: Merge "improved CallStack a bit" into jb-mr2-dev
...
* commit 'dbbf209e66947b7c1f52d90558873ed3ec0591d7':
improved CallStack a bit
2013-03-22 04:34:32 +00:00
Mathias Agopian
7133f8638e
Merge "improved CallStack a bit" into jb-mr2-dev
2013-03-22 04:15:33 +00:00
Mathias Agopian
cab25d680e
improved CallStack a bit
...
- added a ctor that updates and dumps the stack immediately
- added a "logtag" parameter to dump()
Change-Id: Ie51c256071d282591752243bdb4f68cf9ff8829d
2013-03-21 17:12:40 -07:00
Eino-Ville Talvala
905c2d7a2f
am a010749b: am aaebffd5: Merge "CpuConsumer: Properly track acquired buffers" into jb-mr2-dev
...
* commit 'a010749b41d20152389faa5832f1fc34c17cd930':
CpuConsumer: Properly track acquired buffers
2013-03-21 16:41:40 +00:00
Eino-Ville Talvala
aaebffd52f
Merge "CpuConsumer: Properly track acquired buffers" into jb-mr2-dev
2013-03-21 16:39:14 +00:00
Ramanan Rajeswaran
8948a2efc9
am eda14c1b: am ac006439: Merge "Revert "Revert "Change SurfaceControl setPosition to take floats""" into jb-mr2-dev
...
* commit 'eda14c1bef20d853f2e661244ec6a0f38c3192b7':
Revert "Revert "Change SurfaceControl setPosition to take floats""
2013-03-21 15:55:14 +00:00
Ramanan Rajeswaran
ac006439bb
Merge "Revert "Revert "Change SurfaceControl setPosition to take floats""" into jb-mr2-dev
2013-03-21 15:52:49 +00:00