Commit Graph

47578 Commits

Author SHA1 Message Date
Mathias Agopian
a7da0dda39 am 98cbec81: am efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev
* commit '98cbec81be1d39223e33abde9ac35e43b62918bf':
  make transform hint multi-display aware
2012-11-27 16:10:29 -08:00
Mathias Agopian
98cbec81be am efd614b8: Merge "make transform hint multi-display aware" into jb-mr1.1-dev
* commit 'efd614b869e952792b009db4ab54f3bb4375d198':
  make transform hint multi-display aware
2012-11-27 16:08:43 -08:00
Mathias Agopian
efd614b869 Merge "make transform hint multi-display aware" into jb-mr1.1-dev 2012-11-27 16:07:04 -08:00
Jesse Hall
1e310d64d1 am 2004307b: Merge "Create builtin display tokens on demand"
* commit '2004307b65c0cb34c854331e5be21d3426a3ef06':
  Create builtin display tokens on demand
2012-11-27 12:59:56 -08:00
Jesse Hall
2004307b65 Merge "Create builtin display tokens on demand" 2012-11-27 12:43:11 -08:00
Jesse Hall
6edebdf600 Create builtin display tokens on demand
For hotpluggable builtin displays (currently just HDMI), create the
display device IBinder token when the display is connected and destroy
it when the display is disconnected. Previously we created the tokens
at startup and never changed them. This made it so that when comparing
current and drawing state, we couldn't tell whether a display had been
disconnected and reconnected.

Bug: 7491120
Change-Id: I2ac82b864e10cb1cd0a308782d7e0ab9745c5d81
2012-11-27 12:30:18 -08:00
Andy McFadden
db2e4f16bb am a90173d8: am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
* commit 'a90173d86dd209aee55d833c73c424d854a98c70':
  DO NOT MERGE - native_fence_sync: fix an enum name
2012-11-27 11:39:20 -08:00
Andy McFadden
a90173d86d am 762a6d86: Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev
* commit '762a6d86de63ad319884ab6e666be6ad0d75996e':
  DO NOT MERGE - native_fence_sync: fix an enum name
2012-11-27 11:31:44 -08:00
Andy McFadden
762a6d86de Merge "DO NOT MERGE - native_fence_sync: fix an enum name" into jb-mr1.1-dev 2012-11-27 07:36:50 -08:00
Jamie Gennis
378787cf62 DO NOT MERGE - native_fence_sync: fix an enum name
This change replaces all references to the "EGL_NO_NATIVE_FENCE_ANDROID" enum
with "EGL_NO_NATIVE_FENCE_FD_ANDROID".

Bug: http://code.google.com/p/android/issues/detail?id=40295

(cherry-pick from master)

Change-Id: Ie25d4ab9721d8b69b8d4afcf18e902ef8e3ad911
2012-11-26 14:26:31 -08:00
Mathias Agopian
8430095879 make transform hint multi-display aware
if a layer is not mirrored, we now use its display
as the source for the transfrom hint calculation
instead of always using the default (main) display.

this change does two thing:
1) we make updateTransformHint take a DisplayDevice
   as a parameter instead of hard-coding the
   main display.

2) each time we do a transaction that could change
   the hint, we go through all layers and
   figure out which display should be used for their
   transform hint.

Bug: 7599344
Change-Id: I9b04a95e6c372dd770bacf81d8ef6f8e31b87b83
2012-11-21 16:03:52 -08:00
Siva Velusamy
0e34af6284 am c859084c: am a9a4cd48: gltrace: Make sure device is debuggable.
* commit 'c859084ca303ca1ab69bdc78f864d39c9c81ab0b':
  gltrace: Make sure device is debuggable.
2012-11-20 20:01:30 -08:00
Siva Velusamy
c859084ca3 am a9a4cd48: gltrace: Make sure device is debuggable.
* commit 'a9a4cd4806ea5b2cf525c8ab4c6604d78c6e3f8f':
  gltrace: Make sure device is debuggable.
2012-11-20 19:59:23 -08:00
Siva Velusamy
a9a4cd4806 gltrace: Make sure device is debuggable.
(cherry picked from commit 6482fa4db0)

Change-Id: I205aabcab1932025c12e7ba3d1b3cf94684f6758
2012-11-20 15:55:35 -08:00
Mathias Agopian
b171fe9f47 am 594a8773: am 764c197c: fix typo that broke all the builds
* commit '594a8773c1ef5632a8eb2ef61a86c319460d4248':
  fix typo that broke all the builds
2012-11-20 07:13:12 -08:00
Mathias Agopian
594a8773c1 am 764c197c: fix typo that broke all the builds
* commit '764c197c6fc2bf10b038c33b320a4e95594d52d8':
  fix typo that broke all the builds
