Commit Graph

47320 Commits

Author SHA1 Message Date
Jesse Hall
ef27e9cea0 Check that HWC exists before trying to use it
Bug: 7185810
Change-Id: I1271d6ba397f3abf0ef166b8d03b9b26b72e28d7
2012-09-18 14:28:25 -07:00
Mathias Agopian
157bb2c1d9 am 6ab93290: suppress superfluous log
* commit '6ab93290aeed63f139b0e77819ea889bbce9ec8b':
  suppress superfluous log
2012-09-18 13:23:56 -07:00
Mathias Agopian
6ab93290ae suppress superfluous log
Change-Id: I838f2de4cf99e885833c4f42e2a69d6e3bb8eea5
2012-09-18 13:19:46 -07:00
Jesse Hall
c7e4e27fd4 am aeb76d16: Merge "Check that HWC exists before trying to use it" into jb-mr1-dev
* commit 'aeb76d160c530786d58d6a8b35d9b4a75a2279e3':
  Check that HWC exists before trying to use it
2012-09-18 12:21:45 -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
Jamie Gennis
21fc3a0560 am 3941cb24: SurfaceTexture: default to doing GL sync
* commit '3941cb240d438bfdebe24920bb2ada86456a0bf9':
  SurfaceTexture: default to doing GL sync
2012-09-18 12:14:51 -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
721b2a2815 am 8dfa92fe: Plumb display name into SurfaceFlinger
* commit '8dfa92fef9759a881e96ee58d59875d35023aab9':
  Plumb display name into SurfaceFlinger
2012-09-18 10:10:14 -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
The Android Automerger
336768a935 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-18 06:59:48 -07:00
Mathias Agopian
e303e43140 am d870703d: fix external displays
* commit 'd870703d5566490cfdfb389d9336b2b8d3c6cc7a':
  fix external displays
2012-09-18 02:32:47 -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
cb54b2a42c am 41cb1b5f: Merge changes I53d70510,If34a05f3 into jb-mr1-dev
* commit '41cb1b5f673b7f73e7f781b9f51ed095085dfdcd':
  add support hwc 1.1
  refactor things a bit
2012-09-18 00:04:32 -07:00
Jamie Gennis
8e7e539976 am f0f56f32: Merge "EGL: fix an extension string bug" into jb-mr1-dev
* commit 'f0f56f32bba418ebb42381cd63ba5da36f6fa228':
  EGL: fix an extension string bug
2012-09-18 00:04:24 -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
001d3c28af am c8cff90d: Merge "Use a named constant rather than a magic number." into jb-mr1-dev
* commit 'c8cff90d49b6eeaf0290c16517ff49df185dbdcd':
  Use a named constant rather than a magic number.
2012-09-17 12:13:28 -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
41fc5a4882 am 86ca50d8: am e917bfbd: am 09a22fc2: Merge "Allow disable of dumpstate vibrate"
* commit '86ca50d860fa256f5553ac7b313ba5ff0f120ef0':
  Allow disable of dumpstate vibrate
2012-09-17 11:03:29 -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
The Android Automerger
eb1844f8ea merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-16 17:12:24 -07:00
Ben Cheng
149627d136 am 07e8134e: Merge "Print warnings when backwards timestamps are detected." into jb-mr1-dev
* commit '07e8134e24e9ef7a3b2ade361ead5ce1b514c72f':
  Print warnings when backwards timestamps are detected.
2012-09-16 16:25:21 -07: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
cc29e530cf am 71f683ac: New test
* commit '71f683ac8d28e93928a9bb1744f43264b4846e8f':
  New test
2012-09-16 13:28:48 -07:00
Andy McFadden
1d84178faf am 6905205c: Fix transform hints
* commit '6905205c8d130b6ea3a813c1b9283492ed183367':
  Fix transform hints
2012-09-16 12:54:28 -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
The Android Automerger
d76dba486a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-14 07:11:52 -07:00
Jeff Brown
1aee81862e am 6e220a6c: Fix display projections when translated.
* commit '6e220a6ce6971555b883f4852c6e5d4c7a617815':
  Fix display projections when translated.
2012-09-13 19:42:12 -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
c410428451 am ae2cfb57: Minor tweaks
* commit 'ae2cfb5746e87f1bf17c446e20274c41ce0a57ce':
  Minor tweaks
2012-09-13 13:25:17 -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
The Android Automerger
5eb434e4fe merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-13 06:59:52 -07:00
Jesse Hall
65a835df43 am a4383fd9: Merge "Initialize new HWC 1.2 fields" into jb-mr1-dev
* commit 'a4383fd9de407d16342cd1069f75d2f0207efc0f':
  Initialize new HWC 1.2 fields
2012-09-12 20:20:02 -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
c66f34d8dd am fa32888f: Merge "Fix display projection transforms" into jb-mr1-dev
* commit 'fa32888f5822093f69522086d96ea2d493011a67':
  Fix display projection transforms
2012-09-12 20:18:31 -07:00
Jesse Hall
fa32888f58 Merge "Fix display projection transforms" into jb-mr1-dev 2012-09-12 20:16:28 -07:00
Mathias Agopian
917321d2fb am a5be0cd4: Merge "don\'t call hwc with non-empty layer lists for blanked displays" into jb-mr1-dev
* commit 'a5be0cd4f360a415a65825e5956e80a374c09743':
  don't call hwc with non-empty layer lists for blanked displays
2012-09-12 19:11:52 -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
791dcea018 am 9ca6491b: Region::validate() cannot be called from addRectUnchecked()
* commit '9ca6491bb701919a3f88fa7c43da284b13822ed6':
  Region::validate() cannot be called from addRectUnchecked()
2012-09-12 18:01:27 -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