platform/upstream/VK-GL-CTS.git
7 years agoMerge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3b...
Tina Zhou [Fri, 20 Jan 2017 18:41:07 +0000 (18:41 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3be2 am: b3f5df9d8f
am: c51b8d9aed

Change-Id: Iebfad13ffbabdce0d1225dba1a5a7e7eef61a5f0

7 years agoDrop incorrect framebuffer texture subtests. am: 625d685874 am: 9df734d698
Kenneth Graunke [Fri, 20 Jan 2017 18:40:48 +0000 (18:40 +0000)]
Drop incorrect framebuffer texture subtests. am: 625d685874 am: 9df734d698
am: b7e9123835

Change-Id: Idfa304af7fc533f4fcfd620727ec2915db376962

7 years agoMerge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am: 27b237e149
Tina Zhou [Fri, 20 Jan 2017 18:40:38 +0000 (18:40 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99 am: 27b237e149
am: 941703d7ac

Change-Id: I4f1c9a3aaf13075bea436da17673256ea79bc0cd

7 years agoOptimize swapchain OOM tests am: 1614827a71 am: c4cd6ba5e7
Pyry Haulos [Fri, 20 Jan 2017 18:40:26 +0000 (18:40 +0000)]
Optimize swapchain OOM tests am: 1614827a71 am: c4cd6ba5e7
am: 58dd13c4bd

Change-Id: I73140e4f04757e3b08d64eff88d70360abf8a52a

7 years agoMerge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into...
Tina Zhou [Fri, 20 Jan 2017 18:40:12 +0000 (18:40 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am: 0991459ed1 am: 0a2fc88750
am: 842ee2b145

Change-Id: I509b02768c89111e15c3f541336aee990dc88ecb

7 years agoFix internal format/type for ES3 3D + depth/stencil negative API tests. am: 2ed3a5a66...
Kenneth Graunke [Fri, 20 Jan 2017 18:40:02 +0000 (18:40 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am: 2ed3a5a66f am: ad563bc887
am: c05194f0c9

Change-Id: I2135b0d06636da98797a4e92b79967b761409714

7 years agoMerge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am: 13a05434cc...
Tina Zhou [Fri, 20 Jan 2017 18:39:48 +0000 (18:39 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am: 13a05434cc am: 4fc6c2e455
am: 57763dc162

Change-Id: Icba07b9c2e1c05c3e506b282461b0eecbf8e6c80

7 years agoAdd support for EGL_EXT_pixel_format_float am: 521bf8a7c3 am: 28a6ef5df2
Mark Adams [Fri, 20 Jan 2017 18:39:36 +0000 (18:39 +0000)]
Add support for EGL_EXT_pixel_format_float am: 521bf8a7c3 am: 28a6ef5df2
am: 69a929f82c

Change-Id: Ie2e9501067f41c0548ae25365f8d0043cf0749d2

7 years agoMerge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3be2
Tina Zhou [Fri, 20 Jan 2017 18:36:25 +0000 (18:36 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev am: 3baf7e3be2
am: b3f5df9d8f

Change-Id: Ie130b6d34ae0dcd24b2fa867d3631cc9428ef4ba

7 years agoDrop incorrect framebuffer texture subtests. am: 625d685874
Kenneth Graunke [Fri, 20 Jan 2017 18:36:08 +0000 (18:36 +0000)]
Drop incorrect framebuffer texture subtests. am: 625d685874
am: 9df734d698

Change-Id: Ideece41c3411c8a01ea403395edc851dc734c4db

7 years agoMerge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99
Tina Zhou [Fri, 20 Jan 2017 18:35:58 +0000 (18:35 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev am: c811d42d99
am: 27b237e149

Change-Id: Id9d29d51ace7767e0b2a57a32d3f38379ed32900

7 years agoOptimize swapchain OOM tests am: 1614827a71
Pyry Haulos [Fri, 20 Jan 2017 18:35:48 +0000 (18:35 +0000)]
Optimize swapchain OOM tests am: 1614827a71
am: c4cd6ba5e7

Change-Id: I61acabdc7d5696b4565e346143a189267ae0aeb8

7 years agoMerge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into...
Tina Zhou [Fri, 20 Jan 2017 18:35:36 +0000 (18:35 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev am: 0991459ed1
am: 0a2fc88750

Change-Id: I893215e862509b29f8fd3477fd513cb0ae87970d

7 years agoFix internal format/type for ES3 3D + depth/stencil negative API tests. am: 2ed3a5a66f
Kenneth Graunke [Fri, 20 Jan 2017 18:35:27 +0000 (18:35 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests. am: 2ed3a5a66f
am: ad563bc887

Change-Id: I290e18b7ab69769c08fab421f022eeccc25a5e26

7 years agoMerge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am: 13a05434cc
Tina Zhou [Fri, 20 Jan 2017 18:35:16 +0000 (18:35 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am: 13a05434cc
am: 4fc6c2e455

Change-Id: I5e6511ecd304ecf0374cfb2078740c74629145cc

7 years agoAdd support for EGL_EXT_pixel_format_float am: 521bf8a7c3
Mark Adams [Fri, 20 Jan 2017 18:35:06 +0000 (18:35 +0000)]
Add support for EGL_EXT_pixel_format_float am: 521bf8a7c3
am: 28a6ef5df2

Change-Id: I737dc392ec39fa022166905d7af7f029da7e0c36

7 years agoMerge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:30:11 +0000 (18:30 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev
am: 3baf7e3be2

Change-Id: I2f95c748059d7aea5f1899ff6ee6c0fe96ea7245

7 years agoDrop incorrect framebuffer texture subtests.
Kenneth Graunke [Fri, 20 Jan 2017 18:30:10 +0000 (18:30 +0000)]
Drop incorrect framebuffer texture subtests.
am: 625d685874

Change-Id: I7b1cab296c2a61ed3e05ae52dd21fd62bc6d3c8a

7 years agoMerge "Optimize swapchain OOM tests" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:29:58 +0000 (18:29 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev
am: c811d42d99

Change-Id: I06e852cc34ee156dbd66ac36fbb052a2db8ec36f

7 years agoOptimize swapchain OOM tests
Pyry Haulos [Fri, 20 Jan 2017 18:29:57 +0000 (18:29 +0000)]
Optimize swapchain OOM tests
am: 1614827a71

Change-Id: I5ac33602999153d04624eb32504437ffff9b3b51

7 years agoMerge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into...
Tina Zhou [Fri, 20 Jan 2017 18:29:46 +0000 (18:29 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev
am: 0991459ed1

Change-Id: If9f75801b7ea26bec470e4dd11b318431ed56352

7 years agoFix internal format/type for ES3 3D + depth/stencil negative API tests.
Kenneth Graunke [Fri, 20 Jan 2017 18:29:45 +0000 (18:29 +0000)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests.
am: 2ed3a5a66f

Change-Id: I9439b037614e52368b771e1b7a84bd4930bfbf6a

7 years agoMerge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:29:33 +0000 (18:29 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev
am: 13a05434cc

Change-Id: Ic956c9c223aef327c2614b3f52ecf5c1166bec22

7 years agoAdd support for EGL_EXT_pixel_format_float
Mark Adams [Fri, 20 Jan 2017 18:29:32 +0000 (18:29 +0000)]
Add support for EGL_EXT_pixel_format_float
am: 521bf8a7c3

Change-Id: I64bda78561b2eb598e78bb2ba13b485602ea96e7

7 years agoMerge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:28:18 +0000 (18:28 +0000)]
Merge "Drop incorrect framebuffer texture subtests." into nougat-cts-dev

7 years agoMerge "Optimize swapchain OOM tests" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:27:50 +0000 (18:27 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev

7 years agoMerge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into...
Tina Zhou [Fri, 20 Jan 2017 18:27:40 +0000 (18:27 +0000)]
Merge "Fix internal format/type for ES3 3D + depth/stencil negative API tests." into nougat-cts-dev

7 years agoMerge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:27:14 +0000 (18:27 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev

7 years agoDrop incorrect framebuffer texture subtests.
Kenneth Graunke [Fri, 6 Jan 2017 08:25:28 +0000 (00:25 -0800)]
Drop incorrect framebuffer texture subtests.

This patch removes two broken subcases of:
dEQP-GLES31.functional.debug.negative_coverage.log.buffer.framebuffer_texture_layer

These were fixed in dEQP master by commit f28187809176f5eeb1ee25ccfa70d3,
but we cannot backport that to release branches because it changes the
existing expectations, which would break previously passing
implementations.  See buganizer 30287182 and 28090252.

The first subtest incorrectly checked layer (array slice) when it should
have checked miplevel.  The subtest description says:

"GL_INVALID_VALUE is generated if texture is a 2D multisample array
 texture and layer not 0."

which is wrong - array textures can certainly have multiple slices.
The ES 3.1 specification says that:

"An INVALID_VALUE error is generated if texture is not zero and level is
 not a supported texture level for texture, as described above."

and miplevel 0 is the only valid miplevel for a multisample texture.

The second subtest is no longer valid according to the resolution of
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=15968.

Bug: 34281627
Merged-In: I500074c1777d88291c0b395498bb0f7d5613d27d

7 years agoSkip commit '302bd7c6b3d468e33b19b693a25d67f2b54b961c' on nougat-mr1-cts-dev. am...
Xin Li [Fri, 13 Jan 2017 00:17:10 +0000 (00:17 +0000)]
Skip commit '302bd7c6b3d468e33b19b693a25d67f2b54b961c' on nougat-mr1-cts-dev. am: c5bbebc46a  -s ours
am: c40b13062c

Change-Id: I8f28c13e35f78f074910f55a4505bc7ef96e7898

7 years agoMerge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat...
Xin Li [Fri, 13 Jan 2017 00:17:07 +0000 (00:17 +0000)]
Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat-cts-mr1-dev. am: 2a9d42a651
am: c3801f447c

Change-Id: I161050b3925295ab2ede4bb46198bc7d42023de8

7 years agoSkip commit '302bd7c6b3d468e33b19b693a25d67f2b54b961c' on nougat-mr1-cts-dev.
Xin Li [Fri, 13 Jan 2017 00:14:42 +0000 (00:14 +0000)]
Skip commit '302bd7c6b3d468e33b19b693a25d67f2b54b961c' on nougat-mr1-cts-dev.
am: c5bbebc46a  -s ours

Change-Id: I9bfe818beb07950ca63f6f1d2e4efbfaaf7eee8d

7 years agoMerge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat...
Xin Li [Fri, 13 Jan 2017 00:14:39 +0000 (00:14 +0000)]
Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from nougat-cts-dev to nougat-cts-mr1-dev.
am: 2a9d42a651

Change-Id: I1a7c1e97354c43a561d91413191fb3b65f5d4f5a

7 years agoSkip commit '302bd7c6b3d468e33b19b693a25d67f2b54b961c' on
Xin Li [Thu, 12 Jan 2017 23:21:25 +0000 (15:21 -0800)]
Skip commit '302bd7c6b3d468e33b19b693a25d67f2b54b961c' on
nougat-mr1-cts-dev.

BUG: 33090058
Change-Id: Ife934b6694e07b2231070cc5d05865fed78e67c4

7 years agoMerge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from
Xin Li [Thu, 12 Jan 2017 23:09:38 +0000 (15:09 -0800)]
Merge commit '09e8b66d03077e9a9b310145112cfd0e747e06f3' from
nougat-cts-dev to nougat-cts-mr1-dev.

BUG: 33090058
Change-Id: I7a8bacd16b5d98255987c5632e73dd823d8643be

7 years agoOptimize swapchain OOM tests
Pyry Haulos [Wed, 4 Jan 2017 22:30:07 +0000 (14:30 -0800)]
Optimize swapchain OOM tests

Swapchain OOM tests were hitting timeouts on some platforms. This commit
optimizes the tests in two ways:

 * VkInstance, VkDevice, and VkSurface are now re-used across all
sub-cases.

 * Loop is re-written to avoid re-creating swapchains for parameters
0..N-1 when testing parameter combination N.

Affects: dEQP-VK.wsi.*.swapchain.simulate_oom.*

Bug: 33555898
(cherry picked from commit 2beac9057d9113ac306632d819ded852691a6842)

Change-Id: I19e9c7c8012a82cd12322a733afab961f4c7a1ae

7 years agoFix internal format/type for ES3 3D + depth/stencil negative API tests.
Kenneth Graunke [Mon, 12 Sep 2016 19:37:08 +0000 (12:37 -0700)]
Fix internal format/type for ES3 3D + depth/stencil negative API tests.

This is a port of commit ae7f8e0a07730e693b24d3dc7a23d2372319145e from
the ES 3.1 tests to the ES 3.0 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.

Affects dEQP-GLES3.functional.negative_api.texture.teximage3d.

Bug: 34103293

Change-Id: Ie01e2d130bb1cadc821153487e3e41593e3ca15e

7 years agoDO NOT MERGE: Remove changed texel buffer access tests from mustpass am: 302bd7c6b3...
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

7 years agoDO NOT MERGE: Remove a few changed Vulkan tests from mustpass am: 09e8b66d03 -s...
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

7 years agoDO NOT MERGE: Remove changed texel buffer access tests from mustpass am: 302bd7c6b3...
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

7 years agoDO NOT MERGE: Remove a few changed Vulkan tests from mustpass am: 09e8b66d03 -s...
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

7 years agoDO NOT MERGE: Remove changed texel buffer access tests from mustpass am: 302bd7c6b3...
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

7 years agoDO NOT MERGE: Remove a few changed Vulkan tests from mustpass am: 09e8b66d03 -s...
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

7 years agoDO NOT MERGE: Remove changed texel buffer access tests from mustpass
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

7 years agoDO NOT MERGE: Remove a few changed Vulkan tests from mustpass
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

7 years agoAdd support for EGL_EXT_pixel_format_float
Mark Adams [Wed, 14 Dec 2016 22:02:52 +0000 (17:02 -0500)]
Add support for EGL_EXT_pixel_format_float

This updates the egl.xml version and identifies/skips the float configs

Bug: 32969314
Change-Id: Iacfdf6b1c32c86ea0e6f80ca7ebaaeef583d1135
Merged-In: Iadeb0d4a76a06b2be716f3e76a1cc9fb69aff16a

7 years agoDO NOT MERGE: Remove changed texel buffer access tests from mustpass
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

7 years agoDO NOT MERGE: Remove a few changed Vulkan tests from mustpass
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

7 years agoCherry-pick the following missing commits from nyc-mr1-dev prior to b/33090058, which...
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

7 years agoCherry-pick the following missing commits from nyc-mr1-dev prior to
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

7 years agoAdd runtime to CtsDeqpTestCases
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)

7 years agoFix internal format/type for 3D + depth/stencil negative API tests.
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)

7 years agoFix sample_mask_in.bit_count_per_two_samples tests for 2x MSAA.
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)

7 years agoMerge "Blacklist match_different_[member_]struct_names SSO validation tests." into...
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

7 years agoBlacklist match_different_[member_]struct_names SSO validation tests. am: b81edb4477...
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

7 years agoMerge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat...
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

7 years agoChange GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am: a42836566d...
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

7 years agoMerge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am...
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

7 years agoUpdate glslang to d02dc5d am: b0ce1f083e am: 62137a913c am: a03e8e8556
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

7 years agoCherry-pick SPIR-V ClipDistance validation fixes am: ef29b7735d am: 9b853f5259 am...
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

7 years agoCherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am: e71e3bbacd am: 5332103...
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

7 years agoMerge "Blacklist match_different_[member_]struct_names SSO validation tests." into...
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

7 years agoBlacklist match_different_[member_]struct_names SSO validation tests. am: b81edb4477...
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

7 years agoMerge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat...
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

7 years agoChange GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am: a42836566d...
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

7 years agoMerge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f am...
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

7 years agoUpdate glslang to d02dc5d am: b0ce1f083e am: 62137a913c
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

7 years agoCherry-pick SPIR-V ClipDistance validation fixes am: ef29b7735d am: 9b853f5259
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

7 years agoCherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am: e71e3bbacd am: 5332103bc2
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

7 years agoMerge "Blacklist match_different_[member_]struct_names SSO validation tests." into...
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

7 years agoBlacklist match_different_[member_]struct_names SSO validation tests. am: b81edb4477
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

7 years agoMerge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat...
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

7 years agoChange GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048 am: a42836566d
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

7 years agoMerge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev am: 4812d6d47f
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

7 years agoUpdate glslang to d02dc5d am: b0ce1f083e
Pyry Haulos [Wed, 21 Dec 2016 23:07:13 +0000 (23:07 +0000)]
Update glslang to d02dc5d am: b0ce1f083e
am: 62137a913c

Change-Id: If38a684776482ff3cf156c22ef653ecf47173379

7 years agoCherry-pick SPIR-V ClipDistance validation fixes am: ef29b7735d
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

7 years agoCherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev am: e71e3bbacd
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

7 years agoMerge "Blacklist match_different_[member_]struct_names SSO validation tests." into...
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

7 years agoBlacklist match_different_[member_]struct_names SSO validation tests.
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

7 years agoMerge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat...
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

7 years agoChange GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048
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

7 years agoMerge changes I7c2ffd66,Ib53b245d,I4862cca3 into nougat-cts-dev
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

7 years agoUpdate glslang to d02dc5d
Pyry Haulos [Wed, 21 Dec 2016 22:47:31 +0000 (22:47 +0000)]
Update glslang to d02dc5d
am: b0ce1f083e

Change-Id: Ib49ac26b3ce273532262cd99000b63b061c5347c

7 years agoCherry-pick SPIR-V ClipDistance validation fixes
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

7 years agoCherry-pick dEQP-VK.pipeline.cache fixes to nougat-cts-dev
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

7 years agoMerge "Blacklist match_different_[member_]struct_names SSO validation tests." into...
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

7 years agoMerge "Change GL_MAX_TESS_CONTROL_TOTAL_OUTPUT_COMPONENTS minmax to 2048" into nougat...
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

7 years agoMerge changes I7c2ffd66,Ib53b245d,I4862cca3 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

7 years agoGetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: a44c013aaf...
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

7 years agoresolve merge conflicts of cc5cabd to nyc-mr1-dev
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

7 years agoGetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: a44c013aaf...
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

7 years agoresolve merge conflicts of cc5cabd to nyc-mr1-dev
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

7 years agoGetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: a44c013aaf...
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

7 years agoGetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: a44c013aaf...
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

7 years agoGetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: a44c013aaf...
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

7 years agoGetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: a44c013aaf
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

7 years agoGetDevices: Also allow `\.` to be part of the host name am: dbf9715509 am: 133c610be6
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

7 years agoGetDevices: Also allow `\.` to be part of the host name am: dbf9715509
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

7 years agoGetDevices: Also allow `\.` to be part of the host name
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

7 years agoGetDevices: Also allow `\.` to be part of the host name am: dbf9715509
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