OSDN Git Service
Elliott Hughes [Wed, 12 Oct 2016 00:55:06 +0000 (00:55 +0000)]
Merge "Rely on the platform -std default." am:
26989871a5 am:
35368f2475
am:
274347ebf1
Change-Id: Idce8ffa834e8ae8298d3ab8f516b4f4f31b02f18
Elliott Hughes [Wed, 12 Oct 2016 00:48:50 +0000 (00:48 +0000)]
Merge "Rely on the platform -std default." am:
26989871a5
am:
35368f2475
Change-Id: I1dffb52b3f59a8fe42c4c42e10ff7c9287e81e63
Elliott Hughes [Wed, 12 Oct 2016 00:42:19 +0000 (00:42 +0000)]
Merge "Rely on the platform -std default."
am:
26989871a5
Change-Id: I1acbc09058a339d0df076e0fccb750bb57099e8d
Treehugger Robot [Wed, 12 Oct 2016 00:32:21 +0000 (00:32 +0000)]
Merge "Rely on the platform -std default."
Elliott Hughes [Tue, 11 Oct 2016 21:47:19 +0000 (14:47 -0700)]
Rely on the platform -std default.
Bug: http://b/
32019064
Test: builds
Change-Id: I88ea6b959b9d855a536e1475ed437105370203d0
Elliott Hughes [Mon, 10 Oct 2016 22:33:21 +0000 (22:33 +0000)]
Merge "Rely on the platform -std default." am:
53b6fc5ddc am:
0ef01bab39
am:
b48bc88b75
Change-Id: I948f14c73030d6d0f0cae8b9e374962ad119f7f6
Elliott Hughes [Mon, 10 Oct 2016 22:00:57 +0000 (22:00 +0000)]
Merge "Rely on the platform -std default." am:
53b6fc5ddc
am:
0ef01bab39
Change-Id: I11137b0f1327691fa88acee67d9270fe509aa353
Elliott Hughes [Mon, 10 Oct 2016 21:46:02 +0000 (21:46 +0000)]
Merge "Rely on the platform -std default."
am:
53b6fc5ddc
Change-Id: Ie70a8414a18c0f8b8bb4054545bc7dc74c99838c
Treehugger Robot [Mon, 10 Oct 2016 21:19:54 +0000 (21:19 +0000)]
Merge "Rely on the platform -std default."
Matthew Bouyack [Mon, 10 Oct 2016 18:11:34 +0000 (18:11 +0000)]
Merge "Use snprintf for SurfaceFlinger fence name" into cw-f-dev
am:
f35d95673e
Change-Id: I014bbfa36ee2f660309d8bb10e6be989189e6de1
Matthew Bouyack [Mon, 10 Oct 2016 18:11:30 +0000 (18:11 +0000)]
Use snprintf for SurfaceFlinger fence name
am:
fd4c8c3805
Change-Id: I16d3eb7cde318f2078be36acea22b9bc84975b63
Matthew Bouyack [Mon, 10 Oct 2016 18:03:37 +0000 (18:03 +0000)]
Merge "Use snprintf for SurfaceFlinger fence name" into cw-f-dev
Matthew Bouyack [Fri, 7 Oct 2016 21:26:47 +0000 (14:26 -0700)]
Use snprintf for SurfaceFlinger fence name
snprintf is significantly faster than String8::format
This change saves ~50us per frame on Android Wear
Change-Id: I6ac47c2434662ca561208daae232f02a9f136aaf
Elliott Hughes [Fri, 7 Oct 2016 22:46:42 +0000 (15:46 -0700)]
Rely on the platform -std default.
Bug: http://b/
32019064
Test: builds
Change-Id: Ie2df259641889b3ce95648bd2be48d061108162c
Matthew Bouyack [Fri, 7 Oct 2016 16:54:57 +0000 (16:54 +0000)]
Merge "Eliminate unnecessary calls to onBufferReleased" into cw-f-dev
am:
76456aa438
Change-Id: I9ee9b9146397c46b98c9bf736a10b0e343c4e836
Matthew Bouyack [Thu, 6 Oct 2016 22:36:56 +0000 (15:36 -0700)]
resolve merge conflicts of
3b8e6b2 to nyc-mr1-dev-plus-aosp
Change-Id: I9c02a56d63de5828453aa8926ca801d96b04a6cf
Matthew Bouyack [Thu, 6 Oct 2016 21:27:20 +0000 (21:27 +0000)]
Merge "Eliminate unnecessary calls to onBufferReleased" into cw-f-dev
Wei Liu [Thu, 6 Oct 2016 21:25:23 +0000 (21:25 +0000)]
Dumpstate should hold a wakelock to save bug report time. DO NOT MERGE. am:
2cc37eaaa7
am:
079abd98af
Change-Id: I36189431935344400deea32596c030dae8b4a82b
Wei Liu [Thu, 6 Oct 2016 19:54:04 +0000 (19:54 +0000)]
Dumpstate should hold a wakelock to save bug report time. DO NOT MERGE.
am:
2cc37eaaa7
Change-Id: Ic58338aaf3dd67b9256e42fe4d61416b35c367de
Dan Albert [Thu, 6 Oct 2016 19:27:13 +0000 (19:27 +0000)]
Merge "Migrate libvulkan to ndk_library." am:
02affcd552 am:
425ae4a06a
am:
38bfdb02db
Change-Id: Ib499b72acfc947cd27e084c2cdc7c6b52b1ea07e
Dan Albert [Thu, 6 Oct 2016 19:23:43 +0000 (19:23 +0000)]
Merge "Migrate libvulkan to ndk_library." am:
02affcd552
am:
425ae4a06a
Change-Id: Ie771d411939c583dd30dd1b753d9dfdf28f2fd74
Dan Albert [Thu, 6 Oct 2016 19:20:13 +0000 (19:20 +0000)]
Merge "Migrate libvulkan to ndk_library."
am:
02affcd552
Change-Id: I97d6f3e7ce8058c190ac38ad9214794ccea6def3
Treehugger Robot [Thu, 6 Oct 2016 19:14:10 +0000 (19:14 +0000)]
Merge "Migrate libvulkan to ndk_library."
Dan Albert [Wed, 5 Oct 2016 00:49:33 +0000 (17:49 -0700)]
Migrate libvulkan to ndk_library.
Test: make native
Bug: http://b/
30465923
Change-Id: I97199a600b71447fd14181e06be3f9221c2529f3
Colin Cross [Fri, 30 Sep 2016 23:32:19 +0000 (16:32 -0700)]
Fix constructor parameters shadowing member variables
Using the same name for the constructor parameter and the member
variable causes a warning that was being hidden by the use of -isystem
to include frameworks/native/include. Prefix the parameter with an
underscore.
Bug:
31752268
Test: m -j
Change-Id: I60c7dc388999bafbb97cb42f5e0af5361df68d56
(cherry picked from commit
0ed088bd90c4e9ae5a92047319c3932b2aa78ddf)
Dan Albert [Wed, 5 Oct 2016 23:20:59 +0000 (23:20 +0000)]
Merge "Migrate khrplatform.h to ndk_headers." am:
a0d616be74 am:
fea2cbbe39
am:
939621c380
Change-Id: Ic06b577feeac9a6419b03644cd529886e0330978
Dan Albert [Wed, 5 Oct 2016 23:18:28 +0000 (23:18 +0000)]
Merge "Migrate khrplatform.h to ndk_headers." am:
a0d616be74
am:
fea2cbbe39
Change-Id: If4cfe4aa468e50dd12c8f0c66bdfdbca8e0bf8f5
Dan Albert [Wed, 5 Oct 2016 23:15:59 +0000 (23:15 +0000)]
Merge "Migrate khrplatform.h to ndk_headers."
am:
a0d616be74
Change-Id: I659219ee179aac1d43e74dcdecde46c073c89436
Treehugger Robot [Wed, 5 Oct 2016 23:11:53 +0000 (23:11 +0000)]
Merge "Migrate khrplatform.h to ndk_headers."
Dan Albert [Wed, 5 Oct 2016 00:49:33 +0000 (17:49 -0700)]
Migrate khrplatform.h to ndk_headers.
Test: make native
Bug: http://b/
30465923
Change-Id: Idaf0eb973b7569f92b1f1575869d13b8c5e706fd
Dan Albert [Wed, 5 Oct 2016 20:42:50 +0000 (20:42 +0000)]
Merge changes I6a2f4df7,I62e108bd,Icd83a5ef am:
900da7b14a am:
93c91c81fd
am:
75a118f9d1
Change-Id: Icc233e4c2b64497741b75502dc51497a23a1c51f
Dan Albert [Wed, 5 Oct 2016 20:42:41 +0000 (20:42 +0000)]
Migrate libGLESv3 to ndk_library. am:
d7d8efa471 am:
0238c63510
am:
61b9688387
Change-Id: I794fc4359c6eb0601dd765867ad1c42990351687
Dan Albert [Wed, 5 Oct 2016 20:42:30 +0000 (20:42 +0000)]
Migrate libGLESv2 to ndk_library. am:
00500c798a am:
2cdf177bc1
am:
6e8eeea98f
Change-Id: Ic208e02635970134d5911fdbbc422aaeef553a9b
Dan Albert [Wed, 5 Oct 2016 20:42:19 +0000 (20:42 +0000)]
Migrate libGLESv1_CM to ndk_library. am:
7facb1db6e am:
ebe4ea9e88
am:
ff88cbd859
Change-Id: Ibbfd1136fb1d53f83204e697c5c233d73b3a7bb8
Dan Albert [Wed, 5 Oct 2016 20:40:19 +0000 (20:40 +0000)]
Merge changes I6a2f4df7,I62e108bd,Icd83a5ef am:
900da7b14a
am:
93c91c81fd
Change-Id: I4f4c9b668d019d8eae010b41755c8985b9c76b17
Dan Albert [Wed, 5 Oct 2016 20:40:09 +0000 (20:40 +0000)]
Migrate libGLESv3 to ndk_library. am:
d7d8efa471
am:
0238c63510
Change-Id: Ie8a699ed04e115de621f4b2d5ac5b904d39006bd
Dan Albert [Wed, 5 Oct 2016 20:39:59 +0000 (20:39 +0000)]
Migrate libGLESv2 to ndk_library. am:
00500c798a
am:
2cdf177bc1
Change-Id: Iff08c160dbe9f974672672ca453303aaac5487bc
Dan Albert [Wed, 5 Oct 2016 20:39:49 +0000 (20:39 +0000)]
Migrate libGLESv1_CM to ndk_library. am:
7facb1db6e
am:
ebe4ea9e88
Change-Id: I6639fc184bf99095a3bcb3d8b0e77d6a24d5b3b6
Dan Albert [Wed, 5 Oct 2016 20:37:09 +0000 (20:37 +0000)]
Merge changes I6a2f4df7,I62e108bd,Icd83a5ef
am:
900da7b14a
Change-Id: I8d50ffcdaff60b51a81c0648a0087d645e99ee1d
Dan Albert [Wed, 5 Oct 2016 20:37:08 +0000 (20:37 +0000)]
Migrate libGLESv3 to ndk_library.
am:
d7d8efa471
Change-Id: I86f06ebcaa1e2dd860d61ff9cd9b5503158735ba
Dan Albert [Wed, 5 Oct 2016 20:36:58 +0000 (20:36 +0000)]
Migrate libGLESv2 to ndk_library.
am:
00500c798a
Change-Id: I3031e4a938bbfbd97b51735707bf5fe0bc884b37
Dan Albert [Wed, 5 Oct 2016 20:36:49 +0000 (20:36 +0000)]
Migrate libGLESv1_CM to ndk_library.
am:
7facb1db6e
Change-Id: I777d5d8b08ff11491aabdb4166d7c0d38b09f20c
Treehugger Robot [Wed, 5 Oct 2016 20:31:38 +0000 (20:31 +0000)]
Merge changes I6a2f4df7,I62e108bd,Icd83a5ef
* changes:
Migrate libGLESv3 to ndk_library.
Migrate libGLESv2 to ndk_library.
Migrate libGLESv1_CM to ndk_library.
Colin Cross [Wed, 5 Oct 2016 19:02:12 +0000 (19:02 +0000)]
Merge "Fix anonymous struct and union warnings" am:
87e72cb237 am:
a3ac6c2b86
am:
86eff80c19
Change-Id: I6358d387eebddcd9238f250db7429f5846a2260a
Colin Cross [Wed, 5 Oct 2016 18:59:41 +0000 (18:59 +0000)]
Merge "Fix anonymous struct and union warnings" am:
87e72cb237
am:
a3ac6c2b86
Change-Id: Iecd9d1b0b6a22d48a1cac59e028f7d31b50a3e3e
Colin Cross [Wed, 5 Oct 2016 18:56:41 +0000 (18:56 +0000)]
Merge "Fix anonymous struct and union warnings"
am:
87e72cb237
Change-Id: I1ace0ad7d2f175b6d6cc42a0ce6845c76ba032b3
Treehugger Robot [Wed, 5 Oct 2016 18:52:25 +0000 (18:52 +0000)]
Merge "Fix anonymous struct and union warnings"
Dan Albert [Wed, 5 Oct 2016 18:35:40 +0000 (18:35 +0000)]
Merge "Migrate libEGL to ndk_library." am:
ce1bc304a2 am:
183edbb062
am:
62d80401f3
Change-Id: Iba58208172ee35efd854d2fd629e40413063f28d
Dan Albert [Wed, 5 Oct 2016 18:33:11 +0000 (18:33 +0000)]
Merge "Migrate libEGL to ndk_library." am:
ce1bc304a2
am:
183edbb062
Change-Id: Iff01a29d4b03a45a5b28a6f98f93eb4af3e00ad7
Dan Albert [Wed, 5 Oct 2016 18:30:40 +0000 (18:30 +0000)]
Merge "Migrate libEGL to ndk_library."
am:
ce1bc304a2
Change-Id: If048759fd60754bd0c7df9c02f33f28a800eaace
Treehugger Robot [Wed, 5 Oct 2016 18:24:16 +0000 (18:24 +0000)]
Merge "Migrate libEGL to ndk_library."
Colin Cross [Sat, 1 Oct 2016 00:24:06 +0000 (17:24 -0700)]
Fix anonymous struct and union warnings
gui/BufferItem.h and android/sensor.h uses anymous structs and nested
anonymous unions, which are GNU extensions. sensor.h uses them as part
of its API, so disable the warnings in libgui, the only module that
tries to use it with -Weverything. BufferItem.h only uses the unioned
fields inside libgui, remove the union and do the 64-bit to 32-bit
slicing manually so libvulkan doesn't need the warnings disabled.
Bug:
31752268
Test: m -j
Change-Id: I92d59b1202f4d6e5419edaa6d27b6e1c50ac0042
Dan Albert [Mon, 3 Oct 2016 19:36:00 +0000 (12:36 -0700)]
Migrate libGLESv3 to ndk_library.
Test: make checkbuild
Bug: http://b/
30465923
Change-Id: I6a2f4df7f409596f487879eb7d43a7774dced894
Dan Albert [Mon, 3 Oct 2016 19:36:00 +0000 (12:36 -0700)]
Migrate libGLESv2 to ndk_library.
Test: make checkbuild
Bug: http://b/
30465923
Change-Id: I62e108bdd27b6dc40fdf7ede7d579a286cbf3b9b
Dan Albert [Mon, 3 Oct 2016 19:36:00 +0000 (12:36 -0700)]
Migrate libGLESv1_CM to ndk_library.
Test: make checkbuild
Bug: http://b/
30465923
Change-Id: Icd83a5ef5d6afcde9441f49de14a8e645d15da2f
Colin Cross [Tue, 4 Oct 2016 21:23:41 +0000 (21:23 +0000)]
Merge "Rename dump methods to dumpState" am:
c72b9a3ce4 am:
219df2fd5b
am:
bb6d63ad52 -s ours
Change-Id: Id9b5435b3e309206a6a924005be240986bc46663
Colin Cross [Tue, 4 Oct 2016 21:23:07 +0000 (21:23 +0000)]
Merge changes I2ce11db5,Idba8278b am:
dd3f863499 am:
198134666b
am:
d45e51b815 -s ours
Change-Id: I4f7e6dbcd4a1ab14ed0c6e7cb056a6a94175831e
Colin Cross [Tue, 4 Oct 2016 21:22:53 +0000 (21:22 +0000)]
Fix logging implicit sign conversions am:
8bafabf1f6 am:
6b2749643f
am:
33a6d87795 -s ours
Change-Id: Idb41fd375c17ff8125f3149ad7ec4802a76d3d58
Colin Cross [Tue, 4 Oct 2016 21:22:41 +0000 (21:22 +0000)]
Fix libgui warnings am:
6c5a17dd26 am:
972cce4cb9
am:
af06c61e1b
Change-Id: I191c8a14d54427215922427c4bb497bdb7c27dd9
Dan Stoza [Tue, 4 Oct 2016 21:21:37 +0000 (21:21 +0000)]
Merge changes I1c6a271f,I1e41e5f5,Ib2f48895,Ia8af95d2,Ie966e37d, ... am:
2b23374b45 am:
ea8e8a2aa6
am:
9d9e611d89
Change-Id: I4e20874d0096fc4a5bc526821191d8903acac563
Dan Stoza [Tue, 4 Oct 2016 21:21:27 +0000 (21:21 +0000)]
SF: Fix a couple of Layer ref count issues am:
de84eb6b82 am:
1ce7c1d3aa
am:
6ce2ad4310
Change-Id: I1eeff52d56054e0f5b6ee9eaa3b7b9abb99ad106
Dan Stoza [Tue, 4 Oct 2016 21:21:16 +0000 (21:21 +0000)]
Build SF executable with USE_HWC2 when needed am:
f9f7f6931f am:
58719ff766
am:
1802970525
Change-Id: I376f995fbe7c1aca83f9aeafe27fae34d832111e
Dan Stoza [Tue, 4 Oct 2016 21:21:01 +0000 (21:21 +0000)]
HWC2: Clear transform for SolidColor layers am:
f1098abecf am:
21200d1887
am:
af63992893
Change-Id: I091535d02569f81997924990bec1f9f592cf9fbb
Dan Stoza [Tue, 4 Oct 2016 21:20:47 +0000 (21:20 +0000)]
HWC2: Use SolidColor composition for DimLayer am:
0183f7acac am:
b4365b8d0b
am:
f12431879e -s ours
Change-Id: I34607a9ae18dcc713d3e7a43bee4ca23883faee2
Dan Stoza [Tue, 4 Oct 2016 21:20:37 +0000 (21:20 +0000)]
HWC2: Kill logspam for non-HWC virtual displays am:
179533d107 am:
9853a795ab
am:
860ff9c846
Change-Id: Ibc40214c27890b0224918449818b2195dff5de71
Dan Stoza [Tue, 4 Oct 2016 21:20:27 +0000 (21:20 +0000)]
HWC2: Fix virtual displays am:
5450fe5268 am:
d6fb6ea07b
am:
aa23ebe03e -s ours
Change-Id: I72c0ca4d6dff8e295eaeddc472cb3b3cc49b4498
Dan Stoza [Tue, 4 Oct 2016 21:20:16 +0000 (21:20 +0000)]
HWC2: Don't set null handle for client layers am:
6be002845f am:
0fac961a58
am:
64e18c2bfe -s ours
Change-Id: Ib001496809231f89c31a790617d4aa32e43b6825
Dan Stoza [Tue, 4 Oct 2016 21:20:05 +0000 (21:20 +0000)]
HWC2: Hook up to BoardConfig variable am:
8beb15f220 am:
608852e318
am:
607bb29a98
Change-Id: Ica9191d91e58f8526ddf0f7e245bab1ab0ebfefd
Dan Stoza [Tue, 4 Oct 2016 21:19:57 +0000 (21:19 +0000)]
HWC2: Skip validate/present if display is off am:
00ac359a3b am:
de79392408
am:
ebec74a215
Change-Id: Ic7168a2c94ec5c4d93e8b2507c0570d97434829f
Matthew Bouyack [Mon, 3 Oct 2016 23:24:26 +0000 (16:24 -0700)]
Eliminate unnecessary calls to onBufferReleased
This change adds a callback to ProducerListener to indicate whether the
listener needs the 'onBufferReleased' notification. This allows us to
avoid making that binder call unnecessarily, saving ~170us per frame on
Android Wear.
By default the new callback returns true, so behavior for existing
clients should be unchanged. Only the DummyProducerListener returns
false.
Also note that it would be simpler to just pass NULL for the
ProducerListener if not for that fact that we still need it for death
notification.
Bug: b/
31122630
Change-Id: I730834218a055d89e89f876dd77da8127eb78000
Dan Albert [Mon, 3 Oct 2016 19:36:00 +0000 (12:36 -0700)]
Migrate libEGL to ndk_library.
Test: make checkbuild
Bug: http://b/
30465923
Change-Id: I154a95c6fde9c34d770b6fe65bfd71ac51e05574
Wei Liu [Fri, 26 Aug 2016 21:51:42 +0000 (14:51 -0700)]
Dumpstate should hold a wakelock to save bug report time. DO NOT MERGE.
BUG:
31828706
BUG:
30832947
Change-Id: I0a4b1fcce91caa96ccbc4e890d9968e3033487de
(cherry picked from commit
f87959e00732d7d737527f1248a71adea99ae29d)
Colin Cross [Fri, 30 Sep 2016 23:46:46 +0000 (23:46 +0000)]
Merge "Rename dump methods to dumpState" am:
c72b9a3ce4
am:
219df2fd5b
Change-Id: I0597aa09cf66820708b125421e0814d1c1f6a4ac
Colin Cross [Fri, 30 Sep 2016 23:43:18 +0000 (23:43 +0000)]
Merge "Rename dump methods to dumpState"
am:
c72b9a3ce4
Change-Id: I41cc42a6838c6e42bf257d8304f99d5ca8d74ab0
Colin Cross [Fri, 30 Sep 2016 23:30:24 +0000 (23:30 +0000)]
Merge "Rename dump methods to dumpState"
Colin Cross [Tue, 27 Sep 2016 01:10:16 +0000 (18:10 -0700)]
Rename dump methods to dumpState
The dump methods shadow the IBinder dump method. The warnings were being
hidden by the use of -isystem to include frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: Iafc64da43032d5d9d84b64640e70d93fd7051bcf
(cherry picked from commit
3d1d280fa3cbc30700f728a4b13e5308315433d3)
Colin Cross [Fri, 30 Sep 2016 20:12:34 +0000 (20:12 +0000)]
Merge changes I2ce11db5,Idba8278b am:
dd3f863499
am:
198134666b
Change-Id: Ibe861546bc113889034ee9d0e37c4368e4e13eac
Colin Cross [Fri, 30 Sep 2016 20:12:26 +0000 (20:12 +0000)]
Fix logging implicit sign conversions am:
8bafabf1f6
am:
6b2749643f
Change-Id: I22582b46e7490c3a6aae4417628a2d585fd21460
Colin Cross [Fri, 30 Sep 2016 20:12:18 +0000 (20:12 +0000)]
Fix libgui warnings am:
6c5a17dd26
am:
972cce4cb9
Change-Id: I83e31cd57286bb8fc5a25f7a1f6d895176640a84
Colin Cross [Fri, 30 Sep 2016 20:09:27 +0000 (20:09 +0000)]
Merge changes I2ce11db5,Idba8278b
am:
dd3f863499
Change-Id: I811fb4b61aed0ee6324b48aff2a8b3dfa4581b86
Colin Cross [Fri, 30 Sep 2016 20:09:26 +0000 (20:09 +0000)]
Fix logging implicit sign conversions
am:
8bafabf1f6
Change-Id: I5bdd64dddd845b3ffc910bc2161363e27d4f83ba
Colin Cross [Fri, 30 Sep 2016 20:09:18 +0000 (20:09 +0000)]
Fix libgui warnings
am:
6c5a17dd26
Change-Id: I463a190d7830dbdc5817c753f57fa9b5cdecd404
Colin Cross [Tue, 27 Sep 2016 01:10:16 +0000 (18:10 -0700)]
Rename dump methods to dumpState
The dump methods shadow the IBinder dump method. The warnings were being
hidden by the use of -isystem to include frameworks/native/include.
Bug:
31752268
Test: m -j
Merged-in: Iafc64da43032d5d9d84b64640e70d93fd7051bcf
Change-Id: Iafc64da43032d5d9d84b64640e70d93fd7051bcf
Colin Cross [Fri, 30 Sep 2016 19:56:38 +0000 (19:56 +0000)]
Merge changes I2ce11db5,Idba8278b
* changes:
Fix logging implicit sign conversions
Fix libgui warnings
Colin Cross [Tue, 27 Sep 2016 21:08:19 +0000 (14:08 -0700)]
Fix logging implicit sign conversions
The warnings were being hidden by the use of -isystem to include
frameworks/native/include.
Bug:
31752268
Test: m -j
Change-Id: I2ce11db524ee9d8f846fdf3ed6fb882d5ef57956
(cherry picked from commit
152c3b749a8ec634afc66dddef7d33130472aeb1)
Colin Cross [Fri, 30 Sep 2016 17:59:48 +0000 (17:59 +0000)]
Merge "Fix struct vs. class mismatch in forward definitions" am:
1d6c149d89 am:
8806e2a789
am:
132b7491bc
Change-Id: Ibb73e33e1517a724dda605e5d38a57615e48c4e1
Dan Stoza [Fri, 30 Sep 2016 17:59:03 +0000 (17:59 +0000)]
Merge changes I1c6a271f,I1e41e5f5,Ib2f48895,Ia8af95d2,Ie966e37d, ... am:
2b23374b45
am:
ea8e8a2aa6
Change-Id: I9688b655a778ad5ea675af0286cc7050f7ccfb96
Dan Stoza [Fri, 30 Sep 2016 17:58:55 +0000 (17:58 +0000)]
SF: Fix a couple of Layer ref count issues am:
de84eb6b82
am:
1ce7c1d3aa
Change-Id: I2ff87a50409fcc244b2cb59286990f98affdedbc
Dan Stoza [Fri, 30 Sep 2016 17:58:45 +0000 (17:58 +0000)]
Build SF executable with USE_HWC2 when needed am:
f9f7f6931f
am:
58719ff766
Change-Id: I559a674184a0a08829b49dd90d85e75478385021
Dan Stoza [Fri, 30 Sep 2016 17:58:35 +0000 (17:58 +0000)]
HWC2: Clear transform for SolidColor layers am:
f1098abecf
am:
21200d1887
Change-Id: I1039e2ddcbc139e5234f996be343e4ba88c0e75d
Dan Stoza [Fri, 30 Sep 2016 17:58:26 +0000 (17:58 +0000)]
HWC2: Use SolidColor composition for DimLayer am:
0183f7acac
am:
b4365b8d0b
Change-Id: I89241809c69af21aa62a5af7562d8f3e6bb8dbd7
Dan Stoza [Fri, 30 Sep 2016 17:58:10 +0000 (17:58 +0000)]
HWC2: Kill logspam for non-HWC virtual displays am:
179533d107
am:
9853a795ab
Change-Id: I68c6c6a0bdefb7b196eacd95e486f275c21377df
Dan Stoza [Fri, 30 Sep 2016 17:57:49 +0000 (17:57 +0000)]
HWC2: Fix virtual displays am:
5450fe5268
am:
d6fb6ea07b
Change-Id: I11166b2d968bf8a4ba23b5ba86bf307a457e8ba9
Dan Stoza [Fri, 30 Sep 2016 17:57:30 +0000 (17:57 +0000)]
HWC2: Don't set null handle for client layers am:
6be002845f
am:
0fac961a58
Change-Id: I259c37bd7ba6cf57f07f494cce4bfda7f837d76c
Dan Stoza [Fri, 30 Sep 2016 17:57:15 +0000 (17:57 +0000)]
HWC2: Hook up to BoardConfig variable am:
8beb15f220
am:
608852e318
Change-Id: I91252f79de7035b958329a68e4172edb5b2c302a
Dan Stoza [Fri, 30 Sep 2016 17:57:07 +0000 (17:57 +0000)]
HWC2: Skip validate/present if display is off am:
00ac359a3b
am:
de79392408
Change-Id: I36810f4c2623591942bac447b2b118edc3104f9d
Dan Stoza [Fri, 30 Sep 2016 17:52:19 +0000 (17:52 +0000)]
Merge changes I1c6a271f,I1e41e5f5,Ib2f48895,Ia8af95d2,Ie966e37d, ...
am:
2b23374b45
Change-Id: Ic74060aa51fe814d5033e9014059791a1e5cdd8c
Dan Stoza [Fri, 30 Sep 2016 17:52:16 +0000 (17:52 +0000)]
SF: Fix a couple of Layer ref count issues
am:
de84eb6b82
Change-Id: I779b869d340ce5320f7924ccd6579cada3227899
Dan Stoza [Fri, 30 Sep 2016 17:52:02 +0000 (17:52 +0000)]
Build SF executable with USE_HWC2 when needed
am:
f9f7f6931f
Change-Id: Icda54608b691f84969709a20fa7272abc045bd04
Dan Stoza [Fri, 30 Sep 2016 17:51:54 +0000 (17:51 +0000)]
HWC2: Clear transform for SolidColor layers
am:
f1098abecf
Change-Id: Iff664310ed2275c0ce9b7afaf8041b8a30ea3a6c
OSDN Git Service
