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:
5f30178321
am:
764cd6e60b
Change-Id: I0f8b9eb0c1fa7ce4fdc26e5c8fbbefa3aac04bb6
Mark Adams [Fri, 20 Jan 2017 18:39:36 +0000 (18:39 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3 am:
4b7baeace7
am:
86683f95c7
Change-Id: I54718e0c412ba01c43e357f99f247f55ed139ed3
Tina Zhou [Fri, 20 Jan 2017 18:37:55 +0000 (18:37 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev am:
e98444b9bf
am:
ce3144c3e5
Change-Id: If580320c0105fcc4087ef873f89de3350019c719
Pyry Haulos [Fri, 20 Jan 2017 18:37:44 +0000 (18:37 +0000)]
Remove tests affected by NV/OES_viewport_array extension am:
267c765690
am:
0004ce1767
Change-Id: I4d38d14737546246b00830294efe9366a36e51b8
Tina Zhou [Fri, 20 Jan 2017 18:37:32 +0000 (18:37 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev am:
61d6d95a66
am:
73b7f271a9
Change-Id: I81f005b1da8dabe780d5f16e2b0b24f587286546
Alexander Galazin [Fri, 20 Jan 2017 18:37:21 +0000 (18:37 +0000)]
Generate flat triangles in polygon offset tests. am:
975a59ebca
am:
02c67b12c1
Change-Id: I86b9659a38fb029def1ab9c7de15c73f1e60473a
Tina Zhou [Fri, 20 Jan 2017 18:37:10 +0000 (18:37 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev am:
312a550657
am:
36d3dd2ab1
Change-Id: I1328497673c38aefc8617ee7c555ae2b242edb53
Pyry Haulos [Fri, 20 Jan 2017 18:36:59 +0000 (18:36 +0000)]
Relax line width verification in primitive bbox tests am:
ba45591407
am:
a11fd8b487
Change-Id: I559fa411bd3e9ab117e4fdacd466c03ead6c73da
Tina Zhou [Fri, 20 Jan 2017 18:36:48 +0000 (18:36 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev am:
6068dfbf3a
am:
839be6fae4
Change-Id: I15e8699e526124806d63a299d9c5ce73fffd696f
Nicolas Boichat [Fri, 20 Jan 2017 18:36:37 +0000 (18:36 +0000)]
Fix eglBindAPI negative test am:
09784f8510
am:
b7b2f00530
Change-Id: I87f03d37402abea5854ea8db14f847943ac306ba
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
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
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
Pyry Haulos [Fri, 20 Jan 2017 18:35:48 +0000 (18:35 +0000)]
Optimize swapchain OOM tests am:
1614827a71
am:
c4cd6ba5e7
Change-Id: I61acabdc7d5696b4565e346143a189267ae0aeb8
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
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
Tina Zhou [Fri, 20 Jan 2017 18:35:18 +0000 (18:35 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev am:
13a05434cc
am:
5f30178321
Change-Id: I1c8e7901ff7203a242baa374f4f0d8c3c111dadd
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
Mark Adams [Fri, 20 Jan 2017 18:35:06 +0000 (18:35 +0000)]
Add support for EGL_EXT_pixel_format_float am:
521bf8a7c3
am:
4b7baeace7
Change-Id: Ia42668945a64ea86b6357fb34cfb9b47a32719b5
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
Tina Zhou [Fri, 20 Jan 2017 18:31:04 +0000 (18:31 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev
am:
e98444b9bf
Change-Id: I03190aa34e911cb4a8b174d1251a354ff6e34718
Pyry Haulos [Fri, 20 Jan 2017 18:31:02 +0000 (18:31 +0000)]
Remove tests affected by NV/OES_viewport_array extension
am:
267c765690
Change-Id: I74f0255f38b618d9c72e1e48fabbda9636daf14d
Tina Zhou [Fri, 20 Jan 2017 18:30:48 +0000 (18:30 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev
am:
61d6d95a66
Change-Id: Ia7141732269df847c13bbb8b36e9f911c76d8753
Alexander Galazin [Fri, 20 Jan 2017 18:30:47 +0000 (18:30 +0000)]
Generate flat triangles in polygon offset tests.
am:
975a59ebca
Change-Id: If91ab1b34f3215705636abaa4dc52ebad5d3d3a7
Tina Zhou [Fri, 20 Jan 2017 18:30:39 +0000 (18:30 +0000)]
Merge "Add support for EGL_EXT_pixel_format_float" into nougat-cts-dev
am:
13a05434cc
Change-Id: Id211d01ef9006c6fcd2866ddc087f71fcd5500eb
Mark Adams [Fri, 20 Jan 2017 18:30:37 +0000 (18:30 +0000)]
Add support for EGL_EXT_pixel_format_float
am:
521bf8a7c3
Change-Id: I5328e30c4dcf07283541aaa5f9842597e56c4036
Tina Zhou [Fri, 20 Jan 2017 18:30:36 +0000 (18:30 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev
am:
312a550657
Change-Id: Ia8465e3ae1fb9d80125305134c157857e5e339b1
Pyry Haulos [Fri, 20 Jan 2017 18:30:35 +0000 (18:30 +0000)]
Relax line width verification in primitive bbox tests
am:
ba45591407
Change-Id: Ia0f71e5511d1bf4bf449ef71ecf5bb822311cf08
Tina Zhou [Fri, 20 Jan 2017 18:30:23 +0000 (18:30 +0000)]
Merge "Fix eglBindAPI negative test" into nougat-cts-dev
am:
6068dfbf3a
Change-Id: I4ca862cbe3c17c0887437a98570f16e1bfc19d34
Nicolas Boichat [Fri, 20 Jan 2017 18:30:22 +0000 (18:30 +0000)]
Fix eglBindAPI negative test
am:
09784f8510
Change-Id: I9f1246736de39cfc6bc6593bad465fa881f55e29
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
Kenneth Graunke [Fri, 20 Jan 2017 18:30:10 +0000 (18:30 +0000)]
Drop incorrect framebuffer texture subtests.
am:
625d685874
Change-Id: I7b1cab296c2a61ed3e05ae52dd21fd62bc6d3c8a
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
Pyry Haulos [Fri, 20 Jan 2017 18:29:57 +0000 (18:29 +0000)]
Optimize swapchain OOM tests
am:
1614827a71
Change-Id: I5ac33602999153d04624eb32504437ffff9b3b51
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
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
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
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
Tina Zhou [Fri, 20 Jan 2017 18:28:49 +0000 (18:28 +0000)]
Merge "Remove tests affected by NV/OES_viewport_array extension" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:28:42 +0000 (18:28 +0000)]
Merge "Generate flat triangles in polygon offset tests." into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:28:34 +0000 (18:28 +0000)]
Merge "Relax line width verification in primitive bbox tests" into nougat-cts-dev
Tina Zhou [Fri, 20 Jan 2017 18:28:26 +0000 (18:28 +0000)]
Merge "Fix eglBindAPI negative test" 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
Tina Zhou [Fri, 20 Jan 2017 18:27:50 +0000 (18:27 +0000)]
Merge "Optimize swapchain OOM tests" into nougat-cts-dev
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
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
Pyry Haulos [Wed, 18 Jan 2017 20:28:32 +0000 (12:28 -0800)]
Remove tests affected by NV/OES_viewport_array extension
Tests were not properly taking into account viewport clamping behavior
introduced by GL_NV/OES_viewport_array extensions.
Bug:
34349411
Change-Id: I3eae36359e6408191e0fbefb20cededec2a5bd39
Merged-In: I3d3c2e32d7dd96d1db960aa53dc18cc690187ec0
Alexander Galazin [Wed, 11 Jan 2017 07:50:13 +0000 (08:50 +0100)]
Generate flat triangles in polygon offset tests.
The tests setup triangles with a depth slope and then call
glPolygonOffset(factor, units) with variable units and
always 0 slope scaled factor.
According to the GLES 3.2 spec 13.7.2 Depth Offset:
"void PolygonOffset( float factor, float units );
factor scales the maximum depth slope of the polygon, and units scales an
implementation-dependent constant that relates to the usable resolution of the
depth buffer."
If the polygon has a depth slope,
the depth slope factor has to be not equal to zero.
The rationale of the slope scaled factor is to ensure that the offset
(equation 13.11) is greater than max(dz/dx, dz/dy) for all resolutions,
which may not be the case for the constant offset since it doesn't take
the screen resolution into account.
Changed tests:
dEQP-GLES2.functional.polygon_offset.*_displacement_with_units
dEQP-GLES3.functional.polygon_offset.*_displacement_with_units
Bug:
34386628
Change-Id: Ie8009ba1766eb50c3c5a750122aa8bb231144210
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
Pyry Haulos [Tue, 15 Nov 2016 18:28:48 +0000 (10:28 -0800)]
Relax line width verification in primitive bbox tests
Originally contributed by ARM to Khronos OpenGL ES CTS. Cherry-picked
with permission.
Google bug:
22713865
Khronos OpenGL issue: #19
Change-Id: I95359847611144e179819aaab6ac5dfe4bf4e4da
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
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
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
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
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
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
Nicolas Boichat [Sun, 18 Dec 2016 16:13:28 +0000 (00:13 +0800)]
Fix eglBindAPI negative test
It is ok for an implementation to not fail eglBindAPI if the current
display does not support the specified client API. However, in that
case, getConfig must not return any configuration for that specific
API.
Bug:
33278378
Affects: dEQP-EGL.functional.negative_api.bind_api
Test: Deploy to elm Chromebook, run with Cherry, test passes.
Change-Id: Idb86971de7a30e1aa78bb0951f971ed2829e2794
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
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
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 [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: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: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
projects / platform / upstream / VK-GL-CTS.git / log