ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity
51,554 Commits 2 Branches 0 Tags 54 MiB
e75a9a26ee
Commit Graph

2731 Commits

Author SHA1 Message Date
Dan Stoza
6b7a45859e am 8e624d4c: am 98d20f82: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 
* commit '8e624d4cad45532c09879356f3adaa3b65fdcfc9':
  Add a BufferItem parameter to onFrameAvailable
 2014-11-07 20:09:39 +00:00
Dan Stoza
8e624d4cad am 98d20f82: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 
* commit '98d20f82ca8979b30c81df9639f54ab11e1951f9':
  Add a BufferItem parameter to onFrameAvailable
 2014-11-07 20:03:42 +00:00
Dan Stoza
98d20f82ca Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 2014-11-07 19:44:31 +00:00
Dan Stoza
8dc55396fc Add a BufferItem parameter to onFrameAvailable 
Passes the BufferItem for the queued buffer to the onFrameAvailable
callback so the consumer can track the BufferQueue's contents. Also
adds an onFrameReplaced callback, which is necessary if the consumer
wants to do anything more than simple queue length tracking.

Bug: 18111837
Change-Id: If9d07229c9b586c668e5f99074e9b63b0468feb0
 2014-11-07 10:39:13 -08:00
Dan Albert
cad831fb15 am c6f93a43: Merge "Add missing include to fix libc++ build." 
* commit 'c6f93a43d636b0ad16b75adf664c6a33d30b39dd':
  Add missing include to fix libc++ build.
 2014-11-07 18:37:43 +00:00
Dan Albert
0d1c700214 Add missing include to fix libc++ build. 
This was previously committed, but I guess it got lost in the merge
queue.

Bug: 15193147
Change-Id: Ic0e5d90ab403fb833d6a3bb7c55d279c56534869
 2014-11-07 09:33:44 -08:00
Michael Lentine
585cccc7ff am a2f27a0d: am 26645298: Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev 
* commit 'a2f27a0d63da87b23bf214355882bbcea6a163ea':
  Fix for corruption when numFds or numInts is too large.
 2014-11-05 20:11:32 +00:00
Michael Lentine
a2f27a0d63 am 26645298: Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev 
* commit '26645298400c0ae3a95731388364263d6a914ee4':
  Fix for corruption when numFds or numInts is too large.
 2014-11-05 19:06:19 +00:00
Michael Lentine
2664529840 Merge "Fix for corruption when numFds or numInts is too large." into lmp-mr1-dev 2014-11-05 18:58:22 +00:00
Dan Albert
c954a121e1 Add a missing include. 
Was being included transitively by stlport.

Bug: 15193147
Change-Id: If462e5ddcf4a620367fb4b5533f44960fd3b7378
 2014-11-04 22:31:05 -08:00
Jesse Hall
6eb6b9fd8c am 06ce1094: am fee99040: Revert "Add more logging for dup(fd) failure" 
* commit '06ce1094706bb0856f6cc876e1f5276adc642446':
  Revert "Add more logging for dup(fd) failure"
 2014-11-04 17:40:28 +00:00
Jesse Hall
eab3e59f8b am 88361aaa: am 8e5cf83a: Revert "Parcel: extra validation/debug code for writeDupFileDescriptor" 
* commit '88361aaaf4f2339f50dc32438a261283c642d471':
  Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
 2014-11-04 17:40:27 +00:00
Jesse Hall
06ce109470 am fee99040: Revert "Add more logging for dup(fd) failure" 
* commit 'fee99040de000a64f6036a7db172fb7c68d9764a':
  Revert "Add more logging for dup(fd) failure"
 2014-11-04 17:35:23 +00:00
Jesse Hall
88361aaaf4 am 8e5cf83a: Revert "Parcel: extra validation/debug code for writeDupFileDescriptor" 
* commit '8e5cf83afbe2b671f96d04786cf0d0f967e342f9':
  Revert "Parcel: extra validation/debug code for writeDupFileDescriptor"
 2014-11-04 17:35:23 +00:00
Jesse Hall
aa4ccfd123 am de288fe2: Revert "bufferqueue: workaround: allow NULL fence with queueBuffer" 
* commit 'de288fe2d43adfa1b2243ae534faaf832bf50491':
  Revert "bufferqueue: workaround: allow NULL fence with queueBuffer"
 2014-11-04 17:35:22 +00:00
Jesse Hall
fee99040de Revert "Add more logging for dup(fd) failure" 
Underlying bug has been fixed, extra debug code no longer needed

This reverts commit 36273c991b.

Change-Id: Ia47f1ae9ee7338329bfb8d710aff57e15e944f20
 2014-11-04 08:48:16 -08:00
Jesse Hall
8e5cf83afb Revert "Parcel: extra validation/debug code for writeDupFileDescriptor" 
Underlying bug has been fixed, extra debug code no longer needed.

This reverts commit ccf851f108.

