review.tizen.org Git - platform/upstream/VK-GL-CTS.git/log

Tina Zhou [Thu, 22 Dec 2016 02:46:07 +0000 (02:46 +0000)]

Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am: b44fae0a8a am: 4045968a8e am: d1e1ca812f am: 6a64e395a5
am: ffc44cfca7

Change-Id: I1a27a9a985eac26d8db649413ad396551f5323d1

commit | commitdiff | tree

Pyry Haulos [Thu, 22 Dec 2016 02:46:02 +0000 (02:46 +0000)]

Update glslang to d02dc5d am: b0ce1f083e am: 62137a913c am: a03e8e8556 am: 092f056a9b am: e4e623db59
am: 3ae98f7a99

Change-Id: I681739b9409a86ae0c175dd3b0ac08c44b245bf5

commit | commitdiff | tree

Pyry Haulos [Thu, 22 Dec 2016 02:45:57 +0000 (02:45 +0000)]

Cherry-pick SPIR-V ClipDistance validation fixes am: ef29b7735d am: 9b853f5259 am: ae704400e8 am: 91b53912e4 am: a5b5961f77
am: b18013c548 -s ours

Change-Id: Id25377e8d5d8c84d538fea42ab98ef4d6d48a37e

commit | commitdiff | tree

Pyry Haulos [Thu, 22 Dec 2016 02:45:52 +0000 (02:45 +0000)]

Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am: e71e3bbacd am: 5332103bc2 am: f066c9a577 am: df90278080 am: 3ff1767250
am: 1f280cdeb3

Change-Id: I788a9cad20f12816e476e7c857a6c95a68ad352f

commit | commitdiff | tree

Tina Zhou [Thu, 22 Dec 2016 02:40:50 +0000 (02:40 +0000)]

Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am: ce7ccaab4a am: 073e32f72f am: 3e3b90e9d6 am: 9959179887 am: 8ab0548300
am: bd83a918f8

Change-Id: I51bfa6900d412618b438310f7b859cc8084417c5

commit | commitdiff | tree

Pyry Haulos [Thu, 22 Dec 2016 02:40:37 +0000 (02:40 +0000)]

Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am: a42836566d am: 020b95377e am: 2da2988f32 am: 96f1cc8ba9 am: d7e6b5159d
am: e7edfc1088

Change-Id: I4d82f91a6939920c08c9eeebe9980af876f314dd

commit | commitdiff | tree

Tina Zhou [Thu, 22 Dec 2016 02:40:00 +0000 (02:40 +0000)]

Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am: b44fae0a8a am: 4045968a8e am: d1e1ca812f am: 6a64e395a5
am: c54f821620

Change-Id: I509c19856489116ab17e0b7848f9b2ffebc0e3ba

commit | commitdiff | tree

Pyry Haulos [Thu, 22 Dec 2016 02:39:52 +0000 (02:39 +0000)]

Update glslang to d02dc5d am: b0ce1f083e am: 62137a913c am: a03e8e8556 am: 092f056a9b am: e4e623db59 -s ours
am: 7ef5a2e2c8

Change-Id: I1a4745fc9a3359bcba2cf649f1c34be8910b5a58

commit | commitdiff | tree

Pyry Haulos [Thu, 22 Dec 2016 02:39:45 +0000 (02:39 +0000)]

Cherry-pick SPIR-V ClipDistance validation fixes am: ef29b7735d am: 9b853f5259 am: ae704400e8 am: 91b53912e4 am: a5b5961f77 -s ours
am: 519b83426e

Change-Id: I537b737fb57e404ccb0eb7cd66a9d21143cd04c3

commit | commitdiff | tree

Pyry Haulos [Thu, 22 Dec 2016 02:39:36 +0000 (02:39 +0000)]

Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am: e71e3bbacd am: 5332103bc2 am: f066c9a577 am: df90278080 am: 3ff1767250
am: ee947f1770

Change-Id: I9347f52cbcd368a98c962819f6a525a0e43d350f

commit | commitdiff | tree

Tina Zhou [Thu, 22 Dec 2016 02:35:42 +0000 (02:35 +0000)]

Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am: ce7ccaab4a am: 073e32f72f am: 3e3b90e9d6 am: 9959179887
am: 8ab0548300

