Commit Graph

51813 Commits

Author SHA1 Message Date
Johan Euphrosine 91e485fad1 am b9009863: Merge "frameworks/native: document native types and enums"
* commit 'b9009863cb45acd7455c0ac873fb8e6a3e7a4f99':
  frameworks/native: document native types and enums
2015-05-12 22:15:51 +00:00
Johan Euphrosine b9009863cb Merge "frameworks/native: document native types and enums" 2015-05-12 22:05:22 +00:00
Johan Euphrosine bf6d5e012c frameworks/native: document native types and enums
Change-Id: Id94b610f27b87426abb30e13484cbd16990aa995
2015-05-12 14:39:28 -07:00
Dan Stoza 2089a65c9b am 38d7f755: Merge "libgui: Hook up onFrameReplaced"
* commit '38d7f7550f5848b33b2e0a2048687fc22f708fda':
  libgui: Hook up onFrameReplaced
2015-05-12 17:25:00 +00:00
Dan Stoza 38d7f7550f Merge "libgui: Hook up onFrameReplaced" 2015-05-12 17:18:12 +00:00
Dan Stoza a3b6693272 libgui: Hook up onFrameReplaced
This completes the plumbing from ConsumerListener::onFrameReplaced into
SurfaceFlinger (and other consumers that may care).

Change-Id: I376e78ace95d6748e8662e6b4d47c0dfa697a300
(cherry picked from commit dc13c5b85b)
2015-05-12 09:35:29 -07:00
Jesse Hall eec21aeec9 am 364ed954: Merge "libEGL: whitelist the EGL_KHR_create_context_no_error extension"
* commit '364ed9545382539ab9875555947bc18ec94bb82b':
  libEGL: whitelist the EGL_KHR_create_context_no_error extension
2015-05-11 21:42:24 +00:00
Jesse Hall 364ed95453 Merge "libEGL: whitelist the EGL_KHR_create_context_no_error extension" 2015-05-11 21:31:44 +00:00
Jesse Hall 5245af3cb7 libEGL: whitelist the EGL_KHR_create_context_no_error extension
Allow EGL implementations to expose the
EGL_KHR_create_context_no_error extension if they wish.

https://www.khronos.org/registry/egl/extensions/KHR/EGL_KHR_create_context_no_error.txt

Change-Id: I3290ccc2a69a1fa0b00ec3f1aa4f876906c64bfb
2015-05-11 13:59:15 -07:00
Chris Craik 9a104951a3 am 05815996: Merge "Added Voltage and Current regulator ftrace events to atrace"
* commit '05815996c965b99c4cc4ea96f6b6c4a9123cdf1c':
  Added Voltage and Current regulator ftrace events to atrace
2015-05-07 16:34:00 +00:00
Chris Craik 05815996c9 Merge "Added Voltage and Current regulator ftrace events to atrace" 2015-05-07 16:20:52 +00:00
Dan Stoza c037ca7fb1 am c4e98c40: Merge "SF: Apply pending transactions to new sidebands"
* commit 'c4e98c40deacb54ad7288337927506cb5798dfa5':
  SF: Apply pending transactions to new sidebands
2015-05-06 17:01:06 +00:00
Dan Stoza c4e98c40de Merge "SF: Apply pending transactions to new sidebands" 2015-05-06 16:50:38 +00:00
Dan Stoza 8afb76731a SF: Apply pending transactions to new sidebands
When a Layer's sideband stream is set, apply any pending transactions.
Otherwise they would never be applied since sideband streams don't
trigger updates by pushing new buffers.

Bug: 20125898
Change-Id: I0c7a91cdf84e6205801f4ab64eee0b09e4c0b3e0
(cherry picked from commit 3b04e1383eca6cb1d43ebe23a421c427007690c7)
2015-05-05 14:21:20 -07:00
Dan Stoza d9fd7a7864 am e357f649: Merge "libgui: Clear frame number while freeing slot"
* commit 'e357f6494539cf40a87f77a85e9c0a694c331b86':
  libgui: Clear frame number while freeing slot
2015-05-04 17:06:30 +00:00
Dan Stoza e357f64945 Merge "libgui: Clear frame number while freeing slot" 2015-05-04 16:57:54 +00:00
Dan Stoza 24056507af libgui: Clear frame number while freeing slot
Clears the frame number of a slot when it is freed, since it is used
to determine if a released buffer is stale.

Bug: 20445852
Change-Id: I02415e7b25a1eafe7414d6eb1cedf62ac5543cd9
(cherry picked from commit 52937cd9a5)
2015-05-01 16:48:35 -07:00
Mark Salyzyn 701552f368 am dfe7e7e6: Merge "dumpstate: report per-partition MMC performance"
* commit 'dfe7e7e63fa80a8a9050ea47f69a340e2f7e342d':
  dumpstate: report per-partition MMC performance