2012-11-19 17:04:44 -08:00
Mathias Agopian
764c197c6f fix typo that broke all the builds
Bug: 7584338
Change-Id: Ieb8c27a544ac583af9aa1e0376e33a673d2d9673
2012-11-19 16:50:24 -08:00
Mathias Agopian
c763303eca am 92c3a307: am 3e095b25: workaround: don\'t reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
* commit '92c3a307d3ce3ec7a8808d6a2cbb324c0526ac5b':
  workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
2012-11-19 15:23:36 -08:00
Mathias Agopian
92c3a307d3 am 3e095b25: workaround: don\'t reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
* commit '3e095b251503d71bea04d6b707e8188cd30034e2':
  workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
2012-11-19 15:22:04 -08:00
Mathias Agopian
c208cdd402 am 1d3612f1: am 2a8c49eb: fix an out-of-bounds memory access
* commit '1d3612f11cb0a56062059dad4643657750c23aab':
  fix an out-of-bounds memory access
2012-11-19 15:14:08 -08:00
Mathias Agopian
3e095b2515 workaround: don't reset compositionType to HWC_FRAMEBUFFER [DO NOT MERGE]
This workaround a HWC HAL issue in Nexus 7, which causes videos and live
wallpapers to animate slowly.

Bug: 7563862
Change-Id: I16ad85317e3e7f47f005e7397357c14186b0a13d
2012-11-19 15:07:33 -08:00
Mathias Agopian
1d3612f11c am 2a8c49eb: fix an out-of-bounds memory access
* commit '2a8c49eb5dd51b2e60c9a78bea00870867d91c03':
  fix an out-of-bounds memory access
2012-11-19 14:36:43 -08:00
Mathias Agopian
2a8c49eb5d fix an out-of-bounds memory access
in this particular case, this OOB is always harmless
(and that's why it didn't get fixed from MR1), however,
it interfers with valgrind debugging.

Change-Id: Ic977e03287e59c4b124a89146c9023bd0cb540a8
2012-11-15 17:19:48 -08:00
Mathias Agopian
35d3988616 am f9730c3b: am ee932d0a: Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
* commit 'f9730c3b9655c32fc7ea13159ac5ff2f90fda3f1':
  Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
2012-11-14 16:59:03 -08:00
Mathias Agopian
f9730c3b96 am ee932d0a: Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
* commit 'ee932d0ad1a16cc93b4bd9eaf9cb3cc756fb2dfc':
  Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
2012-11-14 16:56:35 -08:00
Mathias Agopian
ee932d0ad1 Reset compositionType to HWC_FRAMEBUFFER before calling prepare()
Honor the documentation. this broke in JB-MR1.

Change-Id: I841a93b409fc940374bc748c4e143d82a192669c
2012-11-14 14:41:42 -08:00
The Android Open Source Project
11dd4b998d Reconcile with jb-mr1.1-release - do not merge
Change-Id: I7915c2abffbc99177c1fec8cf47dfd5c43d88d20
2012-11-14 12:41:05 -08:00
The Android Automerger
2d3d9d11ba merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-14 11:28:21 -08:00
Andy McFadden
41f7736ad1 am 434e21bf: am 3fdeb48e: Reduce emulator logspam
* commit '434e21bfd6b14f8d99b9bcdb829e7252edd574f3':
  Reduce emulator logspam
2012-11-09 22:45:13 -08:00
Andy McFadden
434e21bfd6 am 3fdeb48e: Reduce emulator logspam
* commit '3fdeb48e3c89be15fe3b539a26ec9a3cf28c898c':
  Reduce emulator logspam
2012-11-09 22:41:48 -08:00
Andy McFadden
3fdeb48e3c Reduce emulator logspam
The emulator doesn't support systrace, but we should point that out
at most once per process.

Bug 7436352

Change-Id: I06b2c1ea0df6c02c11cd2496423c337f8d7c62a1
2012-11-08 16:40:11 -08:00
Dmitry Shmidt
77622879a6 am 4bacaec4: am 0b2c9268: bugreport: Add /proc/interrupts dump
* commit '4bacaec4cd5844d67bfa4659393cb7e7fe343d1e':
  bugreport: Add /proc/interrupts dump
2012-11-08 15:43:05 -08:00
Dmitry Shmidt
af9e8a5961 am 61db92e7: am c11f56e5: bugreport: Add wlan FW counters dump for bcmdhd
* commit '61db92e72771a42456a3b703f275c4a4e1f8b552':
  bugreport: Add wlan FW counters dump for bcmdhd
2012-11-08 15:43:04 -08:00
Dmitry Shmidt
4bacaec4cd am 0b2c9268: bugreport: Add /proc/interrupts dump
* commit '0b2c9268265e9a165551eaa66cb461d3fab8b564':
  bugreport: Add /proc/interrupts dump
