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
Mathias Agopian
9414d67f46
make sure SF initialization is ran at target priority and correct thread group
...
SF can spawn threads (indirectly) during initialization
and we want those to be spawned at URGENT_DISPLAY_PRIORITY
(in theory they should set their own, but some code lives
in vendor libraries and doesn't).
Bug: 10430209
Change-Id: I5b3a8f979297de287614c8eafd8267bef1176e4b
2013-08-23 17:10:32 -07:00
Mathias Agopian
bcab7b17b1
fix DimLayer in GLES2.0 SF
...
DimLayer state wasn't initialized properly.
Bug: 10442967
Change-Id: I384c1d85c58c96ae29d5daa1fabee9f4ce003501
2013-08-23 16:12:34 -07:00
Jeff Brown
14641f7f30
am 464febc4
: Remove input flinger stubs. (DO NOT MERGE)
...
* commit '464febc44908fb4a8fca9e513ba8469750dde838':
Remove input flinger stubs. (DO NOT MERGE)
2013-08-22 19:34:04 -07:00
Jeff Brown
464febc449
Remove input flinger stubs. (DO NOT MERGE)
...
Bug: 10446930
Change-Id: I4dd46f539cd2a2e324dfc83b45ba2787f7404a4a
2013-08-22 18:40:07 -07:00
Jeff Tinker
052f9b2fad
am 39bfc698
: Merge "Add ability to test supported content types to MediaDrm" into klp-dev
...
* commit '39bfc6989259c5d24fd43f3d7fa7e967a4b17aac':
Add ability to test supported content types to MediaDrm
2013-08-22 16:13:15 -07:00
Jeff Tinker
39bfc69892
Merge "Add ability to test supported content types to MediaDrm" into klp-dev
2013-08-22 23:08:09 +00:00
Eino-Ville Talvala
169636c62b
am b6aea00c
: Merge "Surface: Fix controlledByApp parameter" into klp-dev
...
* commit 'b6aea00c7843705fdc6d265d7e15b3df52e86009':
Surface: Fix controlledByApp parameter
2013-08-22 12:26:51 -07:00
Eino-Ville Talvala
b6aea00c78
Merge "Surface: Fix controlledByApp parameter" into klp-dev
2013-08-22 19:23:27 +00:00
The Android Automerger
a574a99b43
merge in klp-release history after reset to klp-dev
2013-08-22 06:01:19 -07:00
Mathias Agopian
bef42c50eb
handle several vsync signal correctly
...
Change-Id: I34935d2197ce8e914fef2f110896e47b44225ad2
2013-08-21 17:45:46 -07:00
Mathias Agopian
0f288fcc9c
only use format compatible with CPU consumers
...
EGL now picks the buffer format out of a small set
of formats compatible with CPU consumers instead of
using the EGL_NATIVE_VISUAL_ID.
Bug: 10194508
Change-Id: If423cd29601b7a3ace8670f4c73004132cfc4b31
2013-08-21 16:36:34 -07:00
Jeff Tinker
611d3d4816
Add ability to test supported content types to MediaDrm
...
bug: 10244066
Change-Id: I6666d0dbfdc6e791deb9a82c918255af4fa19816
2013-08-21 16:00:06 -07:00
Mathias Agopian
0a289c9cc8
am 4ceff3d5
: screenshot layers wouldn\'t work in some cases
...
* commit '4ceff3d5efd27c164788bb2b3f0fd17c691a0204':
screenshot layers wouldn't work in some cases
2013-08-21 15:59:20 -07:00
Mathias Agopian
4ceff3d5ef
screenshot layers wouldn't work in some cases
...
specifically when the display size and the screenshot window
size didn't match, the buffer would be rejected.
We simply fix this by setting the scalling mode to
"SCALE_TO_WINDOW".
Bug: 9992306
Change-Id: Ib821767899af330bb70d3cbbfa7d41b02794a075
2013-08-21 15:25:50 -07:00
Dmitry Shmidt
072ca28d78
am 56968ec0
: Merge "dumpstate: Fix wifi list of networks dump" into klp-dev
...
* commit '56968ec0bfbe70b76193a2614a23beacfc9cf9dc':
dumpstate: Fix wifi list of networks dump
2013-08-21 12:38:25 -07:00
Dmitry Shmidt
56968ec0bf
Merge "dumpstate: Fix wifi list of networks dump" into klp-dev
2013-08-21 19:35:25 +00:00
Eino-Ville Talvala
7895e90e29
Surface: Fix controlledByApp parameter
...
Bug: 10425641
Change-Id: I1a47e2ce4ecbdb8e67030a5d9ddf6604c5e2497d
2013-08-21 12:05:42 -07:00
Mathias Agopian
b383438b97
am a525483d
: Merge "Fix a bug where non-cropped layer could be scaled incorrectly" into klp-dev
...
* commit 'a525483dc73df39a72c9b4865102a86704b3622c':
Fix a bug where non-cropped layer could be scaled incorrectly
2013-08-21 11:56:48 -07:00
Mathias Agopian
a525483dc7
Merge "Fix a bug where non-cropped layer could be scaled incorrectly" into klp-dev
2013-08-21 18:55:19 +00:00
Dmitry Shmidt
1d6b97c869
dumpstate: Fix wifi list of networks dump
...
Bug: 9056601
Change-Id: Ia0adb67afdf3d478033d0ee34bbb95e621e2fe51
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2013-08-21 10:58:29 -07:00
Jesse Hall
5bc0c358a8
am d2cf8c2f
: Merge "Provide HWC prepare with a valid output buffer" into klp-dev
...
* commit 'd2cf8c2f07b4285a224acd262e6f052c37dbc0b0':
Provide HWC prepare with a valid output buffer
2013-08-21 07:41:23 -07:00
Jesse Hall
68c4d784ab
am 7127d17d
: Merge "Fix HWComposer dumping of float source crops" into klp-dev
...
* commit '7127d17db148ad388a4eb3c152d4c257c6015476':
Fix HWComposer dumping of float source crops
2013-08-21 07:41:23 -07:00
Jesse Hall
d2cf8c2f07
Merge "Provide HWC prepare with a valid output buffer" into klp-dev
2013-08-21 14:38:51 +00:00
Jesse Hall
7127d17db1
Merge "Fix HWComposer dumping of float source crops" into klp-dev
2013-08-21 14:37:51 +00:00