Treehugger Robot [Wed, 4 Jan 2017 19:03:50 +0000 (19:03 +0000)]
Merge "Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master"
Pyry Haulos [Wed, 4 Jan 2017 18:52:48 +0000 (18:52 +0000)]
DO NOT MERGE: Remove changed texel buffer access tests from mustpass
am:
302bd7c6b3 -s ours
Change-Id: I1cefd7be538f766444576ae02a4b28b639a3e8cb
Pyry Haulos [Wed, 4 Jan 2017 18:52:44 +0000 (18:52 +0000)]
DO NOT MERGE: Remove a few changed Vulkan tests from mustpass
am:
09e8b66d03 -s ours
Change-Id: I595b0c3b589b73c806145602957875b57cffe84a
Pyry Haulos [Wed, 4 Jan 2017 17:32:13 +0000 (09:32 -0800)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Change-Id: Id23cc2f5a2ff4238fbf56d8c9cd4330dd166971a
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: 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
Pyry Haulos [Wed, 4 Jan 2017 00:42:53 +0000 (16:42 -0800)]
Revert "Add new files to Android.mk"
This reverts commit
4ed5a72717f9dc776f7f63aa21aca2c727524d0f.
Pyry Haulos [Wed, 4 Jan 2017 00:24:51 +0000 (16:24 -0800)]
Add new files to Android.mk
Change-Id: Ib396f9504a3b5523314cd2d5ab9375a346dbb219
Pyry Haulos [Wed, 4 Jan 2017 00:07:06 +0000 (16:07 -0800)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2
Jorg Wagner [Thu, 15 Dec 2016 21:52:06 +0000 (22:52 +0100)]
Skip integer formats that expose a max. sample count of 1
Actually fixes #538
As agreed in the ticket we need to skip integer formats if they
need to be sampled and only expose a max. sample count of 1.
Change-Id: Ia67c8d84cedcae09804e83cfefeb279b329d07b9
Kalle Raita [Fri, 16 Dec 2016 17:45:41 +0000 (09:45 -0800)]
install.py continues if adb uninstall fails
ADB uninstall fails with non-zero return code if the package to be
uninstalled does not exist. To allow the installation proceed when
there's no previous package, the non-zero return value should be ignored
for the uninstall step.
There are historical reasons for not relying on -r -d for
install (replace, allow downgrade), which I can't recall right now.
Test: Installed succesfully on device without deqp package.
Bug:
33961937
Change-Id: I401f3861f8d68f352747c041bd60cd372b48134b
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 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: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 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
Maciej Jesionowski [Wed, 21 Dec 2016 11:20:28 +0000 (12:20 +0100)]
Correct a typo in blit image test case names
Modified test names:
- dEQP-VK.api.copy_and_blit.blit_image.simple_tests.*
Change-Id: I20b09407101eb3e395d10f324e9f402f5c1c4b77
Maciej Jesionowski [Wed, 21 Dec 2016 11:20:28 +0000 (12:20 +0100)]
Correct a typo in blit image test case names
Modified test names:
- dEQP-VK.api.copy_and_blit.blit_image.simple_tests.*
Change-Id: Ia62b9f616466b919f1e92d0a74714586ccc6e313
Nicolas Boichat [Tue, 20 Dec 2016 18:59:40 +0000 (18:59 +0000)]
GetDevices: Also allow `\.` to be part of the host name am:
dbf9715509
am:
133c610be6
Change-Id: I21054992a16e3e6847a8af086528f4172602d614
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
Kalle Raita [Thu, 15 Dec 2016 23:29:39 +0000 (23:29 +0000)]
Merge "Non-compressed copy image target size (64,64,8)"
Maciej Jesionowski [Wed, 7 Dec 2016 09:55:36 +0000 (10:55 +0100)]
Alloc callbacks: don't report a quality warning for pooled objects
Modified tests:
- dEQP-VK.api.object_management.alloc_callback_fail_multiple.descriptor_set
- dEQP-VK.api.object_management.alloc_callback_fail_multiple.command_buffer_primary
- dEQP-VK.api.object_management.alloc_callback_fail_multiple.command_buffer_secondary
Change-Id: I0daea167c4b0c1e0a00039286b85af8c02e410f5
(cherry picked from commit
ca634a5ac0b5278736e012f43a59bb25a5234e6f)
iostrows [Tue, 13 Dec 2016 10:34:22 +0000 (11:34 +0100)]
Fix image memory barriers for depth/stencil formats
Affected tests:
- dEQP-VK.api.copy_and_blit.image_to_image.all_formats.depth_stencil*
Fixes #562
Change-Id: I59a851d2748f7ae0c2b56fdcd879978de4755ddf
Maciej Jesionowski [Wed, 14 Dec 2016 13:44:19 +0000 (14:44 +0100)]
Sparse resources: create correct device interface
Make sure correct function pointers are used with the a VkDevice.
This should make no actual difference on most implementations.
Affected tests:
- dEQP-VK.sparse_resources.*
Change-Id: Id39cf318c4ae24b47135e1f27308985bd20a0009
Pyry Haulos [Thu, 15 Dec 2016 12:24:03 +0000 (04:24 -0800)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2
Change-Id: I5ee52225ed76297caba6ae717e897d7290c20684
Pyry Haulos [Thu, 15 Dec 2016 12:24:01 +0000 (04:24 -0800)]
Merge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1
Change-Id: I82eb4eb290e5d85b44ac2f1f2efb1eb88aef062a
Pyry Haulos [Thu, 15 Dec 2016 12:11:43 +0000 (14:11 +0200)]
Add -Wno-delete-non-virtual-dtor to default cxxflags
That warning generates some false negatives that are hard to work
around.
Change-Id: Ib451eca3af7bf2a6bfd24aa966f89496257b9f0d
Pyry Haulos [Thu, 15 Dec 2016 12:02:11 +0000 (04:02 -0800)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2
Pyry Haulos [Thu, 15 Dec 2016 12:01:22 +0000 (04:01 -0800)]
Merge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1
Maciej Jesionowski [Wed, 14 Dec 2016 10:42:03 +0000 (11:42 +0100)]
Synchronization: use the correct device interface
This is a correctness change, likely has no impact
on most implementations.
Affected tests:
- dEQP-VK.synchronization.op.multi_queue.*
Change-Id: Ic2687f60c1ef2c468908c6c7240205b9e77e944c
Maciej Jesionowski [Wed, 14 Dec 2016 10:42:03 +0000 (11:42 +0100)]
Synchronization: use the correct device interface
This is a correctness change, likely has no impact
on most implementations.
Affected tests:
- dEQP-VK.synchronization.op.multi_queue.*
Change-Id: I3eee09c13626e23261a7d0496aacab259265c3b9
Treehugger Robot [Wed, 14 Dec 2016 12:50:45 +0000 (12:50 +0000)]
Merge "Allow ANGLE_depth_texture for FBO completeness."
Treehugger Robot [Wed, 14 Dec 2016 12:23:50 +0000 (12:23 +0000)]
Merge "Extend primitive_bounding_box negative tests"
Jamie Madill [Thu, 8 Dec 2016 19:51:07 +0000 (14:51 -0500)]
Allow ANGLE_depth_texture for FBO completeness.
This extension enables the same depth attachment formats as
GL_OES_depth_texture. The few restrictions on usage aren't
relevant for the completeness tests.
Bug:
33453991
John Richardson [Tue, 1 Nov 2016 13:06:53 +0000 (13:06 +0000)]
Extend primitive_bounding_box negative tests
Tests groups added to
- dEQP-GLES31.functional.debug.negative_coverage.*.
Extended tests:
- shader_directive.primitive_bounding_box
Change-Id: I38b698e3bd594f71b15d3bce4dc9a809298eb95e
John Richardson [Wed, 26 Oct 2016 08:43:56 +0000 (09:43 +0100)]
Add shader storage negative coverage tests
Tests groups added to:
- dEQP-GLES31.functional.debug.negative_coverage.*.
New tests:
- shader_storage.block_number_limits
- shader_storage.max_combined_block_number_limit
Extended tests:
- state.get_integeri_v
- state.get_integer64i_v
- shader.compile_compute_shader
Fixed tests:
- buffer.bind_buffer_base
- buffer.bind_buffer_range
Change-Id: Id71fb997e14ad026f0d6634298993f1638c67dde
Maciej Jesionowski [Mon, 12 Dec 2016 15:24:30 +0000 (16:24 +0100)]
Get rid of invalid buffer create flags combinations
Removed tests:
- dEQP-VK.api.buffer.createBuffer_*_2
- dEQP-VK.api.buffer.createBuffer_*_6
(cherry picked from commit
bdd0a62ee565d0e7e07f05ddb95217d532e407cb)
Change-Id: I6cc6ed365de9d710f07fbfd2dde9db7edaecd007
Maciej Jesionowski [Mon, 12 Dec 2016 15:24:30 +0000 (16:24 +0100)]
Get rid of invalid buffer create flags combinations
Removed tests:
- dEQP-VK.api.buffer.createBuffer_*_2
- dEQP-VK.api.buffer.createBuffer_*_6
(cherry picked from commit
bdd0a62ee565d0e7e07f05ddb95217d532e407cb)
Change-Id: I6cc6ed365de9d710f07fbfd2dde9db7edaecd007
Maciej Jesionowski [Mon, 12 Dec 2016 15:24:30 +0000 (16:24 +0100)]
Get rid of invalid buffer create flags combinations
Removed tests:
- dEQP-VK.api.buffer.createBuffer_*_2
- dEQP-VK.api.buffer.createBuffer_*_6
Change-Id: I6cc6ed365de9d710f07fbfd2dde9db7edaecd007
Arkadiusz Sarwa [Thu, 6 Oct 2016 13:30:03 +0000 (15:30 +0200)]
Update synchronization multi queue extended tests
Tests now use all available queue families.
Updated tests:
- dEQP-VK.synchronization.op.multi_queue.*
Fixes #499
Change-Id: I7ec4cedc16e61addd07b85768c68410b7777bfcc
Pyry Haulos [Fri, 9 Dec 2016 19:21:40 +0000 (11:21 -0800)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2
Change-Id: I3ac10a34c6169dccad99dc99346f178470c26056
Maciej Jesionowski [Wed, 7 Dec 2016 12:37:15 +0000 (13:37 +0100)]
Use mipmapPrecisionBits when calculating LOD error
Affected tests:
- dEQP-VK.pipeline.image.sampling_type.*
- dEQP-VK.pipeline.image_view.view_type.*
- dEQP-VK.pipeline.sampler.view_type.*
Khronos issue: #554
Change-Id: I7cb3bedd8df6b033dd6e7ae2d1631e5e2f25673e
Maciej Jesionowski [Fri, 9 Dec 2016 17:05:54 +0000 (18:05 +0100)]
Correct a typo in if statement in synchronization module
Change-Id: I13635c1c078456adb6af8e8689d809d7ef72ebb4
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
Pyry Haulos [Thu, 8 Dec 2016 19:56:21 +0000 (11:56 -0800)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0.2
Change-Id: Id05a662016ed60805a17dc96614967db899e095e
Kalle Raita [Wed, 7 Dec 2016 17:41:41 +0000 (09:41 -0800)]
Non-compressed copy image target size (64,64,8)
Non-compressed copy image tests target size reduced to (64,64,8). The
compressed cases retain old size of (128,128,16) to ensure coverage of
all block size combinations.
Test: Run tests on N6 and N9 on L MR 1 with known failures.
Change-Id: I7ddc7c55d73731d0a8cc2fcc04f2391f78d2d7de
Jamie Madill [Wed, 7 Dec 2016 17:34:25 +0000 (12:34 -0500)]
Encode es3pBufferDataUploadTests.cpp as utf-8
This test was using "Mac Ndash". Change this to plain "-".
BUG=chromium:671021
Alexander Galazin [Tue, 6 Dec 2016 20:54:57 +0000 (21:54 +0100)]
Update the verification script to reflect git 2.9.1 changes
git 2.9.1 changed the "working directory" message to "working
tree". Accept both statements in the verification script.
Ref:
https://raw.githubusercontent.com/git/git/master/Documentation/RelNotes/2.9.1.txt
Fixes #559
Change-Id: Ie90097d39e1f09c1796bb1238ee92bf19aff93bf
Pyry Haulos [Sat, 3 Dec 2016 04:12:46 +0000 (04:12 +0000)]
Merge gerrit/vulkan-cts-1.0-dev into aosp/master
am:
6c4fe5bd7a
Change-Id: I4048f85f24ef24c8825cb5bbfb62033742a04657
Pyry Haulos [Fri, 2 Dec 2016 23:51:17 +0000 (15:51 -0800)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
Change-Id: Ib54e6e75d11508c1ee4194ae90815666088c79d7
Pyry Haulos [Fri, 2 Dec 2016 23:51:14 +0000 (15:51 -0800)]
Merge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1
Change-Id: I4f62b1e39978bea366e0b7e2f745b0f7a25a0f66
Pyry Haulos [Fri, 2 Dec 2016 23:48:21 +0000 (15:48 -0800)]
Merge aosp/master into gerrit/vulkan-cts-1.0-dev
Change-Id: Ic50054c78a4bb736f9fcfa2768968ea8bbc1bd41
Pyry Haulos [Fri, 2 Dec 2016 22:29:24 +0000 (14:29 -0800)]
Clarify --deqp-log-filename usage in README.md
Vulkan CTS issue: #525
Change-Id: Idb0f23cd13e548aaea21682ec02d89e52adee579
Pyry Haulos [Fri, 2 Dec 2016 22:26:30 +0000 (14:26 -0800)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
Change-Id: Ida8369e7d121c8282069fd3a70a64efb4490bddd
Arkadiusz Sarwa [Tue, 29 Nov 2016 10:43:38 +0000 (11:43 +0100)]
Fix VkPipelineLayout overwriting
Fixes #527
Change-Id: Ia053e9ead201f62fc1310d07e7dafd76139ba173
Pyry Haulos [Fri, 2 Dec 2016 21:38:22 +0000 (13:38 -0800)]
Merge gerrit/vulkan-cts-1.0-dev into aosp/master
Change-Id: Ic9e43c0554d8976766507fab6916be6a037505a7
Pyry Haulos [Fri, 2 Dec 2016 21:36:36 +0000 (13:36 -0800)]
Add new files to Android.mk
Change-Id: I75be28ac1a62e9ee3f797e8eb4adaffc75486826
Maciej Jesionowski [Mon, 28 Nov 2016 15:12:23 +0000 (16:12 +0100)]
Bugfix: Use PointSize in draw tests
Tests that rasterize points have to write to PointSize variable.
Also fix nonCoherentAtomSize errors from validation.
Affected tests:
- dEQP-VK.draw.basic_draw.draw.point_list.*
- dEQP-VK.draw.basic_draw.draw_indexed.point_list.*
- dEQP-VK.draw.basic_draw.draw_indirect.point_list.*
- dEQP-VK.draw.basic_draw.draw_indexed_indirect.point_list.*
- dEQP-VK.draw.instanced.draw_vk_primitive_topology_point_list
- dEQP-VK.draw.instanced.draw_indexed_vk_primitive_topology_point_list
- dEQP-VK.draw.instanced.draw_indirect_vk_primitive_topology_point_list
- dEQP-VK.draw.instanced.draw_indexed_indirect_vk_primitive_topology_point_list
Fixes #536
Change-Id: Ief9df51887babfc3765b0d11c6431765f322c634
Lei Zhang [Wed, 30 Nov 2016 23:10:36 +0000 (18:10 -0500)]
Fix variable declaring location in SPIR-V assembly.
The spec validation rules require that all OpVariable instructions
in a function must be as the first instructions in the first block.
Change-Id: If054bd7882eaf5ffc00899fbdef9a9b71d544019
Maciej Jesionowski [Wed, 30 Nov 2016 11:37:01 +0000 (12:37 +0100)]
Bugfix: upload stencil data in pipeline image util
Fixes:
- Upload stencil data to the image with mixed DS formats
- Respect 4 byte offset alignment for formats <4 bytes
- Fix some nonCoherentAtomSize validation errors
Affected tests:
- dEQP-VK.texture.shadow.*d16_unorm
- dEQP-VK.texture.shadow.*x8_d24_unorm_pack32
- dEQP-VK.texture.shadow.*d32_sfloat
- dEQP-VK.texture.shadow.*s8_uint
- dEQP-VK.texture.shadow.*d16_unorm_s8_uint
- dEQP-VK.texture.shadow.*d24_unorm_s8_uint
- dEQP-VK.texture.shadow.*d32_sfloat_s8_uint
Issue #556
Change-Id: I56c0e7eef9c1bfc82790eb8ba6e48b95dc65f521
Arkadiusz Sarwa [Tue, 22 Nov 2016 13:05:03 +0000 (14:05 +0100)]
Add new tests Render To Image
New tests:
- dEQP-VK.pipeline.render_to_image.*
Issue #535
Change-Id: I3854942c69d95b034cd9358cc7970f04b1c85d5b
Maciej Jesionowski [Tue, 22 Nov 2016 11:30:45 +0000 (12:30 +0100)]
Add tests for bulk object allocation failures
New tests:
- dEQP-VK.api.object_management.alloc_callback_fail_multiple.*
Issue #532
Change-Id: I1a8050c8000abf083435910e2e65c6ee045364af
Maciej Jesionowski [Mon, 7 Nov 2016 15:18:58 +0000 (16:18 +0100)]
Add test: sparse buffer usage
Test UBO, SSBO, VB, IB, InB with sparse buffers using:
- sparse binding
- sparse residency
- sparse aliasing
- residencyNonResidentStrict (with UBOs)
New tests:
- dEQP-VK.sparse_resources.buffer.ubo.*
- dEQP-VK.sparse_resources.buffer.vertex_buffer.*
- dEQP-VK.sparse_resources.buffer.index_buffer.*
- dEQP-VK.sparse_resources.buffer.indirect_buffer.*
Renamed tests:
in dEQP-VK.sparse_resources:
- .buffer_sparse_binding.* -> .buffer.transfer.sparse_binding.*
- .buffer_sparse_residency.* -> .buffer.ssbo.sparse_residency.*
- .buffer_sparse_memory_aliasing.* -> .buffer.ssbo.sparse_binding_aliased.*
Issue: #401
Change-Id: Iba583a16eba0b688849175813a86d44c9b038f0d
Szilard Ledan [Tue, 26 Jul 2016 12:43:02 +0000 (14:43 +0200)]
Extend copyImage tests with depth/stencil formats
Add tests with all depth/stencil formats into image to image copies cases.
It was needed to fix the 'uploadImage' and 'readImage' functions, because
the copying combined dept/stencil data between buffers and images are not
supprted at the same time.
Update and fix the generation of expected image.
Update the mustpass lists.
Fix conflict after rebase.
This affects:
* dEQP-VK.api.copy_and_blit.image_to_image.all_formats.depth_stencil_*
* dEQP-VK.api.copy_and_blit.blit_image.all_formats.scaling_partial_d16_unorm_d16_unorm_nearest
* dEQP-VK.api.copy_and_blit.blit_image.all_formats.scaling_partial_x8_d24_unorm_pack32_x8_d24_unorm_pack32_nearest
* dEQP-VK.api.copy_and_blit.blit_image.all_formats.scaling_partial_d32_sfloat_d32_sfloat_nearest
* dEQP-VK.api.copy_and_blit.blit_image.all_formats.scaling_partial_s8_uint_s8_uint_nearest
* dEQP-VK.api.copy_and_blit.blit_image.all_formats.scaling_partial_d16_unorm_s8_uint_d16_unorm_s8_uint_nearest
* dEQP-VK.api.copy_and_blit.blit_image.all_formats.scaling_partial_d24_unorm_s8_uint_d24_unorm_s8_uint_nearest
* dEQP-VK.api.copy_and_blit.blit_image.all_formats.scaling_partial_d32_sfloat_s8_uint_d32_sfloat_s8_uint_nearest
Fixes #488
Change-Id: I29bdaf1d87d7bdba112fd55526f8e661865baa6e
Pyry Haulos [Fri, 2 Dec 2016 16:42:53 +0000 (08:42 -0800)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
Change-Id: I9afe7efd004ee04a7edd465457e5376b03e0abc0
Pyry Haulos [Fri, 2 Dec 2016 16:34:43 +0000 (08:34 -0800)]
Fix post-copy barrier in readImageAspect()
* Barrier was using TOP_OF_PIPE_BIT for flushing buffer contents for
host access. HOST_BIT must be used instead.
* For combined depth stencil formats image was left in wrong image layout
for later stencil aspect copy.
Affects combined DS format cases in:
dEQP-VK.api.copy_and_blit.blit_image.all_formats.*
Change-Id: I80263efbc12da21c8205768687725416419e923e
Pyry Haulos [Fri, 2 Dec 2016 00:33:32 +0000 (16:33 -0800)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
Non-trivial merge of
0b0c5dba7daed6439ec6352aacf3cd216d1c1dd5
Change-Id: I1fa72e1814387b05b935cd781126880e603c91b4
Pyry Haulos [Thu, 1 Dec 2016 23:23:12 +0000 (15:23 -0800)]
Do not generate constructor utils if API creates multiple objects
See #541
Change-Id: I1aa9ddae3bb758a70f6a72d1eb31e58c524ca9f4
Pyry Haulos [Tue, 25 Oct 2016 08:41:48 +0000 (17:41 +0900)]
Fix combined depth stencil handling in dEQP-VK.api.copy_and_blit
The existing code had several bugs related to handling of combined DS
formats that manifested on implementations that support blitting of
said formats.
vk::isSupportedByFramework(VkFormat) utility function is added for
checking whether format is mappable to tcu::TextureFormat. This query
is used to filter out test cases that will always result in InternalError,
namely all cases that attempted to exercise formats with 64-bit channels.
Vulkan null driver is updated to advertise
VK_FORMAT_FEATURE_SAMPLED_IMAGE_FILTER_LINEAR_BIT to allow easier testing.
Affects:
dEQP-VK.api.copy_and_blit.*
See #488
See #515
Change-Id: Ic03c523aea6a4bc9115568ec486200c53ec37d80
Pyry Haulos [Thu, 1 Dec 2016 22:23:53 +0000 (14:23 -0800)]
Merge gerrit/vulkan-cts-1.0.1 into gerrit/vulkan-cts-1.0-dev
Change-Id: I8723ff8e2442c4311dad5b9c305d5def12d3a4f0
Pyry Haulos [Thu, 1 Dec 2016 22:23:51 +0000 (14:23 -0800)]
Merge gerrit/vulkan-cts-1.0.0 into gerrit/vulkan-cts-1.0.1
Change-Id: I1881729f313bd8fbee7dcc2d305ac89e7aaf2761
Oivind Boge [Tue, 22 Nov 2016 13:21:00 +0000 (14:21 +0100)]
Increase blit source to avoid extreme blit scaling
Fixes #548
Change-Id: Ied146b91dc748f9efe41b7b64d11c5da870e5ac0
Dominik Witczak [Tue, 15 Nov 2016 08:51:05 +0000 (09:51 +0100)]
Improve coverage of dEQP-VK.pipeline.image test group
Change-Id: I711edd83f8c75e980d6e979a56810f67bbe2e204
Maciej Jesionowski [Thu, 13 Oct 2016 14:18:07 +0000 (16:18 +0200)]
Add test: image views with VK_REMAINING_* levels/layers
Test image view subresource range with VK_REMAINING_MIP_LEVELS and VK_REMAINING_ARRAY_LAYERS.
New tests:
- dEQP-VK.pipeline.image_view.view_type.*.subresource_range.lod_base_mip_level_remaining_levels
- dEQP-VK.pipeline.image_view.view_type.*.subresource_range.base_array_layer_remaining_layers
- dEQP-VK.pipeline.image_view.view_type.*.subresource_range.lod_base_mip_level_base_array_layer_remaining_levels_and_layers
Fixes #504
Change-Id: I9b78c8ba345b45231d7a931de9effdbde8aa0fc2
Gabor Abraham [Mon, 10 Oct 2016 15:12:19 +0000 (17:12 +0200)]
Add granularity test cases.
New test:
- dEQP-VK.api.granularity.*
Change-Id: Ib3b045a0199aeb7195dd17a603c089834c64b904
Pyry Haulos [Wed, 30 Nov 2016 22:27:07 +0000 (14:27 -0800)]
Check in vulkan.h for generating framework code
Having copy of vulkan.h checked in makes it easier to re-generate
framework when needed.
vulkan.h is checked in as vulkan.h.in to discourage anyone from ever
attempting to include it directly in test code.
As part of this framework is updated to vulkan.h version 1.0.35.
Change-Id: I6e202a01d3633fe19855cf62afbf16e2b0ea67ea
Pyry Haulos [Wed, 30 Nov 2016 22:23:57 +0000 (14:23 -0800)]
Move Vulkan CTS scripts to external/vulkancts/scripts
Change-Id: I928d848225d08f03d93fd700a80d36ac3fbc3ada
Dominik Witczak [Thu, 17 Nov 2016 15:08:44 +0000 (16:08 +0100)]
dEQP-VK.sparse_resources.shader_intrinsics fixes
Some of the tests in the group form invalid SPIR-V code,
which tries to pass two arguments to the OpFAdd instruction,
whose number of components differs.
This change fixes this.
Khronos issue: #545
Change-Id: I3cad57d393f986cfb5b9bce85f758dcca3686d8a
Iago Toral Quiroga [Tue, 22 Nov 2016 10:55:44 +0000 (06:55 -0400)]
Adjust {Max,Min}Coords for {proj}offset texture tests with 3D texture targets
As it is now, the computed lod ends up being ~0.962, which is very close to the
threshold that separates selection of the first two mipmap levels. At least on
Intel GPUs this leads to test failures because the miplevel selected by CTS to
produce the expected result does not match the one actually selected by the
hardware.
This patch alters the coordinates used with these tests so the comuted lod
isn't too close to a mipmap level threshold.
Affects:
dEQP-VK.glsl.texture_functions.texture{proj}offset.sampler3d*
Khronos issue: #552
Change-Id: I6ec766133905d2085cd795eea8aaf0b04e830278
Dominik Witczak [Fri, 18 Nov 2016 12:13:12 +0000 (13:13 +0100)]
Fixes incorrect usage of textureSamples().
The function should not be called against single-sample
images. See #538 for more details.
Tests affected: dEQP-VK.glsl.texture_functions.query.texturesamples.isampler*ms*
Change-Id: I7ce507c657b33cbcf99c9e3202fdafaee5ea1577
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
Maciej Jesionowski [Tue, 29 Nov 2016 12:38:22 +0000 (13:38 +0100)]
Framework: Add assert to position deviation image compare
When using position deviation tolerance it's easy to forget
about the depth and effectively skip the check for the whole
image.
Change-Id: Ide873be57ba19e7e9e45606d27aae403f9c131ec
Dominik Witczak [Thu, 17 Nov 2016 15:13:32 +0000 (16:13 +0100)]
ShaderRenderCaseInstance::uploadSparseImage() fix
The function is used by various test cases to fill sparse images
with actual content. What they are unaware of is that the func
does not assign memory backing to odd tiles.
This change fixes this by removing the malicious if() block.
The change affects dEQP-VK.glsl.*sparse* tests
Change-Id: Ia2b157181d5fdba2d4fa0bcaf37dc02c4a6fe320
Dominik Witczak [Thu, 17 Nov 2016 12:10:19 +0000 (13:10 +0100)]
Fix memory management, image layout issues in uploadImageSparse()
Fixes an issue where ShaderRenderCaseInstance::uploadSparseImage()
would first configure sparse image bindings and then deallocate
the memory objects, prior to actually sampling the image.
Fixes an issue where the sparse image, after having been filled with
contents, would first be transitioned to SHADER_READ_ONLY_OPTIMAL
layout, and then used in a DS which was expecting it to be in
GENERLA layout.
Finally, the patch addresses a problem, where the function would not
correctly recognize the VK_SPARSE_IMAGE_FORMAT_SINGLE_MIPTAIL_BIT,
as reported by the running driver.
The change affects dEQP-VK.glsl.*sparse* tests
Khronos issue: #543
Change-Id: Ie5717841fe0ef9c0672b5075380ff96bba9855b9
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
Pyry Haulos [Fri, 18 Nov 2016 20:49:13 +0000 (20:49 +0000)]
Do not remove old SPIR-V binaries before running vk-build-programs
am:
b28ca98dd6
Change-Id: I0d8d8b118f3c3097e4416c4c9130eb2de9418b00
Pyry Haulos [Fri, 18 Nov 2016 20:46:16 +0000 (20:46 +0000)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
am:
c9061d1b52
Change-Id: I24f864e246bd5d5ab5677cb0f5edeff67b9ad547
Pyry Haulos [Fri, 18 Nov 2016 18:46:55 +0000 (10:46 -0800)]
Do not remove old SPIR-V binaries before running vk-build-programs
vk-build-programs can update pre-built binary directory in a smarter way
when there are existing binaries.
Test: Run external/vulkancts/build_spirv_binaries.py
Change-Id: I2a6afdc2855b7da1baf02682e8214a73a35cebda
Pyry Haulos [Fri, 18 Nov 2016 18:40:54 +0000 (10:40 -0800)]
Merge aosp/upstream-vulkan-cts-1.0-dev into aosp/master
Change-Id: I656d82525b18e936b6c4a78dd73cbb9ef65a06a4
Pyry Haulos [Fri, 18 Nov 2016 18:40:10 +0000 (10:40 -0800)]
Add vktTextureFilteringAnisotropyTests.cpp to Android.mk