Commit Graph

47029 Commits

Author SHA1 Message Date
Jesse Hall
1887af43a5 Merge "Allow 16-bit color EGLConfigs" into jb-mr1-dev 2012-09-19 22:30:56 -07:00
Mathias Agopian
2a60824abc am 516efc1b: am 8a2b5423: Merge "libagl: Transform the vertex if using eye space lighting with point lights"
* commit '516efc1bea1c05492c5d4636a589cfc686661842':
  libagl: Transform the vertex if using eye space lighting with point lights
2012-09-19 22:05:14 -07:00
Jesse Hall
f21cffa7d7 Allow 16-bit color EGLConfigs
The emulator without GPU acceleration only supports 16-bit
framebuffers.

Bug: 7185810
Change-Id: I883180367bf5b291d5e70427ab586d2e17868a96
2012-09-19 21:00:49 -07:00
Mathias Agopian
516efc1bea am 8a2b5423: Merge "libagl: Transform the vertex if using eye space lighting with point lights"
* commit '8a2b54235a45f92827b13723380065d1ce308236':
  libagl: Transform the vertex if using eye space lighting with point lights
2012-09-19 20:39:05 -07:00
Mathias Agopian
8a2b54235a Merge "libagl: Transform the vertex if using eye space lighting with point lights" 2012-09-19 19:31:53 -07:00
Mathias Agopian
3a24e8f160 Merge changes I561c198c,Id4865f3c into jb-mr1-dev
* changes:
  improve sensor battery usage tracking
  track UID with connections
2012-09-19 16:26:31 -07:00
Mathias Agopian
d56eff2f49 fix typo in DisplayDevice logs
Change-Id: I593ef674f12073bd9d690946447031394ef9044e
2012-09-19 16:25:29 -07:00
Mathias Agopian
787ac1b388 improve sensor battery usage tracking
until now we were tracking when a sensors was
physically enabled or disabled and we were reporting
that to the BattaryService.

this wasn incorrect because we could have several different
apps enabling the same sensor, so the accounting by the
battery service would be incorrect in that case (depending
on the order in which these apps disabled said sensor).

BatteryService tracks sensors per uid, however SensorService
does this per binder connection, so we could have several
binder connections for the same uid, to solve this we keep
a list of sensor/uid -> count, which is the bulk of this
change.

Bug: 6661604
Change-Id: I561c198c42ba1736a8671bdacda4c76d72b9dd6f
2012-09-18 23:33:36 -07:00
Mathias Agopian
5307d17fe3 track UID with connections
Change-Id: Id4865f3cd27a95acdbbfdff1f2bb4123f312a13b
2012-09-18 23:33:36 -07:00
Mathias Agopian
3cdccc6f85 Merge "fix a typo in SensorService" into jb-mr1-dev 2012-09-18 23:33:20 -07:00
Iliyan Malchev
2398bc67bb Merge "gui: conditionally set USE_NATIVE_FENCE_SYNC for msm8960" into jb-mr1-dev 2012-09-18 20:28:04 -07:00
Jeff Boody
42223f6fdd gui: conditionally set USE_NATIVE_FENCE_SYNC for msm8960
Change-Id: Ib7ad11597ef7c79162a0b0a49a1b8ae16d192c10
Signed-off-by: Iliyan Malchev <malchev@google.com>
2012-09-18 19:36:12 -07:00
Mathias Agopian
a5b8e8bfa9 fix a typo in SensorService
It shouldn't have caused much harm though.
Also log a warning when enabling a sensor
for a connection that is already enabled.

Change-Id: Ia4a052381e79183cd4cb1bedc7ba08e5228d7a38
2012-09-18 17:19:04 -07:00
Mathias Agopian
1d12d8a8e6 improve logging of external displays
Change-Id: I041aebb7fc655aeca98bbf698d15e05d7c12cac9
2012-09-18 14:42:32 -07:00
Mathias Agopian
6ab93290ae suppress superfluous log
Change-Id: I838f2de4cf99e885833c4f42e2a69d6e3bb8eea5
2012-09-18 13:19:46 -07:00
Jesse Hall
aeb76d160c Merge "Check that HWC exists before trying to use it" into jb-mr1-dev 2012-09-18 12:16:14 -07:00
Jesse Hall
d3d35f1834 Check that HWC exists before trying to use it
Bug: 7185810
Change-Id: I1271d6ba397f3abf0ef166b8d03b9b26b72e28d7
2012-09-18 11:39:40 -07:00
Jamie Gennis
3941cb240d SurfaceTexture: default to doing GL sync
This change makes updateTexImage default to performing the necessary
synchronization and adds an argument for SurfaceFlinger to disable that
synchronization so that it can be performed lazily.

