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
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
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
0c92ef2bb6
am a95d60de
: am 6db4ff62
: Disable GLES 2.x rendering
...
* commit 'a95d60deda33645f7f0e94d8aa5564283c9dae39':
Disable GLES 2.x rendering
2013-08-15 10:49:47 -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
0ca2e23021
am 38b5e8c7
: am 892f22dc
: Initialize mIndent
...
* commit '38b5e8c70906a17d3ada0887f089103eba4c94fd':
Initialize mIndent
2013-08-15 10:18:18 -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
Mathias Agopian
bebc84e19c
am 99b535ad
: am 5bbe0ab6
: fix build. optional test broke.
...
* commit '99b535ad06fa033784c251394143287f9b0b89c8':
fix build. optional test broke.
2013-08-14 18:32:27 -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
811f271bdd
am 70986f00
: am c6bae007
: Fix build. optional tests were broken.
...
* commit '70986f00348e1af2f04cc7a80bcb0431a01d93d5':
Fix build. optional tests were broken.
2013-08-14 16:36:03 -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
d8bc9696d6
am 32ca79c8
: am b2620900
: Merge "don\'t reallocate the mesh each time we use it" into klp-dev
...
* commit '32ca79c8a7c4ae982fb59e4911a7ec91a418770c':
don't reallocate the mesh each time we use it
2013-08-14 15:49:35 -07:00
Mathias Agopian
7a602035ef
am b881700a
: am 56f825e7
: Merge "SurfaceFlinger now uses GLES 2.x when available" into klp-dev
...
* commit 'b881700ab160b4544453bf8920e3022d46fee262':
SurfaceFlinger now uses GLES 2.x when available
2013-08-14 15:49:35 -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