2012-11-07 14:37:14 -08:00
Dmitry Shmidt
61db92e727 am c11f56e5: bugreport: Add wlan FW counters dump for bcmdhd
* commit 'c11f56e5615c5d388c072705322df5bcf22c2012':
  bugreport: Add wlan FW counters dump for bcmdhd
2012-11-07 14:37:11 -08:00
Dmitry Shmidt
0b2c926826 bugreport: Add /proc/interrupts dump
Bug: 7301178

Change-Id: Ifad3b981ac904d4637d69dfc223d5bb2c9d80bda
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-11-07 11:09:46 -08:00
Dmitry Shmidt
c11f56e561 bugreport: Add wlan FW counters dump for bcmdhd
Bug: 7494877

Change-Id: I4d24dbcf7596777ec02ab1312c2ab996ba7688f1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2012-11-07 10:42:05 -08:00
Andrew Hsieh
168dfe71bf am 5e530e02: am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
* commit '5e530e02bc3073a2e2469df3c333ae14f1b37433':
  Fix return type of glGetAttribLocation and glGetUniformLocation
2012-11-06 20:43:06 -08:00
Andrew Hsieh
5e530e02bc am a151a19d: Merge "Fix return type of glGetAttribLocation and glGetUniformLocation"
* commit 'a151a19db2fa07295837027fb5d84c02401cc78d':
  Fix return type of glGetAttribLocation and glGetUniformLocation
2012-11-06 20:41:34 -08:00
Andrew Hsieh
a151a19db2 Merge "Fix return type of glGetAttribLocation and glGetUniformLocation" 2012-11-06 20:16:14 -08:00
Andrew Hsieh
300ad09822 Fix return type of glGetAttribLocation and glGetUniformLocation
from int to GLint.

See:
   http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetAttribLocation.xml
   http://www.khronos.org/opengles/sdk/docs/man/xhtml/glGetUniformLocation.xml

Change-Id: I4a9f8e9e34b8c3cca239ae84bfe8f3cdfd94802a
2012-11-06 14:39:08 -08:00
The Android Open Source Project
c2e5b273c4 Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ic4f86f5a85ccb35cb054ba6294756456cde4b493
2012-11-06 12:37:30 -08:00
The Android Open Source Project
1509a46a86 am 20152ac7: am d8e8e662: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit '20152ac797ab3a26561eb23ce672137c9e24ac8c':
2012-11-06 12:24:34 -08:00
The Android Open Source Project
20152ac797 am d8e8e662: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
* commit 'd8e8e66220cd71486a3b545096a1cdc298dee5fd':
  partially implement external display clipping
  Always set vertex alpha when drawing screenshot layers
  SurfaceFlinger: add animation transactions
  ugly, temporary, workaroung for a problem where a binder thread spins forever
  make sure we don't call into the HWC HAL when not needed
  Fix crashes after HDMI disconnect
  Fix issue #7271589: Cannot set Ocean HD live wallpaper
  Revert "Compatibility work around for bad graphics driver dependency."
  only abort when errors happen on the main display
  Check that HWC exists before trying to use it
  Always reset layer acquireFenceFd after commit
  fix a problem where  all hwc layers would have the SKIP flags set
  we were sometimes not setting fences properly
  A vendor ril depends on a native screen shot code.
  Revert "Added display initialization method"
  fix various issues in SF's EventThread
  Revert "SurfaceTexture: inherit from ConsumerBase"
  we were mistakenly optimizing out SF's main transactions in some cases
  Revert "Minimal changes to support multi-display HWC"
2012-11-06 12:20:29 -08:00
The Android Open Source Project
d8e8e66220 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
Change-Id: I219247f1b0f5d87b4144dc1535039e93fc636a94
2012-11-06 12:17:20 -08:00
The Android Automerger
42118c7795 merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-06 02:25:46 -08:00
The Android Automerger
f67623632a merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-05 18:38:55 -08:00
Mathias Agopian
731e0331eb am e70fbe8b: am 02b95105: fix transitions from hwc to GLES composition
* commit 'e70fbe8b32687d9178e828d6023de599be5431c3':
  fix transitions from hwc to GLES composition
2012-11-05 18:17:18 -08:00
Mathias Agopian
e70fbe8b32 am 02b95105: fix transitions from hwc to GLES composition
* commit '02b95105754b1859a97e234b79f41489a4677c20':
  fix transitions from hwc to GLES composition
2012-11-05 18:15:56 -08:00
Mathias Agopian
02b9510575 fix transitions from hwc to GLES composition
If we switched from HWC to GLES but the dirty region was empty
(could happen if the dirty region is outside of the screen for instance), we
need to force a full screen composition.

In this change we ignore the dirty region for the purpose of
rejecting the whole update and we rely on the fact that it will later
be expanded to the whole screen. This was the least risky fix.

Bug: 7467760, 7452931
Change-Id: I2132f2f963b00a3ce7150adadb107b0367b3862e
2012-11-05 17:50:57 -08:00