Xin Li [Wed, 28 Dec 2016 21:03:12 +0000 (21:03 +0000)]
Merge "Cherry-pick the following missing commits from nyc-mr1-dev prior to b/
33090058, which was lost as a result of merge
01c922fc267ea41cc1c6cb83cde7ba6da200dc38: am:
77f62518ec am:
3d11686e0e am:
3d0f2fb381" into nyc-mr2-dev-plus-aosp
am:
231078fb46
Change-Id: Ic5b5d8489dc77013b48e04779671066ae3576328
Xin Li [Wed, 28 Dec 2016 21:03:11 +0000 (21:03 +0000)]
Cherry-pick the following missing commits from nyc-mr1-dev prior to b/
33090058, which was lost as a result of merge
01c922fc267ea41cc1c6cb83cde7ba6da200dc38: am:
77f62518ec am:
3d11686e0e am:
3d0f2fb381
am:
ed086fd003
Change-Id: I95b368fb87cfa63c195b7f9fa6add6ffbb6dedf8
Xin Li [Wed, 28 Dec 2016 21:02:54 +0000 (21:02 +0000)]
Cherry-pick the following missing commits from nyc-mr1-dev prior to b/
33090058, which was lost as a result of merge
01c922fc267ea41cc1c6cb83cde7ba6da200dc38: am:
77f62518ec am:
3d11686e0e am:
72d633abbd
am:
2c3475cb3a
Change-Id: Ibf708e815fc010886c885e1e3af620986b210a3a
Android Build Merger (Role) [Wed, 28 Dec 2016 20:57:01 +0000 (20:57 +0000)]
Merge "Cherry-pick the following missing commits from nyc-mr1-dev prior to b/
33090058, which was lost as a result of merge
01c922fc267ea41cc1c6cb83cde7ba6da200dc38: am:
77f62518ec am:
3d11686e0e am:
3d0f2fb381" into nyc-mr2-dev-plus-aosp
Xin Li [Wed, 28 Dec 2016 20:56:54 +0000 (20:56 +0000)]
Cherry-pick the following missing commits from nyc-mr1-dev prior to b/
33090058, which was lost as a result of merge
01c922fc267ea41cc1c6cb83cde7ba6da200dc38: am:
77f62518ec am:
3d11686e0e
am:
3d0f2fb381
Change-Id: I443976f9e012cb0f5c08bd29a03cac5d1b36e493
Xin Li [Wed, 28 Dec 2016 20:56:53 +0000 (20:56 +0000)]
Cherry-pick the following missing commits from nyc-mr1-dev prior to b/
33090058, which was lost as a result of merge
01c922fc267ea41cc1c6cb83cde7ba6da200dc38: am:
77f62518ec am:
3d11686e0e
am:
72d633abbd
Change-Id: I557bd48c7fc66c79ad4a0befcffd1e6f9e8fe54f
Xin Li [Wed, 28 Dec 2016 20:50:25 +0000 (20:50 +0000)]
Cherry-pick the following missing commits from nyc-mr1-dev prior to b/
33090058, which was lost as a result of merge
01c922fc267ea41cc1c6cb83cde7ba6da200dc38: am:
77f62518ec
am:
3d11686e0e
Change-Id: I113f3f7c10bd5ce44b0cfd6ce2d1d0ac8102fc5f
Xin Li [Wed, 28 Dec 2016 20:50:21 +0000 (20:50 +0000)]
Cherry-pick the following missing commits from nyc-mr1-dev prior to b/
33090058, which was lost as a result of merge
01c922fc267ea41cc1c6cb83cde7ba6da200dc38: am:
77f62518ec
am:
3d11686e0e
Change-Id: I83bcf17f51753c8ff9eaf5037e9150e094955305
Xin Li [Wed, 28 Dec 2016 20:43:51 +0000 (20:43 +0000)]
Cherry-pick the following missing commits from nyc-mr1-dev prior to b/
33090058, which was lost as a result of merge
01c922fc267ea41cc1c6cb83cde7ba6da200dc38:
am:
77f62518ec
Change-Id: I94b4ddb18d2edb47a336ef1d43ad4df00a210afb
Xin Li [Tue, 27 Dec 2016 22:48:38 +0000 (14:48 -0800)]
Cherry-pick the following missing commits from nyc-mr1-dev prior to
b/
33090058, which was lost as a result of merge
01c922fc267ea41cc1c6cb83cde7ba6da200dc38:
ea5589 Kenneth Graunke: Fix sample_mask_in.bit_count_per_two_samples
tests for 2x MSAA.
d2f3b4 Kenneth Graunke: Fix internal format/type for 3D + depth/stencil
negative API tests.
bf0076 Aaron Holden: Add runtime to CtsDeqpTestCases
BUG:
33090058
Change-Id: I88a47ddebd9dff35a3fa65967cca6fe21b739a6e
Aaron Holden [Tue, 15 Nov 2016 01:47:00 +0000 (17:47 -0800)]
Add runtime to CtsDeqpTestCases
Test: cts-tradefed run cts -m CtsDeqpTestCases
Bug:
32843094
Change-Id: I6ea71f0d6658b1f06354374ece54743609472345
(cherry picked from commit
bf0076a42408b330a5117c61a0b0d8d6d2b18660)
Kenneth Graunke [Mon, 12 Sep 2016 19:37:08 +0000 (12:37 -0700)]
Fix internal format/type for 3D + depth/stencil negative API tests.
According to the ES 3.2 specification:
"Textures with a base internal format of DEPTH_COMPONENT, DEPTH_STENCIL
or STENCIL_INDEX are supported by texture image specification commands
only if target is TEXTURE_2D, TEXTURE_2D_MULTISAMPLE, TEXTURE_2D_ARRAY,
TEXTURE_2D_MULTISAMPLE_ARRAY, TEXTURE_CUBE_MAP or TEXTURE_CUBE_MAP_ARRAY.
Using these formats in conjunction with any other target will result in
an INVALID_OPERATION error."
This subtest tried to check the above error condition, but it specified
GL_DEPTH_STENCIL / GL_DEPTH_COMPONENT as format, rather than internalFormat.
Since the above text calls out "base internal format", we should specify
it as internalFormat.
We also change GL_DEPTH_STENCIL to use GL_UNSIGNED_INT_24_8 rather than
GL_UNSIGNED_BYTE, as that combination was illegal for a different reason
than the one the test intended to check.
Change-Id: I44bf607533b59f93fa42415bd6cad8783352582d
(cherry picked from commit
ae7f8e0a07730e693b24d3dc7a23d2372319145e)
(cherry picked from commit
d2f3b468db45e8deb130de84bf194eebe37d5fff)
Kenneth Graunke [Sun, 4 Sep 2016 07:34:47 +0000 (00:34 -0700)]
Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA.
The dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.
bit_count_per_two_samples.multisample_{texture,renderbuffer}_{1,2}
tests report:
Verifying gl_SampleMaskIn.
Fragment shader may be invoked [ceil(numSamples/2), numSamples] times.
=> gl_SampleMaskIn should have the number of bits set in range
[1, numSamples - ceil(numSamples/2) + 1]:
which suggests that maxBitCount should be ceil(2/2) + 1 = 1 + 1 = 2.
However, it then says:
Setting minBitCount = 1, maxBitCount = 1.
Having two bits should be acceptable for 2x MSAA.
This patch drops the special case for 1x/2x MSAA, making them work
like all the other MSAA levels.
Change-Id: Ie615c82150588dab53226dc46670182a29d85ef5
(cherry picked from commit
724519b8fda9c2a92d646c3dfd1478e0daa282e9)
(cherry picked from commit
ea5589c748c0f399e478a570f9cc3c063fe55bf1)
Kalle Raita [Thu, 22 Dec 2016 06:31:12 +0000 (06:31 +0000)]
Merge "Add options for reading in filters from files"
Tina Zhou [Thu, 22 Dec 2016 05:47:24 +0000 (05:47 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
22bf0dfa43 am:
2d0cce04d9 am:
8d55e05ba8 am:
6f7af0f1fd am:
399626de90
am:
57b0f45347
Change-Id: I33e43ff2be98545ba57b224278815e03040a69b5
Kenneth Graunke [Thu, 22 Dec 2016 05:47:15 +0000 (05:47 +0000)]
Blacklist match_different_[member_]struct_names SSO validation tests. am:
b81edb4477 am:
c823e5456f am:
42c0ad1d1b am:
8c2c2894e4 am:
f611e70b3d am:
15fe9ce8a2
am:
33b578aa61
Change-Id: I481ad21aecbca431fb16ee489985f034355279b0
Tina Zhou [Thu, 22 Dec 2016 05:42:36 +0000 (05:42 +0000)]
Merge "Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
22bf0dfa43 am:
2d0cce04d9 am:
8d55e05ba8 am:
6f7af0f1fd am:
d4d6d9753b" into nyc-mr2-dev-plus-aosp
am:
4fbdeebb2f
Change-Id: Icc754c0812404cbecafe371bdca70c6e689826df
Tina Zhou [Thu, 22 Dec 2016 05:42:35 +0000 (05:42 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
22bf0dfa43 am:
2d0cce04d9 am:
8d55e05ba8 am:
6f7af0f1fd am:
d4d6d9753b
am:
e563dd6699
Change-Id: Ib733d3606b9c9803bf3f594f8ef7e3a2ac081ded
Kenneth Graunke [Thu, 22 Dec 2016 05:42:15 +0000 (05:42 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests. am:
b81edb4477 am:
c823e5456f am:
42c0ad1d1b am:
8c2c2894e4 am:
f611e70b3d am:
beccdd90c3" into nyc-mr2-dev-plus-aosp
am:
732ec7c09e
Change-Id: Ia44ed1762355724931405663c997019b8ae1522a
Kenneth Graunke [Thu, 22 Dec 2016 05:42:14 +0000 (05:42 +0000)]
Blacklist match_different_[member_]struct_names SSO validation tests. am:
b81edb4477 am:
c823e5456f am:
42c0ad1d1b am:
8c2c2894e4 am:
f611e70b3d am:
beccdd90c3
am:
827c0a734b
Change-Id: Idd5df945bf782631f8de251ce739054ac0ffebb9
Tina Zhou [Thu, 22 Dec 2016 05:41:58 +0000 (05:41 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
22bf0dfa43 am:
2d0cce04d9 am:
8d55e05ba8 am:
6f7af0f1fd
am:
399626de90
Change-Id: Ib1beaeb1602a1ae410efaeacdd5e649f202eae73
Tina Zhou [Thu, 22 Dec 2016 05:41:56 +0000 (05:41 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
736369667b am:
53c8574bda am:
29003e52d0
am:
c1757958a7
Change-Id: I6fb311d5457f26446d3641cfa8e56a2758a8e1be
Kenneth Graunke [Thu, 22 Dec 2016 05:41:46 +0000 (05:41 +0000)]
Blacklist match_different_[member_]struct_names SSO validation tests. am:
b81edb4477 am:
c823e5456f am:
42c0ad1d1b am:
8c2c2894e4 am:
f611e70b3d
am:
15fe9ce8a2
Change-Id: I4eb712e729f3339b7284f0c1872292e5d54d6ac5
David Sodman [Thu, 22 Dec 2016 05:41:44 +0000 (05:41 +0000)]
resolve merge conflicts of b81edb4 to master am:
ce5292f584 am:
49ddc6319b am:
f07ca045e6
am:
8122cc866a
Change-Id: I1ddd7718f309448e4897b62d629d364ecb173e85
Android Build Merger (Role) [Thu, 22 Dec 2016 05:37:19 +0000 (05:37 +0000)]
Merge "Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
22bf0dfa43 am:
2d0cce04d9 am:
8d55e05ba8 am:
6f7af0f1fd am:
d4d6d9753b" into nyc-mr2-dev-plus-aosp
Tina Zhou [Thu, 22 Dec 2016 05:37:13 +0000 (05:37 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
22bf0dfa43 am:
2d0cce04d9 am:
8d55e05ba8
am:
6f7af0f1fd
Change-Id: I7bf8a13c1e5e61cf17ee27dad8710ea237af83ac
Tina Zhou [Thu, 22 Dec 2016 05:37:12 +0000 (05:37 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
22bf0dfa43 am:
2d0cce04d9 am:
8d55e05ba8 am:
6f7af0f1fd
am:
d4d6d9753b
Change-Id: I1290ac6699cbb9eb8bf2a75869b5ff5c5ff5e4a2
Android Build Merger (Role) [Thu, 22 Dec 2016 05:37:07 +0000 (05:37 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests. am:
b81edb4477 am:
c823e5456f am:
42c0ad1d1b am:
8c2c2894e4 am:
f611e70b3d am:
beccdd90c3" into nyc-mr2-dev-plus-aosp
Kenneth Graunke [Thu, 22 Dec 2016 05:37:02 +0000 (05:37 +0000)]
Blacklist match_different_[member_]struct_names SSO validation tests. am:
b81edb4477 am:
c823e5456f am:
42c0ad1d1b am:
8c2c2894e4 am:
f611e70b3d
am:
beccdd90c3
Change-Id: I21e66982c8150152440948a72c85897ff7688faa
Kenneth Graunke [Thu, 22 Dec 2016 05:37:01 +0000 (05:37 +0000)]
Blacklist match_different_[member_]struct_names SSO validation tests. am:
b81edb4477 am:
c823e5456f am:
42c0ad1d1b am:
8c2c2894e4
am:
f611e70b3d
Change-Id: I3d4119990149e083882328f7627804d0523d2a5c
Tina Zhou [Thu, 22 Dec 2016 05:36:56 +0000 (05:36 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
736369667b am:
53c8574bda
am:
29003e52d0
Change-Id: If196508f15cbc78be6d437af55e5da065092563e
David Sodman [Thu, 22 Dec 2016 05:36:44 +0000 (05:36 +0000)]
resolve merge conflicts of b81edb4 to master am:
ce5292f584 am:
49ddc6319b
am:
f07ca045e6
Change-Id: Idd11105e84a891d593e318c1a267bc4763f7a8ca
Tina Zhou [Thu, 22 Dec 2016 05:31:26 +0000 (05:31 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
736369667b
am:
53c8574bda
Change-Id: Ib0891de8ee251a83e79fa37f42534adc11eb9274
David Sodman [Thu, 22 Dec 2016 05:31:14 +0000 (05:31 +0000)]
resolve merge conflicts of b81edb4 to master am:
ce5292f584
am:
49ddc6319b
Change-Id: I4b005cc60d389d784325429bf1c0efef4396f8fa
Tina Zhou [Thu, 22 Dec 2016 05:25:58 +0000 (05:25 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866
am:
736369667b
Change-Id: I5ac67d657cfac9a37bfe7723c3fd18650f948ae5
David Sodman [Thu, 22 Dec 2016 05:25:45 +0000 (05:25 +0000)]
resolve merge conflicts of b81edb4 to master
am:
ce5292f584
Change-Id: I0bd3fa65bf2e456829fc609d3cd743c0508f856d
Tina Zhou [Thu, 22 Dec 2016 05:20:13 +0000 (05:20 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev
am:
4acf725866
Change-Id: I2cc66f7fb73fecf721da7704aa5a35384c5f5d4d
David Sodman [Thu, 22 Dec 2016 03:06:13 +0000 (19:06 -0800)]
resolve merge conflicts of b81edb4 to master
Change-Id: I16c7230358a1758afe1bc9ca2b22ae6eff2490b7
Tina Zhou [Thu, 22 Dec 2016 03:02:29 +0000 (03:02 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am:
ce7ccaab4a am:
a164d23f5c am:
490048f2a6 am:
c056a421a1
am:
3d24f19c31
Change-Id: I1095a6c9b68e41460872b6d4fc13722470a538c5
Pyry Haulos [Thu, 22 Dec 2016 03:02:17 +0000 (03:02 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d am:
c1e020bec5 am:
5ca19fdb34 am:
d5fa5e4357
am:
2f030d9731
Change-Id: I929d441b08503d9e5f758c412c7ac32a9e8515c8
Tina Zhou [Thu, 22 Dec 2016 03:01:49 +0000 (03:01 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f am:
f2ab59be70 am:
a911a04556 am:
aa9cd15468
am:
2597c25fd9
Change-Id: Iab0500283d59f370ae6dbcc823853fd641b1c08a
Pyry Haulos [Thu, 22 Dec 2016 03:01:45 +0000 (03:01 +0000)]
Update glslang to d02dc5d am:
b0ce1f083e -s ours am:
ce56d4629c am:
ad154a3284 am:
62f7b49be7
am:
80758ecfbf
Change-Id: Ie574efbe8c6cc48664e9971d7ed6a31d77254bc4
Pyry Haulos [Thu, 22 Dec 2016 03:01:40 +0000 (03:01 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes am:
ef29b7735d -s ours am:
6503fc0e0d am:
835ca88406 am:
de68c1bac2
am:
fb964cbc1f
Change-Id: I5d5e4c443261aa881721f0445c3d90a61dbdd44b
Pyry Haulos [Thu, 22 Dec 2016 03:01:36 +0000 (03:01 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am:
e71e3bbacd am:
7994095bf2 am:
35fd8bafe2 am:
2a9e6a68e3
am:
3e7afc94e1
Change-Id: I0ce068b178fcbc2b1b201319bb040760f3a1a1b4
Tina Zhou [Thu, 22 Dec 2016 02:57:09 +0000 (02:57 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am:
ce7ccaab4a am:
a164d23f5c am:
490048f2a6
am:
c056a421a1
Change-Id: I400628367615287771022a71d3893a88e33cbfe8
Pyry Haulos [Thu, 22 Dec 2016 02:56:56 +0000 (02:56 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d am:
c1e020bec5 am:
5ca19fdb34
am:
d5fa5e4357
Change-Id: Id5e39fd002f9e5c4beddf2c5f503f1b39cc9b3e3
Tina Zhou [Thu, 22 Dec 2016 02:56:24 +0000 (02:56 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f am:
f2ab59be70 am:
a911a04556
am:
aa9cd15468
Change-Id: I0cb6261e655df6a06fdc00c8120a733cc395b95d
Pyry Haulos [Thu, 22 Dec 2016 02:56:18 +0000 (02:56 +0000)]
Update glslang to d02dc5d am:
b0ce1f083e -s ours am:
ce56d4629c am:
ad154a3284
am:
62f7b49be7
Change-Id: I3544d90994d9a626497d838902bbd87b4f4bc656
Pyry Haulos [Thu, 22 Dec 2016 02:56:12 +0000 (02:56 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes am:
ef29b7735d -s ours am:
6503fc0e0d am:
835ca88406
am:
de68c1bac2
Change-Id: I5c8b326bdc8f114efb17727a6f7d4f7b5d7fed9b
Pyry Haulos [Thu, 22 Dec 2016 02:56:06 +0000 (02:56 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am:
e71e3bbacd am:
7994095bf2 am:
35fd8bafe2
am:
2a9e6a68e3
Change-Id: Ief1a3c9874dd3b4ddc28a11fde8b182730017e9a
Tina Zhou [Thu, 22 Dec 2016 02:51:48 +0000 (02:51 +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:
29fa182895
am:
bad040d8c9
Change-Id: I84032f9a6d9302ded72f3a89f3a3cf5c0f683331
Tina Zhou [Thu, 22 Dec 2016 02:51:43 +0000 (02:51 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am:
ce7ccaab4a am:
a164d23f5c
am:
490048f2a6
Change-Id: Ib24e240bca32a17c1db996f494c1da247e5e4fea
Pyry Haulos [Thu, 22 Dec 2016 02:51:33 +0000 (02:51 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d am:
020b95377e am:
2da2988f32 am:
96f1cc8ba9 am:
d7e6b5159d am:
438f8c11ab
am:
9a18a2125d
Change-Id: Ic7e62802c6a46b3c12d74acab82644c6939e6304
Pyry Haulos [Thu, 22 Dec 2016 02:51:28 +0000 (02:51 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d am:
c1e020bec5
am:
5ca19fdb34
Change-Id: If6b0ca58729c2ec8debf3ac52776623114afdef2
Tina Zhou [Thu, 22 Dec 2016 02:50:59 +0000 (02:50 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f am:
b44fae0a8a am:
4045968a8e am:
d1e1ca812f am:
6a64e395a5 am:
ffc44cfca7
am:
4fedaa18d0
Change-Id: I3c51fdf7be0bd5b9c0de6d54d65b6776661e5e9e
Tina Zhou [Thu, 22 Dec 2016 02:50:53 +0000 (02:50 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f am:
f2ab59be70
am:
a911a04556
Change-Id: Ia3502fed8bfae8e24843ffedfd1beea34c6553b8
Pyry Haulos [Thu, 22 Dec 2016 02:50:51 +0000 (02:50 +0000)]
Update glslang to d02dc5d am:
b0ce1f083e am:
62137a913c am:
a03e8e8556 am:
092f056a9b am:
e4e623db59 am:
3ae98f7a99
am:
6ff9efe58c
Change-Id: I1bc6d0c8f1225725848e6f6efdc1553cf8f598e2
Pyry Haulos [Thu, 22 Dec 2016 02:50:47 +0000 (02:50 +0000)]
Update glslang to d02dc5d am:
b0ce1f083e -s ours am:
ce56d4629c
am:
ad154a3284
Change-Id: I9c503da417e986b7083743a4e3efa08550e729af
Pyry Haulos [Thu, 22 Dec 2016 02:50:43 +0000 (02:50 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes am:
ef29b7735d am:
9b853f5259 am:
ae704400e8 am:
91b53912e4 am:
a5b5961f77 am:
b18013c548 -s ours
am:
2509c96ece
Change-Id: Ia1c47780df6066a4b9d25c9d3d99463d4a1c6999
Pyry Haulos [Thu, 22 Dec 2016 02:50:41 +0000 (02:50 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes am:
ef29b7735d -s ours am:
6503fc0e0d
am:
835ca88406
Change-Id: I783b240b963ac4d219bbbd00278b3f5fce63cbb3
Pyry Haulos [Thu, 22 Dec 2016 02:50:36 +0000 (02:50 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am:
e71e3bbacd am:
7994095bf2
am:
35fd8bafe2
Change-Id: I5fc7d97ca7391ea8174a08dcfc30ae0c256b5256
Pyry Haulos [Thu, 22 Dec 2016 02:50:35 +0000 (02:50 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am:
e71e3bbacd am:
5332103bc2 am:
f066c9a577 am:
df90278080 am:
3ff1767250 am:
1f280cdeb3
am:
6f5c2dace4
Change-Id: I8bacd1f4a8fb3fc418f6f05a699f28214f2036f0
Tina Zhou [Thu, 22 Dec 2016 02:46:49 +0000 (02:46 +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:
29fa182895
Change-Id: I0a461dbf16f57fb2b785bab9d5f6d7f2c3763e5b
Tina Zhou [Thu, 22 Dec 2016 02:46:42 +0000 (02:46 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev am:
ce7ccaab4a
am:
a164d23f5c
Change-Id: I5d9aeb3c9bdb3861d3fd685d10c13a3c0fc8a204
Pyry Haulos [Thu, 22 Dec 2016 02:46:37 +0000 (02:46 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d am:
020b95377e am:
2da2988f32 am:
96f1cc8ba9 am:
d7e6b5159d
am:
438f8c11ab
Change-Id: If53fffd14068f606b3038d71dfe209b4d90f98f5
Tina Zhou [Thu, 22 Dec 2016 02:46:36 +0000 (02:46 +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
am:
174a602315
Change-Id: I3133e1cfa8d48ba10767c709fd0778d39c013fe7
Pyry Haulos [Thu, 22 Dec 2016 02:46:30 +0000 (02:46 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d
am:
c1e020bec5
Change-Id: Ib5fdce79a6b3eb6485f6ac8f25816185bebb1797
Pyry Haulos [Thu, 22 Dec 2016 02:46:23 +0000 (02:46 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am:
a42836566d am:
020b95377e am:
2da2988f32 am:
96f1cc8ba9 am:
d7e6b5159d am:
e7edfc1088
am:
50c1f09126
Change-Id: I4207e49fe2986acde94d8668935d2bf804ea7893
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
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
Tina Zhou [Thu, 22 Dec 2016 02:46:01 +0000 (02:46 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f
am:
f2ab59be70
Change-Id: I463700034a673d0a81d93c8072eba4fa99d30523
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
Tina Zhou [Thu, 22 Dec 2016 02:45:53 +0000 (02:45 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am:
4812d6d47f am:
b44fae0a8a am:
4045968a8e am:
d1e1ca812f am:
6a64e395a5 am:
c54f821620
am:
39f956ac28
Change-Id: Ie21d50116ab96ac30408237503dd0829f634509d
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
Pyry Haulos [Thu, 22 Dec 2016 02:45:51 +0000 (02:45 +0000)]
Update glslang to d02dc5d am:
b0ce1f083e -s ours
am:
ce56d4629c
Change-Id: I4ffe104b9b993bbabb841177d7513a0be90c3d6b
Pyry Haulos [Thu, 22 Dec 2016 02:45:48 +0000 (02:45 +0000)]
Update glslang to d02dc5d am:
b0ce1f083e am:
62137a913c am:
a03e8e8556 am:
092f056a9b am:
e4e623db59 -s ours am:
7ef5a2e2c8
am:
48e4480038
Change-Id: Id7ba8b9ef49ef311269e9e5f7f2961fec29c8006
Pyry Haulos [Thu, 22 Dec 2016 02:45:43 +0000 (02:45 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes am:
ef29b7735d -s ours
am:
6503fc0e0d
Change-Id: I2ca2e81043cfe98ea4f7fa75fcf2d5bcc116cf59
Pyry Haulos [Thu, 22 Dec 2016 02:45:41 +0000 (02:45 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes am:
ef29b7735d am:
9b853f5259 am:
ae704400e8 am:
91b53912e4 am:
a5b5961f77 -s ours am:
519b83426e
am:
b44b1338b4
Change-Id: I257118a0d6de4802562d317661d2a765ce998be7
Pyry Haulos [Thu, 22 Dec 2016 02:45:35 +0000 (02:45 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am:
e71e3bbacd
am:
7994095bf2
Change-Id: Ic8f0aa06f6816a9f26096b2294539ba7a64a2e89
Pyry Haulos [Thu, 22 Dec 2016 02:45:35 +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:
ee947f1770
am:
7ba3b0654b
Change-Id: I84385a4ba62a88c20c15bc05df285ed8c3e26aba
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
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
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
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
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
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
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
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
Tina Zhou [Thu, 22 Dec 2016 02:34:59 +0000 (02:34 +0000)]
Merge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat-cts-dev
am:
ce7ccaab4a
Change-Id: I36f440b4feadda51d9a47c856a820986800c387b
Pyry Haulos [Thu, 22 Dec 2016 02:34:59 +0000 (02:34 +0000)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048
am:
a42836566d
Change-Id: I6cf9f214b1a66360823af5fb219860454bc5a275
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
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
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
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
Tina Zhou [Thu, 22 Dec 2016 02:34:38 +0000 (02:34 +0000)]
Merge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev
am:
4812d6d47f
Change-Id: I6c5c6201bedac30702f65c2633454dc6bd27b4a5
Pyry Haulos [Thu, 22 Dec 2016 02:34:37 +0000 (02:34 +0000)]
Update glslang to d02dc5d
am:
b0ce1f083e -s ours
Change-Id: I12b4d9962c21073cfc89766b87049f4140d69f2a
Pyry Haulos [Thu, 22 Dec 2016 02:34:36 +0000 (02:34 +0000)]
Cherry-pick SPIR-V ClipDistance validation fixes
am:
ef29b7735d -s ours
Change-Id: I05ec2bc33b606a2500f7991e60a9823b08a5868d
Pyry Haulos [Thu, 22 Dec 2016 02:34:35 +0000 (02:34 +0000)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev
am:
e71e3bbacd
Change-Id: Id4477e4ab350a34791c9a59bec747d487b31d5c5
Tina Zhou [Wed, 21 Dec 2016 23:35:56 +0000 (23:35 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
22bf0dfa43 am:
2d0cce04d9 am:
8d55e05ba8
am:
6f7af0f1fd
Change-Id: Ife38f2a347f5c208dc606dc6817884f7a526551b
Kenneth Graunke [Wed, 21 Dec 2016 23:35:47 +0000 (23:35 +0000)]
Blacklist match_different_[member_]struct_names SSO validation tests. am:
b81edb4477 am:
c823e5456f am:
42c0ad1d1b am:
8c2c2894e4
am:
f611e70b3d
Change-Id: I7ca88ba5fa87c180ac1ca7f6be0270ce3b9b4a85