Change-Id: I0cb0050b068f24350817c9b9126e8a8c244611fd

commit | commitdiff | tree

Pyry Haulos [Thu, 22 Dec 2016 02:35:31 +0000 (02:35 +0000)]

Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am: a42836566d am: 020b95377e am: 2da2988f32 am: 96f1cc8ba9
am: d7e6b5159d

Change-Id: I52210ec72e94dab85d770fbeb4e1e671789adfff

commit | commitdiff | tree

Tina Zhou [Thu, 22 Dec 2016 02:34:59 +0000 (02:34 +0000)]

Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am: b44fae0a8a am: 4045968a8e am: d1e1ca812f
am: 6a64e395a5

Change-Id: I5e54dda493336d0690a366efae0c0301df343bbf

commit | commitdiff | tree

Pyry Haulos [Thu, 22 Dec 2016 02:34:56 +0000 (02:34 +0000)]

Update glslang to d02dc5d am: b0ce1f083e am: 62137a913c am: a03e8e8556 am: 092f056a9b
am: e4e623db59 -s ours

Change-Id: Ia6382ce1e3e682ae180aba07b2f9d6db48b179a2

commit | commitdiff | tree

Pyry Haulos [Thu, 22 Dec 2016 02:34:54 +0000 (02:34 +0000)]

Cherry-pick SPIR-V ClipDistance validation fixes am: ef29b7735d am: 9b853f5259 am: ae704400e8 am: 91b53912e4
am: a5b5961f77 -s ours

Change-Id: I76c25dd4619d2bb20e789f94295a633b6225b15f

commit | commitdiff | tree

Pyry Haulos [Thu, 22 Dec 2016 02:34:51 +0000 (02:34 +0000)]

Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am: e71e3bbacd am: 5332103bc2 am: f066c9a577 am: df90278080
am: 3ff1767250

Change-Id: I08f61f97bdb22aad57911f2df11ff56c151c8616

commit | commitdiff | tree

Tina Zhou [Wed, 21 Dec 2016 23:34:53 +0000 (23:34 +0000)]

Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am: b44fae0a8a am: 4045968a8e am: d1e1ca812f
am: 6a64e395a5

Change-Id: I0de981e47bba7261d547af21da577705a243380d

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 23:34:50 +0000 (23:34 +0000)]

Update glslang to d02dc5d am: b0ce1f083e am: 62137a913c am: a03e8e8556 am: 092f056a9b
am: e4e623db59

Change-Id: I20c5f71d79fce7e2a3fadec876b55ddf1aaae492

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 23:34:47 +0000 (23:34 +0000)]

Cherry-pick SPIR-V ClipDistance validation fixes am: ef29b7735d am: 9b853f5259 am: ae704400e8 am: 91b53912e4
am: a5b5961f77

Change-Id: If21c99e5d7e607f3ded68e4ec7167f699ae3d859

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 23:34:43 +0000 (23:34 +0000)]

Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am: e71e3bbacd am: 5332103bc2 am: f066c9a577 am: df90278080
am: 3ff1767250

Change-Id: I3ae3e90a9577b739ff4814048082dc7e1ff54bee

commit | commitdiff | tree

Tina Zhou [Wed, 21 Dec 2016 23:26:10 +0000 (23:26 +0000)]

Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am: ce7ccaab4a am: 073e32f72f am: 3e3b90e9d6
am: 9959179887

Change-Id: I28b017ab925d82a3304451db13927678bab4ed87

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 23:25:58 +0000 (23:25 +0000)]

Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am: a42836566d am: 020b95377e am: 2da2988f32
am: 96f1cc8ba9

Change-Id: I76f659d4d91ab6b3562b0b278744e7736c7999a7

commit | commitdiff | tree

Tina Zhou [Wed, 21 Dec 2016 23:25:28 +0000 (23:25 +0000)]

Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am: b44fae0a8a am: 4045968a8e
am: d1e1ca812f

Change-Id: I34f00e32575cbf482fd192b16368789a9fb80081

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 23:25:26 +0000 (23:25 +0000)]

