Commit Graph

49263 Commits

Author SHA1 Message Date
Jesse Hall
028dc8f2d7 Provide HWC prepare with a valid output buffer
We weren't dequeing and setting the output buffer until just before
set(). This didn't allow HWC to make decisions in prepare() based on
the output buffer format, dimensions, etc.

Now we dequeue the output buffer at the beginning of the composition
loop and provide it to HWC in prepare. In GLES-only rendering, we may
have to cancel the buffer and acquire a new one if GLES requests a
buffer with properties different than the one we already dequeued.

Bug: 10365313
Change-Id: I96b4b0a851920e4334ef05080d58097d46467ab8
2013-08-20 16:35:32 -07:00
Jesse Hall
353ddc6e77 Fix HWComposer dumping of float source crops
Change-Id: I45a9344b5fab17ccb54bebd01382d738a03860e6
2013-08-20 16:11:50 -07:00
Andy McFadden
22a99f0fc2 Fix virtual displays for HWC 1.0
We weren't swapping the buffers.

Bug 10366404

Change-Id: I43eb7648231bedf24899da6fc0d9acc09e0b047e
2013-08-20 16:04:47 -07:00
Mathias Agopian
7775925c90 am 4f4f0943: SurfaceFlinger now runs in the process\'s main thread
* commit '4f4f0943489d9113c66ac22b58cfba8c21dfa879':
  SurfaceFlinger now runs in the process's main thread
2013-08-20 14:36:37 -07:00
Mathias Agopian
4f4f094348 SurfaceFlinger now runs in the process's main thread
it used to spawn its own thread and return the main thread
to the binder thread pool -- this was confusing the naming
of things in the kernel.

Bug: 10331839

Change-Id: I2d13a6d73409a38109300fcbe6a04b4c41cb5d00
2013-08-20 11:16:45 -07:00
The Android Automerger
fdbc68bf1f merge in klp-release history after reset to klp-dev 2013-08-20 06:01:38 -07:00
Andy McFadden
f94705f5fb am 8b308ed7: Fix build
* commit '8b308ed70ed782f68c8075aac2a6b66bbfcdb9af':
  Fix build
2013-08-19 09:51:16 -07:00
Andy McFadden
8b308ed70e Fix build
Neglected the "checkbuild"-built tests.

Change-Id: I202692f1a6d1e306c88e820c959d07d16e7c6a00
2013-08-19 08:56:07 -07:00
Andy McFadden
30290a557e am 90f59bf9: Merge "Re-enable frame dropping for non-auto timestamps" into klp-dev
* commit '90f59bf9eba79b27629505bc2709d84e7c811c8b':
  Re-enable frame dropping for non-auto timestamps
2013-08-19 07:29:11 -07:00
Andy McFadden
90f59bf9eb Merge "Re-enable frame dropping for non-auto timestamps" into klp-dev 2013-08-19 14:27:28 +00:00
The Android Automerger
152cd76544 merge in klp-release history after reset to klp-dev 2013-08-19 06:01:39 -07:00
Jesse Hall
e5df9a069c am 7c6278de: Merge "Use new HWC display type/count constants." into klp-dev
* commit '7c6278de6e2aed171362012d578d8bd093c8f280':
  Use new HWC display type/count constants.
2013-08-17 21:34:03 -07:00
Jesse Hall
7c6278de6e Merge "Use new HWC display type/count constants." into klp-dev 2013-08-18 04:31:24 +00:00
Mathias Agopian
f3044fe20d am 0f05a926: Merge "Encapsulate textures into their own Texture class" into klp-dev
* commit '0f05a926647389551aba6b8cfac37aaf73e8bad8':
  Encapsulate textures into their own Texture class
2013-08-16 17:43:31 -07:00
Mathias Agopian
0f05a92664 Merge "Encapsulate textures into their own Texture class" into klp-dev 2013-08-17 00:40:19 +00:00
Mathias Agopian
49457ac092 Encapsulate textures into their own Texture class
the main reason for doing this is so that we can have
access to informations about a texture (like its dimension)
close to where we generate and use shaders in ES 2.0.
Previously, there wasn't any way to get to a texture's size
from a RenderEngine implementation.

Bug: 8679321

Change-Id: I388b338a70d07e3e8177dde248710ea1e4c82dff
2013-08-16 16:29:02 -07:00
Andy McFadden
3c25621ad7 Re-enable frame dropping for non-auto timestamps
This change adds an entire field to note whether the timestamp was
auto-generated by Surface or supplied by the application.

