Jesse Hall
68df058934
am 5bc0c358
: am d2cf8c2f
: Merge "Provide HWC prepare with a valid output buffer" into klp-dev
...
* commit '5bc0c358a80f3c0e762b489e8bfb5888444159a6':
Provide HWC prepare with a valid output buffer
2013-08-21 07:44:13 -07:00
Jesse Hall
2bb83067e3
am 68c4d784
: am 7127d17d
: Merge "Fix HWComposer dumping of float source crops" into klp-dev
...
* commit '68c4d784abbc43f3f47679e301385b01b824c8ed':
Fix HWComposer dumping of float source crops
2013-08-21 07:44:13 -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
a482ef802e
am 7c696162
: am 32551478
: Merge "Fix virtual displays for HWC 1.0" into klp-dev
...
* commit '7c696162017ab99fcffc08b08cb6de6e63c321b9':
Fix virtual displays for HWC 1.0
2013-08-21 07:35:41 -07: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
The Android Automerger
6e75330814
merge in klp-release history after reset to klp-dev
2013-08-21 06:02:26 -07: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
a4175dc084
am 7775925c
: am 4f4f0943
: SurfaceFlinger now runs in the process\'s main thread
...
* commit '7775925c9021e188bcba0884d4124616a7c58dcd':
SurfaceFlinger now runs in the process's main thread
2013-08-20 14:39:45 -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
9bdb72e078
am f94705f5
: am 8b308ed7
: Fix build
...
* commit 'f94705f5fba8da61b0cdfc3c08f54a8ee66e1a42':
Fix build
2013-08-19 09:54:31 -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
410f23baf3
am 30290a55
: am 90f59bf9
: Merge "Re-enable frame dropping for non-auto timestamps" into klp-dev
...
* commit '30290a557e596c9bd58f99f9b8a3ea10bcbc8760':
Re-enable frame dropping for non-auto timestamps
2013-08-19 07:32: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
c1408e908f
am e5df9a06
: am 7c6278de
: Merge "Use new HWC display type/count constants." into klp-dev
...
* commit 'e5df9a069c4570ebe14009701bc43bdc80a358d2':
Use new HWC display type/count constants.
2013-08-17 21:35:22 -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
93f2a5d185
am f3044fe2
: am 0f05a926
: Merge "Encapsulate textures into their own Texture class" into klp-dev
...
* commit 'f3044fe20dee4db9986f2403631aca73738c397e':
Encapsulate textures into their own Texture class
2013-08-16 17:46:41 -07: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
65e2eed38b
am 5a6b2c53
: am a33b62cc
: Merge "Replace sRGB_888 with sRGB_X_8888" into klp-dev
...
* commit '5a6b2c530cd8fb2ea9239c634f0652c18bd8f15a':
Replace sRGB_888 with sRGB_X_8888
2013-08-16 14:56:18 -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
68322a366c
am 0ba1a16b
: am e60a0b1e
: Merge "gui: CpuConsumer::lockNextBuffer change return code when too many bufs acquired" into klp-dev
...
* commit '0ba1a16bbb2c7ea5f52691c062613a2309821354':
gui: CpuConsumer::lockNextBuffer change return code when too many bufs acquired
2013-08-16 14:10:00 -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
ddb7ae4258
am 3b835a8d
: am e048a437
: Merge "Add support for EGL_KHR_gl_colorspace" into klp-dev
...
* commit '3b835a8db09e59321da2c42972690edd5cae9714':
Add support for EGL_KHR_gl_colorspace
2013-08-15 17:01:13 -07:00
Mathias Agopian
bc06712409
am 20b25201
: am e0ec2a95
: Merge "Fix ES2 composition on some devices" into klp-dev
...
* commit '20b25201b7ca088ff751a292c32d397f86232dcf':
Fix ES2 composition on some devices
2013-08-15 17:01:13 -07:00
Mathias Agopian
9ab41030a8
am 110bc6a5
: am 2eaefe19
: Simplify handling of opaque layers in shader generation
...
* commit '110bc6a50fb0c06053bef83afe5075f7e25c5093':
Simplify handling of opaque layers in shader generation
2013-08-15 17:01:12 -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