OSDN Git Service
luliuhui [Thu, 30 Aug 2012 03:15:36 +0000 (11:15 +0800)]
Gfx-3d: fix GetProcAddress in egl extention
This patch can fix issue when Proc address return NULL.
Glbench10, egl-ext and conformance test need this patch to run pass.
Change-Id: I275c7cb6f77cb334c3ee7fa23cd696bba1c5a458
Author: Liuhui Lu <liuhui.lu@intel.com>
Signed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 52622
Jesse Hall [Mon, 14 Jan 2013 21:53:09 +0000 (13:53 -0800)]
Merge "DisplayDevice: initialize mDisplayToken correctly"
Jesse Hall [Mon, 14 Jan 2013 17:25:21 +0000 (09:25 -0800)]
Merge "Remove support for legacy HWC version encoding"
Jesse Hall [Fri, 11 Jan 2013 00:19:56 +0000 (16:19 -0800)]
Remove support for legacy HWC version encoding
Change-Id: If03ae1ebf10d15777310e1449a57473021390582
Chih-Wei Huang [Mon, 7 Jan 2013 09:33:56 +0000 (17:33 +0800)]
DisplayDevice: initialize mDisplayToken correctly
mDisplayToken should be initialized by displayToken.
Change-Id: I0a5fec1f1732200a32d10b1575239dceffe6dee4
Andrew Hsieh [Mon, 17 Dec 2012 00:03:03 +0000 (16:03 -0800)]
Merge "Fix build"
Andrew Hsieh [Mon, 17 Dec 2012 00:01:36 +0000 (08:01 +0800)]
Fix build
Change-Id: Ie011cbf74a08f760ccd93ca37fa2b437b7063462
Andrew Hsieh [Sun, 16 Dec 2012 04:32:26 +0000 (20:32 -0800)]
Merge "Revert "Fix typo""
Andrew Hsieh [Sun, 16 Dec 2012 04:31:56 +0000 (20:31 -0800)]
Revert "Fix typo"
This reverts commit
c118edfc1ab9a608537ebc2f2ec936216f15a36c
Need to go together with https://android-review.googlesource.com/#/c/48117/
Change-Id: Ib413be1035cfb1d18cc9cf4099694a308dadf8f5
Andrew Hsieh [Sun, 16 Dec 2012 04:30:30 +0000 (20:30 -0800)]
Merge "Fix typo"
Andrew Hsieh [Wed, 12 Dec 2012 03:27:12 +0000 (11:27 +0800)]
Fix typo
Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS
Change-Id: I4e15e946107ea6f3d0955f72e97894512743c6ca
Jesse Hall [Tue, 27 Nov 2012 20:43:10 +0000 (12:43 -0800)]
Merge "Create builtin display tokens on demand"
Jesse Hall [Thu, 8 Nov 2012 23:41:56 +0000 (15:41 -0800)]
Create builtin display tokens on demand
For hotpluggable builtin displays (currently just HDMI), create the
display device IBinder token when the display is connected and destroy
it when the display is disconnected. Previously we created the tokens
at startup and never changed them. This made it so that when comparing
current and drawing state, we couldn't tell whether a display had been
disconnected and reconnected.
Bug:
7491120
Change-Id: I2ac82b864e10cb1cd0a308782d7e0ab9745c5d81
Andy McFadden [Sat, 10 Nov 2012 06:45:13 +0000 (22:45 -0800)]
am
434e21bf: am
3fdeb48e: Reduce emulator logspam
* commit '
434e21bfd6b14f8d99b9bcdb829e7252edd574f3':
Reduce emulator logspam
Andy McFadden [Sat, 10 Nov 2012 06:41:48 +0000 (22:41 -0800)]
am
3fdeb48e: Reduce emulator logspam
* commit '
3fdeb48e3c89be15fe3b539a26ec9a3cf28c898c':
Reduce emulator logspam
Andy McFadden [Mon, 29 Oct 2012 23:49:44 +0000 (16:49 -0700)]
Reduce emulator logspam
The emulator doesn't support systrace, but we should point that out
at most once per process.
Bug
7436352
Change-Id: I06b2c1ea0df6c02c11cd2496423c337f8d7c62a1
Dmitry Shmidt [Thu, 8 Nov 2012 23:43:05 +0000 (15:43 -0800)]
am
4bacaec4: am
0b2c9268: bugreport: Add /proc/interrupts dump
* commit '
4bacaec4cd5844d67bfa4659393cb7e7fe343d1e':
bugreport: Add /proc/interrupts dump
Dmitry Shmidt [Thu, 8 Nov 2012 23:43:04 +0000 (15:43 -0800)]
am
61db92e7: am
c11f56e5: bugreport: Add wlan FW counters dump for bcmdhd
* commit '
61db92e72771a42456a3b703f275c4a4e1f8b552':
bugreport: Add wlan FW counters dump for bcmdhd
Dmitry Shmidt [Wed, 7 Nov 2012 22:37:14 +0000 (14:37 -0800)]
am
0b2c9268: bugreport: Add /proc/interrupts dump
* commit '
0b2c9268265e9a165551eaa66cb461d3fab8b564':
bugreport: Add /proc/interrupts dump
Dmitry Shmidt [Wed, 7 Nov 2012 22:37:11 +0000 (14:37 -0800)]
am
c11f56e5: bugreport: Add wlan FW counters dump for bcmdhd
* commit '
c11f56e5615c5d388c072705322df5bcf22c2012':
bugreport: Add wlan FW counters dump for bcmdhd
Dmitry Shmidt [Wed, 7 Nov 2012 19:09:46 +0000 (11:09 -0800)]
bugreport: Add /proc/interrupts dump
Bug:
7301178
Change-Id: Ifad3b981ac904d4637d69dfc223d5bb2c9d80bda
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Dmitry Shmidt [Wed, 7 Nov 2012 18:42:05 +0000 (10:42 -0800)]
bugreport: Add wlan FW counters dump for bcmdhd
Bug:
7494877
Change-Id: I4d24dbcf7596777ec02ab1312c2ab996ba7688f1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Andrew Hsieh [Wed, 7 Nov 2012 04:43:06 +0000 (20:43 -0800)]
am
5e530e02: am
a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
* commit '
5e530e02bc3073a2e2469df3c333ae14f1b37433':
Fix return type of glGetAttribLocation and glGetUniformLocation
Andrew Hsieh [Wed, 7 Nov 2012 04:41:34 +0000 (20:41 -0800)]
am
a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
* commit '
a151a19db2fa07295837027fb5d84c02401cc78d':
Fix return type of glGetAttribLocation and glGetUniformLocation
Andrew Hsieh [Wed, 7 Nov 2012 04:16:14 +0000 (20:16 -0800)]
Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
Andrew Hsieh [Tue, 6 Nov 2012 21:42:48 +0000 (13:42 -0800)]
Fix return type of glGetAttribLocation and glGetUniformLocation
from int to GLint.
See:
http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetAttribLocation.xml
http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetUniformLocation.xml
Change-Id: I4a9f8e9e34b8c3cca239ae84bfe8f3cdfd94802a
The Android Open Source Project [Tue, 6 Nov 2012 20:37:30 +0000 (12:37 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ic4f86f5a85ccb35cb054ba6294756456cde4b493
The Android Open Source Project [Tue, 6 Nov 2012 20:24:34 +0000 (12:24 -0800)]
am
20152ac7: am
d8e8e662: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
20152ac797ab3a26561eb23ce672137c9e24ac8c':
The Android Open Source Project [Tue, 6 Nov 2012 20:20:29 +0000 (12:20 -0800)]
am
d8e8e662: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '
d8e8e66220cd71486a3b545096a1cdc298dee5fd':
partially implement external display clipping
Always set vertex alpha when drawing screenshot layers
SurfaceFlinger: add animation transactions
ugly, temporary, workaroung for a problem where a binder thread spins forever
make sure we don't call into the HWC HAL when not needed
Fix crashes after HDMI disconnect
Fix issue #
7271589: Cannot set Ocean HD live wallpaper
Revert "Compatibility work around for bad graphics driver dependency."
only abort when errors happen on the main display
Check that HWC exists before trying to use it
Always reset layer acquireFenceFd after commit
fix a problem where all hwc layers would have the SKIP flags set
we were sometimes not setting fences properly
A vendor ril depends on a native screen shot code.
Revert "Added display initialization method"
fix various issues in SF's EventThread
Revert "SurfaceTexture: inherit from ConsumerBase"
we were mistakenly optimizing out SF's main transactions in some cases
Revert "Minimal changes to support multi-display HWC"
The Android Open Source Project [Tue, 6 Nov 2012 20:17:20 +0000 (12:17 -0800)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I219247f1b0f5d87b4144dc1535039e93fc636a94
The Android Automerger [Tue, 6 Nov 2012 10:25:46 +0000 (02:25 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
The Android Automerger [Tue, 6 Nov 2012 02:38:55 +0000 (18:38 -0800)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Tue, 6 Nov 2012 02:17:18 +0000 (18:17 -0800)]
am
e70fbe8b: am
02b95105: fix transitions from hwc to GLES composition
* commit '
e70fbe8b32687d9178e828d6023de599be5431c3':
fix transitions from hwc to GLES composition
Mathias Agopian [Tue, 6 Nov 2012 02:15:56 +0000 (18:15 -0800)]
am
02b95105: fix transitions from hwc to GLES composition
* commit '
02b95105754b1859a97e234b79f41489a4677c20':
fix transitions from hwc to GLES composition
Mathias Agopian [Tue, 6 Nov 2012 01:50:57 +0000 (17:50 -0800)]
fix transitions from hwc to GLES composition
If we switched from HWC to GLES but the dirty region was empty
(could happen if the dirty region is outside of the screen for instance), we
need to force a full screen composition.
In this change we ignore the dirty region for the purpose of
rejecting the whole update and we rely on the fact that it will later
be expanded to the whole screen. This was the least risky fix.
Bug:
7467760,
7452931
Change-Id: I2132f2f963b00a3ce7150adadb107b0367b3862e
The Android Open Source Project [Wed, 31 Oct 2012 16:16:58 +0000 (09:16 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I4f96bf28f6585ad8331daeab60e6d23e92cf0c5d
The Android Automerger [Tue, 30 Oct 2012 15:52:44 +0000 (08:52 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Colin Cross [Tue, 30 Oct 2012 00:10:16 +0000 (17:10 -0700)]
am
742801c6: am
2281af96: dumpstate: add kernel memory fragmentation unusable index
* commit '
742801c625ecb09fbe14e717fa5d580b3957ed4a':
dumpstate: add kernel memory fragmentation unusable index
Colin Cross [Tue, 30 Oct 2012 00:08:14 +0000 (17:08 -0700)]
am
2281af96: dumpstate: add kernel memory fragmentation unusable index
* commit '
2281af967dd840aade7bc55b19ea7df0e6da36f2':
dumpstate: add kernel memory fragmentation unusable index
Colin Cross [Mon, 29 Oct 2012 05:41:06 +0000 (22:41 -0700)]
dumpstate: add kernel memory fragmentation unusable index
Dump /d/extfrag/unusable_index in bugreports. It shows the
percentage of memory in each zone that is not available for
allocations for each order.
Change-Id: I2af6680cb609887ea7b3d6107d1aa88bd0206b52
Mathias Agopian [Wed, 24 Oct 2012 23:29:17 +0000 (16:29 -0700)]
partially implement external display clipping
we perform external display clipping only on the GL
side (ie: not done on the h/w composer side, which is
harder and would be too risky). in practice this means
that WFD will be clipped properly, while HDMI *may* or
may not depending on how hwc is used.
Bug:
7149437
Change-Id: I92d4d04220db72b6ffb134c7fa7a93af569723a5
Jason Simmons [Fri, 26 Oct 2012 01:06:06 +0000 (18:06 -0700)]
am
78b4977e: Merge "Ensure that Vector::erase() returns a valid iterator" into jb-mr1-aah-dev
* commit '
78b4977efd365d2ad7c9227c3a89e65ab60c3260':
Ensure that Vector::erase() returns a valid iterator
Jason Simmons [Fri, 26 Oct 2012 01:03:50 +0000 (18:03 -0700)]
Merge "Ensure that Vector::erase() returns a valid iterator" into jb-mr1-aah-dev
Mathias Agopian [Fri, 26 Oct 2012 00:29:41 +0000 (17:29 -0700)]
am
f45c5100: partially implement external display clipping
* commit '
f45c510009edab4a3e93f8d66b2e30aa26759fed':
partially implement external display clipping
Jason Simmons [Thu, 25 Oct 2012 22:58:43 +0000 (15:58 -0700)]
Ensure that Vector::erase() returns a valid iterator
Vector::erase may reallocate the Vector's storage while removing an element.
However, erase() calls begin() before calling removeItemsAt(), thus caching
a pointer the the Vector's old storage. If the storage is reallocated,
the iterator returned by erase() will be based on the old storage pointer
and will thus be invalid.
Change-Id: I2450c55fd418e6b1c558a4ca7c024573abbaa098
The Android Automerger [Thu, 25 Oct 2012 20:42:23 +0000 (13:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Wed, 24 Oct 2012 23:29:17 +0000 (16:29 -0700)]
partially implement external display clipping
we perform external display clipping only on the GL
side (ie: not done on the h/w composer side, which is
harder and would be too risky). in practice this means
that WFD will be clipped properly, while HDMI *may* or
may not depending on how hwc is used.
Bug:
7149437
Change-Id: I92d4d04220db72b6ffb134c7fa7a93af569723a5
Dave Burke [Thu, 25 Oct 2012 18:45:41 +0000 (11:45 -0700)]
am
04075569: Revert "Revert "put back the unused virtuals in Vector<>""
* commit '
04075569b565c949a6db8b4e8a9f10d281de4d9c':
Revert "Revert "put back the unused virtuals in Vector<>""
Dave Burke [Thu, 25 Oct 2012 00:30:31 +0000 (17:30 -0700)]
Revert "Revert "put back the unused virtuals in Vector<>""
This reverts commit
225c66a48cdc3acef21ee380dc134449749d3cb3
Change-Id: If31a04b81052cbc7dd7bf237c07107c33066d03d
The Android Automerger [Mon, 22 Oct 2012 23:42:08 +0000 (16:42 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Mon, 22 Oct 2012 22:35:51 +0000 (15:35 -0700)]
am
d17e3b5f: prevent a client from crashing surfaceflinger
* commit '
d17e3b5f6cf71eb52bc81f37719254ce08244b34':
prevent a client from crashing surfaceflinger
Mathias Agopian [Mon, 22 Oct 2012 21:27:45 +0000 (14:27 -0700)]
prevent a client from crashing surfaceflinger
a misbehaving or malicious client could cause SF to crash
by providing a "fake" IInterface. we now check the
IInterface we get is our own and local.
Bug:
7278879
Change-Id: Ia19d05902d4b2385c5a16416148378d4998833fd
Jamie Gennis [Mon, 22 Oct 2012 20:54:50 +0000 (13:54 -0700)]
am
ba7dc2db: Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev
* commit '
ba7dc2db6e93a2407c8c328f2838591b7b760658':
SurfaceFlinger: add support for secure displays
Jamie Gennis [Mon, 22 Oct 2012 20:50:18 +0000 (13:50 -0700)]
Merge "SurfaceFlinger: add support for secure displays" into jb-mr1-dev
Jamie Gennis [Sat, 20 Oct 2012 01:19:11 +0000 (18:19 -0700)]
SurfaceFlinger: add support for secure displays
This change adds support for displays that are not allowed to display surfaces
with the eSecure flag set. All non-virtual displays are considered secure,
while virtual displays have their secure-ness specified at creation time.
Bug:
7368436
Change-Id: I81ad535d2d1e5a7ff78269017e85b111f0098500
Jesse Hall [Mon, 15 Oct 2012 19:38:33 +0000 (12:38 -0700)]
Always set vertex alpha when drawing screenshot layers
The screenshot is a GL_RGB texture, and the GL_REPLACE texture env
mode uses vertex alpha for GL_RGB textures instead of alpha=1.0.
Bug:
7340077
Change-Id: I6fbb907023e48f9c422b15a33da79757d6726840
The Android Automerger [Sun, 21 Oct 2012 06:14:12 +0000 (23:14 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Andy McFadden [Fri, 19 Oct 2012 23:14:34 +0000 (16:14 -0700)]
am
620685c2: Fix emulator vsync
* commit '
620685c2e684082c82657732d1e35cefd0c79006':
Fix emulator vsync
Andy McFadden [Fri, 19 Oct 2012 19:53:46 +0000 (12:53 -0700)]
Fix emulator vsync
The code that reserves display IDs was only run when a hardware
composer was present. The eventControl() function, which handles
enabling of vsync, was ignoring the request because the primary
display didn't appear in its set of allocated IDs. This moves
reservation of IDs for built-in displays outside the HWC-only block.
Also, added a couple of warnings in eventControl().
Bug
7376568
Change-Id: I185ccdf817a25499b5c2668f8f6d594afb8c1568
The Android Automerger [Fri, 19 Oct 2012 13:59:39 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Romain Guy [Fri, 19 Oct 2012 00:37:54 +0000 (17:37 -0700)]
am
60393d45: Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev
* commit '
60393d45207b6548e1f61ca104fa59aecee87d30':
Add runtime debugging capabilities to OpenGL
Romain Guy [Fri, 19 Oct 2012 00:33:36 +0000 (17:33 -0700)]
Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev
Romain Guy [Thu, 18 Oct 2012 23:16:10 +0000 (16:16 -0700)]
Add runtime debugging capabilities to OpenGL
The shell property debug.egl.trace can now be set to:
0
disables tracing
1
logs all GL calls
error
checks glGetError after every GL call, logs a stack trace on error
systrace
logs each GL call to systrace
Change-Id: I34a2a2d4e19c373fd9eaa1b0cd93e67c87378996
The Android Automerger [Thu, 18 Oct 2012 13:59:41 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jamie Gennis [Wed, 17 Oct 2012 23:57:01 +0000 (16:57 -0700)]
am
7c41bf70: SurfaceFlinger: change the animation timeout
* commit '
7c41bf7092b75dba6029cd3bbc842d3a2661b0aa':
SurfaceFlinger: change the animation timeout
The Android Automerger [Wed, 17 Oct 2012 23:07:12 +0000 (16:07 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jamie Gennis [Wed, 17 Oct 2012 16:29:47 +0000 (09:29 -0700)]
SurfaceFlinger: change the animation timeout
This change changes the animation transaction timeout from 500us to 5s.
Bug:
7362633
Change-Id: I9bed8e74f726dae2daa398afc29babcea00d5b04
Jamie Gennis [Wed, 17 Oct 2012 16:37:40 +0000 (09:37 -0700)]
am
7f79a2bd: Merge "BufferQueue: alloc without holding the lock" into jb-mr1-dev
* commit '
7f79a2bd5c92bc626890dc16ffb8cd2de934e5fb':
BufferQueue: alloc without holding the lock
Jamie Gennis [Wed, 17 Oct 2012 16:32:42 +0000 (09:32 -0700)]
Merge "BufferQueue: alloc without holding the lock" into jb-mr1-dev
The Android Automerger [Wed, 17 Oct 2012 00:30:45 +0000 (17:30 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Kenny Root [Tue, 16 Oct 2012 23:29:17 +0000 (16:29 -0700)]
am
125becee: am
7abbbc68: Merge "Add TEMP_FAILURE_RETRY to ZipUtils"
* commit '
125beceefd44f6abd17ff336bb989e1850965bd8':
Add TEMP_FAILURE_RETRY to ZipUtils
Kenny Root [Tue, 16 Oct 2012 23:26:42 +0000 (16:26 -0700)]
am
7abbbc68: Merge "Add TEMP_FAILURE_RETRY to ZipUtils"
* commit '
7abbbc680d03dd8e50a709f89b78ace6b81154b0':
Add TEMP_FAILURE_RETRY to ZipUtils
Kenny Root [Tue, 16 Oct 2012 22:57:11 +0000 (15:57 -0700)]
Merge "Add TEMP_FAILURE_RETRY to ZipUtils"
Kenny Root [Tue, 16 Oct 2012 18:34:02 +0000 (11:34 -0700)]
Add TEMP_FAILURE_RETRY to ZipUtils
Change-Id: I275c415f14eeffaf9a58d45f3ea014d766441ec3
Jamie Gennis [Tue, 16 Oct 2012 01:24:43 +0000 (18:24 -0700)]
SurfaceFlinger: add animation transactions
This change adds a transaction flag for WindowManager to indicate that a
transaction is being used to animate windows around the screen. SurfaceFlinger
will not allow more than one of these transactions to be outstanding at a time
to prevent the animation "frames" from being dropped.
Bug:
7353840
Change-Id: I6488a6e0e1ed13d27356d2203c9dc766dc6b1759
Romain Guy [Tue, 16 Oct 2012 16:47:38 +0000 (09:47 -0700)]
am
825a9a2d: Merge "Update comments to reflect what the code actually does" into jb-mr1-dev
* commit '
825a9a2dcd1b3e139dd0677ff46f966fb23f963c':
Update comments to reflect what the code actually does
Romain Guy [Tue, 16 Oct 2012 16:45:01 +0000 (09:45 -0700)]
Merge "Update comments to reflect what the code actually does" into jb-mr1-dev
The Android Automerger [Tue, 16 Oct 2012 13:59:29 +0000 (06:59 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Mathias Agopian [Tue, 16 Oct 2012 03:38:09 +0000 (20:38 -0700)]
am
db9b41fd: fix a corruption in blank/unblank
* commit '
db9b41fd157279d1b988a854e0d7c5b43c2fac38':
fix a corruption in blank/unblank
Mathias Agopian [Mon, 15 Oct 2012 23:51:41 +0000 (16:51 -0700)]
fix a corruption in blank/unblank
we were holding a reference (ie: pointer) to a sp<DisplayDevice>
while processing the message. Meanwhile the object itself could
go away and we would end up accessing a dead object.
the root cause of the problem is that we are accessing mDisplays[]
in a few places outside of the main thread.
Bug:
7352770
Change-Id: I89e35dd85fb30e9a6383eca9a0bbc7028363876c
Jamie Gennis [Tue, 16 Oct 2012 03:19:36 +0000 (20:19 -0700)]
am
3365c567: Merge "SurfaceFlinger: add animation transactions" into jb-mr1-dev
* commit '
3365c56716432d3bfdf41bb82fb08df821f41d0c':
SurfaceFlinger: add animation transactions
Romain Guy [Tue, 16 Oct 2012 03:19:18 +0000 (20:19 -0700)]
am
b96fe085: Merge "Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps" into jb-mr1-dev
* commit '
b96fe08540dcf7e90be56919ea9863f687da779c':
Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps
Jamie Gennis [Tue, 16 Oct 2012 02:36:11 +0000 (19:36 -0700)]
Merge "SurfaceFlinger: add animation transactions" into jb-mr1-dev
Romain Guy [Tue, 16 Oct 2012 02:25:18 +0000 (19:25 -0700)]
Update comments to reflect what the code actually does
Change-Id: I2613aa32c29eddc52a00090656c1bd11f9f5732b
Jamie Gennis [Tue, 16 Oct 2012 01:24:43 +0000 (18:24 -0700)]
SurfaceFlinger: add animation transactions
This change adds a transaction flag for WindowManager to indicate that a
transaction is being used to animate windows around the screen. SurfaceFlinger
will not allow more than one of these transactions to be outstanding at a time
to prevent the animation "frames" from being dropped.
Bug:
7353840
Change-Id: I6488a6e0e1ed13d27356d2203c9dc766dc6b1759
Romain Guy [Tue, 16 Oct 2012 01:43:19 +0000 (18:43 -0700)]
Merge "Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps" into jb-mr1-dev
Romain Guy [Tue, 16 Oct 2012 01:13:05 +0000 (18:13 -0700)]
Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps
Change-Id: I53ac91a9ce07b5dd5f2ee0e3cc5b65b6402f9229
Jesse Hall [Mon, 15 Oct 2012 21:59:16 +0000 (14:59 -0700)]
am
837d2f9e: Always set vertex alpha when drawing screenshot layers
* commit '
837d2f9e83e7d8625ef482d9c9d9afa852c8dbaa':
Always set vertex alpha when drawing screenshot layers
Jesse Hall [Mon, 15 Oct 2012 19:38:33 +0000 (12:38 -0700)]
Always set vertex alpha when drawing screenshot layers
The screenshot is a GL_RGB texture, and the GL_REPLACE texture env
mode uses vertex alpha for GL_RGB textures instead of alpha=1.0.
Bug:
7340077
Change-Id: I6fbb907023e48f9c422b15a33da79757d6726840
The Android Automerger [Mon, 15 Oct 2012 19:30:57 +0000 (12:30 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Open Source Project [Mon, 15 Oct 2012 14:38:56 +0000 (07:38 -0700)]
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I50d7a0cbc6632c78a725810d960e049c310b3597
The Android Automerger [Sat, 13 Oct 2012 10:50:10 +0000 (03:50 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Kenny Root [Sat, 13 Oct 2012 06:43:29 +0000 (23:43 -0700)]
am
9bdaa60b: Merge "Add TEMP_FAILURE_RETRY around open and write calls" into jb-mr1-dev
* commit '
9bdaa60b809b223d14619d1f13afdd38acb1738d':
Add TEMP_FAILURE_RETRY around open and write calls
Kenny Root [Sat, 13 Oct 2012 06:39:47 +0000 (23:39 -0700)]
Merge "Add TEMP_FAILURE_RETRY around open and write calls" into jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 23:34:34 +0000 (16:34 -0700)]
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
The Android Automerger [Fri, 12 Oct 2012 23:32:47 +0000 (16:32 -0700)]
merge in jb-mr1-release history after reset to jb-mr1-dev
Jamie Gennis [Fri, 12 Oct 2012 21:37:22 +0000 (14:37 -0700)]
am
dd57d551: Merge "SurfaceFlinger: make the num FBs a board config" into jb-mr1-dev
* commit '
dd57d551944c01394bc2807d962be4953c58c7c1':
SurfaceFlinger: make the num FBs a board config
Jamie Gennis [Fri, 12 Oct 2012 21:33:51 +0000 (14:33 -0700)]
Merge "SurfaceFlinger: make the num FBs a board config" into jb-mr1-dev
Jamie Gennis [Fri, 12 Oct 2012 21:18:10 +0000 (14:18 -0700)]
SurfaceFlinger: make the num FBs a board config
Bug:
7283132
Change-Id: I38116f39fc18212f2daab94bbfc3daaf89439fc4
Kenny Root [Fri, 12 Oct 2012 06:42:05 +0000 (23:42 -0700)]
Add TEMP_FAILURE_RETRY around open and write calls
Bug:
7330849
Change-Id: I9aef3c3d3a248c3eea7ca060124ad6decaa6b4da