The value is used when deciding whether or not to drop frames based
on buffer presentation timestamps.  If a desired presentation time
was set explicitly, BufferQueue will use that value to decide if a
frame should be dropped.  If the timestamp was generated by Surface
at the time the buffer was queued, the timestamp is ignored.

Bug 10151804

Change-Id: Ibd571a7578351063b813cbdad2ddbeed70655ba5
2013-08-16 15:15:16 -07:00
Jesse Hall
5a6b2c530c am a33b62cc: Merge "Replace sRGB_888 with sRGB_X_8888" into klp-dev
* commit 'a33b62cc4700c68a3481d415a55e1a7b688981e1':
  Replace sRGB_888 with sRGB_X_8888
2013-08-16 14:53:51 -07:00
Jesse Hall
a33b62cc47 Merge "Replace sRGB_888 with sRGB_X_8888" into klp-dev 2013-08-16 21:50:22 +00:00
Jesse Hall
9e663de4fe Use new HWC display type/count constants.
Change-Id: I774d0c68906ac6dc69268f708c30a6b0868b8816
2013-08-16 14:28:37 -07:00
Igor Murashkin
0ba1a16bbb am e60a0b1e: Merge "gui: CpuConsumer::lockNextBuffer change return code when too many bufs acquired" into klp-dev
* commit 'e60a0b1e6a29d79b4d0ec0374446cb829bcadee4':
  gui: CpuConsumer::lockNextBuffer change return code when too many bufs acquired
2013-08-16 14:07:10 -07:00
Igor Murashkin
e60a0b1e6a Merge "gui: CpuConsumer::lockNextBuffer change return code when too many bufs acquired" into klp-dev 2013-08-16 21:02:02 +00:00
Jesse Hall
bc2a90b024 Replace sRGB_888 with sRGB_X_8888
Bug: 10357459
Change-Id: I3a1d92cce2c9d3e930408129fb20887276fffddc
2013-08-16 07:50:11 -07:00
Jesse Hall
3b835a8db0 am e048a437: Merge "Add support for EGL_KHR_gl_colorspace" into klp-dev
* commit 'e048a4374c4e355c361f5eec0482ac85df0c73fe':
  Add support for EGL_KHR_gl_colorspace
2013-08-15 16:59:27 -07:00
Mathias Agopian
20b25201b7 am e0ec2a95: Merge "Fix ES2 composition on some devices" into klp-dev
* commit 'e0ec2a956840fa70387883f422b6020c1dfc6bad':
  Fix ES2 composition on some devices
2013-08-15 16:59:25 -07:00
Mathias Agopian
110bc6a50f am 2eaefe19: Simplify handling of opaque layers in shader generation
* commit '2eaefe198a0cae1ee0b6366797a6b074c76df9ef':
  Simplify handling of opaque layers in shader generation
2013-08-15 16:59:24 -07:00
Jesse Hall
e048a4374c Merge "Add support for EGL_KHR_gl_colorspace" into klp-dev 2013-08-15 23:17:49 +00:00
Mathias Agopian
e0ec2a9568 Merge "Fix ES2 composition on some devices" into klp-dev 2013-08-15 23:12:26 +00:00
Mathias Agopian
2eaefe198a Simplify handling of opaque layers in shader generation
just ensure the alpha value is 1.0 in the opaque case
when reading the color from the texture or the
global color.

Bug: 8679321

Change-Id: Ia38b30e97c3bce5a2d534a40c0d66e0bfc3ea40d
2013-08-15 15:11:01 -07:00
Mathias Agopian
458197de00 Fix ES2 composition on some devices
- turns out fragment shaders don't have default precision by default
- GLES 1.x extensions that became core in GLES 2.0 don't always work
  as extensions in GLES 2.0 (!)

Bug: 8679321
Change-Id: I5a4a93e158247910399325a965af5d2e3bbece9b
2013-08-15 14:56:51 -07:00
Andy McFadden
79f0edfa8b Disable GLES 2.x rendering
Bug 10340705

Change-Id: I91f3baf0d79655d8d031c100d0b116f745c2fbef
2013-08-15 12:22:38 -07:00
Andy McFadden
a25a959b7f Initialize mIndent
Bug 10334731

Change-Id: Ia3aa118a1516cc480b0d85179b78c4447f982dd6
2013-08-15 12:22:32 -07:00
Andy McFadden
a95d60deda am 6db4ff62: Disable GLES 2.x rendering
* commit '6db4ff621898573b41abf570271a04a13bd36a69':
  Disable GLES 2.x rendering