Update glslang to d02dc5d am: b0ce1f083e am: 62137a913c am: a03e8e8556
am: 092f056a9b

Change-Id: I27ab48a73a40c7e73e78f65be93dc1302d6133f3

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 23:25:24 +0000 (23:25 +0000)]

Cherry-pick SPIR-V ClipDistance validation fixes am: ef29b7735d am: 9b853f5259 am: ae704400e8
am: 91b53912e4

Change-Id: Ic3d3a31adc8e261191ac9a2e892d31dcaf327e1d

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 23:25:22 +0000 (23:25 +0000)]

Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am: e71e3bbacd am: 5332103bc2 am: f066c9a577
am: df90278080

Change-Id: I5571f9a6c8701129dd4236c95b5764b7747c3944

commit | commitdiff | tree

Tina Zhou [Wed, 21 Dec 2016 23:19:09 +0000 (23:19 +0000)]

Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am: ce7ccaab4a am: 073e32f72f
am: 3e3b90e9d6

Change-Id: I2fb74a59191d6aea30b0f57f41c4d9dcf5df10cc

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 23:18:57 +0000 (23:18 +0000)]

Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am: a42836566d am: 020b95377e
am: 2da2988f32

Change-Id: I20ca36cc3781aafa2f38cb5d45d8e19a473685ac

commit | commitdiff | tree

Tina Zhou [Wed, 21 Dec 2016 23:18:30 +0000 (23:18 +0000)]

Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am: b44fae0a8a
am: 4045968a8e

Change-Id: Iaf0bdea3563c785d7b70178784941298a817c535

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 23:18:27 +0000 (23:18 +0000)]

Update glslang to d02dc5d am: b0ce1f083e am: 62137a913c
am: a03e8e8556

Change-Id: Ida321adb60b0c2a5452404c168636fa9393049ca

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 23:18:23 +0000 (23:18 +0000)]

Cherry-pick SPIR-V ClipDistance validation fixes am: ef29b7735d am: 9b853f5259
am: ae704400e8

Change-Id: Ie37d0d42a21b19ad984570a7273590c349a20cf8

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 23:18:19 +0000 (23:18 +0000)]

Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am: e71e3bbacd am: 5332103bc2
am: f066c9a577

Change-Id: I0e567116a2cce1b652060aeddbe1c1f615674554

commit | commitdiff | tree

Tina Zhou [Wed, 21 Dec 2016 23:07:57 +0000 (23:07 +0000)]

Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am: ce7ccaab4a
am: 073e32f72f

Change-Id: I4c44e15d17669387f61033752398775ebc3e46d4

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 23:07:45 +0000 (23:07 +0000)]

Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am: a42836566d
am: 020b95377e

Change-Id: I7b6ff723d55faf9ba640248493b7c58a3534f365

commit | commitdiff | tree

Tina Zhou [Wed, 21 Dec 2016 23:07:17 +0000 (23:07 +0000)]

Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f
am: b44fae0a8a

Change-Id: I4dd81db0bf1123030a372f72dacc1f09ec695272

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 23:07:13 +0000 (23:07 +0000)]

Update glslang to d02dc5d am: b0ce1f083e
am: 62137a913c

Change-Id: If38a684776482ff3cf156c22ef653ecf47173379

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 23:07:09 +0000 (23:07 +0000)]

Cherry-pick SPIR-V ClipDistance validation fixes am: ef29b7735d
am: 9b853f5259

Change-Id: Ib961d7855cf27b70d8f60169706536528e721090

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 23:07:05 +0000 (23:07 +0000)]

Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am: e71e3bbacd
am: 5332103bc2

Change-Id: I2819b5fa50c9c2a939d74b2f0aff167e7279af6c

commit | commitdiff | tree

Tina Zhou [Wed, 21 Dec 2016 22:48:13 +0000 (22:48 +0000)]

Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev
am: ce7ccaab4a

Change-Id: I2007ee1120f3a52381153a6432871dea4a2547fd

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 22:48:12 +0000 (22:48 +0000)]

Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048
am: a42836566d

Change-Id: Icf2b203e0ffe4a5f253c0c1b3f0b76deafd34c57

commit | commitdiff | tree

