Commit Graph

49124 Commits

Author SHA1 Message Date
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
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
Andy McFadden
7c69616201 am 32551478: Merge "Fix virtual displays for HWC 1.0" into klp-dev
* commit '32551478fc5417d3b7b5e33a202eb6ca66061f7d':
  Fix virtual displays for HWC 1.0
2013-08-21 07:33:46 -07:00
Andy McFadden
32551478fc Merge "Fix virtual displays for HWC 1.0" into klp-dev 2013-08-21 14:31:35 +00:00
Mathias Agopian
0e8f1443b8 Fix a bug where non-cropped layer could be scaled incorrectly
If a layer is not cropped but its bounds are outside of the
viewport (i.e.: clipped), the crop rectangle passed to
hw composer would be invalid because it started invalid
in the first place (to indicate "no crop").

Bug: 10410944
Change-Id: I4ae4d49a1adef0be7fa4304ecf84b1a5b7d03fe0
2013-08-20 21:46:45 -07:00
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
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
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
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
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