Mathias Agopian
9a86704c22
Merge "get rid of Surface identity and token"
2013-02-14 20:24:37 +00:00
Elliott Hughes
bbb7322c36
am 45b0e435
: Merge "Simplify OpenGL TLS access on ARM."
...
# Via Elliott Hughes (1) and Gerrit Code Review (1)
* commit '45b0e4350d3404bd194edc569e36ecca017c3d76':
Simplify OpenGL TLS access on ARM.
2013-02-14 11:42:06 -08:00
Elliott Hughes
45b0e4350d
Merge "Simplify OpenGL TLS access on ARM."
2013-02-14 18:31:20 +00:00
Elliott Hughes
288870ebc3
Simplify OpenGL TLS access on ARM.
...
bionic now assumes the TLS register is available, so OpenGL can too.
Change-Id: If2b56a4c08de9f887759b78f70022026a181dc47
2013-02-13 17:30:54 -08:00
Alex Ray
36ebf51a1b
atrace: add HAL tag
...
Change-Id: Idfd4f2075e8cd82833ef06d4487423c62b59fe11
2013-02-13 15:30:31 -08:00
Mathias Agopian
ac9fa427d4
get rid of Surface identity and token
...
we use the IBinder instead.
Change-Id: I4aa0b58869ba43f19980013620051e5a261b062d
2013-02-13 15:27:08 -08:00
Jamie Gennis
b997f6ef0f
Merge changes I50831d4e,I5360aebe
...
* changes:
flatland: remove an unneeded #include
libgui: disallow NULL Fence pointers
2013-02-13 23:22:04 +00:00
Jamie Gennis
c52e16cbf9
flatland: remove an unneeded #include
...
Change-Id: I50831d4efd543664ff7df7aaef35d842aebf1bd6
2013-02-12 18:15:38 -08:00
Jamie Gennis
1df8c34585
libgui: disallow NULL Fence pointers
...
This change eliminates the uses of a NULL sp<Fence> indicating that no waiting
is required. Instead we use a non-NULL but invalid Fence object for which the
wait methods will return immediately.
Bug: 7892871
Change-Id: I5360aebe3090422ef6920d56c99fc4eedc642e48
2013-02-12 18:15:38 -08:00
Dianne Hackborn
c8a1e10fd2
Merge "Implement issue #6646859 : 4K!!!! 4K!!!! 4K!!!!"
2013-02-12 23:54:28 +00:00
Dianne Hackborn
6303d06ece
Implement issue #6646859 : 4K!!!! 4K!!!! 4K!!!!
...
Change-Id: I1bb630c58d0d41446b726de1b9d2c3875fcbbceb
2013-02-12 15:36:31 -08:00
Dianne Hackborn
6f965e02d0
Merge "App ops: new native access API."
2013-02-12 23:29:05 +00:00
Dianne Hackborn
5da5ca520c
App ops: new native access API.
...
This is to help implementation of bug #8181262 and maybe
bug #8181261
Note the current code has not yet been tested; it is only
known to compile at this point.
Change-Id: I489674c96d0d3fc0ddacc92611931a19a9ee5230
2013-02-12 15:13:37 -08:00
Jesse Hall
2b6694f5f0
Force a specific locale for sorting
...
Avoids irrelevant output differences based on the user's locale. The
current output files were generated with a C or POSIX locale, and sort
differently under en_US.UTF-8.
Change-Id: I0dd85475e9ee2d58e7fa9fe2a4f86ad5c8142e00
2013-02-11 16:12:48 -08:00
Jamie Gennis
351c294173
Merge changes I8bded1ea,I7478293e
...
* changes:
SurfaceFlinger: add win anim frame time tracking
SurfaceFlinger: remove a driver bug workaround
2013-02-11 19:48:18 +00:00
Arve Hjønnevåg
b7c1ebc3fb
Merge "Do not use su to run the df command in bugreports"
2013-02-09 01:41:09 +00:00
Ken Sumrall
8f75fa7bcf
Do not use su to run the df command in bugreports
...
User builds do not have su, so when the bugreport attempts to report
disk free space, the command fails and nothing is reported. However,
the df command does not need to be run as root to report free space,
so just run the command directly.
Change-Id: Ic7deb696f293e772ddf28eacfe16e4250af9a9f3
2013-02-08 17:35:58 -08:00
James Dong
9921d49a44
Merge "Adds some OpenMAX 1.1.2 IL extension headers."
2013-02-09 00:47:00 +00:00
Jamie Gennis
4b0eba949c
SurfaceFlinger: add win anim frame time tracking
...
This change makes the 'dumpsys SurfaceFlinger --latency' command with no extra
args dump the frame timestamp data for the most recent frames that
SurfaceFlinger generated that included window animation transaction changes.
Change-Id: I8bded1ea08a4cddefef0aa955401052bb9107c90
2013-02-08 13:32:21 -08:00
Mathias Agopian
5fe58b8ba6
only disable hwc when alpha < 1.0
...
Bug: 8149181
Change-Id: Ib3c7a44f04871e020adceeae16d002141ac758d4
2013-02-07 16:22:50 -08:00
Kunter Gultekin
203f89a75a
Adds some OpenMAX 1.1.2 IL extension headers.
...
Includes index and video extension headers
in order to support vpx specific parameters
and enable vpx encoder.
Note that existing (seemingly modified) version
of OMX_Video.h semantically conflicts with
official OMX_VideoExt.h because former includes
OMX_Video_CodingVPX as OMX_VIDEO_CODINGTYPE
whereas official extension headers denote
it as OMX_VIDEO_CodingVP8 within
OMX_VIDEO_CODINGEXTTYPE.
Change-Id: Ibab9663fcbc9c406a2cfb4bf79fe21e3b01a6e66
Signed-off-by: Kunter Gultekin <kuntergultekin@google.com>
2013-02-07 12:16:05 -08:00
Mathias Agopian
9f8386e111
Add support for plane-alpha in HWC
...
Change-Id: I218e7dd5f23de535aabce61e993002ab6cb46cdd
2013-02-05 14:46:32 -08:00
Jesse Hall
6cf6ba69f0
Merge "Remove unused HWCLayer::setPerFrameDefaultState()"
2013-02-05 16:02:51 +00:00
Jamie Gennis
33c544c4d3
SurfaceFlinger: remove a driver bug workaround
...
Change-Id: I7478293e87899d6e467db8c2f9e295935c8b1d4e
2013-02-04 14:43:07 -08:00
Nick Kralevich
c4fd05b172
Revert "try to fix win_sdk build."
...
A better change was checked into system/core. See commit
941daef629bd571032851edf7ae1dce24266640e
This reverts commit fa99d30ec7
.
2013-02-02 18:09:15 -08:00
Nick Kralevich
2b7b349b56
Merge "try to fix win_sdk build."
2013-02-02 00:09:59 +00:00
Nick Kralevich
fa99d30ec7
try to fix win_sdk build.
...
Change-Id: I55e78e339874a6d6a3381c2550556b65c7ec1ca0
2013-02-01 16:09:23 -08:00
Michael Wright
cf89c76ee0
Merge "Add keycodes for brightness up/down"
2013-02-01 22:36:07 +00:00
Jesse Hall
519191670e
am 873ab60e
: am 75b83e4d
: Merge "Gfx-3d: fix GetProcAddress in egl extention"
...
# By luliuhui
# Via Android Git Automerger (1) and others
* commit '873ab60e94811488caea1906eb98133329a3e28f':
Gfx-3d: fix GetProcAddress in egl extention
2013-02-01 14:26:21 -08:00
Jesse Hall
873ab60e94
am 75b83e4d
: Merge "Gfx-3d: fix GetProcAddress in egl extention"
...
# By luliuhui
# Via Gerrit Code Review (1) and Shuo Gao (1)
* commit '75b83e4dc7d8055a70e590f868f7307fdaf656a7':
Gfx-3d: fix GetProcAddress in egl extention
2013-02-01 12:37:25 -08:00
Jesse Hall
75b83e4dc7
Merge "Gfx-3d: fix GetProcAddress in egl extention"
2013-02-01 19:33:16 +00:00
Michael Wright
e85650d603
Add keycodes for brightness up/down
...
Change-Id: I8ed56b510c46f372df0fc71e1735c72058efc677
2013-01-31 15:14:54 -08:00
Andreas Huber
0dcde5213b
Extend the HDCP API to also allow for a _decryption_ module, the counterpart
...
to what we previously defined exclusively.
Change-Id: I774d3cd7146da77675dcb90e33c9552cb7b10ac6
2013-01-30 10:40:28 -08:00
Marco Nelissen
d8d9c5b89b
Merge "Add new format constant"
2013-01-29 18:30:41 +00:00
luliuhui
69d100762c
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
2013-01-22 15:14:34 +08:00
Marco Nelissen
62b40b3535
Add new format constant
...
Change-Id: I8a53c69c9e44450b7ee3d32750965d53265812bf
2013-01-17 09:18:29 -08:00
Glenn Kasten
64c8be0787
Add media.log service
...
Change-Id: Ic17752fff30676fe692c80260ff68284543385dd
2013-01-16 12:07:03 -08:00
Jesse Hall
f3df96026c
Merge "Fix memory leak when getting signal time for unsignaled fences"
2013-01-15 06:56:49 -08:00
Jesse Hall
7c36cd2315
Fix memory leak when getting signal time for unsignaled fences
...
Bug: 8000983
Change-Id: Ie88ed23fc5e8c95bfade364e090e90b7f070fa8e
2013-01-14 16:33:29 -08:00
Jesse Hall
7dd35a165d
am fc866eb8
: am 845ed8fd
: Merge "DisplayDevice: initialize mDisplayToken correctly"
...
* commit 'fc866eb8423cd1d720683946f7d102547718b6c9':
DisplayDevice: initialize mDisplayToken correctly
2013-01-14 14:41:43 -08:00
Jesse Hall
fc866eb842
am 845ed8fd
: Merge "DisplayDevice: initialize mDisplayToken correctly"
...
* commit '845ed8fdaa34d0f684c93bf4dbadb9162f769235':
DisplayDevice: initialize mDisplayToken correctly
2013-01-14 14:34:15 -08:00
Jesse Hall
845ed8fdaa
Merge "DisplayDevice: initialize mDisplayToken correctly"
2013-01-14 13:53:09 -08:00
Jesse Hall
51d2200738
Remove unused HWCLayer::setPerFrameDefaultState()
...
Bug: 7977590
Change-Id: Ic49c4e38ef2ee6beaeb268c406347c882135bdf0
2013-01-14 12:17:27 -08:00
Jesse Hall
800856a7b7
am f3e9d5bd
: am cbe51356
: Merge "Remove support for legacy HWC version encoding"
...
* commit 'f3e9d5bde57a41593a7dbc15e6f1fdb1ea64ea74':
Remove support for legacy HWC version encoding
2013-01-14 09:52:16 -08:00
Jesse Hall
f3e9d5bde5
am cbe51356
: Merge "Remove support for legacy HWC version encoding"
...
* commit 'cbe5135610cd3c919e6334fada72cc52238bb8b0':
Remove support for legacy HWC version encoding
2013-01-14 09:47:49 -08:00
Jesse Hall
cbe5135610
Merge "Remove support for legacy HWC version encoding"
2013-01-14 09:25:21 -08:00
Andy McFadden
c19c15174b
Merge "Add some comments."
2013-01-11 15:05:40 -08:00
Andy McFadden
8f06a8c2c8
Reduce C++11 warnings
...
A few typecasts to fix "narrowing conversion" complaints.
Change-Id: Ib2118079a2ca33959c748d03d8c6f1722d62e8fe
2013-01-11 10:24:34 -08:00
Andy McFadden
882e3a39ed
Add some comments.
...
Also, minor tweak to SurfaceTextureLayer.
Change-Id: If616d5ee4e8226dd0e16c5dbb0e0f80db553110e
2013-01-11 10:16:10 -08:00
Jesse Hall
7296051995
Remove support for legacy HWC version encoding
...
Change-Id: If03ae1ebf10d15777310e1449a57473021390582
2013-01-10 18:17:13 -08:00