Tina Zhou [Wed, 21 Dec 2016 22:47:32 +0000 (22:47 +0000)]

Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev
am: 4812d6d47f

Change-Id: I008b5f61e4e68e6783cffd2d2fe5cc11fc10e814

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 22:47:31 +0000 (22:47 +0000)]

Update glslang to d02dc5d
am: b0ce1f083e

Change-Id: Ib49ac26b3ce273532262cd99000b63b061c5347c

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 22:47:28 +0000 (22:47 +0000)]

Cherry-pick SPIR-V ClipDistance validation fixes
am: ef29b7735d

Change-Id: I1754888223cf4f23d359472276620400a0dc9a07

commit | commitdiff | tree

Pyry Haulos [Wed, 21 Dec 2016 22:47:25 +0000 (22:47 +0000)]

Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev
am: e71e3bbacd

Change-Id: I466771aaf44fc8670cabf442bb35f1548b4b3342

commit | commitdiff | tree

Tina Zhou [Wed, 21 Dec 2016 22:31:04 +0000 (22:31 +0000)]

Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev

commit | commitdiff | tree

Tina Zhou [Wed, 21 Dec 2016 22:30:03 +0000 (22:30 +0000)]

Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev

* changes:
  Update glslang to d02dc5d
  Cherry-pick SPIR-V ClipDistance validation fixes
  Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 20 Dec 2016 22:25:13 +0000 (22:25 +0000)]

Merge "GetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: a44c013aaf am: 79041623c9 am: 639a3b82f5 am: fddf33bdd1 am: a6d2c746fa am: 4004893d31 am: d6734426ee am: ea87ae8483 am: cc4458b117" into nyc-mr2-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 20 Dec 2016 22:25:13 +0000 (22:25 +0000)]

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 22:25:07 +0000 (22:25 +0000)]

GetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: a44c013aaf am: 79041623c9 am: 639a3b82f5 am: fddf33bdd1 am: a6d2c746fa am: 4004893d31 am: d6734426ee am: ea87ae8483
am: cc4458b117

Change-Id: I06df05dafcd443b274d6765def8afdad3ab6109e

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 22:25:06 +0000 (22:25 +0000)]

GetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: a44c013aaf am: 79041623c9 am: 639a3b82f5 am: fddf33bdd1 am: a6d2c746fa am: 4004893d31 am: d6734426ee am: ea87ae8483
am: 323ee30ce8

Change-Id: I5c8fd548ab5bc54b97047eefa983964902f8d074

commit | commitdiff | tree

Android Build Merger (Role) [Tue, 20 Dec 2016 22:25:02 +0000 (22:25 +0000)]

Merge "resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f am: 52bab3789f" into nyc-mr2-dev-plus-aosp

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 22:24:55 +0000 (22:24 +0000)]

resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f
am: 52bab3789f

Change-Id: Ie5115233fc6bef645f14f03e69039188dfd6d908

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 22:24:54 +0000 (22:24 +0000)]

resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626 am: b64869c70f
am: 1486f7ae07

Change-Id: I0a5d182b1c76e979346eb244c1b25bc3014e8208

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 22:20:35 +0000 (22:20 +0000)]

GetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: a44c013aaf am: 79041623c9 am: 639a3b82f5 am: fddf33bdd1 am: a6d2c746fa am: 4004893d31 am: d6734426ee
am: ea87ae8483

Change-Id: I2e77efb8ba46959a0457184ced3e19cb79984403

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 22:20:33 +0000 (22:20 +0000)]

GetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: a44c013aaf am: 79041623c9 am: 639a3b82f5 am: fddf33bdd1 am: a6d2c746fa am: 4004893d31 am: d6734426ee
am: ea87ae8483

Change-Id: I2275b7c4ea5516fcac695717559179ed1df7f6df

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 22:20:24 +0000 (22:20 +0000)]

resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626
am: b64869c70f

Change-Id: I1a875a589c43630fc3f1baf7fdff6902aacbca95

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 22:20:21 +0000 (22:20 +0000)]

resolve merge conflicts of cc5cabd to nyc-mr1-dev am: 7a338a6626
am: b64869c70f

