OSDN Git Service
Mathias Agopian [Mon, 18 Jun 2012 23:47:56 +0000 (16:47 -0700)]
split-up Client.h out of SurfaceFlinger.h
Change-Id: I1993bf23e417163749d886283563a93d50b361b4
Jeff Brown [Mon, 18 Jun 2012 17:52:34 +0000 (10:52 -0700)]
am
bbdad819: am
7c24b1d4: Merge "SF could get stuck waiting for vsync when turning the screen off" into jb-dev
* commit '
bbdad8193ea3a16e9f65f32f4469959577b400e9':
SF could get stuck waiting for vsync when turning the screen off
Jeff Brown [Mon, 18 Jun 2012 17:32:32 +0000 (10:32 -0700)]
am
7c24b1d4: Merge "SF could get stuck waiting for vsync when turning the screen off" into jb-dev
* commit '
7c24b1d4da5e13329d2105cb2f8285715d920787':
SF could get stuck waiting for vsync when turning the screen off
Mathias Agopian [Fri, 15 Jun 2012 22:34:55 +0000 (15:34 -0700)]
Merge "Implement SurfaceFlinger's ANW on top of BufferQueue"
Jeff Brown [Fri, 15 Jun 2012 22:30:35 +0000 (15:30 -0700)]
Merge "SF could get stuck waiting for vsync when turning the screen off" into jb-dev
Mathias Agopian [Fri, 15 Jun 2012 06:39:35 +0000 (23:39 -0700)]
SF could get stuck waiting for vsync when turning the screen off
When turning the screen off we could have 2 waiters on the
vsync condition: The main vsync waiter as well as one in
onScreenReleased(). We were only signaling the condition though,
so it it would be possible to wake onScreenReleased() without waking
the main vsync thread which would then be stuck in .wait().
We fix this by just using broadcast() when receiving a vsync event.
We also add a broadcast() to signal when the state of
mUseSoftwareVSync changes. This is important particularly for
the transition from hardware to software vsync because the main
vsync waiter might have observed mUseSoftwareVSync == false
and decided to block indefinitely pending a hardware vsync
signal that will never arrive.
Removed a potentially deadlocking wait for a signal in
onScreenReleased(). The function was trying to wait for the last
vsync event from the hardware to be delivered to clients but there
was no guarantee that another thread would signal it to wake up
again afterwards. (As far as I can tell, the only other other
thread that might wake it up at this point would be a client
application issuing a vsync request.) We don't really need to wait
here anyhow. It's enough to set the mUseSoftwareVSync flag,
wake up the thread loop and go. If there was a pending vsync
timestamp from the hardware, then the thread loop will grab
it and use it then start software vsync on the next iteration.
Bug:
6672102
Change-Id: I7c6abc23bb021d1dfc94f101bd3ce18e3a81a73e
Jeff Brown [Fri, 15 Jun 2012 19:00:28 +0000 (12:00 -0700)]
am
0512af11: am
16272efb: Add ASSIST keycode.
* commit '
0512af11f4b790fb032dc7c344dcdac527faf8ad':
Add ASSIST keycode.
Jeff Brown [Fri, 15 Jun 2012 18:57:37 +0000 (11:57 -0700)]
am
16272efb: Add ASSIST keycode.
* commit '
16272efb7af0692266fecdc53b2c6d995bf397b7':
Add ASSIST keycode.
Jeff Brown [Fri, 15 Jun 2012 18:46:11 +0000 (11:46 -0700)]
Add ASSIST keycode.
Bug:
6594275
Change-Id: I032b055207d16bfff93ee8a350c0dc52b9102926
Mathias Agopian [Mon, 14 May 2012 03:42:01 +0000 (20:42 -0700)]
refactor HWComposer to break dependency with the HAL headers
HWComposer must abstract the HWC HAL entirely, so that the
HAL can continue to evolve (and break binary compatibility)
without breaking SurfaceFlinger. The HWC data structure had
leaked outside of HWComposer, this is now fixed.
We now have an abstract interface that provide all the
needed functionality, HWCompose provides concrete
implementations of it based on the the HWC version.
Change-Id: I40c4676dc986b682ede5520a1c60efe64037b0bb
Mathias Agopian [Fri, 8 Jun 2012 00:52:54 +0000 (17:52 -0700)]
Implement SurfaceFlinger's ANW on top of BufferQueue
SF now has its own implementation of ANW for the
framebuffer and it uses BufferQueue. FramebufferNativeWindow
is now only used by stand-alone apps.
Change-Id: Iddeb24087df62bd92b0f78e391dda9b97ddc859c
Mathias Agopian [Wed, 13 Jun 2012 23:27:54 +0000 (16:27 -0700)]
Merge "don't error out when eglTerminate()ing an already terminated display"
Mathias Agopian [Wed, 13 Jun 2012 22:21:21 +0000 (15:21 -0700)]
don't error out when eglTerminate()ing an already terminated display
so says the EGL specification, section 3.2
Change-Id: Ice60530f8f6e47b4e14e06d2ab8eba799a7688a6
Mathias Agopian [Tue, 12 Jun 2012 20:15:10 +0000 (13:15 -0700)]
am
1d2eb663: am
2d15fcab: Merge "reduce PB size from 2MB to 512KB" into jb-dev
* commit '
1d2eb663ef5cf69aa852045c8a1c1807dfa7039e':
reduce PB size from 2MB to 512KB
Mathias Agopian [Tue, 12 Jun 2012 19:42:38 +0000 (12:42 -0700)]
am
2d15fcab: Merge "reduce PB size from 2MB to 512KB" into jb-dev
* commit '
2d15fcab3e3588cfddb6c7b180faecd3eccce2e5':
reduce PB size from 2MB to 512KB
Mathias Agopian [Mon, 11 Jun 2012 21:43:37 +0000 (14:43 -0700)]
Merge "reduce PB size from 2MB to 512KB" into jb-dev
Siva Velusamy [Mon, 11 Jun 2012 19:26:03 +0000 (12:26 -0700)]
Merge "gltrace: Fixup vertex attrib pointers only for GLES2"
Siva Velusamy [Mon, 11 Jun 2012 18:14:23 +0000 (11:14 -0700)]
gltrace: Fixup vertex attrib pointers only for GLES2
Change-Id: Ibf280c2a4372ce6e598e164eef0d72b7c0a6d1c2
The Android Open Source Project [Mon, 11 Jun 2012 16:25:48 +0000 (09:25 -0700)]
The Android Open Source Project [Mon, 11 Jun 2012 16:22:35 +0000 (09:22 -0700)]
Reconcile with jb-release
Change-Id: Iac1c88f2833e67e52af2bc22a17fa93d30cb44cc
The Android Automerger [Mon, 11 Jun 2012 14:02:56 +0000 (07:02 -0700)]
merge in jb-release history after reset to jb-dev
Jeff Brown [Fri, 8 Jun 2012 22:33:30 +0000 (15:33 -0700)]
am
4f0dfaa7: am
9be7caf3: Merge "Include stack traces for certain native processes in bugreport." into jb-dev
* commit '
4f0dfaa7c338870eb58d96fe40234505734db728':
Include stack traces for certain native processes in bugreport.
Jeff Brown [Fri, 8 Jun 2012 22:30:38 +0000 (15:30 -0700)]
am
9be7caf3: Merge "Include stack traces for certain native processes in bugreport." into jb-dev
* commit '
9be7caf380b0e2fb29b8813fb8762c2ae417ce95':
Include stack traces for certain native processes in bugreport.
Jeff Brown [Fri, 8 Jun 2012 21:38:30 +0000 (14:38 -0700)]
Merge "Include stack traces for certain native processes in bugreport." into jb-dev
Dianne Hackborn [Fri, 8 Jun 2012 21:23:45 +0000 (14:23 -0700)]
am
66506eaa: am
49b97e20: I am having second thoughts about 512m for the large heap size.
* commit '
66506eaacb8c419a4e5ce5f8de00a0b8fbe0b156':
I am having second thoughts about 512m for the large heap size.
Dianne Hackborn [Fri, 8 Jun 2012 21:22:06 +0000 (14:22 -0700)]
am
49b97e20: I am having second thoughts about 512m for the large heap size.
* commit '
49b97e20f17af0ba98cdece2b7b93ab0a2199af4':
I am having second thoughts about 512m for the large heap size.
Colin Cross [Fri, 8 Jun 2012 21:14:18 +0000 (14:14 -0700)]
Merge "surfaceflinger: replace early suspend with binder call from PowerManager"
Dianne Hackborn [Fri, 8 Jun 2012 20:02:09 +0000 (13:02 -0700)]
I am having second thoughts about 512m for the large heap size.
Let's go with 384 megs, half way between the large heap size on
Xoom and 512.
Change-Id: I4a7f2e5a8b2920b49fa53777725e24811145f5f2
Jeff Brown [Thu, 7 Jun 2012 23:40:01 +0000 (16:40 -0700)]
Include stack traces for certain native processes in bugreport.
Bug:
6615693
Change-Id: I64c3b3ce0bba62d9c332a795f7d979fb753dc27b
Magnus Strandberg [Fri, 8 Jun 2012 15:32:28 +0000 (08:32 -0700)]
am
1ba24574: Aligning native Parcel implementation to Java.
* commit '
1ba24574b2debd3ca012adbbd77f12bed4f2d266':
Aligning native Parcel implementation to Java.
Magnus Strandberg [Tue, 3 May 2011 13:44:00 +0000 (15:44 +0200)]
Aligning native Parcel implementation to Java.
The Java implementation of writing the RPC response header
calculates the length of the header including the 4 bytes
specifying the header length but the native implementation
excludes the 4 bytes specifying the length from the header
length.
The native implementation has been aligned to the Java impl.
Change-Id: I325bf272a63152d8fded4cf4e51a906b5a9bfe19
The Android Automerger [Fri, 8 Jun 2012 15:20:32 +0000 (08:20 -0700)]
merge in jb-release history after reset to jb-dev
Mathias Agopian [Fri, 8 Jun 2012 00:21:53 +0000 (17:21 -0700)]
am
b2c1cfbe: am
0cd545f1: sometimes we would incorrectly scale the content of a surface
* commit '
b2c1cfbe95bed419487455d1b82956f9c5b2a40c':
sometimes we would incorrectly scale the content of a surface
Mathias Agopian [Fri, 8 Jun 2012 00:16:52 +0000 (17:16 -0700)]
am
0cd545f1: sometimes we would incorrectly scale the content of a surface
* commit '
0cd545f14261d829513e0d6e8fa5e4e4f3372b3d':
sometimes we would incorrectly scale the content of a surface
Mathias Agopian [Thu, 7 Jun 2012 21:18:55 +0000 (14:18 -0700)]
sometimes we would incorrectly scale the content of a surface
this would happen when a resize was pending (ie: we have received
and processed a resize transaction but have not received a buffer
with the right size) and a new transaction came in that didn't
involve a resize, for instance a translate-only transaction.
in this case, we would incorrectly update the drawing state
with the pending size, eventhough we still don't have a buffer
for it.
the solution is quite simple, we never allow the size to propagate
from current to drawing state during the regular transaction processing
(unless we are in fixed-size mode -- meaning we don't need to have
a matching size buffer), this propagation happens later once we
receive the buffer.
Bug:
6624163
Change-Id: I11a97e4b88a7f3a0571ddcfe99c86cb04ce01a4d
Colin Cross [Thu, 7 Jun 2012 20:17:52 +0000 (13:17 -0700)]
surfaceflinger: replace early suspend with binder call from PowerManager
SurfaceFlinger will no longer directly synchronize with early suspend.
Instead, PowerManagerService will synchronize with SurfaceFlinger to
ensure that a black frame has been drawn on the display, and then
trigger all early suspend handlers.
Change-Id: I07acdd628440d23fdb69db94319ec5d65d3f4919
The Android Open Source Project [Thu, 7 Jun 2012 14:55:24 +0000 (07:55 -0700)]
The Android Open Source Project [Thu, 7 Jun 2012 14:51:00 +0000 (07:51 -0700)]
Reconcile with jb-release
Change-Id: I73f561b3fb9c76aa30ff7de8eab378a1ba5963cc
The Android Automerger [Thu, 7 Jun 2012 14:03:01 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Nick Kralevich [Wed, 25 Apr 2012 20:38:45 +0000 (13:38 -0700)]
dumpstate: handle old style "adb bugreport"
When "adb bugreport" was run on previous adb releases, it
called "adb shell dumpstate". In later versions of Android,
this was changed to "adb shell bugreport", which starts
the dumpstate service.
Modify the dumpstate command so that it calls bugreport
when it's not running as root. This allows both
"adb shell dumpstate" and "adb shell bugreport" to have
the exact same output.
Bug:
6391938
Change-Id: Ia32bb9ebc579db3bee7caa0fe66dc3f124d60a12
Jamie Gennis [Wed, 6 Jun 2012 22:51:16 +0000 (15:51 -0700)]
am
ec07c8e9: am
ba43e0a1: Merge "SurfaceFlinger: remove all GLES scissor calls." into jb-dev
* commit '
ec07c8e9576f6f455e281dc0b619100b29133c0e':
SurfaceFlinger: remove all GLES scissor calls.
Jamie Gennis [Wed, 6 Jun 2012 22:47:29 +0000 (15:47 -0700)]
am
ba43e0a1: Merge "SurfaceFlinger: remove all GLES scissor calls." into jb-dev
* commit '
ba43e0a1faee9629ca2d0beb53dd6c44bb9bfd05':
SurfaceFlinger: remove all GLES scissor calls.
Jamie Gennis [Wed, 6 Jun 2012 22:45:10 +0000 (15:45 -0700)]
Merge "SurfaceFlinger: remove all GLES scissor calls." into jb-dev
Dianne Hackborn [Wed, 6 Jun 2012 17:54:28 +0000 (10:54 -0700)]
am
a586c9b1: am
be502a02: Add new Dalvik memory limit definition.
* commit '
a586c9b18ad780e32b3c6f8a99d1e9432cc52639':
Add new Dalvik memory limit definition.
Dianne Hackborn [Wed, 6 Jun 2012 17:51:15 +0000 (10:51 -0700)]
am
be502a02: Add new Dalvik memory limit definition.
* commit '
be502a02c8e0ea232e7339ed60b1754c929ecec1':
Add new Dalvik memory limit definition.
Mathias Agopian [Wed, 6 Jun 2012 04:44:43 +0000 (21:44 -0700)]
reduce PB size from 2MB to 512KB
this allows us to enable h/w acceleration on low-end
devices while keeping memory usage down.
Bug:
6557760
Change-Id: I8af2de3038dc2579360b8b73aa452cb7a0e506a9
Jamie Gennis [Mon, 4 Jun 2012 22:02:33 +0000 (15:02 -0700)]
SurfaceFlinger: remove all GLES scissor calls.
Bug:
6576505
Change-Id: I494b7627f2e271a234706bf49a9490f8ac56c77a
Dianne Hackborn [Wed, 6 Jun 2012 01:21:03 +0000 (18:21 -0700)]
Add new Dalvik memory limit definition.
This is for a 7in hdpi/tvdpi tablet with 1G of RAM.
That sounds kind-of familiar. I don't know. Have I seen
such a thing before? Maybe.
Bug:
6576049
Change-Id: Iabc245692d5106feec9199eb2b5a3d06e27a9b83
Mathias Agopian [Tue, 5 Jun 2012 16:21:56 +0000 (09:21 -0700)]
am
4929e821: am
4824d40a: sometimes SF would not process a surface resize
* commit '
4929e821ffad4e53192ad6d2aa65a6f040c295b8':
sometimes SF would not process a surface resize
The Android Automerger [Tue, 5 Jun 2012 13:59:22 +0000 (06:59 -0700)]
merge in jb-release history after reset to jb-dev
Mathias Agopian [Tue, 5 Jun 2012 01:35:48 +0000 (18:35 -0700)]
am
4824d40a: sometimes SF would not process a surface resize
* commit '
4824d40a35333182c2eb3593511b9bcbecd0a943':
sometimes SF would not process a surface resize
Mathias Agopian [Tue, 5 Jun 2012 01:16:30 +0000 (18:16 -0700)]
sometimes SF would not process a surface resize
this would happen when a window started with size A, was
resized to B and immediately resized to A. In this situation
the erquested and active size would be the same, and SF
would think a transaction wasn't needed.
we fix this by always comparing the requested sizes.
Also, make sure to set mRefreshPending once we're sure
we have succesfully called updateTexImage().
Bug:
6580962
Change-Id: I2c48b4df7f05fd35c9e1d2dd82095b0f3d5a0b6a
The Android Automerger [Sun, 3 Jun 2012 13:03:18 +0000 (06:03 -0700)]
merge in jb-release history after reset to jb-dev
Jeff Brown [Fri, 1 Jun 2012 01:43:27 +0000 (18:43 -0700)]
am
d5085da3: am
4467bba7: Merge "Support looper callbacks based on smart pointers." into jb-dev
* commit '
d5085da3c0c103bba0c2c927382f7d414275b661':
Support looper callbacks based on smart pointers.
Jeff Brown [Fri, 1 Jun 2012 01:43:26 +0000 (18:43 -0700)]
am
80586761: am
dad23789: Merge "Delete unused poll() code." into jb-dev
* commit '
805867612c0c11d3bb494cbf454cbb2de21a1b75':
Delete unused poll() code.
Jeff Brown [Fri, 1 Jun 2012 01:43:26 +0000 (18:43 -0700)]
am
dce1547d: am
9e2e781a: Merge "Remove unused statistics code." into jb-dev
* commit '
dce1547d65877b89cec4e52ee8e5b39830911d00':
Remove unused statistics code.
Jeff Brown [Fri, 1 Jun 2012 01:41:16 +0000 (18:41 -0700)]
am
4467bba7: Merge "Support looper callbacks based on smart pointers." into jb-dev
* commit '
4467bba73a91161da01d5d969cf7ba3e2309d989':
Support looper callbacks based on smart pointers.
Jeff Brown [Fri, 1 Jun 2012 01:41:16 +0000 (18:41 -0700)]
am
dad23789: Merge "Delete unused poll() code." into jb-dev
* commit '
dad2378911a244607afa3899928c429b340031cb':
Delete unused poll() code.
Jeff Brown [Fri, 1 Jun 2012 01:41:14 +0000 (18:41 -0700)]
am
9e2e781a: Merge "Remove unused statistics code." into jb-dev
* commit '
9e2e781acaead54d0fb095d55a1c44b32563248f':
Remove unused statistics code.
Jeff Brown [Fri, 1 Jun 2012 01:39:13 +0000 (18:39 -0700)]
Merge "Support looper callbacks based on smart pointers." into jb-dev
Jeff Brown [Fri, 1 Jun 2012 01:39:06 +0000 (18:39 -0700)]
Merge "Delete unused poll() code." into jb-dev
Jeff Brown [Fri, 1 Jun 2012 01:39:02 +0000 (18:39 -0700)]
Merge "Remove unused statistics code." into jb-dev
Jeff Brown [Thu, 31 May 2012 23:15:35 +0000 (16:15 -0700)]
Support looper callbacks based on smart pointers.
Bug:
6559630
Change-Id: I5a667f219f431838638acefbc9fa6afa610971bd
Eino-Ville Talvala [Thu, 31 May 2012 22:49:43 +0000 (15:49 -0700)]
Add camera as an ATRACE tag
Change-Id: Ib4f22d593836c4b973d122efa114d359f1529914
Jeff Brown [Thu, 31 May 2012 02:21:12 +0000 (19:21 -0700)]
Delete unused poll() code.
We don't need this code anymore and it is just in the way.
Bug:
6559630
Change-Id: I1dc9decf85d5ea1feab159c2985da6c20baffdd5
Jeff Brown [Thu, 31 May 2012 02:17:47 +0000 (19:17 -0700)]
Remove unused statistics code.
Bug:
6559630
Change-Id: Iacdf4bb4c1c125c09305cbd8cb443c7c80cfc010
Jamie Gennis [Wed, 30 May 2012 02:14:36 +0000 (19:14 -0700)]
Add the EGL_ANDROID_fence_sync spec.
Change-Id: I8c26e5caaf8d89a60a09a5308d55e336537b916e
The Android Open Source Project [Wed, 30 May 2012 17:21:50 +0000 (10:21 -0700)]
The Android Open Source Project [Wed, 30 May 2012 17:15:16 +0000 (10:15 -0700)]
Reconcile with jb-release
Change-Id: If0a430615dadb425b82aa27204e6c670f06ee099
The Android Automerger [Wed, 30 May 2012 14:03:19 +0000 (07:03 -0700)]
merge in jb-release history after reset to jb-dev
Mathias Agopian [Wed, 30 May 2012 04:09:04 +0000 (21:09 -0700)]
am
79f2e1af: am
e31564d8: Fix a crasher is surfaceflinger.
* commit '
79f2e1afbc08cd0cbcddc70cde5e3b7f1f0afea4':
Fix a crasher is surfaceflinger.
Mathias Agopian [Wed, 30 May 2012 04:06:55 +0000 (21:06 -0700)]
am
e31564d8: Fix a crasher is surfaceflinger.
* commit '
e31564d8eb0ab67e167a888eccce20f5b4e4ef45':
Fix a crasher is surfaceflinger.
Mathias Agopian [Wed, 30 May 2012 03:41:03 +0000 (20:41 -0700)]
Fix a crasher is surfaceflinger.
this bug introduced recently would happen when the very first
buffer of a surface was rejected for not having the right size
Bug:
6577035
Change-Id: I9fabf20006019f2a6c308be7c7f5c05bdcfd5014
Mathias Agopian [Wed, 30 May 2012 02:53:52 +0000 (19:53 -0700)]
am
584fcb32: am
2c8207e9: add the ability to reject buffers in SurfaceTexture::updateTexImage
* commit '
584fcb3218e07d7b4cc0aeaef41faa4e891b45a4':
add the ability to reject buffers in SurfaceTexture::updateTexImage
Mathias Agopian [Wed, 30 May 2012 02:53:50 +0000 (19:53 -0700)]
am
c7c8334f: am
702634a4: refactoring in preparation for bug:
6498869 fix
* commit '
c7c8334f059e42106c7cfa27cdead277fd5e135d':
refactoring in preparation for bug:
6498869 fix
Mathias Agopian [Wed, 30 May 2012 02:53:49 +0000 (19:53 -0700)]
am
f67148ec: am
05cec9d1: improve resize transactions
* commit '
f67148eccd54a9529e9e65c0f1bc07f1abd01fb6':
improve resize transactions
Mathias Agopian [Wed, 30 May 2012 02:53:47 +0000 (19:53 -0700)]
am
b18d747e: am
419e196e: Improve debug logs and minor clean-up
* commit '
b18d747ef6ddf5d140221e32a287a5238f729612':
Improve debug logs and minor clean-up
Mathias Agopian [Wed, 30 May 2012 02:50:58 +0000 (19:50 -0700)]
am
2c8207e9: add the ability to reject buffers in SurfaceTexture::updateTexImage
* commit '
2c8207e9627fe6c7a90e31fae8d71ae49df56845':
add the ability to reject buffers in SurfaceTexture::updateTexImage
Mathias Agopian [Wed, 30 May 2012 02:50:57 +0000 (19:50 -0700)]
am
702634a4: refactoring in preparation for bug:
6498869 fix
* commit '
702634a4dad85cfc292618ac91eda6c00f42b7c5':
refactoring in preparation for bug:
6498869 fix
Mathias Agopian [Wed, 30 May 2012 02:50:55 +0000 (19:50 -0700)]
am
05cec9d1: improve resize transactions
* commit '
05cec9d1275fd939c2d1aec235dca2bdb8edef63':
improve resize transactions
Mathias Agopian [Wed, 30 May 2012 02:50:54 +0000 (19:50 -0700)]
am
419e196e: Improve debug logs and minor clean-up
* commit '
419e196e639c8adb875da2765abcef95017b6d4a':
Improve debug logs and minor clean-up
The Android Open Source Project [Tue, 29 May 2012 16:44:58 +0000 (09:44 -0700)]
am
65838c52: Reconcile with nakasi-factoryrom-release
* commit '
65838c52fa47cd4b7adf2ca0c27ed26376acc6c5':
The Android Open Source Project [Tue, 29 May 2012 16:41:02 +0000 (09:41 -0700)]
Reconcile with nakasi-factoryrom-release
Change-Id: Ib47a2f4001bbf5ec4a2b889a16e41a1259eb6e1a
The Android Automerger [Thu, 24 May 2012 17:17:56 +0000 (10:17 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Open Source Project [Thu, 24 May 2012 16:04:10 +0000 (09:04 -0700)]
am
227d45ea: Reconcile with jb-release nakasi-factoryrom-release
* commit '
227d45ea2b9ccade09fd620d028e992ff1140b99':
The Android Open Source Project [Thu, 24 May 2012 16:01:16 +0000 (09:01 -0700)]
Reconcile with jb-release nakasi-factoryrom-release
Change-Id: I3bc06420f32fe0ce50b6943fe33eca293f375d05
Mathias Agopian [Thu, 24 May 2012 00:56:42 +0000 (17:56 -0700)]
add the ability to reject buffers in SurfaceTexture::updateTexImage
SurfaceFlinger is using this new feature to reject buffers that
don't have the right size.
Bug:
6498869
Change-Id: I8a7250a47db6c082a357b703feb3b9d0fc8d3443
Mathias Agopian [Thu, 24 May 2012 00:50:31 +0000 (17:50 -0700)]
refactoring in preparation for bug:
6498869 fix
here we just shuffle a bit the code inside lockPageFlip(),
we move the code that handles the buffer size closer to the call
to updateTexImage(). no functionality change.
Change-Id: Ie3193cd86cd32cf3c89532449fd747d145ca0ab6
Mathias Agopian [Wed, 23 May 2012 21:35:49 +0000 (14:35 -0700)]
improve resize transactions
use a flag instead of pre-committing the "requested" state
to prevent propagation or "requested" to "active", which makes
things a lot clearer when reading the code.
also avoid going through the "resized" code-path when requested
size is equal to "active" size.
Bug:
6498869
Change-Id: I24f893ba0ec5ca06aac5b8da9818989ae7ce4005
Mathias Agopian [Wed, 23 May 2012 21:34:07 +0000 (14:34 -0700)]
Improve debug logs and minor clean-up
Bug:
6498869
Change-Id: I14d1b4d6960b87b5a7c4d7e20b92538edd9331ff
The Android Automerger [Wed, 23 May 2012 14:02:43 +0000 (07:02 -0700)]
merge in jb-release history after reset to jb-dev
Jesse Hall [Wed, 23 May 2012 04:29:27 +0000 (21:29 -0700)]
am
138a8d75: am
e1082496: Enable SurfaceTexture fence sync for the emulator
* commit '
138a8d7510e6ba8a402ffacc38c7cc5bfaa5e571':
Enable SurfaceTexture fence sync for the emulator
Jesse Hall [Wed, 23 May 2012 04:27:13 +0000 (21:27 -0700)]
am
e1082496: Enable SurfaceTexture fence sync for the emulator
* commit '
e10824965c64663b8878b808206ee382c7ab6af8':
Enable SurfaceTexture fence sync for the emulator
Todd Poynor [Wed, 23 May 2012 00:54:59 +0000 (17:54 -0700)]
dumpstate: Add kernel wakeup sources info
Change-Id: I0f95afd6815c1403d8400a18ef3cd19d936d4601
Jesse Hall [Mon, 21 May 2012 18:23:28 +0000 (11:23 -0700)]
Enable SurfaceTexture fence sync for the emulator
The host-accelerated GL ES driver doesn't do the implicit
synchronization required when fence sync isn't used.
Bug:
6515813
Change-Id: I6a667f2db6b519f3557b5abda78775f767841dae
Jesse Hall [Tue, 22 May 2012 23:09:27 +0000 (16:09 -0700)]
am
1974391b: am
83e7c8c4: Implement the EGL_KHR_fence_sync in libagl
* commit '
1974391ba8d47a6f9468e2e72bd688dc48d3b827':
Implement the EGL_KHR_fence_sync in libagl
Jesse Hall [Tue, 22 May 2012 23:07:25 +0000 (16:07 -0700)]
am
83e7c8c4: Implement the EGL_KHR_fence_sync in libagl
* commit '
83e7c8c431ec8b578b6f778811837632e3798768':
Implement the EGL_KHR_fence_sync in libagl
The Android Open Source Project [Tue, 22 May 2012 21:21:17 +0000 (14:21 -0700)]
The Android Automerger [Tue, 22 May 2012 20:24:05 +0000 (13:24 -0700)]
merge in nakasi-factoryrom-release history after reset to jb-dev
The Android Open Source Project [Tue, 22 May 2012 20:06:34 +0000 (13:06 -0700)]
Reconcile with jb-release
Change-Id: I37477f9871208d227b42937c5aa7d27129bdecb1