2015-05-01 22:02:12 +00:00
Mark Salyzyn dfe7e7e63f Merge "dumpstate: report per-partition MMC performance" 2015-05-01 21:48:51 +00:00
Dan Stoza a016254260 am bb58111c: Merge "SurfaceFlinger: Fix PTS on stale buffers"
* commit 'bb58111c22b41f605a8edb6599fd3df42f6d8e4e':
  SurfaceFlinger: Fix PTS on stale buffers
2015-05-01 20:40:26 +00:00
Dan Stoza bb58111c22 Merge "SurfaceFlinger: Fix PTS on stale buffers" 2015-05-01 20:28:47 +00:00
Dan Stoza 2e36f2283f SurfaceFlinger: Fix PTS on stale buffers
SurfaceFlinger's (Layer's) shadow copy of the BufferQueue queue was
getting out of sync for a few reasons. This change fixes these by
doing the following:

- Adds a check to re-synchronize the shadow copy every time we
  successfully acquire a buffer by first dropping stale buffers before
  removing the current buffer.
- Avoids trying to perform updates for buffers which have been rejected
  (for incorrect dimensions) by SurfaceFlinger.
- Adds IGraphicBufferConsumer::setShadowQueueSize, which allows the
  consumer to notify the BufferQueue that it is maintaining a shadow
  copy of the queue and prevents it from dropping so many buffers
  during acquireBuffer that it ends up returning a buffer for which the
  consumer has not yet received an onFrameAvailable call.

Bug: 20096136
Change-Id: I78d0738428005fc19b3be85cc8f1db498043612f
2015-04-30 15:29:05 -07:00
Dan Stoza 6dbfc87da5 am 32d4b6c8: Merge "SurfaceFlinger: Limit to 4k Layers"
* commit '32d4b6c8e122308a7ae296406f87a1df1b611a44':
  SurfaceFlinger: Limit to 4k Layers
2015-04-30 22:21:02 +00:00
Dan Stoza 32d4b6c8e1 Merge "SurfaceFlinger: Limit to 4k Layers" 2015-04-30 22:09:38 +00:00
Dan Stoza c8ffe5a662 am 676d10b2: Merge "SurfaceFlinger: Fix integer overflow in Mesh ctor"
* commit '676d10b2709059079823698cb6b16e71a97d6d8b':
  SurfaceFlinger: Fix integer overflow in Mesh ctor
2015-04-30 22:08:00 +00:00
Dan Stoza a4cba8c1d7 am ed6e907b: Merge "Close Fence FDs in error cases of Surface and GraphicBufferMapper"
* commit 'ed6e907bc7a259d85c6a6c141a06a06e5c0b224c':
  Close Fence FDs in error cases of Surface and GraphicBufferMapper
2015-04-30 21:57:16 +00:00
Dan Stoza 676d10b270 Merge "SurfaceFlinger: Fix integer overflow in Mesh ctor" 2015-04-30 21:57:15 +00:00
Dan Stoza ed6e907bc7 Merge "Close Fence FDs in error cases of Surface and GraphicBufferMapper" 2015-04-30 21:49:40 +00:00
Dan Stoza e7f8dde3f3 SurfaceFlinger: Limit to 4k Layers
Sets a limit of 4k Layers which SurfaceFlinger will allow to be in
existence at any given time. An attempt to create Layers in excess of
this limit will fail with NO_MEMORY.

Bug: 20674586
Change-Id: I2dfaf59643d826f982b2fa44e8a9ed643176d972
2015-04-30 14:29:30 -07:00
Mark Salyzyn 540e3de99f dumpstate: report per-partition MMC performance
Change-Id: If5cabe186d8377056effa1c0672a90e277cd7221
2015-04-30 12:58:32 -07:00
Dan Stoza ab79e33ef3 SurfaceFlinger: Fix integer overflow in Mesh ctor
Performs range checking on the inputs to Mesh::Mesh() before allocating
the storage array.

Bug: 20674682
Change-Id: I4fc918a8c312d967dd6d9f91a098b2e0a7081027
2015-04-30 12:44:03 -07:00
Dan Stoza 11603b7b87 am 08a7c792: Merge "Remove gamma correction from color correction shader"
* commit '08a7c79284dd1cda095b79e5081fea0b0b4ec151':
  Remove gamma correction from color correction shader
2015-04-30 19:43:24 +00:00
Dan Stoza 08a7c79284 Merge "Remove gamma correction from color correction shader" 2015-04-30 19:36:30 +00:00
Dan Stoza f9a3b73ee9 am f0c17b08: Merge "Avoid closing invalid FD in Surface and GraphicBufferMapper"
* commit 'f0c17b0831512cc700414d12dee1e84fb174bbbe':
  Avoid closing invalid FD in Surface and GraphicBufferMapper