Change-Id: I7c20923cc786634126fbf7021c9d2541aa77be5d
Bug: 6991805
2012-09-18 10:59:40 -07:00
Andy McFadden
8dfa92fef9 Plumb display name into SurfaceFlinger
The Surface createDisplay() call takes a display name for debugging.
This change carries it through SurfaceFlinger and displays it in
the "dumpsys SurfaceFlinger" output.

Bug 7058158

Change-Id: I79f3474a8656ff1beb7b478e0dbf2c5de666118a
2012-09-18 09:20:23 -07:00
Mathias Agopian
d870703d55 fix external displays
we were not calling eglSwapBuffers() on external displays
because they can't use HWC which caused us to think they
didn't have GLES composition.

Change-Id: I6cef4ae40b138412d2e6f2acda33c9d222b03a83
2012-09-18 01:21:55 -07:00
Mathias Agopian
41cb1b5f67 Merge changes I53d70510,If34a05f3 into jb-mr1-dev
* changes:
  add support hwc 1.1
  refactor things a bit
2012-09-17 18:59:04 -07:00
Mathias Agopian
da27af9832 add support hwc 1.1
Bug: 7124069

Change-Id: I53d705105c4ad8954d3f50ee4f4c8b7ec936b871
2012-09-17 18:57:53 -07:00
Jamie Gennis
f0f56f32bb Merge "EGL: fix an extension string bug" into jb-mr1-dev 2012-09-17 18:51:55 -07:00
Jamie Gennis
a08cf6e3a4 EGL: fix an extension string bug
This change fixes a bug where initializing EGL multiple times (eglTerminate
followed by eglInitialize) would cause extensions to show up in the extension
string multiple times.

Change-Id: I707a3da62ed30ef13835087167f84a08bc6addd7
2012-09-17 17:23:29 -07:00
Mathias Agopian
cde87a3b9d refactor things a bit
- decouple GL and main display initialization
- ensure that each "supported" display has its own FramebufferSurface
- onScreenAcquired/Released now takes a display

Change-Id: If34a05f3dea40f6c79db77f4dde283a2580daac4
2012-09-17 12:37:10 -07:00
Elliott Hughes
c8cff90d49 Merge "Use a named constant rather than a magic number." into jb-mr1-dev 2012-09-17 12:11:25 -07:00
Elliott Hughes
5f87b31d80 Use a named constant rather than a magic number.
Change-Id: I86e8c91c6f5628df3eec38faf28598cc8cef2ea3
2012-09-17 11:43:40 -07:00
jp abgrall
86ca50d860 am e917bfbd: am 09a22fc2: Merge "Allow disable of dumpstate vibrate"
* commit 'e917bfbd19c265ef09c90f93f5dc175fc62259f5':
  Allow disable of dumpstate vibrate
2012-09-17 11:01:37 -07:00
jp abgrall
e917bfbd19 am 09a22fc2: Merge "Allow disable of dumpstate vibrate"
* commit '09a22fc29d588b173e5c0dd2002ac2c44d45b7c6':
  Allow disable of dumpstate vibrate
2012-09-17 10:58:38 -07:00
jp abgrall
09a22fc29d Merge "Allow disable of dumpstate vibrate" 2012-09-17 10:21:31 -07:00
John Michelau
1f794c442c Allow disable of dumpstate vibrate
Change-Id: I747b757f4b5e2d6a472b7b2a19f8c1ca8a4b7fdd
2012-09-17 11:20:19 -05:00
Ben Cheng
07e8134e24 Merge "Print warnings when backwards timestamps are detected." into jb-mr1-dev 2012-09-16 16:24:29 -07:00
Ben Cheng
8dc7c6e659 Print warnings when backwards timestamps are detected.
Bug: 7100774

