Mathias Agopian
50f262fe56
minor SharedBuffer clean-up
...
Change-Id: If38b7ce85806ae628c00f2c938de4e3f75142543
2012-08-31 18:41:21 -07:00
Mathias Agopian
2401ead700
Add a way to retrieve a Region as a SharedBuffer
...
Change-Id: Ia53cb905fbc88f899521658545f990fb9217b1e1
2012-08-31 18:38:22 -07:00
Mathias Agopian
3ab68558fa
change how we store Region data internally
...
We used to keep the bounds of the region as a
separate rectangle. Instead we now store it as the last
element of the Vector<> of Rects.
This has the benefit of being slightly more efficient when
copying regions and reduces the overhead of small regions,
but more importantly will allow us to export the underlaying
SharedBuffer (eventually).
Change-Id: I80790e4fb1a09a747a5616000cfef852ac4ce9e9
2012-08-31 18:38:22 -07:00
Mathias Agopian
4c0a170585
don't generate a new Region when translating by 0,0
...
since regions are copy-on-write, this prevents to
duplicate the region entirely and offseting by 0,0 is
fairly common.
Change-Id: I9b8c286315a2e00dda01c2456397d72b5e12006b
2012-08-31 18:38:22 -07:00
Mathias Agopian
2098517e3e
make sure Parcel handles 0-sized LightFlatenables
...
Change-Id: Ib30a1c0228f8a938abaa0c7c8a6ba32ffd971121
2012-08-31 18:09:51 -07:00
Jamie Gennis
9e75ddda93
libgui: add BufferQueue test infrastructure
...
This change adds some infrastructure for testing the BufferQueue class. It
also includes a test that tests the new check in BufferQueue::acquireBuffer
that prevents the consumer from acquiring more than one buffer beyond the max
acquired buffer count that was set.
Change-Id: I38554ad3f9a53d2ddeba7ef0deee35ec2e2f9775
2012-08-31 17:02:49 -07:00
Andy McFadden
6bf552ee02
Add timeout when waiting for HW vsync
...
This way we don't get stuck if, say, the driver decides not
to send us vsync events.
Change-Id: I4af6358b3a1f304eaae5fd926ed3403fa1091827
2012-08-31 16:47:44 -07:00
Dianne Hackborn
a2de8585e8
am 8210185f
: No longer need "original calling uid".
...
* commit '8210185fe337ca9d5b01f2bff8590ea60984c31e':
No longer need "original calling uid".
2012-08-31 16:27:40 -07:00
Jamie Gennis
fdb6b49dfa
libgui: disable CpuConsumer tests
...
This change disables the CpuConsumer tests because they require a Gralloc
format that is not supported on all devices.
Change-Id: Ifaa618062c1dae53d9fcb9e16ba92c480d3dbd0c
2012-08-31 15:54:21 -07:00
Dianne Hackborn
8210185fe3
No longer need "original calling uid".
...
Change-Id: Ifc4a89dd088609a5a8553f6ac6553174e09e8222
2012-08-31 15:40:58 -07:00
Jesse Hall
8fc56006b6
am 9ca48916
: If there is no hwc, call eglSwapBuffers for the main display
...
* commit '9ca48916bc9408d0f3f8ac95469ced0a6a342aca':
If there is no hwc, call eglSwapBuffers for the main display
2012-08-31 13:54:08 -07:00
Jesse Hall
9ca48916bc
If there is no hwc, call eglSwapBuffers for the main display
...
Bug: 7068568
Change-Id: I6a0309613fe3619d065b9047af6c3fb32b510d97
2012-08-31 13:52:25 -07:00
Jesse Hall
5909d99e1d
am f90883d6
: Merge "HWC 1.1: hook up hotplug event, use new display config queries" into jb-mr1-dev
...
* commit 'f90883d6a50688081642855bba43bef0693d5020':
HWC 1.1: hook up hotplug event, use new display config queries
2012-08-31 12:58:56 -07:00
Jamie Gennis
023881e28d
am 4697528e
: SurfaceTexture: fix a few tests
...
* commit '4697528eac85d34b2b375ece1d4b40aebe3fa5dd':
SurfaceTexture: fix a few tests
2012-08-31 12:57:30 -07:00
Jamie Gennis
b6d226ef4a
am d69097f9
: libgui: add some error checks
...
* commit 'd69097f936d9780957a51ce77335ae409b32aaa3':
libgui: add some error checks
2012-08-31 12:57:30 -07:00
Jamie Gennis
d7c862b371
am 5e5efde7
: BufferQueue: add a check for the max acquired bufs
...
* commit '5e5efde7874a9fab650fd4b724ceef46db850470':
BufferQueue: add a check for the max acquired bufs
2012-08-31 12:57:29 -07:00
Jesse Hall
f90883d6a5
Merge "HWC 1.1: hook up hotplug event, use new display config queries" into jb-mr1-dev
2012-08-31 12:57:07 -07:00
Jesse Hall
1bd20e0f9e
HWC 1.1: hook up hotplug event, use new display config queries
...
Change-Id: I2fd359e5fc7e1948072c6bc6b6fe47ea5e8025c1
2012-08-31 09:25:24 -07:00
Jamie Gennis
4697528eac
SurfaceTexture: fix a few tests
...
Change-Id: Ic74fe8791361f8fe91ad7149720fafd4cc154ac1
2012-08-30 18:38:11 -07:00
Jamie Gennis
d69097f936
libgui: add some error checks
...
This change adds a few error checks both in the framework and in some tests.
Change-Id: I2baf2676942a0dc15866e75852a775a0091ed16d
2012-08-30 18:38:11 -07:00
Jamie Gennis
5e5efde787
BufferQueue: add a check for the max acquired bufs
...
This change adds an error check to ensure that consumers don't acquire more
buffers than the maximum that they set.
Change-Id: I026643564bde52732e4ee6146972b207ddbbba77
2012-08-30 18:38:11 -07:00
Jamie Gennis
4d4ebc4788
am 72f096fb
: BufferQueue: use max acquired buffer count
...
* commit '72f096fb1ad0a0deadbfac5f88627461905d38e8':
BufferQueue: use max acquired buffer count
2012-08-30 18:28:31 -07:00
Jamie Gennis
72f096fb1a
BufferQueue: use max acquired buffer count
...
This change makes BufferQueue derive the min undequeued buffer count from a max
acquired buffer count that is set by the consumer. This value may be set at
any time that a producer is not connected to the BufferQueue rather than at
BufferQueue construction time.
Change-Id: Icf9f1d91ec612a079968ba0a4621deffe48f4e22
2012-08-30 18:26:09 -07:00
Jamie Gennis
c02ee02604
am 1847f7fd
: Merge "BufferQueue: simplify max buffer count handling" into jb-mr1-dev
...
* commit '1847f7fd799f92300b3786e49f5883eaa03f4507':
BufferQueue: simplify max buffer count handling
2012-08-30 18:24:37 -07:00
Jamie Gennis
1847f7fd79
Merge "BufferQueue: simplify max buffer count handling" into jb-mr1-dev
2012-08-30 18:23:27 -07:00
Jamie Gennis
f4d82f7d52
am 2b977698
: Merge "BufferQueue: clean up buffer counting" into jb-mr1-dev
...
* commit '2b9776982360a234803665cb79e8abcfeb0e3c79':
BufferQueue: clean up buffer counting
2012-08-30 18:23:14 -07:00
Jamie Gennis
2b97769823
Merge "BufferQueue: clean up buffer counting" into jb-mr1-dev
2012-08-30 18:21:11 -07:00
Wink Saville
fdddb7b0fd
am f196b56d
: Merge "Revert "A vendor ril depends on a native screen shot code."" into jb-mr1-dev
...
* commit 'f196b56d70df6af753cb08bbb68e52498f0f37f1':
Revert "A vendor ril depends on a native screen shot code."
2012-08-30 17:34:11 -07:00
Wink Saville
f196b56d70
Merge "Revert "A vendor ril depends on a native screen shot code."" into jb-mr1-dev
2012-08-30 17:31:47 -07:00
Jesse Hall
066b3d39a8
am ec34af41
: Merge "Handle new device api version encoding" into jb-mr1-dev
...
* commit 'ec34af4144c0f990513fe58b0754b20f94b36d6f':
Handle new device api version encoding
2012-08-30 14:27:03 -07:00
Jesse Hall
ec34af4144
Merge "Handle new device api version encoding" into jb-mr1-dev
2012-08-30 14:24:53 -07:00
Wink Saville
94f261556c
Revert "A vendor ril depends on a native screen shot code."
...
This reverts commit 9b5782baf0
.
A new ril for toro, hack no longer needed.
2012-08-30 11:53:55 -07:00
The Android Automerger
edf7ba4a74
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-30 06:34:01 -07:00
Mathias Agopian
344d189cee
am 93997a8a
: fix a crasher when setting a display to a null surface
...
* commit '93997a8a75942b4d06cf50925de5bede489cc134':
fix a crasher when setting a display to a null surface
2012-08-29 18:24:58 -07:00
Mathias Agopian
93997a8a75
fix a crasher when setting a display to a null surface
...
Bug: 7076303
Change-Id: I843dd4ee4a603b8ad51bc1ad14e429db15050bec
2012-08-29 18:22:23 -07:00
Mathias Agopian
6338654ed2
we were sometimes not setting fences properly
...
this would happen when the composition was handled
entirely in h/w composer, in this case, we would
not set the fences for any involved layers.
Bug: 7049373
Change-Id: I1439dc156ce23c24041cdfbbebfe8ff4fdf790f8
2012-08-29 17:38:13 -07:00
Mathias Agopian
3fc6a2cebc
am c9ea4c8b
: Merge "we were sometimes not setting fences properly" into jb-mr1-dev
...
* commit 'c9ea4c8b580e73a89984641ed37a3eb417cc86c5':
we were sometimes not setting fences properly
2012-08-29 17:26:45 -07:00
Mathias Agopian
c9ea4c8b58
Merge "we were sometimes not setting fences properly" into jb-mr1-dev
2012-08-29 17:24:54 -07:00
Mathias Agopian
85d751cba5
we were sometimes not setting fences properly
...
this would happen when the composition was handled
entirely in h/w composer, in this case, we would
not set the fences for any involved layers.
Bug: 7049373
Change-Id: I1439dc156ce23c24041cdfbbebfe8ff4fdf790f8
2012-08-29 16:59:24 -07:00
Jamie Gennis
e191e6c348
BufferQueue: simplify max buffer count handling
...
This change reworks how the maximum buffer count is computed.
Change-Id: I7d3745814b9bd6f6f447f86bfea8eb7729914ebf
2012-08-29 15:35:34 -07:00
Jamie Gennis
31a353da22
BufferQueue: clean up buffer counting
...
This change is a clean up of some of the handling of the maximum number of
buffers that are allowed at once. It mostly renames a few member variables and
methods, but it includes a couple small refactorings.
Change-Id: I9959310f563d09583548d4291e1050a7bbc7d87d
2012-08-29 15:35:34 -07:00
Andreas Huber
146ea3eec4
am c1396dd1
: Merge "initial checkin of a preliminary HDCP API for vendors to implement." into jb-mr1-dev
...
* commit 'c1396dd14506d29e92fc047141d62b3d9246a72d':
initial checkin of a preliminary HDCP API for vendors to implement.
2012-08-29 13:34:01 -07:00
Andreas Huber
c1396dd145
Merge "initial checkin of a preliminary HDCP API for vendors to implement." into jb-mr1-dev
2012-08-29 13:32:15 -07:00
Andreas Huber
a8fc772b5b
initial checkin of a preliminary HDCP API for vendors to implement.
...
Change-Id: If98277efdec1bc8f1e9f4af1ca73324e4c3d469b
2012-08-29 13:26:55 -07:00
Jesse Hall
9eb1eb5bb5
Handle new device api version encoding
...
Change-Id: I3d36058bd5d31c23b3cc4a7eb5aa033b6f3c1955
2012-08-29 10:39:38 -07:00
The Android Automerger
37a32cb555
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-29 06:33:49 -07:00
Wink Saville
d026a1e163
A vendor ril depends on a native screen shot code.
...
Add a temporary shim until the vendor fixes the ril.
Bug: 7073467
Change-Id: Ia95a58bd90677c03406c988d1c29ae785f8662f2
2012-08-28 22:12:54 -07:00
Wink Saville
8f86ff7967
am b82af2a8
: Merge "A vendor ril depends on a native screen shot code." into jb-mr1-dev
...
* commit 'b82af2a8aec99faf6fd37d202b98224cee461a12':
A vendor ril depends on a native screen shot code.
2012-08-28 16:25:13 -07:00
Wink Saville
b82af2a8ae
Merge "A vendor ril depends on a native screen shot code." into jb-mr1-dev
2012-08-28 16:22:55 -07:00
Wink Saville
9b5782baf0
A vendor ril depends on a native screen shot code.
...
Add a temporary shim until the vendor fixes the ril.
Bug: 7073467
Change-Id: Ia95a58bd90677c03406c988d1c29ae785f8662f2
2012-08-28 16:20:50 -07:00