Change-Id: I19ad9239efdf1d8f70cd74af9b7c2ae97713208f
 2014-11-04 08:47:57 -08:00
Jesse Hall
de288fe2d4 Revert "bufferqueue: workaround: allow NULL fence with queueBuffer" 
Underlying bug has been fixed, workaround no longer needed

This reverts commit 5b0cbcf946.

Change-Id: Ic9532b407d1291a7780a12a75aaa117ae4aa9fcb
 2014-11-04 08:47:37 -08:00
Chih-Hung Hsieh
4c1482acb1 am 923b0f6a: am ac5cd96f: am dbab409c: Merge "Avoid two warnings from clang." 
* commit '923b0f6a6787462509c23349ac04b8e9360c51cc':
  Avoid two warnings from clang.
 2014-11-04 02:09:30 +00:00
Chih-Hung Hsieh
923b0f6a67 am ac5cd96f: am dbab409c: Merge "Avoid two warnings from clang." 
* commit 'ac5cd96fe24690d9e0ae823c77334b8579139aa2':
  Avoid two warnings from clang.
 2014-11-04 01:58:17 +00:00
Chih-Hung Hsieh
ac5cd96fe2 am dbab409c: Merge "Avoid two warnings from clang." 
* commit 'dbab409c49ca5dd6686912d0b3eeb19ef1c37a3e':
  Avoid two warnings from clang.
 2014-11-04 01:24:07 +00:00
Michael Lentine
dfd06b89a4 Fix for corruption when numFds or numInts is too large. 
Bug: 18076253
Change-Id: I4c5935440013fc755e1d123049290383f4659fb6
 2014-11-03 14:08:54 -08:00
Michael Lentine
001ed44536 am 54430ca2: am 793fc0e1: Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev 
* commit '54430ca2a88f57c709ea2924ea0b78820ae62643':
  Fix crash when user provides large values in the Parcel.
 2014-11-01 00:41:16 +00:00
Michael Lentine
54430ca2a8 am 793fc0e1: Merge "Fix crash when user provides large values in the Parcel." into lmp-mr1-dev 
* commit '793fc0e13d25bdecda1219999f8be2cb3c121d20':
  Fix crash when user provides large values in the Parcel.
 2014-11-01 00:33:29 +00:00
Michael Lentine
8afa1c4ab8 Fix crash when user provides large values in the Parcel. 
Bug: 18102648
Change-Id: Ie6a24718e586a34424238363de80f9545951514f
 2014-10-31 16:08:44 -07:00
Michael Lentine
fb66335bcc am 078794ed: am 98536859: Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev 
* commit '078794ed377e7080ee155a632482bb98f1c9ade7':
  Fix output of pointers for 64bit devices.
 2014-10-31 23:07:01 +00:00
Michael Lentine
078794ed37 am 98536859: Merge "Fix output of pointers for 64bit devices." into lmp-mr1-dev 
* commit '9853685931298ba02066ebb50a8377ad4aa80f00':
  Fix output of pointers for 64bit devices.
 2014-10-31 22:58:19 +00:00
Chih-Hung Hsieh
8e5337de2c Avoid two warnings from clang. 
Clang compiler warns about undefined static functions like getReturnString
before all references are removed inside IF_LOG_COMMANDS.
To remove such warnings, we can leave those static functions defined
and the compiler will remove them at the end when they are not used.

Add a cast to long before converting from int to void*,
to avoid type cast warnings on 64 bit targets.

BUG: 17043248
Change-Id: Ica31101522279d2c8eacc90e2939767002fb827b
 2014-10-31 18:38:00 +00:00
Michael Lentine
fae12d4fb4 Fix output of pointers for 64bit devices. 
Change-Id: I279c1cf8d4c126b98f4a92ca807ade3749d01ff0
 2014-10-31 11:08:19 -07:00
Jesse Hall
f12f15502a am 1834f8ea: GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT 
* commit '1834f8ea975e9a882b44dc479320fe02e306e630':
  GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT
 2014-10-30 20:58:43 +00:00
Jesse Hall
1834f8ea97 GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT 
Change-Id: I4dcb57a0db9ee3c5222cd453c9213859384212b0
(cherry picked from commit 46a1f6b40e)
 2014-10-29 17:15:09 +00:00
Michael Lentine
2bb7270783 am 15b2ecf5: am dcc959be: Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev 
* commit '15b2ecf599414c86cb198f3ffc126b50f88b5aa0':
  Adding eglInitialize and eglTerminate image creation and deletion.
 2014-10-21 18:43:47 +00:00
Michael Lentine
15b2ecf599 am dcc959be: Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev 
* commit 'dcc959beb77099d319a94e3985da2f4ea4064e7b':
  Adding eglInitialize and eglTerminate image creation and deletion.
 2014-10-21 18:35:24 +00:00
