Pyry Haulos [Wed, 4 Jan 2017 19:03:49 +0000 (19:03 +0000)]
DO NOT MERGE: Remove changed texel buffer access tests from mustpass am:
302bd7c6b3 -s ours am:
fb82c2f3ed am:
0ae27e7ebe am:
4f3a58d096
am:
05dbe9e32b
Change-Id: I8c012b597e435916b4cc02c741ab2f1544a876b7
Pyry Haulos [Wed, 4 Jan 2017 19:03:45 +0000 (19:03 +0000)]
DO NOT MERGE: Remove a few changed Vulkan tests from mustpass am:
09e8b66d03 -s ours am:
5cdea1cc60 am:
7bc5d2910f am:
d45c6244d5
am:
d4f55ad2fc
Change-Id: I2ab711cc3e4f0218ed8201293ef387558257d1ca
Pyry Haulos [Wed, 4 Jan 2017 19:01:46 +0000 (19:01 +0000)]
DO NOT MERGE: Remove changed texel buffer access tests from mustpass am:
302bd7c6b3 -s ours am:
fb82c2f3ed am:
0ae27e7ebe
am:
4f3a58d096
Change-Id: I66e5d609d08b51f52638c7fa9e96f1bbceb983b6
Pyry Haulos [Wed, 4 Jan 2017 19:01:44 +0000 (19:01 +0000)]
DO NOT MERGE: Remove a few changed Vulkan tests from mustpass am:
09e8b66d03 -s ours am:
5cdea1cc60 am:
7bc5d2910f
am:
d45c6244d5
Change-Id: I190fac6a22a3233cdcdf57465eabb271ab85a124
Pyry Haulos [Wed, 4 Jan 2017 18:59:17 +0000 (18:59 +0000)]
DO NOT MERGE: Remove changed texel buffer access tests from mustpass am:
302bd7c6b3 -s ours am:
fb82c2f3ed
am:
0ae27e7ebe
Change-Id: I7fcc1d4237db9ea395b85bcdedc7acf340751c8d
Pyry Haulos [Wed, 4 Jan 2017 18:59:14 +0000 (18:59 +0000)]
DO NOT MERGE: Remove a few changed Vulkan tests from mustpass am:
09e8b66d03 -s ours am:
5cdea1cc60
am:
7bc5d2910f
Change-Id: Id9d584f16b6b43190528aa93945ae479520ada47
Pyry Haulos [Wed, 4 Jan 2017 18:56:50 +0000 (18:56 +0000)]
DO NOT MERGE: Remove changed texel buffer access tests from mustpass am:
302bd7c6b3 -s ours
am:
fb82c2f3ed
Change-Id: Ie61b8831c62b3559950b721707830f3fed3cd5c4
Pyry Haulos [Wed, 4 Jan 2017 18:56:46 +0000 (18:56 +0000)]
DO NOT MERGE: Remove a few changed Vulkan tests from mustpass am:
09e8b66d03 -s ours
am:
5cdea1cc60
Change-Id: Iac6064074cf31d05563b47e90167fde94a641fde
Pyry Haulos [Wed, 4 Jan 2017 18:54:14 +0000 (18:54 +0000)]
DO NOT MERGE: Remove changed texel buffer access tests from mustpass
am:
302bd7c6b3 -s ours
Change-Id: I452742de754cbfad9bbd8633f7ecbc911c6dc172
Pyry Haulos [Wed, 4 Jan 2017 18:54:12 +0000 (18:54 +0000)]
DO NOT MERGE: Remove a few changed Vulkan tests from mustpass
am:
09e8b66d03 -s ours
Change-Id: Ibf74d17b9c30903c3c9fca20443330ba4f72ae7e
Pyry Haulos [Wed, 4 Jan 2017 16:20:43 +0000 (08:20 -0800)]
DO NOT MERGE: Remove changed texel buffer access tests from mustpass
NYC CTS bug-fix changes the SPIR-V for these tests causing drivers that
passed old CTS fail the new version.
Bug:
33041922
Change-Id: I7e23a700693d5e6ee7c4264e05d449f49f820516
Pyry Haulos [Wed, 4 Jan 2017 00:45:19 +0000 (16:45 -0800)]
DO NOT MERGE: Remove a few changed Vulkan tests from mustpass
Original NYC CTS was decorating struct member locations differently and
this was later fixed causing drivers that pass original NYC CTS fail.
Bug:
34060750
Bug:
33041922
Change-Id: I3fe33960a74fb8f568aa7e1327bc09de8bc3df41
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)
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
Tina Zhou [Wed, 21 Dec 2016 23:35:36 +0000 (23: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: I32386026628a54e94847bf95cb794aec20a87698
Pyry Haulos [Wed, 21 Dec 2016 23:35:24 +0000 (23: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: I3229d8c3e80b465d15aeaecc2fb9c26b2a6b8992
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
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
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
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
Tina Zhou [Wed, 21 Dec 2016 23:26:28 +0000 (23:26 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
22bf0dfa43 am:
2d0cce04d9
am:
8d55e05ba8
Change-Id: I700fe5f94e7d8e488d6372bf124a164aba5f3770
Kenneth Graunke [Wed, 21 Dec 2016 23:26:20 +0000 (23:26 +0000)]
Blacklist match_different_[member_]struct_names SSO validation tests. am:
b81edb4477 am:
c823e5456f am:
42c0ad1d1b
am:
8c2c2894e4
Change-Id: I26d9eae8521c4f037ae49c5de569aee968237ed8
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
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
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
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
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
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
Tina Zhou [Wed, 21 Dec 2016 23:19:28 +0000 (23:19 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866 am:
22bf0dfa43
am:
2d0cce04d9
Change-Id: I71a2b886081ddb7e0f6478ccbce0842ebbd8c728
Kenneth Graunke [Wed, 21 Dec 2016 23:19:19 +0000 (23:19 +0000)]
Blacklist match_different_[member_]struct_names SSO validation tests. am:
b81edb4477 am:
c823e5456f
am:
42c0ad1d1b
Change-Id: I5ec5acc3908c42f008b1fb6d3aa9fe10be169d33
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
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
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
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
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
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
Tina Zhou [Wed, 21 Dec 2016 23:08:17 +0000 (23:08 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev am:
4acf725866
am:
22bf0dfa43
Change-Id: I5772e52777a17608917d0a6f201c1c84ba66ca1b
Kenneth Graunke [Wed, 21 Dec 2016 23:08:08 +0000 (23:08 +0000)]
Blacklist match_different_[member_]struct_names SSO validation tests. am:
b81edb4477
am:
c823e5456f
Change-Id: Iac68efff2c2993aab5622ec9e55f5517065590c1
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
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
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
Pyry Haulos [Wed, 21 Dec 2016 23:07:13 +0000 (23:07 +0000)]
Update glslang to d02dc5d am:
b0ce1f083e
am:
62137a913c
Change-Id: If38a684776482ff3cf156c22ef653ecf47173379
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
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
Tina Zhou [Wed, 21 Dec 2016 22:48:33 +0000 (22:48 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev
am:
4acf725866
Change-Id: I0a2cd0a934b5fe0982508583e753b3fd2b9a1233
Kenneth Graunke [Wed, 21 Dec 2016 22:48:31 +0000 (22:48 +0000)]
Blacklist match_different_[member_]struct_names SSO validation tests.
am:
b81edb4477
Change-Id: Id2c34f0ccfae0c3b2f904d0539e0bc35a3979a18
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
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
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
Pyry Haulos [Wed, 21 Dec 2016 22:47:31 +0000 (22:47 +0000)]
Update glslang to d02dc5d
am:
b0ce1f083e
Change-Id: Ib49ac26b3ce273532262cd99000b63b061c5347c
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
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
Tina Zhou [Wed, 21 Dec 2016 22:32:08 +0000 (22:32 +0000)]
Merge "Blacklist match_different_[member_]struct_names SSO validation tests." into nougat-cts-dev
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Kenneth Graunke [Thu, 8 Dec 2016 22:09:31 +0000 (14:09 -0800)]
Blacklist match_different_[member_]struct_names SSO validation tests.
This patch blacklists the following tests:
- dEQP-GLES31.functional.separate_shader.validation.varying.match_different_struct_names
- dEQP-GLES31.functional.separate_shader.validation.io_blocks.match_different_member_struct_names
The resolution of Khronos bug #15866 is that the spec should be changed
to require that "structures have the same name" in order for the types
to match during SSO validation. These structures differ in name,
so they should not match, and we should get an SSO validation failure.
See https://cvs.khronos.org/bugzilla/show_bug.cgi?id=15866 and Khronos
legacy CTS commit
1607a3ce7caa5736471fb460d08130e62d689351.
Bug:
33457655
gitbuildkicker [Thu, 1 Dec 2016 00:55:30 +0000 (16:55 -0800)]
merge in nyc-mr1-cts-release history after reset to nyc-mr1-dev
Nicolas Boichat [Wed, 30 Nov 2016 04:14:52 +0000 (12:14 +0800)]
GetDevices: Also allow `\.` to be part of the host name
Useful when connecting over TCP to a device with a given IP.
Change-Id: Ibe3b75e5ba3ab0ff90219bb31d45e21d8f5fd61b
Pyry Haulos [Tue, 29 Nov 2016 23:24:17 +0000 (15:24 -0800)]
Update glslang to d02dc5d
Bug:
33041922
(cherry picked from commit
4e1f56d2457e0c8736e3e92c48bd8df0c309d600)
Change-Id: I7c2ffd66f55cafa402ffc7a0222973e282f4825f
Pyry Haulos [Wed, 23 Nov 2016 00:13:32 +0000 (16:13 -0800)]
Cherry-pick SPIR-V ClipDistance validation fixes
These fixes are needed in order for SPIR-V validation to pass when
shaders are compiled with a newer glslang version.
Bug:
33041922
Explicitly declare gl_PerVertex block
This fixes SPIR-V validation error in shaders generated from GLSL (not ES)
due to missing ClipDistance capability.
(cherry picked from commit
0a6fe1448b303a6a4e4ab48712eaf1c0b16d75b1)
Explicitly declare gl_PerVertex in push constant tests
(cherry picked from commit
cba5d02d184b771bc4a21b8aecbbde3377d86167)
Change tes/geom shaders in timestamp tests use 310 es
Vertex and fragment shaders were already using that GLSL version.
(cherry picked from commit
d47309690aa9b2e685b267ea6395e88b32c855a8)
Change ubo and ssbo tests to use 310 es shaders
(cherry picked from commit
4d36051923691c5f92cf3615e82d30d54ed3b09b)
Explicitly declare gl_PerVertex in dynamic viewport state tests
(cherry picked from commit
816c46d518d08a4ff321ca93780f2786fa86ba60)
Explicitly declare gl_PerVertex in occlusion query tests
(cherry picked from commit
a1257f69aa6008d4e5a22148a43d59692eb24822)
Change-Id: Ib53b245d25c6cbc345a88e8b247f01ac7cf8a541
Pyry Haulos [Mon, 21 Nov 2016 23:54:55 +0000 (15:54 -0800)]
Cherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev
Bug:
33041922
Validation fixes in dEQP-VK.pipeline
- Corrected out of range minDepthBounds value
- Added missing image layout transitions
- timestamp, cache tests: pass data through geometry shader
- cache test: use correct initialLayout in attachment when starting
a second render pass
(cherry picked from commit
1d3585c5ec71cf90d6519913db6a01ef2c0f840c)
Fix use of out-of-scope struct in pipeline cache tests
Fixes #363
(cherry picked from commit
1ec71c633e5755a1932c1da7692aef69b66999db)
Pipeline cache test: fix SPIRV validation error
(cherry picked from commit
89cce75bae9beb123311281386fb59b8da59052b)
Change-Id: I4862cca352955c33d04540f2f881760f4e4ffd65
Pyry Haulos [Tue, 15 Nov 2016 18:34:57 +0000 (10:34 -0800)]
Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048
Google bug:
33105204
Khronos bug: 12823
(cherry picked from commit
fe6bb67987a4d7fc59739c878e658f2a6d071cde)
Change-Id: I56fcc4ce527c31e48004c43e43e2ec994675e1b4
Tina Zhou [Thu, 17 Nov 2016 18:12:50 +0000 (18:12 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmallow-cts-dev am:
a5af1b076f am:
c1a3067570 am:
effd4e62e5 am:
225502d2cc am:
4d04016fad am:
67dc3662e1 am:
d64c35a5e6 am:
87a4ffcd07
am:
1094f351d1
Change-Id: I2698a529b8c1fe7a4921b9226c70e3397219209e
Kenneth Graunke [Thu, 17 Nov 2016 18:12:39 +0000 (18:12 +0000)]
Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA. am:
ea5589c748 am:
5613abd15f am:
1d0056de13 am:
a4c8f24941 am:
1f1491167d am:
5ac1b7c804 am:
f9ca1468a7 am:
9ee0dc70fc
am:
62d5098093
Change-Id: I1589c9577f5671ca3aab0a66e880fa9d7b5e996d
Tina Zhou [Thu, 17 Nov 2016 18:12:23 +0000 (18:12 +0000)]
Merge "Fix internal format/type for 3D + depth/stencil negative API tests." into marshmallow-cts-dev am:
d962b86909 am:
b5ef7ae649 am:
5702f3e5ae am:
a8564b49db am:
3126b25e64 am:
d1109cef09 am:
bd34d84e25 am:
94862a44ee
am:
ec07f24c86
Change-Id: Ib88202f6b886df1f1e836ff382a107a796dd90ea
Kenneth Graunke [Thu, 17 Nov 2016 18:12:12 +0000 (18:12 +0000)]
Fix internal format/type for 3D + depth/stencil negative API tests. am:
d2f3b468db am:
1d20a4108b am:
200b407779 am:
c6382e2e23 am:
a9d8fe46b4 am:
4cf7816eac am:
ca0f4e0cbb am:
84b462d0fb
am:
7551b11773
Change-Id: I834d8aaf87135a2563c463af8b863bb35585b88a
Tina Zhou [Thu, 17 Nov 2016 18:03:21 +0000 (18:03 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmallow-cts-dev am:
a5af1b076f am:
c1a3067570 am:
effd4e62e5 am:
225502d2cc am:
4d04016fad am:
67dc3662e1 am:
d64c35a5e6
am:
87a4ffcd07
Change-Id: I0eaa10c819e4f424a9afba9a1efef9c6d8db8497
Kenneth Graunke [Thu, 17 Nov 2016 18:03:10 +0000 (18:03 +0000)]
Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA. am:
ea5589c748 am:
5613abd15f am:
1d0056de13 am:
a4c8f24941 am:
1f1491167d am:
5ac1b7c804 am:
f9ca1468a7
am:
9ee0dc70fc
Change-Id: Ie95c2cac12f3325a450b0a8811cccd7be8b5c232
Tina Zhou [Thu, 17 Nov 2016 18:02:58 +0000 (18:02 +0000)]
Merge "Fix internal format/type for 3D + depth/stencil negative API tests." into marshmallow-cts-dev am:
d962b86909 am:
b5ef7ae649 am:
5702f3e5ae am:
a8564b49db am:
3126b25e64 am:
d1109cef09 am:
bd34d84e25
am:
94862a44ee
Change-Id: I096fc56bbee9e12d85fed06a880afa95ce2d8e6c
Kenneth Graunke [Thu, 17 Nov 2016 18:02:47 +0000 (18:02 +0000)]
Fix internal format/type for 3D + depth/stencil negative API tests. am:
d2f3b468db am:
1d20a4108b am:
200b407779 am:
c6382e2e23 am:
a9d8fe46b4 am:
4cf7816eac am:
ca0f4e0cbb
am:
84b462d0fb
Change-Id: I947e96c79900804ac7eeaa61273732f3736a9a43
Tina Zhou [Thu, 17 Nov 2016 17:55:25 +0000 (17:55 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmallow-cts-dev am:
a5af1b076f am:
c1a3067570 am:
effd4e62e5 am:
225502d2cc am:
4d04016fad am:
67dc3662e1
am:
d64c35a5e6
Change-Id: I8bc6c3dd28b4aec45116852fd696934fdc8c48c7
Tina Zhou [Thu, 17 Nov 2016 17:55:13 +0000 (17:55 +0000)]
Merge "Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA." into marshmallow-cts-dev am:
a5af1b076f am:
c2c27aa562 am:
e5d1db1d75 am:
5eed9806da am:
ac4f7241a1
am:
5fa7a52fee
Change-Id: I776e7fb711bac810641be685a35ba536014bffa3
Kenneth Graunke [Thu, 17 Nov 2016 17:55:12 +0000 (17:55 +0000)]
Fix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA. am:
ea5589c748 am:
5613abd15f am:
1d0056de13 am:
a4c8f24941 am:
1f1491167d am:
5ac1b7c804
am:
f9ca1468a7
Change-Id: Ib5d2ef7e8eb9cbeabe77578b53212bb7e0360bc8