Change-Id: If0d874b08fb01e0c603f711675e6b2e1a52c3b87

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 22:16:33 +0000 (22:16 +0000)]

GetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: a44c013aaf am: 79041623c9 am: 639a3b82f5 am: fddf33bdd1 am: a6d2c746fa am: 4004893d31
am: d6734426ee

Change-Id: Ia252fe1d37932ca3059e2b831e0131e836ab21c3

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 22:16:21 +0000 (22:16 +0000)]

resolve merge conflicts of cc5cabd to nyc-mr1-dev
am: 7a338a6626

Change-Id: I195a7d513828433103a20331bbe5eb1ee167a4f3

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 22:16:02 +0000 (22:16 +0000)]

GetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: 133c610be6 am: cc0eaf79f0 am: b6d32610cf
am: b3c1c2cf9b

Change-Id: Ibd863d1d528cf0f2ac8158e5f55646f65c0d2ccd

commit | commitdiff | tree

Kalle Raita [Tue, 20 Dec 2016 22:15:49 +0000 (22:15 +0000)]

resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp
am: ed852bf557

Change-Id: If6f52d32b3875bba642d0215831a634404872a73

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 22:11:55 +0000 (22:11 +0000)]

GetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: 133c610be6 am: cc0eaf79f0
am: b6d32610cf

Change-Id: I9bf7977a59b947d4e9ef7e2a8a66f4d5a96fcbbd

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 22:11:54 +0000 (22:11 +0000)]

GetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: a44c013aaf am: 79041623c9 am: 639a3b82f5 am: fddf33bdd1 am: a6d2c746fa
am: 4004893d31

Change-Id: Ie547c5910391a4e3f4fbb1700f20feab9a7f64e8

commit | commitdiff | tree

Kalle Raita [Tue, 20 Dec 2016 21:38:32 +0000 (13:38 -0800)]

resolve merge conflicts of b6d3261 to nyc-mr1-dev-plus-aosp

Test: Tried to run the install script locally
Change-Id: I2c34fa110c811741ad53bd42143bfd2a371b459a

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 19:56:55 +0000 (03:56 +0800)]

resolve merge conflicts of cc5cabd to nyc-mr1-dev

It appears 4ccc9fd56c9c0305c1cc325d2be8435cb68476e0
"Add the support to device connection via TCP/IP" was not automerged
to nyc-mr1-dev, for whatever reason, this merge also includes
that change.

Change-Id: Ifa9243f7ebc5d4ea7aa3030728a9cfe96789ab96

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 19:22:51 +0000 (19:22 +0000)]

GetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: a44c013aaf am: 79041623c9 am: 639a3b82f5 am: fddf33bdd1
am: a6d2c746fa

Change-Id: I1023988b48ed6b133c9cd9a35e5bd16ce6101882

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 19:17:12 +0000 (19:17 +0000)]

GetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: a44c013aaf am: 79041623c9 am: 639a3b82f5
am: fddf33bdd1

Change-Id: I9b18b64c9e09af46abca64378f410c5819757001

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 19:12:40 +0000 (19:12 +0000)]

GetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: a44c013aaf am: 79041623c9
am: 639a3b82f5

Change-Id: Ia47d588dc3bf3ade9552ab45c9eb1e13389b7216

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 19:09:12 +0000 (19:09 +0000)]

GetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: 133c610be6
am: cc0eaf79f0

Change-Id: I4bb85c1dce1fc225077a5c46911d39dd395c3e40

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 19:09:09 +0000 (19:09 +0000)]

GetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: a44c013aaf
am: 79041623c9

Change-Id: I571901bbc48bffdad90e2a5f278d75a2fe1833ba

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 19:09:00 +0000 (19:09 +0000)]

GetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: 133c610be6
am: 4c63135524

Change-Id: I9d337977ac0e01e8c8fd0b079a3f25c9e2cdcaaa

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 19:04:09 +0000 (19:04 +0000)]

GetDevices: Also allow `\.` to be part of the host name am: dbf9715509
am: a44c013aaf

Change-Id: Ic6181b284d350dedca354ddd60706903f639ba4a

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 18:59:57 +0000 (18:59 +0000)]

