Kenny Root
06ef81bd70
resolved conflicts for merge of 1852eb4f
to klp-dev-plus-aosp
...
Change-Id: I7217c0e859b384a042c02fe339e745996c6ef49e
2013-09-12 11:51:34 -07:00
Kenny Root
1852eb4feb
Merge "Remove copy of UniquePtr.h"
2013-09-12 18:41:19 +00:00
The Android Automerger
3002db1c30
merge in klp-release history after reset to klp-dev
2013-09-12 06:01:32 -07:00
Mathias Agopian
7c4f236532
am 90ed3e8d
: fix a few problems with BitTube
...
* commit '90ed3e8d7883d9c80fb8bf11b1c593bd8b2b39d0':
fix a few problems with BitTube
2013-09-11 15:06:10 -07:00
Kenny Root
0ae966033d
Remove copy of UniquePtr.h
...
The UniquePtr.h file is no longer in libcore/... so there is no need to
have this extra copy of it anymore.
Change-Id: I4ec4f86d2844e524b50441c3a9100a50a6a45b1a
2013-09-11 14:29:20 -07:00
Mathias Agopian
90ed3e8d78
fix a few problems with BitTube
...
BitTube used to send objects one at a time and didn't
handle errors properly.
We now send all the objects in one call, which means they
have to be read as a single batch as well. This changes the
BitTube API.
Update SensorService to the new API.
Also added an API to set the size of the send buffer.
Bug: 10641596
Change-Id: I77c70d35e351fdba0416fae4b7ca3b1d56272251
2013-09-10 21:10:53 -07:00
The Android Automerger
9509dec1ba
merge in klp-release history after reset to klp-dev
2013-09-09 06:01:45 -07:00
Mathias Agopian
455ab58c09
am 63108c34
: fix a possible null dereference when eglMakeCurrent() fails
...
* commit '63108c34ec181e923b68ee840bb7960f205466a7':
fix a possible null dereference when eglMakeCurrent() fails
2013-09-06 15:06:41 -07:00
Mathias Agopian
63108c34ec
fix a possible null dereference when eglMakeCurrent() fails
...
Bug: 10648797
Change-Id: Iee0be47f2646feb25de4ea199bbb9b707452916e
2013-09-06 13:36:49 -07:00
Mathias Agopian
7390e04932
am 77414216
: Merge "color blindness enhancement" into klp-dev
...
* commit '77414216cde4d131eb09454d81dab30e408e4e7a':
color blindness enhancement
2013-09-05 19:13:13 -07:00
Mathias Agopian
77414216cd
Merge "color blindness enhancement" into klp-dev
2013-09-06 02:09:43 +00:00
The Android Automerger
b7524ec3e2
merge in klp-release history after reset to klp-dev
2013-09-05 06:01:25 -07:00
Mathias Agopian
ff2ed70fa3
color blindness enhancement
...
This is an attempt at improving the experience of
users with color vision impairement.
At this time this feature can only be enabled for
debugging:
adb shell service call SurfaceFlinger 1014 i32 PARAM
with PARAM:
0 : disabled
1 : protanomaly/protanopia simulation
2 : deuteranomaly/deuteranopia simulation
3 : tritanopia/tritanomaly simulation
11, 12, 13: same as above w/ attempted correction/enhancement
The enhancement algorithm tries to spread the "error"
such that tones that would otherwise appear similar can be
distinguished.
Bug: 9465644
Change-Id: I860f7eed0cb81f54ef9cf24ad78155b6395ade48
2013-09-04 22:11:15 -07:00
Dianne Hackborn
ecc05fb543
am 59b1516f
: Fix issue #10422349 : Limit/change the battery history data in batterystats
...
* commit '59b1516f4cefcfd599f4e5e9c4a227a48d1ace65':
Fix issue #10422349 : Limit/change the battery history data in batterystats
2013-09-04 18:24:33 -07:00
Dianne Hackborn
59b1516f4c
Fix issue #10422349 : Limit/change the battery history data in batterystats
...
Use new compact option to include history when dumping battery stats.
Change-Id: I3833a88db76d8791bd5c2e8f6ff414af65472a42
2013-09-04 18:04:14 -07:00
Chong Zhang
9f74ea29b8
am e6772914
: Merge "HDCP: add enums for HDCP module capabilities" into klp-dev
...
* commit 'e67729144a56966dd39e1bcda5efa51852e16d74':
HDCP: add enums for HDCP module capabilities
2013-09-04 15:11:28 -07:00
Chong Zhang
e67729144a
Merge "HDCP: add enums for HDCP module capabilities" into klp-dev
2013-09-04 22:07:46 +00:00
Chong Zhang
a3a918557d
HDCP: add enums for HDCP module capabilities
...
This change adds the enums for HDCP caps. An interface getCaps()
will be added later for querying whether HDCP module supports
encryption from a native buffer output from the encoder.
Bug: 10609422
Change-Id: Ib7fa14e7f4de1da90b46eaa174a7a05ec9dacbdc
2013-09-04 11:38:43 -07:00
The Android Automerger
d1eff36fbf
merge in klp-release history after reset to klp-dev
2013-09-04 06:01:18 -07:00
Aravind Akella
e29df8b929
am a5552de9
: Merge "Sensor batching. Changes to the native code." into klp-dev
...
* commit 'a5552de96f0cff9fb1947d8d21556bfeccf9cd03':
Sensor batching. Changes to the native code.
2013-09-03 17:43:44 -07:00
Aravind Akella
a5552de96f
Merge "Sensor batching. Changes to the native code." into klp-dev
2013-09-04 00:41:41 +00:00
Aravind Akella
724d91d778
Sensor batching. Changes to the native code.
...
Bug: 10109508
Change-Id: I7333f3aac76125a8226a4c99c901fb904588df04
2013-09-03 17:04:36 -07:00
Mathias Agopian
4de85b49b3
am 1d4d8f94
: improve mat44 implementation
...
* commit '1d4d8f94e2989b7c8667602304df9059d2701653':
improve mat44 implementation
2013-09-03 16:49:34 -07:00
Mathias Agopian
1d4d8f94e2
improve mat44 implementation
...
this will make it easier to create matrices of different sizes
Change-Id: I2c1771ba0823c42d737762e2dfc2cd47eb302767
2013-09-03 16:38:49 -07:00
The Android Automerger
93854bc091
merge in klp-release history after reset to klp-dev
2013-09-02 06:01:13 -07:00
Mathias Agopian
d213910ab0
am 9b5534b0
: Merge changes I8283a989,I64add89a into klp-dev
...
* commit '9b5534b0e5e1510f56e6a2c58ad0816167603ebd':
switch to use mat4
vector and matrix classes for graphics use
2013-08-30 18:31:38 -07:00
Mathias Agopian
9b5534b0e5
Merge changes I8283a989,I64add89a into klp-dev
...
* changes:
switch to use mat4
vector and matrix classes for graphics use
2013-08-31 01:30:10 +00:00
Jesse Hall
2d28c37269
am 87967c18
: Merge "Force async behavior for the virtual display output BufferQueue" into klp-dev
...
* commit '87967c186995d1500875c495cba8f04f7cff76cc':
Force async behavior for the virtual display output BufferQueue
2013-08-30 14:19:13 -07:00
Jesse Hall
87967c1869
Merge "Force async behavior for the virtual display output BufferQueue" into klp-dev
2013-08-30 21:14:55 +00:00
Jesse Hall
8db92553e9
Force async behavior for the virtual display output BufferQueue
...
Bug: 10551087
Change-Id: I40bbb2b87d64420939a0ea309254f281437dab56
2013-08-29 16:09:11 -07:00
The Android Automerger
fa2aaeeabd
merge in klp-release history after reset to klp-dev
2013-08-29 06:01:02 -07:00
Mathias Agopian
bf5e8b631d
am 19733a32
: minor clean-up of the GLESRenderer
...
* commit '19733a32799f792125913e746e8644d16f8dc223':
minor clean-up of the GLESRenderer
2013-08-28 18:40:14 -07:00
Mathias Agopian
ecebe12e70
am 931bda1c
: reset the gl viewport at each frame for each display
...
* commit '931bda1c472ba8c8e965bdba6757ff94154df903':
reset the gl viewport at each frame for each display
2013-08-28 18:17:28 -07:00
Mathias Agopian
19733a3279
minor clean-up of the GLESRenderer
...
Change-Id: I978dea25b7687fbbbb283f09c24e115d9bad49a2
2013-08-28 18:13:56 -07:00
Mathias Agopian
931bda1c47
reset the gl viewport at each frame for each display
...
Bug: 10097128, 9506003
Change-Id: Ie0403a631e339a9134216224f3366f46ece58b53
2013-08-28 18:11:46 -07:00
Mathias Agopian
6377eea3f3
am 672ddf2b
: remove adreno 130 workaround support
...
* commit '672ddf2b58b6c6ddef4fc4f296e5fa53910d8e3b':
remove adreno 130 workaround support
2013-08-28 15:49:37 -07:00
Mathias Agopian
0221aaf149
am f4486c6e
: try to keep omap4 alive
...
* commit 'f4486c6ea4bcb728ee0f38df7a8ec75c389d9d2e':
try to keep omap4 alive
2013-08-28 15:49:36 -07:00
Mathias Agopian
672ddf2b58
remove adreno 130 workaround support
...
Change-Id: I8ea5ee65d405114b30cfaa44e1a0c971d1ef2a61
2013-08-28 15:27:30 -07:00
Mathias Agopian
f4486c6ea4
try to keep omap4 alive
...
Bug: 10527646
Change-Id: Iec572a910e932115cf4f2e1215142b10cd91bd6f
2013-08-28 15:22:29 -07:00
John Reck
68bfe1fea6
am 05f0a81a
: Merge "Add libpng include path"
...
* commit '05f0a81a93f0d41fa4115c752e617849d145fe5b':
Add libpng include path
2013-08-27 09:54:06 -07:00
John Reck
05f0a81a93
Merge "Add libpng include path"
2013-08-27 16:49:46 +00:00
Mathias Agopian
a8c386f1c3
switch to use mat4
...
Change-Id: I8283a989cfd2b74d53958150bc90298bc083fee7
2013-08-26 20:42:07 -07:00
Mathias Agopian
595ea77f6b
vector and matrix classes for graphics use
...
- this implements vec2, vec3, vec4, which are float vectors
of size 2, 3 and 4 respectively.
the code allows easy instantiation of vectors of a different
type via the tvec{2|3|4}<T> template classes.
- this also implements mat4 which is a float 4x4 matrix. the
tmat44<T> template class allows easy instantiation of a
4x4 matrix of a different value_type.
The vector types have some minimal support for the
glsl style swizzled access; for instance:
vec4 u;
vec3 v = u.xyz;
only .x, .xy, .xyz and their .stpq / .rgba equivalent are
supported.
most operators are supported on both vector and matrices:
arithmetic, unary, compound assignment and comparison
(bit-wise operators NOT supported).
- operations available on vectors include:
dot, length, distance, normalize and cross
- operations available on matrices include:
transpose, inverse, trace
- and a few utilities to create matrices:
ortho, frustum, lookAt
Change-Id: I64add89ae90fa78d3f2f59985b63495575378635
2013-08-26 20:41:13 -07:00
John Reck
e9b2dfe3fd
Add libpng include path
...
Forward compatibility change
Change-Id: Iae792715d9a9aea34f53cd6383981371835c4a31
2013-08-26 16:48:46 -07:00
Mathias Agopian
288b94b4ab
am f2e4fcd9
: Merge changes I34935d21,If423cd29 into klp-dev
...
* commit 'f2e4fcd96c11861bd0af1a9525344c1b691c9de9':
handle several vsync signal correctly
only use format compatible with CPU consumers
2013-08-26 15:03:24 -07:00
Mathias Agopian
db54dbe372
am ed127ea3
: Merge "make sure SF initialization is ran at target priority and correct thread group" into klp-dev
...
* commit 'ed127ea3834045597a072dcf31877ff3084582ff':
make sure SF initialization is ran at target priority and correct thread group
2013-08-26 15:03:23 -07:00
Mathias Agopian
01ff3d6fde
am bcab7b17
: fix DimLayer in GLES2.0 SF
...
* commit 'bcab7b17b1c5476935a6f2f916922b4eb57991a4':
fix DimLayer in GLES2.0 SF
2013-08-26 15:03:19 -07:00
The Android Automerger
f78c42a494
merge in klp-release history after reset to klp-dev
2013-08-26 06:01:12 -07:00
Mathias Agopian
f2e4fcd96c
Merge changes I34935d21,If423cd29 into klp-dev
...
* changes:
handle several vsync signal correctly
only use format compatible with CPU consumers
2013-08-24 00:12:42 +00:00
Mathias Agopian
ed127ea383
Merge "make sure SF initialization is ran at target priority and correct thread group" into klp-dev
2013-08-24 00:12:05 +00:00