Romain Guy
d991b40739
am f58475b5
: am 60393d45
: Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev
...
* commit 'f58475b5ae4ccb3a31c05c79da8b2914c62a3510':
Add runtime debugging capabilities to OpenGL
2012-10-18 17:39:13 -07:00
Romain Guy
f58475b5ae
am 60393d45
: Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev
...
* commit '60393d45207b6548e1f61ca104fa59aecee87d30':
Add runtime debugging capabilities to OpenGL
2012-10-18 17:37:54 -07:00
Romain Guy
60393d4520
Merge "Add runtime debugging capabilities to OpenGL" into jb-mr1-dev
2012-10-18 17:33:37 -07:00
Romain Guy
16928bfeca
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
2012-10-18 16:16:10 -07:00
The Android Automerger
7b2b577f42
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-18 06:59:41 -07:00
Jamie Gennis
5937c9d581
am caadbc53
: am 7c41bf70
: SurfaceFlinger: change the animation timeout
...
* commit 'caadbc5324cd4503450ac6bd9bb09c3c5fcb7430':
SurfaceFlinger: change the animation timeout
2012-10-17 16:58:54 -07:00
Jamie Gennis
caadbc5324
am 7c41bf70
: SurfaceFlinger: change the animation timeout
...
* commit '7c41bf7092b75dba6029cd3bbc842d3a2661b0aa':
SurfaceFlinger: change the animation timeout
2012-10-17 16:57:01 -07:00
The Android Automerger
99991c948a
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-17 16:07:12 -07:00
Jamie Gennis
54c6497530
am 9097e144
: am 7f79a2bd
: Merge "BufferQueue: alloc without holding the lock" into jb-mr1-dev
...
* commit '9097e14443767b37ab0831d46c1090a3960d36e1':
BufferQueue: alloc without holding the lock
2012-10-17 09:40:21 -07:00
Jamie Gennis
7c41bf7092
SurfaceFlinger: change the animation timeout
...
This change changes the animation transaction timeout from 500us to 5s.
Bug: 7362633
Change-Id: I9bed8e74f726dae2daa398afc29babcea00d5b04
2012-10-17 09:40:07 -07:00
Jamie Gennis
9097e14443
am 7f79a2bd
: Merge "BufferQueue: alloc without holding the lock" into jb-mr1-dev
...
* commit '7f79a2bd5c92bc626890dc16ffb8cd2de934e5fb':
BufferQueue: alloc without holding the lock
2012-10-17 09:37:40 -07:00
Jamie Gennis
7f79a2bd5c
Merge "BufferQueue: alloc without holding the lock" into jb-mr1-dev
2012-10-17 09:32:43 -07:00
The Android Automerger
b28efde638
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-16 17:30:45 -07:00
Kenny Root
53f98e69f2
am 3fe50abb
: am 125becee
: am 7abbbc68
: Merge "Add TEMP_FAILURE_RETRY to ZipUtils"
...
* commit '3fe50abbfd12a8d98717bdaba2f9af30f39affbf':
Add TEMP_FAILURE_RETRY to ZipUtils
2012-10-16 16:31:26 -07:00
Kenny Root
3fe50abbfd
am 125becee
: am 7abbbc68
: Merge "Add TEMP_FAILURE_RETRY to ZipUtils"
...
* commit '125beceefd44f6abd17ff336bb989e1850965bd8':
Add TEMP_FAILURE_RETRY to ZipUtils
2012-10-16 16:29:17 -07:00
Kenny Root
125beceefd
am 7abbbc68
: Merge "Add TEMP_FAILURE_RETRY to ZipUtils"
...
* commit '7abbbc680d03dd8e50a709f89b78ace6b81154b0':
Add TEMP_FAILURE_RETRY to ZipUtils
2012-10-16 16:26:42 -07:00
Kenny Root
7abbbc680d
Merge "Add TEMP_FAILURE_RETRY to ZipUtils"
2012-10-16 15:57:11 -07:00
Kenny Root
d611117f24
Add TEMP_FAILURE_RETRY to ZipUtils
...
Change-Id: I275c415f14eeffaf9a58d45f3ea014d766441ec3
2012-10-16 14:00:56 -07:00
Jamie Gennis
529efdf60f
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
2012-10-16 11:25:47 -07:00
Romain Guy
4d0aec67c4
am 23bcd8d2
: am 825a9a2d
: Merge "Update comments to reflect what the code actually does" into jb-mr1-dev
...
* commit '23bcd8d298597659622919027c9ea921d5eed513':
Update comments to reflect what the code actually does
2012-10-16 09:50:35 -07:00
Romain Guy
23bcd8d298
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
2012-10-16 09:47:38 -07:00
Romain Guy
825a9a2dcd
Merge "Update comments to reflect what the code actually does" into jb-mr1-dev
2012-10-16 09:45:01 -07:00
The Android Automerger
af49b5e2c7
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-16 06:59:29 -07:00
Mathias Agopian
e7f167bffa
am 179c4db2
: am db9b41fd
: fix a corruption in blank/unblank
...
* commit '179c4db2c3f26e6586b0b0fe2c576fc9ae349580':
fix a corruption in blank/unblank
2012-10-15 20:39:30 -07:00
Mathias Agopian
179c4db2c3
am db9b41fd
: fix a corruption in blank/unblank
...
* commit 'db9b41fd157279d1b988a854e0d7c5b43c2fac38':
fix a corruption in blank/unblank
2012-10-15 20:38:09 -07:00
Mathias Agopian
db9b41fd15
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
2012-10-15 20:31:12 -07:00
Jamie Gennis
5bc5f22d37
am 5c51f0fb
: am 3365c567
: Merge "SurfaceFlinger: add animation transactions" into jb-mr1-dev
...
* commit '5c51f0fb38bd0cd80031da3eee6f335d5d28c3fc':
SurfaceFlinger: add animation transactions
2012-10-15 20:26:15 -07:00
Romain Guy
1ba2f61d75
am 49fe8add
: am b96fe085
: Merge "Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps" into jb-mr1-dev
...
* commit '49fe8addbfe52bf9a3e69e6250e462a70332235c':
Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps
2012-10-15 20:26:14 -07:00
Jamie Gennis
5c51f0fb38
am 3365c567
: Merge "SurfaceFlinger: add animation transactions" into jb-mr1-dev
...
* commit '3365c56716432d3bfdf41bb82fb08df821f41d0c':
SurfaceFlinger: add animation transactions
2012-10-15 20:19:36 -07:00
Romain Guy
49fe8addbf
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
2012-10-15 20:19:18 -07:00
Jamie Gennis
3365c56716
Merge "SurfaceFlinger: add animation transactions" into jb-mr1-dev
2012-10-15 19:36:12 -07:00
Romain Guy
be3c3e4eca
Update comments to reflect what the code actually does
...
Change-Id: I2613aa32c29eddc52a00090656c1bd11f9f5732b
2012-10-15 19:25:18 -07:00
Jamie Gennis
2d5e230292
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
2012-10-15 19:09:04 -07:00
Romain Guy
b96fe08540
Merge "Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps" into jb-mr1-dev
2012-10-15 18:43:20 -07:00
Romain Guy
1cffc80f97
Add new debug option to force 4x MSAA in OpenGL ES 2.0 apps
...
Change-Id: I53ac91a9ce07b5dd5f2ee0e3cc5b65b6402f9229
2012-10-15 18:13:05 -07:00
Jesse Hall
ce27f53de7
am c558269b
: am 837d2f9e
: Always set vertex alpha when drawing screenshot layers
...
* commit 'c558269b1ab8c4985b86a0f39338d42f162693f2':
Always set vertex alpha when drawing screenshot layers
2012-10-15 15:01:47 -07:00
Jesse Hall
c558269b1a
am 837d2f9e
: Always set vertex alpha when drawing screenshot layers
...
* commit '837d2f9e83e7d8625ef482d9c9d9afa852c8dbaa':
Always set vertex alpha when drawing screenshot layers
2012-10-15 14:59:16 -07:00
Jesse Hall
837d2f9e83
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
2012-10-15 12:38:33 -07:00
The Android Automerger
eec9e6456d
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-15 12:30:57 -07:00
The Android Open Source Project
dfaf80c606
am 935ba809
: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
* commit '935ba80962920ff420bd4714046d1e4d8910889b':
2012-10-15 07:42:41 -07:00
The Android Open Source Project
935ba80962
Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
...
Change-Id: I50d7a0cbc6632c78a725810d960e049c310b3597
2012-10-15 07:38:56 -07:00
The Android Automerger
286d5fad99
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-13 03:50:10 -07:00
Kenny Root
652c9023af
am e2e95c8c
: am 9bdaa60b
: Merge "Add TEMP_FAILURE_RETRY around open and write calls" into jb-mr1-dev
...
* commit 'e2e95c8ccba2c2fb979d0ed42ed905106623d3c3':
Add TEMP_FAILURE_RETRY around open and write calls
2012-10-12 23:45:02 -07:00
Kenny Root
e2e95c8ccb
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
2012-10-12 23:43:29 -07:00
Kenny Root
9bdaa60b80
Merge "Add TEMP_FAILURE_RETRY around open and write calls" into jb-mr1-dev
2012-10-12 23:39:48 -07:00
The Android Automerger
58b6a67096
merge in jb-mr1-factory-release history after reset to jb-mr1-dev
2012-10-12 16:34:34 -07:00
The Android Automerger
37e0f65619
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-10-12 16:32:47 -07:00
Jamie Gennis
ea5ef70398
am ec93e762
: am dd57d551
: Merge "SurfaceFlinger: make the num FBs a board config" into jb-mr1-dev
...
* commit 'ec93e762afc46534aadb3f583dbf87e38e85bfe9':
SurfaceFlinger: make the num FBs a board config
2012-10-12 14:39:54 -07:00
Jamie Gennis
ec93e762af
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
2012-10-12 14:37:22 -07:00
Jamie Gennis
dd57d55194
Merge "SurfaceFlinger: make the num FBs a board config" into jb-mr1-dev
2012-10-12 14:33:52 -07:00