GetDevices: Also allow `\.` to be part of the host name
am: dbf9715509

Change-Id: Id812eaa1a85dded4241ae6d760de072532228109

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 18:59:40 +0000 (18:59 +0000)]

GetDevices: Also allow `\.` to be part of the host name am: dbf9715509
am: 133c610be6

Change-Id: I21054992a16e3e6847a8af086528f4172602d614

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 18:59:39 +0000 (18:59 +0000)]

GetDevices: Also allow `\.` to be part of the host name am: dbf9715509
am: 133c610be6

Change-Id: I8938bf6b769de3d2da911243f203181f191ec89f

commit | commitdiff | tree

Nicolas Boichat [Tue, 20 Dec 2016 18:55:24 +0000 (18:55 +0000)]

GetDevices: Also allow `\.` to be part of the host name
am: dbf9715509

Change-Id: I659ce579867c7ca0c9b47e3b53a734265e0fbb26

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 16 Dec 2016 22:45:14 +0000 (22:45 +0000)]

Merge "merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: 9412810768 am: 01c922fc26 am: bd9e51a20d am: 6d8a37d043" into nyc-mr2-dev-plus-aosp

commit | commitdiff | tree

Tina Zhou [Fri, 16 Dec 2016 22:45:06 +0000 (22:45 +0000)]

merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: 9412810768 am: 01c922fc26 am: bd9e51a20d
am: 6d8a37d043

Change-Id: I732dea11ae0a0e48b107676ac1d2fec21d56af36

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 16 Dec 2016 22:45:04 +0000 (22:45 +0000)]

Merge "merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: 9412810768 am: 01c922fc26 am: bd9e51a20d am: 2ed6dadb09" into nyc-mr2-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Fri, 16 Dec 2016 22:45:00 +0000 (22:45 +0000)]

Merge "merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 868a8938ca am: aea1bbfaa2 am: 5c1cc6ba46 am: f7c84f0b66" into nyc-mr2-dev-plus-aosp

commit | commitdiff | tree

Tina Zhou [Fri, 16 Dec 2016 22:44:56 +0000 (22:44 +0000)]

merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: 9412810768 am: 01c922fc26 am: bd9e51a20d
am: 2ed6dadb09

Change-Id: I1103a856fd087aecd2019b7a262a2195d959d80a

commit | commitdiff | tree

Pyry Haulos [Fri, 16 Dec 2016 22:44:54 +0000 (22:44 +0000)]

merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 868a8938ca am: aea1bbfaa2 am: 5c1cc6ba46
am: f7c84f0b66

Change-Id: I544ccd22b9b46f2a922f5afb8bc51c5ed399a8da

commit | commitdiff | tree

Pyry Haulos [Fri, 16 Dec 2016 22:44:42 +0000 (22:44 +0000)]

merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 868a8938ca am: aea1bbfaa2 am: 5c1cc6ba46
am: faa38a20ac

Change-Id: I9621cf33b43c0795c9b2c343ff3bdac81cd0cfbf

commit | commitdiff | tree

Tina Zhou [Fri, 16 Dec 2016 22:36:56 +0000 (22:36 +0000)]

merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: 9412810768 am: 01c922fc26
am: bd9e51a20d

Change-Id: Ibf40a64c8168f2e0e94e140efb335743f022a0a7

commit | commitdiff | tree

Tina Zhou [Fri, 16 Dec 2016 22:36:55 +0000 (22:36 +0000)]

merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: 9412810768 am: 01c922fc26
am: bd9e51a20d

Change-Id: I7bfddfdc33311a88817c88a25b9370abf4088371

commit | commitdiff | tree

Pyry Haulos [Fri, 16 Dec 2016 22:36:43 +0000 (22:36 +0000)]

merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 868a8938ca am: aea1bbfaa2
am: 5c1cc6ba46

Change-Id: Idb776bc95d3dc7bb5b88f12079f5c579a44547b1

commit | commitdiff | tree

Pyry Haulos [Fri, 16 Dec 2016 22:36:41 +0000 (22:36 +0000)]

merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 868a8938ca am: aea1bbfaa2
am: 5c1cc6ba46

Change-Id: Id23dbea96fcdde835b825a49af5fe10a87715350

commit | commitdiff | tree

Tina Zhou [Fri, 16 Dec 2016 22:28:18 +0000 (22:28 +0000)]

merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev am: 9412810768
am: 01c922fc26

Change-Id: I8a81f63fe2b8462c4697435a2ed9436dfcfe3937

commit | commitdiff | tree

Pyry Haulos [Fri, 16 Dec 2016 22:28:05 +0000 (22:28 +0000)]

merge in nyc-mr1-release history after reset to nyc-mr1-dev am: 868a8938ca
am: aea1bbfaa2

Change-Id: I82c416fb663418dd6bd062fa1b5375ec7c99fa5a

commit | commitdiff | tree

Tina Zhou [Fri, 16 Dec 2016 22:19:20 +0000 (22:19 +0000)]

merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev
am: 9412810768

Change-Id: I822bfa3fba4335717f34be9cfb4ff4c621c7ed8c

commit | commitdiff | tree

Pyry Haulos [Fri, 16 Dec 2016 22:19:07 +0000 (22:19 +0000)]

merge in nyc-mr1-release history after reset to nyc-mr1-dev
am: 868a8938ca

Change-Id: I07a0249da8ae52fb82ad6120dec0897f63d5e567

commit | commitdiff | tree

Kalle Raita [Fri, 16 Dec 2016 01:41:07 +0000 (01:41 +0000)]

Merge "Non-compressed copy image target size (64,64,8)" am: beba5d481a am: 9bbc395b49
am: c842de9d14

Change-Id: Idf191a6797e7ae9aec9e8e2de2583c17e1a6bdae

commit | commitdiff | tree

Kalle Raita [Fri, 16 Dec 2016 01:19:07 +0000 (01:19 +0000)]

Merge "Non-compressed copy image target size (64,64,8)" am: beba5d481a
am: 9bbc395b49

Change-Id: Ic9236cb82742f188a0c8a385ab1371d37e852f7f

commit | commitdiff | tree

Kalle Raita [Thu, 15 Dec 2016 23:37:37 +0000 (23:37 +0000)]

Merge "Non-compressed copy image target size (64,64,8)"
am: beba5d481a

Change-Id: Ifa9d096019e7944b67f1bea9b7ab98214f932673

commit | commitdiff | tree

Kalle Raita [Thu, 15 Dec 2016 23:29:39 +0000 (23:29 +0000)]

Merge "Non-compressed copy image target size (64,64,8)"

commit | commitdiff | tree

Jamie Madill [Wed, 14 Dec 2016 13:14:26 +0000 (13:14 +0000)]

Merge "Allow ANGLE_depth_texture for FBO completeness." am: a8249e3a00 am: 8542846868
am: c7265ec450

Change-Id: I0b1b03a6f363a122a28497332bb99014ec3033eb

commit | commitdiff | tree

Jamie Madill [Wed, 14 Dec 2016 13:07:24 +0000 (13:07 +0000)]

Merge "Allow ANGLE_depth_texture for FBO completeness." am: a8249e3a00
am: 8542846868

Change-Id: I77672e3e1d50f8c3fb5082022393865544e7acd5

commit | commitdiff | tree

Jamie Madill [Wed, 14 Dec 2016 13:00:26 +0000 (13:00 +0000)]

Merge "Allow ANGLE_depth_texture for FBO completeness."
am: a8249e3a00

Change-Id: I54ce3f2e3fef94bdb53136afa6cf70c116418b73

commit | commitdiff | tree

Treehugger Robot [Wed, 14 Dec 2016 12:50:45 +0000 (12:50 +0000)]

Merge "Allow ANGLE_depth_texture for FBO completeness."

commit | commitdiff | tree

John Richardson [Wed, 14 Dec 2016 12:46:25 +0000 (12:46 +0000)]

Merge "Extend primitive_bounding_box negative tests" am: 1975e3bd28 am: 4983f5a49f
am: a4941127f1

Change-Id: Ide3ef1acb809aecfa6b4d2204b8194a6fb9faa97