Mathias Agopian
f4ce7803fe
get rid of mirrorItemAt() which isn't used anywhere
...
Change-Id: Id6f2dbeed21cabc127d39538c0ff464077ada83f
2012-08-20 15:25:19 -07:00
Jamie Gennis
f3a4c96f7a
Revert "SurfaceTexture: inherit from ConsumerBase"
...
This reverts commit ed059a8d75
2012-08-20 14:50:31 -07:00
Jamie Gennis
3eb4987991
am 729f4808: Merge "Revert "SurfaceTexture: inherit from ConsumerBase"" into jb-mr1-dev
...
* commit '729f48082e2c7660e94830e52006f7af4efb747a':
Revert "SurfaceTexture: inherit from ConsumerBase"
2012-08-20 14:35:21 -07:00
Jamie Gennis
9e08ee7493
am f7f63450: Merge "Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"" into jb-mr1-dev
...
* commit 'f7f6345068fe0644bf296b88a687b361eae0cc98':
Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"
2012-08-20 14:35:20 -07:00
Jamie Gennis
729f48082e
Merge "Revert "SurfaceTexture: inherit from ConsumerBase"" into jb-mr1-dev
2012-08-20 14:33:24 -07:00
Jamie Gennis
f7f6345068
Merge "Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"" into jb-mr1-dev
2012-08-20 14:33:16 -07:00
Jamie Gennis
ce7a6c0fc9
Revert "SurfaceTexture: inherit from ConsumerBase"
...
This reverts commit ed059a8d75
2012-08-20 14:28:53 -07:00
Jamie Gennis
483bccd0d9
Revert "SurfaceTexture: call ConsumerBase::freeBufferLocked"
...
This reverts commit f8d33c652b
2012-08-20 14:28:21 -07:00
Mathias Agopian
a2613877fc
am b3d68efa: Merge "Fix deadlock in SF." into jb-mr1-dev
...
* commit 'b3d68efa7e807070ed63cfad3f7576055c58eeba':
Fix deadlock in SF.
2012-08-20 14:22:28 -07:00
Mathias Agopian
b3d68efa7e
Merge "Fix deadlock in SF." into jb-mr1-dev
2012-08-20 14:20:17 -07:00
Jamie Gennis
823b33c7e1
am 220ef10c: Merge "SurfaceTexture: call ConsumerBase::freeBufferLocked" into jb-mr1-dev
...
* commit '220ef10c5fe44df0ff3898de06028975995a34e4':
SurfaceTexture: call ConsumerBase::freeBufferLocked
2012-08-20 12:40:53 -07:00
Jamie Gennis
220ef10c5f
Merge "SurfaceTexture: call ConsumerBase::freeBufferLocked" into jb-mr1-dev
2012-08-20 12:39:38 -07:00
Jamie Gennis
f8d33c652b
SurfaceTexture: call ConsumerBase::freeBufferLocked
...
This change fixes SurfaceTexture::freeBufferLocked so that it calls the base
class implementation.
Change-Id: I45d76fb2eb02c1fa6e4e917823ead83e2086bd15
2012-08-20 11:30:44 -07:00
Jean-Baptiste Queru
d42a32ee01
am d3bbcaff: resolved conflicts for merge of 21938749 to jb-mr1-dev
...
* commit 'd3bbcaff6f0e08db0412d92f42562a2826a58bec':
Fix error trap in SurfaceTexture Client
2012-08-20 10:25:39 -07:00
Jean-Baptiste Queru
d3bbcaff6f
resolved conflicts for merge of 21938749 to jb-mr1-dev
...
Change-Id: I17da10797736f3772a143e2015fe25df0bb3eb3f
2012-08-20 10:22:33 -07:00
Jean-Baptiste Queru
ada5088842
am 0adc8f26: am 6e820eec: am 6f89ebde: Merge "EGL: do not use sparse files for shader"
...
* commit '0adc8f260023ec25c31ff4ceadde047528cb64ab':
EGL: do not use sparse files for shader
2012-08-20 09:44:44 -07:00
Jean-Baptiste Queru
0adc8f2600
am 6e820eec: am 6f89ebde: Merge "EGL: do not use sparse files for shader"
...
* commit '6e820eec21917f8e25c40dbc8b972468535af0e8':
EGL: do not use sparse files for shader
2012-08-20 09:42:32 -07:00
Jean-Baptiste Queru
21938749fa
am 349149b5: Merge "Fix error trap in SurfaceTexture Client"
...
* commit '349149b52a424c212e33d165bc146bc0337ea4c4':
Fix error trap in SurfaceTexture Client
2012-08-20 09:40:11 -07:00
Jean-Baptiste Queru
6e820eec21
am 6f89ebde: Merge "EGL: do not use sparse files for shader"
...
* commit '6f89ebded650406818b5fc5e9eaf096a06a2798c':
EGL: do not use sparse files for shader
2012-08-20 09:40:11 -07:00
Jean-Baptiste Queru
349149b52a
Merge "Fix error trap in SurfaceTexture Client"
2012-08-20 08:55:05 -07:00
Jean-Baptiste Queru
6f89ebded6
Merge "EGL: do not use sparse files for shader"
2012-08-20 08:54:42 -07:00
The Android Automerger
3d91c5ea82
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-20 06:34:51 -07:00
Mathias Agopian
10125f00a5
Fix deadlock in SF.
...
problem was that we were acquiring a strong reference
on Connection object with a lock held, when those
got out of scope (lock still held) their dtor
could be called if all other refs had dropped,
the dtor would acquire the lock again to
remove the Connection from the main list. boom.
we rearange the code so this doesn't happen.
Bug: 6942208
Change-Id: I0a0ebabce2842d29d60d645b64aac2f26640e59b
2012-08-17 18:48:56 -07:00
Jamie Gennis
245bf9b498
am 2c7eb92b: Merge "SurfaceTexture: inherit from ConsumerBase" into jb-mr1-dev
...
* commit '2c7eb92b6394427bfe81962668d46194959bc722':
SurfaceTexture: inherit from ConsumerBase
2012-08-17 15:37:56 -07:00
Jamie Gennis
2c7eb92b63
Merge "SurfaceTexture: inherit from ConsumerBase" into jb-mr1-dev
2012-08-17 15:35:17 -07:00
Mathias Agopian
391f32ba78
am cd60f99a: refactor compositing code to avoid multiple eglMakeCurrent() calls
...
* commit 'cd60f99aba9e750700a967db30b74a29145739cf':
refactor compositing code to avoid multiple eglMakeCurrent() calls
2012-08-16 22:33:30 -07:00
Mathias Agopian
081732f43c
am 5f20e2d4: reimplement wifi display hack with new external display SF framework
...
* commit '5f20e2d4462da3471f59152b32cd8640fa4a21da':
reimplement wifi display hack with new external display SF framework
2012-08-16 22:33:30 -07:00
Mathias Agopian
a631fb0aae
am 818b4605: display states can\'t share the dirty flags
...
* commit '818b46058aa3006e1d3c178abd36d4f10823f5d9':
display states can't share the dirty flags
2012-08-16 21:01:27 -07:00
Mathias Agopian
ed500b3467
am 111b2d89: binder interfaces can\'t be compared directly
...
* commit '111b2d89221722d38f5b5b3ba65904ec22421839':
binder interfaces can't be compared directly
2012-08-16 21:01:26 -07:00
Mathias Agopian
cd60f99aba
refactor compositing code to avoid multiple eglMakeCurrent() calls
...
when multiple displays are connected, we ended-up having to
call eglMakeCurrent() twice per display due to a limitation
in EGL. this fixes that.
Change-Id: I11e4584df50f8c24bbecee74e37b28b3ee031d2f
2012-08-16 20:58:58 -07:00
Mathias Agopian
5f20e2d446
reimplement wifi display hack with new external display SF framework
...
fix a few bugs with external displays
- HWComposer doesn't really handle multiple displays yet
so there is a lot of ugliness there
- We also need to make sure that external displays are not
blanked by default
- due to some EGL limitations surfaces being swapped need
to be current
Change-Id: I82bff05b43bcebd8da863c7c76b4edbc3bc223a9
2012-08-16 20:58:58 -07:00
Mathias Agopian
818b46058a
display states can't share the dirty flags
...
Change-Id: Ifade9f2f1a0df9a36aede77a6cf5eee4be534f98
2012-08-16 20:58:57 -07:00
Mathias Agopian
111b2d8922
binder interfaces can't be compared directly
...
we always need to compare their binder
Change-Id: I70d554ebc5009fe81e87923235f91451f32e1a30
2012-08-16 20:55:28 -07:00
The Android Open Source Project
69543c7ce5
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I2f5150a2972fd8cc92ed4c38c975a8ac73283879
2012-08-16 19:10:39 -07:00
Jamie Gennis
ed059a8d75
SurfaceTexture: inherit from ConsumerBase
...
This change makes SurfaceTexture inherit from ConsumerBase. It removes all of
the functionality from SurfaceTexture that is now provided by the base class.
Change-Id: I4a881df42810a14ee32d4ef7c8772a8f2510f4c7
2012-08-16 18:11:02 -07:00
Siva Velusamy
0bbd95b9be
am c21fc05a: Merge "gltrace: flush trace buffer on createContext & makeCurrent" into jb-mr1-dev
...
* commit 'c21fc05af75ee746e29f48b6d231127ee000f7ed':
gltrace: flush trace buffer on createContext & makeCurrent
2012-08-16 16:29:05 -07:00
Siva Velusamy
c21fc05af7
Merge "gltrace: flush trace buffer on createContext & makeCurrent" into jb-mr1-dev
2012-08-16 16:26:59 -07:00
Siva Velusamy
ad9693f4f0
gltrace: flush trace buffer on createContext & makeCurrent
...
Certain apps (e.g. chrome) seem to create contexts which are unused
for long periods of time. If tracing is stopped before those contexts
are used, then the debugger never gets to know that these contexts
were created. Flushing the trace after these calls ensures that
the debugger knows about all created/used contexts.
Change-Id: I01baa11aa56ac89eddce3c2851e4bf01076984d1
2012-08-16 14:41:20 -07:00
The Android Automerger
ec7ba01af8
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-16 06:33:59 -07:00
Mathias Agopian
e5769db877
we were mistakenly optimizing out SF's main transactions in some cases
...
due to a typo, SF's main transaction was conditional to having a
display transaction.
more correct fix for 6970310
Bug: 6970310
Change-Id: Iafd8c4e02afa5db829cc1c65950cfcc74754c6af
2012-08-15 17:44:23 -07:00
Mathias Agopian
64af43a229
am 13233e06: oopsie, missed a spot when fixing b/6970310
...
* commit '13233e067b8f71adc3a0ade5f442265e1f27084b':
oopsie, missed a spot when fixing b/6970310
2012-08-15 16:16:44 -07:00
Mathias Agopian
13233e067b
oopsie, missed a spot when fixing b/6970310
...
Change-Id: Ia320fddc7cc4b0666a4fee678af710ecf5f83ff5
2012-08-15 16:14:33 -07:00
Mathias Agopian
c94805ba33
am 3559b07a: we were mistakenly optimizing out SF\'s main transactions in some cases
...
* commit '3559b07a885bcdff51a6dffb8e3a5ac5adf3a220':
we were mistakenly optimizing out SF's main transactions in some cases
2012-08-15 13:50:23 -07:00
Mathias Agopian
3559b07a88
we were mistakenly optimizing out SF's main transactions in some cases
...
due to a typo, SF's main transaction was conditional to having a
display transaction.
more correct fix for 6970310
Bug: 6970310
Change-Id: Iafd8c4e02afa5db829cc1c65950cfcc74754c6af
2012-08-15 13:46:03 -07:00
Jeff Brown
8b580f54ed
am ac1f70bb: Use new PowerManager API.
...
* commit 'ac1f70bb7135cd5fe73d6fbf121a62c779679c5a':
Use new PowerManager API.
2012-08-15 10:28:08 -07:00
Jeff Brown
65b2493675
am 01eb9792: Fix layer removal transaction.
...
* commit '01eb979243a57bd33f8389aeeade8024dd0258c0':
Fix layer removal transaction.
2012-08-15 10:00:59 -07:00
The Android Open Source Project
1b488abc8e
Reconcile with jb-mr1-release - do not merge
...
Change-Id: I444e336418583d709973a26579a4f1027ca4abfa
2012-08-15 08:27:33 -07:00
The Android Automerger
741fac3fee
merge in jb-mr1-release history after reset to jb-mr1-dev
2012-08-15 06:34:21 -07:00
Jeff Brown
ac1f70bb71
Use new PowerManager API.
...
Change-Id: I66165d9954e2d1da9204216382a05a873f1393f4
2012-08-15 01:16:39 -07:00
Jeff Brown
01eb979243
Fix layer removal transaction.
...
Layers were not properly being removed because we were
setting the wrong transaction type flag at the time of
removal.
When layers are removed, we must use eDisplayTransactionNeeded,
not eTransactionNeeded, to ensure that the mLayersRemoved
flag is checked and the appropriate cleanup occurs.
Bug: 6970310
Change-Id: Id4b2897a34d4ac00aa0f92349c0ec6db95c1aaf7
2012-08-15 01:16:16 -07:00