Change-Id: I752fd1680b32ce33d17d6042d6c82e27d7ba9dd2
2012-09-16 16:21:01 -07:00
Andy McFadden
71f683ac8d New test
Added a test to confirm that the transform hint is being respected.

Bug: 7162482
Change-Id: I892fe962f8cf2759ff951b4f5065b9ac2732c3d1
2012-09-16 12:53:41 -07:00
Andy McFadden
6905205c8d Fix transform hints
The hints were being set a little too late, so the pre-rotation stuff
wasn't quite working.

Bug 7054997

Change-Id: Id8d5c626db7a76f768ba762a145b315878ee08e6
2012-09-16 11:39:09 -07:00
Jeff Brown
6e220a6ce6 Fix display projections when translated.
There are two different translations to apply in the logical
orientation, one before scaling and one after.
So translate, scale, translate then rotate.

Bug: 7139798
Change-Id: I0726991cadb62988390e77503dbbaed54f07bfe3
2012-09-13 19:24:43 -07:00
Andy McFadden
ae2cfb5746 Minor tweaks
A couple of minor cleanups I stumbled over while looking at other
things.

Change-Id: I385ecfe1afefd577afbc59d7ef1d98d868073651
2012-09-13 11:21:40 -07:00
Jesse Hall
a4383fd9de Merge "Initialize new HWC 1.2 fields" into jb-mr1-dev 2012-09-12 20:18:53 -07:00
Jesse Hall
fa32888f58 Merge "Fix display projection transforms" into jb-mr1-dev 2012-09-12 20:16:28 -07:00
Mathias Agopian
a5be0cd4f3 Merge "don't call hwc with non-empty layer lists for blanked displays" into jb-mr1-dev 2012-09-12 19:10:03 -07:00
Mathias Agopian
9ca6491bb7 Region::validate() cannot be called from addRectUnchecked()
addRectUnchecked() is allowed to be in an invalid state
temporarily.

Change-Id: I6f5162b5c49f378978c070a77abba35023fe918c
2012-09-12 17:56:29 -07:00
Mathias Agopian
8df840aa76 Merge "strengthen region validation" into jb-mr1-dev 2012-09-12 17:49:29 -07:00
Mathias Agopian
ce3a0a541c don't call hwc with non-empty layer lists for blanked displays
we now make sure to take the blanked state of a display into
account when we build its list of visible layers, this ensures
that we won't call prepare/set with a non-empty list when the
display is blanked.

Possibly fixes 7075380, 7103553, 7130187, 7016215

Bug: 7075380
Change-Id: I9fdd2e73d1b7621eaeca3d4ac2ae60d9fb1b3631
2012-09-12 17:42:06 -07:00
Mathias Agopian
068d47f29d strengthen region validation
Change-Id: I75ee7bc4dd7a2f5357ac8994a23bc8b8bfb6eb44
2012-09-12 17:30:47 -07:00
Jamie Gennis
e45b01f575 Merge "EGL: make max cache key size BoardConfig-able" into jb-mr1-dev 2012-09-12 15:54:39 -07:00
Jesse Hall
db27621e22 Initialize new HWC 1.2 fields
Also rename resolution* to width/height.

Change-Id: Ia5f0c50d3f0a349160f314a3257c3b985e13ef1d
2012-09-12 15:35:44 -07:00
Jesse Hall
6360ec42d4 Fix display projection transforms
Bug: 7139798
Change-Id: I61aafe99180d85563c6880d16bc367fce80e6022
2012-09-12 13:49:10 -07:00
Andy McFadden
2c7c8ba56a Merge "Fix emulator" into jb-mr1-dev 2012-09-12 13:27:01 -07:00
Andy McFadden
c272430960 Merge "Watch for SurfaceFlinger death" into jb-mr1-dev 2012-09-12 13:22:35 -07:00
Andy McFadden
babba18687 Fix emulator
Emulator has no HWC.

Change-Id: I7810b27034f6772823142e5bf877681db1c8ee49
2012-09-12 13:17:01 -07:00