Jamie Gennis
ba43e0a1fa
Merge "SurfaceFlinger: remove all GLES scissor calls." into jb-dev
2012-06-06 15:45:10 -07:00
Dianne Hackborn
acb320b864
am a586c9b1
: am be502a02
: Add new Dalvik memory limit definition.
...
* commit 'a586c9b18ad780e32b3c6f8a99d1e9432cc52639':
Add new Dalvik memory limit definition.
2012-06-06 10:54:28 -07:00
Dianne Hackborn
a586c9b18a
am be502a02
: Add new Dalvik memory limit definition.
...
* commit 'be502a02c8e0ea232e7339ed60b1754c929ecec1':
Add new Dalvik memory limit definition.
2012-06-06 10:51:15 -07:00
Mathias Agopian
d75f84d641
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
2012-06-05 21:44:43 -07:00
Jamie Gennis
a4c5b19dd7
SurfaceFlinger: remove all GLES scissor calls.
...
Bug: 6576505
Change-Id: I494b7627f2e271a234706bf49a9490f8ac56c77a
2012-06-05 19:14:44 -07:00
Dianne Hackborn
be502a02c8
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
2012-06-05 18:23:11 -07:00
Mathias Agopian
da9f3a5c97
am 4929e821
: am 4824d40a
: sometimes SF would not process a surface resize
...
* commit '4929e821ffad4e53192ad6d2aa65a6f040c295b8':
sometimes SF would not process a surface resize
2012-06-05 09:21:56 -07:00
The Android Automerger
76b77c9312
merge in jb-release history after reset to jb-dev
2012-06-05 06:59:22 -07:00
Mathias Agopian
4929e821ff
am 4824d40a
: sometimes SF would not process a surface resize
...
* commit '4824d40a35333182c2eb3593511b9bcbecd0a943':
sometimes SF would not process a surface resize
2012-06-04 18:35:48 -07:00
Mathias Agopian
4824d40a35
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
2012-06-04 18:16:30 -07:00
The Android Automerger
89237345c9
merge in jb-release history after reset to jb-dev
2012-06-03 06:03:18 -07:00
Jeff Brown
9a6b4c73fa
am d5085da3
: am 4467bba7
: Merge "Support looper callbacks based on smart pointers." into jb-dev
...
* commit 'd5085da3c0c103bba0c2c927382f7d414275b661':
Support looper callbacks based on smart pointers.
2012-05-31 18:43:27 -07:00
Jeff Brown
ad7b3760ce
am 80586761
: am dad23789
: Merge "Delete unused poll() code." into jb-dev
...
* commit '805867612c0c11d3bb494cbf454cbb2de21a1b75':
Delete unused poll() code.
2012-05-31 18:43:26 -07:00
Jeff Brown
27d928474d
am dce1547d
: am 9e2e781a
: Merge "Remove unused statistics code." into jb-dev
...
* commit 'dce1547d65877b89cec4e52ee8e5b39830911d00':
Remove unused statistics code.
2012-05-31 18:43:26 -07:00
Jeff Brown
d5085da3c0
am 4467bba7
: Merge "Support looper callbacks based on smart pointers." into jb-dev
...
* commit '4467bba73a91161da01d5d969cf7ba3e2309d989':
Support looper callbacks based on smart pointers.
2012-05-31 18:41:16 -07:00
Jeff Brown
805867612c
am dad23789
: Merge "Delete unused poll() code." into jb-dev
...
* commit 'dad2378911a244607afa3899928c429b340031cb':
Delete unused poll() code.
2012-05-31 18:41:16 -07:00
Jeff Brown
dce1547d65
am 9e2e781a
: Merge "Remove unused statistics code." into jb-dev
...
* commit '9e2e781acaead54d0fb095d55a1c44b32563248f':
Remove unused statistics code.
2012-05-31 18:41:14 -07:00
Jeff Brown
4467bba73a
Merge "Support looper callbacks based on smart pointers." into jb-dev
2012-05-31 18:39:13 -07:00
Jeff Brown
dad2378911
Merge "Delete unused poll() code." into jb-dev
2012-05-31 18:39:06 -07:00
Jeff Brown
9e2e781aca
Merge "Remove unused statistics code." into jb-dev
2012-05-31 18:39:02 -07:00
Jeff Brown
af567f73ac
Support looper callbacks based on smart pointers.
...
Bug: 6559630
Change-Id: I5a667f219f431838638acefbc9fa6afa610971bd
2012-05-31 17:16:21 -07:00
Eino-Ville Talvala
1737e57a86
Add camera as an ATRACE tag
...
Change-Id: Ib4f22d593836c4b973d122efa114d359f1529914
2012-05-31 15:57:39 -07:00
Jeff Brown
588d5c8280
Delete unused poll() code.
...
We don't need this code anymore and it is just in the way.
Bug: 6559630
Change-Id: I1dc9decf85d5ea1feab159c2985da6c20baffdd5
2012-05-30 19:21:12 -07:00
Jeff Brown
1ea51bf519
Remove unused statistics code.
...
Bug: 6559630
Change-Id: Iacdf4bb4c1c125c09305cbd8cb443c7c80cfc010
2012-05-30 19:17:47 -07:00
Jamie Gennis
1401ad526c
Add the EGL_ANDROID_fence_sync spec.
...
Change-Id: I8c26e5caaf8d89a60a09a5308d55e336537b916e
2012-05-30 16:34:32 -07:00
The Android Open Source Project
24adb709b7
am 0fda2cce
: Reconcile with jb-release
...
* commit '0fda2cce44cd49f16d50ed618c954e12e453f920':
2012-05-30 10:21:50 -07:00
The Android Open Source Project
0fda2cce44
Reconcile with jb-release
...
Change-Id: If0a430615dadb425b82aa27204e6c670f06ee099
2012-05-30 10:15:16 -07:00
The Android Automerger
8c09d0d80d
merge in jb-release history after reset to jb-dev
2012-05-30 07:03:19 -07:00
Mathias Agopian
7312f864f8
am 79f2e1af
: am e31564d8
: Fix a crasher is surfaceflinger.
...
* commit '79f2e1afbc08cd0cbcddc70cde5e3b7f1f0afea4':
Fix a crasher is surfaceflinger.
2012-05-29 21:09:04 -07:00
Mathias Agopian
79f2e1afbc
am e31564d8
: Fix a crasher is surfaceflinger.
...
* commit 'e31564d8eb0ab67e167a888eccce20f5b4e4ef45':
Fix a crasher is surfaceflinger.
2012-05-29 21:06:55 -07:00
Mathias Agopian
e31564d8eb
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
2012-05-29 20:41:03 -07:00
Mathias Agopian
2466e402a0
am 584fcb32
: am 2c8207e9
: add the ability to reject buffers in SurfaceTexture::updateTexImage
...
* commit '584fcb3218e07d7b4cc0aeaef41faa4e891b45a4':
add the ability to reject buffers in SurfaceTexture::updateTexImage
2012-05-29 19:53:52 -07:00
Mathias Agopian
9f36ebdb5b
am c7c8334f
: am 702634a4
: refactoring in preparation for bug:6498869 fix
...
* commit 'c7c8334f059e42106c7cfa27cdead277fd5e135d':
refactoring in preparation for bug:6498869 fix
2012-05-29 19:53:50 -07:00
Mathias Agopian
61250a3cd6
am f67148ec
: am 05cec9d1
: improve resize transactions
...
* commit 'f67148eccd54a9529e9e65c0f1bc07f1abd01fb6':
improve resize transactions
2012-05-29 19:53:49 -07:00
Mathias Agopian
ff81b732b3
am b18d747e
: am 419e196e
: Improve debug logs and minor clean-up
...
* commit 'b18d747ef6ddf5d140221e32a287a5238f729612':
Improve debug logs and minor clean-up
2012-05-29 19:53:47 -07:00
Mathias Agopian
584fcb3218
am 2c8207e9
: add the ability to reject buffers in SurfaceTexture::updateTexImage
...
* commit '2c8207e9627fe6c7a90e31fae8d71ae49df56845':
add the ability to reject buffers in SurfaceTexture::updateTexImage
2012-05-29 19:50:58 -07:00
Mathias Agopian
c7c8334f05
am 702634a4
: refactoring in preparation for bug:6498869 fix
...
* commit '702634a4dad85cfc292618ac91eda6c00f42b7c5':
refactoring in preparation for bug:6498869 fix
2012-05-29 19:50:57 -07:00
Mathias Agopian
f67148eccd
am 05cec9d1
: improve resize transactions
...
* commit '05cec9d1275fd939c2d1aec235dca2bdb8edef63':
improve resize transactions
2012-05-29 19:50:55 -07:00
Mathias Agopian
b18d747ef6
am 419e196e
: Improve debug logs and minor clean-up
...
* commit '419e196e639c8adb875da2765abcef95017b6d4a':
Improve debug logs and minor clean-up
2012-05-29 19:50:54 -07:00
The Android Open Source Project
db3164091e
am 65838c52
: Reconcile with nakasi-factoryrom-release
...
* commit '65838c52fa47cd4b7adf2ca0c27ed26376acc6c5':
2012-05-29 09:44:58 -07:00
The Android Open Source Project
65838c52fa
Reconcile with nakasi-factoryrom-release
...
Change-Id: Ib47a2f4001bbf5ec4a2b889a16e41a1259eb6e1a
2012-05-29 09:41:02 -07:00
The Android Automerger
9f63d6fece
merge in nakasi-factoryrom-release history after reset to jb-dev
2012-05-24 10:17:56 -07:00
The Android Open Source Project
e718d80e73
am 227d45ea
: Reconcile with jb-release nakasi-factoryrom-release
...
* commit '227d45ea2b9ccade09fd620d028e992ff1140b99':
2012-05-24 09:04:10 -07:00
The Android Open Source Project
227d45ea2b
Reconcile with jb-release nakasi-factoryrom-release
...
Change-Id: I3bc06420f32fe0ce50b6943fe33eca293f375d05
2012-05-24 09:01:16 -07:00
Mathias Agopian
2c8207e962
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
2012-05-23 18:01:33 -07:00
Mathias Agopian
702634a4da
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
2012-05-23 18:01:33 -07:00
Mathias Agopian
05cec9d127
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
2012-05-23 18:01:24 -07:00
Mathias Agopian
419e196e63
Improve debug logs and minor clean-up
...
Bug: 6498869
Change-Id: I14d1b4d6960b87b5a7c4d7e20b92538edd9331ff
2012-05-23 18:01:14 -07:00
The Android Automerger
58ef7675a1
merge in jb-release history after reset to jb-dev
2012-05-23 07:02:43 -07:00
Jesse Hall
c20bd43b8a
am 138a8d75
: am e1082496
: Enable SurfaceTexture fence sync for the emulator
...
* commit '138a8d7510e6ba8a402ffacc38c7cc5bfaa5e571':
Enable SurfaceTexture fence sync for the emulator
2012-05-22 21:29:27 -07:00