2015-04-30 16:46:46 +00:00
Dan Stoza f0c17b0831 Merge "Avoid closing invalid FD in Surface and GraphicBufferMapper" 2015-04-30 16:34:11 +00:00
Taiju Tsuiki dcfe91e1f3 Avoid closing invalid FD in Surface and GraphicBufferMapper
GraphicBufferMapper::lockAsync{,YCbCr} close the fence FD even when the FD
is invalid.

Change-Id: Ia2b4dae3b2c06426e34f623f19ba92435f486ab7
2015-04-30 22:56:25 +09:00
Taiju Tsuiki c7263fb432 Close Fence FDs in error cases of Surface and GraphicBufferMapper
Surface::{cancel,queue}Buffer and GraphicBufferMapper::lockAsyncYCbCr take the
ownership of |fenceFd|s. Though they don't close it on error cases.

Change-Id: I49a7ce8837d5c510c4ac4ad4649f310d18610e80
2015-04-30 22:55:36 +09:00
Alan Viverette ad84681d31 Remove gamma correction from color correction shader
Gamma correction was incorrectly skewing both color inversion and
Daltonization, which resulted in washed-out colors.

Bug: 20346301
Change-Id: I34d879f902c3be115b2d23f09c3ed3902799759e
(cherry picked from commit 3acd9f1d8f)
2015-04-29 12:27:18 -07:00
Dan Stoza 39e85f2cd8 am 8de71a24: Merge "BufferQueue: Add NATIVE_WINDOW_BUFFER_AGE query"
* commit '8de71a2408f632407c25942a39c31f78c7f64ffd':
  BufferQueue: Add NATIVE_WINDOW_BUFFER_AGE query
2015-04-29 17:30:48 +00:00
Dan Stoza 844b01776d am ca8c5695: Merge "libgui: Implement onTransact for sideband streams"
* commit 'ca8c569598d79b4bbe4fc08a4ea97619df3b7262':
  libgui: Implement onTransact for sideband streams
2015-04-29 17:30:45 +00:00
Dan Stoza 8de71a2408 Merge "BufferQueue: Add NATIVE_WINDOW_BUFFER_AGE query" 2015-04-29 17:21:51 +00:00
Dan Stoza ca8c569598 Merge "libgui: Implement onTransact for sideband streams" 2015-04-29 17:17:52 +00:00
Nick Kralevich 1c60f88902 am becd89d1: Merge "Parcel.cpp: use calloc instead of malloc"
* commit 'becd89d185e53eb9ba3ddc24342e0f229dde6175':
  Parcel.cpp: use calloc instead of malloc
2015-04-29 04:24:47 +00:00
Nick Kralevich becd89d185 Merge "Parcel.cpp: use calloc instead of malloc" 2015-04-29 04:16:23 +00:00
Nick Kralevich 6329f0199e Parcel.cpp: use calloc instead of malloc
Bug: 20669363
Change-Id: Ia4c8d8ca9d8b4b87954d7267e8b1c94cf4e570e1
2015-04-28 16:21:30 -07:00
Dan Stoza 81cde67a55 BufferQueue: Add NATIVE_WINDOW_BUFFER_AGE query
Adds a NATIVE_WINDOW_BUFFER_AGE query, which returns the age of the
contents of the most recently dequeued buffer as the number of frames
that have elapsed since it was last queued.

Change-Id: Ib6fd62945cb62d1e60133a65beee510363218a23
2015-04-28 14:26:05 -07:00
Dan Stoza 17166698d9 libgui: Implement onTransact for sideband streams
Implements the GET_SIDEBAND_STREAM case of
IGraphicBufferConsumer::onTransact

Change-Id: I46138b87ce2d70dde48b3561dcd378ce5fd8f383
2015-04-28 13:23:18 -07:00
Dan Stoza b078aef6ce am b5c7ccfd: Merge "libgui: Change detachNextBuffer to return sp<GB>"
* commit 'b5c7ccfdc7eb5b0ab8d22084000e9c39092ccd0e':
  libgui: Change detachNextBuffer to return sp<GB>
2015-04-28 17:46:44 +00:00
Dan Stoza b5c7ccfdc7 Merge "libgui: Change detachNextBuffer to return sp<GB>" 2015-04-28 17:36:54 +00:00
Dan Stoza 745ac038b9 libgui: Change detachNextBuffer to return sp<GB>
Changes Surface::detachNextBuffer to return an sp<GraphicBuffer>
instead of an ANativeWindowBuffer* to ensure that reference counting
works correctly.

Bug: 20092217
Change-Id: I3979ea6121aaf14845f0554477b778770413581e
2015-04-27 11:16:15 -07:00