Michael Lentine
dcc959beb7 Merge "Adding eglInitialize and eglTerminate image creation and deletion." into lmp-mr1-dev 2014-10-21 18:20:45 +00:00
Jesse Hall
937052fb1c am a069e853: am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev 
* commit 'a069e8532ba272ac5b935e332e426a3dacf827fc':
  bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
 2014-10-20 14:31:38 +00:00
Jesse Hall
a069e8532b am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev 
* commit '649bafb7ba2c3204295bc3451ff7af7e28e714ed':
  bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
 2014-10-20 14:17:18 +00:00
Jesse Hall
f35a5ba664 am 649bafb7: Merge "bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)" into lmp-dev 
* commit '649bafb7ba2c3204295bc3451ff7af7e28e714ed':
  bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE)
 2014-10-20 14:13:05 +00:00
Jesse Hall
5b0cbcf946 bufferqueue: workaround: allow NULL fence with queueBuffer (DO NOT MERGE) 
On one device there is a bug, not yet root-caused, that causes fence
fds to not make it across binder from producer to consumer in the
IGraphicBufferProducer::queueBuffer call. Rather than returning an
error, which the producer typically treats as a fatal error, this
change allows the buffer to be queued with no fence. This avoids an
application crash at the risk of (likely single-frame) visible
corruption.

Bug: 17946343
Change-Id: I9ca89f94098c455e1e90f5f58d5336c936b04a9c
 2014-10-19 04:57:10 +00:00
Dan Albert
0e978be998 am 3235d8e4: am c52e54c4: Merge "Some more test cleanup." 
* commit '3235d8e477e1a0ad72d22acfff7d9966f882daa6':
  Some more test cleanup.
 2014-10-17 17:57:51 +00:00
Dan Albert
3235d8e477 am c52e54c4: Merge "Some more test cleanup." 
* commit 'c52e54c47184704613d446eb15d051ceb43d82b3':
  Some more test cleanup.
 2014-10-17 17:53:10 +00:00
Dan Albert
55833709ab am c52e54c4: Merge "Some more test cleanup." 
* commit 'c52e54c47184704613d446eb15d051ceb43d82b3':
  Some more test cleanup.
 2014-10-17 17:53:05 +00:00
Dan Albert
ed7d193ae9 Some more test cleanup. 
Needed to build successfully when libc++ is the default STL.

Also fix a missing include. Not sure how this was getting by before.
Probably some transitive include.

Change-Id: Ie96b79e96b4e154d786fbf2d5ae5cf5892608837
 2014-10-16 20:46:05 -07:00
Dan Albert
fad2e3abf0 am 27b780b5: am 9cc84950: Merge "Don\'t check if this == NULL." 
* commit '27b780b517eb18582f978da64febb31ecfa8e4bf':
  Don't check if this == NULL.
 2014-10-15 22:57:13 +00:00
Dan Albert
27b780b517 am 9cc84950: Merge "Don\'t check if this == NULL." 
* commit '9cc849500df0bba42d3ed19b90c38ff1dffd2262':
  Don't check if this == NULL.
 2014-10-15 22:52:51 +00:00
Dan Albert
759115cd6d am 9cc84950: Merge "Don\'t check if this == NULL." 
* commit '9cc849500df0bba42d3ed19b90c38ff1dffd2262':
  Don't check if this == NULL.
 2014-10-15 22:52:43 +00:00
Dan Albert
9cc849500d Merge "Don't check if this == NULL." 2014-10-15 22:45:07 +00:00
Narayan Kamath
25c5d725f0 am 328f9c25: am 16410d45: am 9ea09757: Fix broken error check in Parcel::readBlob 
* commit '328f9c259ba9d3586a2496d887a96b610d112b7b':
  Fix broken error check in Parcel::readBlob
 2014-10-10 18:42:19 +00:00
Narayan Kamath
328f9c259b am 16410d45: am 9ea09757: Fix broken error check in Parcel::readBlob 
* commit '16410d458fdf9915dc8cb82b1bae3949a8100124':
  Fix broken error check in Parcel::readBlob
 2014-10-10 17:00:18 +00:00
Narayan Kamath
16410d458f am 9ea09757: Fix broken error check in Parcel::readBlob 
* commit '9ea09757fa63ad2a9bea9c846b51c1210d69c79f':
  Fix broken error check in Parcel::readBlob
 2014-10-09 19:17:44 +00:00
Michael Lentine
78be65e7bf Adding eglInitialize and eglTerminate image creation and deletion. 
Previously it was possible to have the driver's eglTerminate called beofre
eglDestroyImageKHR in GLConsumer. This was because we didn't increment the
refcount for the lifetime of the image. This could lead to a crash or a deadlock
when multiple threads called terminate and destroy simultaneously.

Bug: 17700483
Change-Id: I7010d0f1b3db875332e95630b5e098a5564ba755
 2014-10-09 10:26:37 -07:00