ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
49,257 Commits 2 Branches 0 Tags 54 MiB
f0d2b05ac7
Commit Graph

49257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
The Android Open Source Project
6d92b74034 am 8bf4e52c: (-s ours) Reconcile with klp-release - do not merge 
* commit '8bf4e52cdfc3b9a8101d5945124fb7c4fd92c84e':
  Return NO_MEMORY when glReadPixels() fails.
 2013-08-14 15:14:38 -07: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
c8919373b2 am b52bfbb1: am 5025593d: Merge "dumpstate: switch to HAL static libraries" into klp-dev 
* commit 'b52bfbb1c4ee3e19d4ce54f3d9e149878696edf1':
  dumpstate: switch to HAL static libraries
 2013-08-13 17:30:12 -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
Todd Poynor
5025593d0e Merge "dumpstate: switch to HAL static libraries" into klp-dev 2013-08-14 00:22:41 +00:00
Todd Poynor
4f5b9a701b dumpstate: switch to HAL static libraries 
Change-Id: I865a0b4b4a84a2d54a239e7b09874287f0c1ad56
 2013-08-13 16:30:01 -07:00
Mathias Agopian
3f84483382 SurfaceFlinger now uses GLES 2.x when available 
Bug: 8679321

Change-Id: I2b152d01fb4e2de2ea9fe87f1ddbd6826d7520d7
 2013-08-13 16:07:45 -07:00
Mathias Agopian
58a5a6317e am 0aaa1927: am 5ff5a84e: allow "system" screenshots even when the secure flag is set 
* commit '0aaa19271b8e23cc2d4f686d43b46e2bca9fd28f':
  allow "system" screenshots even when the secure flag is set
 2013-08-13 16:06:10 -07:00
Mathias Agopian
0aaa19271b am 5ff5a84e: allow "system" screenshots even when the secure flag is set 
* commit '5ff5a84e4829bad9eb44cc9a32d8579ca089051b':
  allow "system" screenshots even when the secure flag is set
 2013-08-13 16:03:51 -07:00
Mathias Agopian
5ff5a84e48 allow "system" screenshots even when the secure flag is set 
we need too allow this case so that things like the rotation
animation can work.
with this change we only permit these screenshot if the
destination is SurfaceFlinger itself.

Bug: 10235036
Change-Id: I66fea5391e52b0d7f17f25827572b236f2d9eb71
 2013-08-13 15:58:38 -07:00
John Reck
cf27a6bfa2 Merge "Fix libpng includes" 2013-08-13 21:34:43 +00:00
John Reck
05cf62d1c8 Fix libpng includes 
png.h now includes pnglibconf.h
 update the include path so it can find it

Change-Id: I594f1613e42405072029ae4cd7f9f8d0e03b2434
 2013-08-13 13:47:12 -07:00