2013-08-15 10:45:04 -07:00
Andy McFadden
6db4ff6218 Disable GLES 2.x rendering
Bug 10340705

Change-Id: I91f3baf0d79655d8d031c100d0b116f745c2fbef
2013-08-15 10:39:11 -07:00
Andy McFadden
38b5e8c709 am 892f22dc: Initialize mIndent
* commit '892f22dcb96927b4a4f9ab7badd6f2c9f4f37c1f':
  Initialize mIndent
2013-08-15 10:15:45 -07:00
Andy McFadden
892f22dcb9 Initialize mIndent
Bug 10334731

Change-Id: Ia3aa118a1516cc480b0d85179b78c4447f982dd6
2013-08-15 10:05:01 -07:00
The Android Automerger
99ad75d5a8 merge in klp-release history after reset to klp-dev 2013-08-15 06:01:06 -07:00
Igor Murashkin
a5b7513711 gui: CpuConsumer::lockNextBuffer change return code when too many bufs acquired
- Return NOT_ENOUGH_DATA instead of INVALID_OPERATION when too many
  buffers have already been locked.
- INVALID_OPERATION is nominally used when something irrecoverable happens,
  but in this case the client just needs to call unlockBuffer to go back into a
  good state.

Bug: 10333400
Change-Id: I3a034d77de85741429f832a90eedd670afa1dc94
2013-08-14 20:17:17 -07:00
Mathias Agopian
99b535ad06 am 5bbe0ab6: fix build. optional test broke.
* commit '5bbe0ab655713849fbfe750d4d09690106f95d7f':
  fix build. optional test broke.
2013-08-14 18:28:48 -07:00
Mathias Agopian
5bbe0ab655 fix build. optional test broke.
Change-Id: I0ed5e2cd4c8945ee95673ed0eec5820d9def5097
2013-08-14 18:22:02 -07:00
Mathias Agopian
70986f0034 am c6bae007: Fix build. optional tests were broken.
* commit 'c6bae007e6e29b585fc1207f84b378a480006173':
  Fix build. optional tests were broken.
2013-08-14 16:33:04 -07:00
Mathias Agopian
c6bae007e6 Fix build. optional tests were broken.
Change-Id: Iba9f5cb57f134559e1f9c55e293578d9f5d8cb96
2013-08-14 16:27:19 -07:00
Mathias Agopian
32ca79c8a7 am b2620900: Merge "don\'t reallocate the mesh each time we use it" into klp-dev
* commit 'b2620900a8be578dd3358606b26048a72bb2eb2d':
  don't reallocate the mesh each time we use it
2013-08-14 15:45:22 -07:00
Mathias Agopian
b881700ab1 am 56f825e7: Merge "SurfaceFlinger now uses GLES 2.x when available" into klp-dev
* commit '56f825e7ab9f83706a74dcd4825c7bc839e49ae4':
  SurfaceFlinger now uses GLES 2.x when available
2013-08-14 15:45:21 -07:00
Mathias Agopian
b2620900a8 Merge "don't reallocate the mesh each time we use it" into klp-dev 2013-08-14 22:43:25 +00:00
Mathias Agopian
56f825e7ab Merge "SurfaceFlinger now uses GLES 2.x when available" into klp-dev 2013-08-14 22:42:52 +00:00
The Android Open Source Project
8bf4e52cdf Reconcile with klp-release - do not merge
Change-Id: I104b4a186af085b6a7a5f7d64f4dbb3dfd5aeb01
2013-08-14 15:10:28 -07:00
The Android Automerger
7e3060071a merge in klp-release history after reset to klp-dev 2013-08-14 06:06:17 -07:00
Mathias Agopian
5cdc8994a0 don't reallocate the mesh each time we use it
the Mesh object can be part of each Layer (at least currently).
also reworked the Mesh code a bit to make it easier to access
the vertex data.

Change-Id: I0490851ba898f0aa2e55b62958dcd8bdb535e98b
2013-08-13 20:51:23 -07:00
Todd Poynor
b52bfbb1c4 am 5025593d: Merge "dumpstate: switch to HAL static libraries" into klp-dev
* commit '5025593d0ee6bf6d03121d9c42623bae0f131c9d':
  dumpstate: switch to HAL static libraries
2013-08-13 17:26:40 -07:00