Pyry Haulos [Wed, 2 Dec 2015 20:59:25 +0000 (12:59 -0800)]
Fix include order in vkSpirVProgram.hpp
Pyry Haulos [Wed, 2 Dec 2015 20:51:28 +0000 (15:51 -0500)]
Merge branch '26-update-assembly-framework' into 'master'
Add framework for graphics-pipeline tests in spirv_assembly.
This allows single test code to be exercised in all shader kinds (except
for compute shader).
Implement assembly boilerplate as a StringTemplate with parameters in
certain sections that can be specialized.
Extend `StringTemplate` to accept optional parameter expansions, where a
missing parameter isn't an error.
Make `SpirVAsmSource::operator<<()` work on any parameter type.
See merge request !76
Andrew Woloszyn [Mon, 30 Nov 2015 15:47:46 +0000 (10:47 -0500)]
Changed array initializers to fix android build.
Andrew Woloszyn [Wed, 25 Nov 2015 14:50:41 +0000 (09:50 -0500)]
Responded to more feedback
Andrew Woloszyn [Mon, 23 Nov 2015 19:12:10 +0000 (14:12 -0500)]
Responded to formatting feedback.
Dejan Mircevski [Mon, 23 Nov 2015 16:54:07 +0000 (11:54 -0500)]
Address review feedback.
Rename TYPES/CONSTANTS/ARRAYS macros.
Avoid static initialization of StringTemplates.
Use copy constructors instead of memcpy().
Sprinkle const.
Dejan Mircevski [Fri, 20 Nov 2015 19:56:35 +0000 (14:56 -0500)]
Rename TessLevel IDs.
Dejan Mircevski [Thu, 19 Nov 2015 18:35:33 +0000 (13:35 -0500)]
Add framework for graphics-pipeline tests in spirv_assembly.
This allows single test code to be exercised in all shader kinds (except
for compute shader).
Implement assembly boilerplate as a StringTemplate with parameters in
certain sections that can be specialized.
Extend StringTemplate to accept optional parameter expansions, where a
missing parameter isn't an error.
Make SpirVAsmSource::operator<<() work on any parameter type.
Pyry Haulos [Wed, 2 Dec 2015 18:57:24 +0000 (13:57 -0500)]
Merge branch '25-spirv-special-instruction-tests' into 'master'
25 SPIR-V assembly tests based on compute shader
- OpConstantNull
- OpConstantComposite
- OpLine
- OpNoLine
- OpSource
- OpSourceContinued
- OpUndef
- OpUnreachable
- Loop control
- Selection control
- Function control
- Block order
- OpSourceExtension
- OpPhi
- decoration group
Also change input to random numbers for the OpNop test.
See merge request !44
Mika Isojärvi [Tue, 15 Sep 2015 23:25:32 +0000 (16:25 -0700)]
Initial simple Vulkan memory mapping tests
Change-Id: Id14b17a289d7acf1a091bab0c2c11aa279fde7f3
Mika Isojärvi [Fri, 28 Aug 2015 17:56:46 +0000 (10:56 -0700)]
Add initial Vulkan memory allocation tests.
Change-Id: I3698d94e2cbd67419e8cbc5f689de34960458cbd
Kalle Raita [Thu, 26 Nov 2015 00:06:35 +0000 (00:06 +0000)]
Remove unnecessary cast in DeqpTestRunner
am:
4dcb823b0f
* commit '
4dcb823b0f2baf50c1da8efcc43dedada179453b':
Remove unnecessary cast in DeqpTestRunner
Pyry Haulos [Wed, 25 Nov 2015 23:41:10 +0000 (15:41 -0800)]
Merge in changes from Khronos repository
Pyry Haulos [Thu, 12 Nov 2015 22:41:16 +0000 (14:41 -0800)]
Improve prebuilt SPIR-V binary storage
This change improves storage usage of pre-built SPIR-V binary registry
by eliminating duplicate binaries. With the current test set the size of
binary registry drops from almost 400MiB down to 25MiB.
A binary index file (trie) is used to map from binary identifiers to
actual binary files.
Change-Id: I09b015c00bd30df00e7cf96a39549ddbb66ece61
Pyry Haulos [Wed, 25 Nov 2015 01:57:43 +0000 (20:57 -0500)]
Merge branch 'cts_mlentine' into 'master'
Fix sType for vertex assembly in object management tests.
See merge request !77
Pyry Haulos [Wed, 25 Nov 2015 01:56:52 +0000 (20:56 -0500)]
Merge branch 'fix-bgr-channel-mapping' into 'master'
Added missing channel mapping for BGR formats.
Somehow I managed not to include the channel mapping for BGR formats. This should fix any of image, image view or sampler tests using BGR.
See merge request !74
Pyry Haulos [Tue, 24 Nov 2015 21:19:04 +0000 (21:19 +0000)]
Merge "Fix a few null driver bugs" into vulkan
Pyry Haulos [Tue, 24 Nov 2015 21:11:34 +0000 (13:11 -0800)]
Fix a few null driver bugs
* vkAllocDescriptorSets() still had pCounts return variable that was
supposed to be removed in latest API update.
* vkGetPhysicalDeviceFormatFeatures() didn't return sensible properties
leading to several tests unnecessarily reporting NotSupported.
Change-Id: I515422dbd7fc76bf409212d816fe5ab23b937efd
Pyry Haulos [Tue, 24 Nov 2015 20:41:46 +0000 (12:41 -0800)]
Remove use of std::random_shuffle
std::random_shuffle algorithm is implementation-defined,
de::Random::shuffle() must be used instead.
This was causing pipeline blend and stencil test groups to be different
depending on platform.
Change-Id: I21ee6d9cf78ea0466c63d6e9498a6f485edd4d8b
Lei Zhang [Tue, 24 Nov 2015 20:08:29 +0000 (15:08 -0500)]
Change iterator names and inject more necessary empty lines.
Kalle Raita [Tue, 24 Nov 2015 20:05:38 +0000 (12:05 -0800)]
Remove unnecessary cast in DeqpTestRunner
Also fix the run_tests.sh script with 'CtsDeqp' -> 'CtsDeqpTestCases'
Tested with DeqpTestRunner unit tests.
Change-Id: Iadcb36b0a3bf435d590a7a3b9ed3129fdf3f01bd
Jed Estep [Mon, 23 Nov 2015 23:32:58 +0000 (23:32 +0000)]
DO NOT MERGE add running time hints for dEQP packages am:
75da7d236c -s ours am:
01680109b8 am:
e22743284f -s ours
am:
53df280acd -s ours
* commit '
53df280acd735efdf58d120f6e61e02269ca6bcc':
DO NOT MERGE add running time hints for dEQP packages
Jed Estep [Mon, 23 Nov 2015 23:28:36 +0000 (23:28 +0000)]
DO NOT MERGE add running time hints for dEQP packages am:
75da7d236c -s ours am:
01680109b8
am:
e22743284f -s ours
* commit '
e22743284f0ab65a27301b87b33daef994b2f6b7':
DO NOT MERGE add running time hints for dEQP packages
Jed Estep [Mon, 23 Nov 2015 23:25:22 +0000 (23:25 +0000)]
DO NOT MERGE add running time hints for dEQP packages am:
75da7d236c -s ours
am:
01680109b8
* commit '
01680109b81948f78fe5b69da44635a8facd2d12':
DO NOT MERGE add running time hints for dEQP packages
Pyry Haulos [Mon, 23 Nov 2015 23:23:52 +0000 (15:23 -0800)]
Merge changes from Khronos repository
Jed Estep [Mon, 23 Nov 2015 23:05:27 +0000 (23:05 +0000)]
DO NOT MERGE add running time hints for dEQP packages
am:
75da7d236c -s ours
* commit '
75da7d236c608d6e1020e21d59325feb7dcbe711':
DO NOT MERGE add running time hints for dEQP packages
Pyry Haulos [Mon, 23 Nov 2015 22:36:25 +0000 (14:36 -0800)]
Fix a few warnings
Change-Id: I2cf5d4f070b8b438e25fb50b88b7123a6e47a593
Daniel Xie [Mon, 23 Nov 2015 15:56:55 +0000 (15:56 +0000)]
Merge "DO NOT MERGE Restore accidentally commented line" into marshmallow-cts-dev am:
a3571bc9c9 -s ours am:
4e2092b555 am:
2239f84a37 -s ours
am:
c3fef93d97 -s ours
* commit '
c3fef93d9715ac6419542cfded8362923a6a7bec':
DO NOT MERGE Restore accidentally commented line
Kalle Raita [Mon, 23 Nov 2015 15:56:51 +0000 (15:56 +0000)]
Exclude RGB565 blending cases from the must-pass am:
494bb5a472 am:
c6d365645f am:
770c827918
am:
bdc383d45d
* commit '
bdc383d45d7ce4066f1505ed7692f4d6ade3454a':
Exclude RGB565 blending cases from the must-pass
Daniel Xie [Mon, 23 Nov 2015 15:52:57 +0000 (15:52 +0000)]
Merge "DO NOT MERGE Restore accidentally commented line" into marshmallow-cts-dev am:
a3571bc9c9 -s ours am:
4e2092b555
am:
2239f84a37 -s ours
* commit '
2239f84a37e3288e49523e98d5bb964ba62143b6':
DO NOT MERGE Restore accidentally commented line
Kalle Raita [Mon, 23 Nov 2015 15:52:52 +0000 (15:52 +0000)]
Exclude RGB565 blending cases from the must-pass am:
494bb5a472 am:
c6d365645f
am:
770c827918
* commit '
770c8279183d6cc310f9ddc6b123255ff2836a94':
Exclude RGB565 blending cases from the must-pass
Daniel Xie [Sun, 22 Nov 2015 02:58:30 +0000 (02:58 +0000)]
Merge "DO NOT MERGE Restore accidentally commented line" into marshmallow-cts-dev am:
a3571bc9c9 -s ours
am:
4e2092b555
* commit '
4e2092b555b3ef3e5ea6e3eb798bca4b21e33dce':
DO NOT MERGE Restore accidentally commented line
Kalle Raita [Sun, 22 Nov 2015 02:58:21 +0000 (02:58 +0000)]
Exclude RGB565 blending cases from the must-pass am:
494bb5a472
am:
c6d365645f
* commit '
c6d365645f8315dc84f1e3253e575f454be460db':
Exclude RGB565 blending cases from the must-pass
Jed Estep [Tue, 27 Oct 2015 18:17:13 +0000 (11:17 -0700)]
DO NOT MERGE add running time hints for dEQP packages
Change-Id: Iac61edd175714ffb5901925ac81c16e9a3a18d81
Daniel Xie [Fri, 20 Nov 2015 18:57:29 +0000 (18:57 +0000)]
Merge "DO NOT MERGE Restore accidentally commented line" into marshmallow-cts-dev
am:
a3571bc9c9 -s ours
* commit '
a3571bc9c9f16c58a49cbb080da97223c807b2f5':
DO NOT MERGE Restore accidentally commented line
Daniel Xie [Fri, 20 Nov 2015 18:49:33 +0000 (18:49 +0000)]
Merge "DO NOT MERGE Restore accidentally commented line" into marshmallow-cts-dev
Kalle Raita [Fri, 20 Nov 2015 04:10:27 +0000 (04:10 +0000)]
Exclude RGB565 blending cases from the must-pass
am:
494bb5a472
* commit '
494bb5a4725c6cc57fcfe1457aebabac6477aa76':
Exclude RGB565 blending cases from the must-pass
Michael Lentine [Thu, 19 Nov 2015 17:56:47 +0000 (09:56 -0800)]
Fix sType for vertex assembly in object management tests.
Lei Zhang [Mon, 9 Nov 2015 21:16:52 +0000 (16:16 -0500)]
Add more tests for SPIR-V special cases.
- OpSourceExtension
- OpPhi
- decoration group
Change-Id: I81ea7a8a3e6c1137e0e5cc4068081c7db3e4aee5
Lei Zhang [Tue, 3 Nov 2015 17:10:38 +0000 (12:10 -0500)]
Add tests for SPIR-V special instructions.
- OpUnreachable
- Loop control
- Selection control
- Function control
- Block order
Change-Id: I3de28d18b6a716c3c2b5ed93cc49a3e98ddcaaa1
Lei Zhang [Mon, 19 Oct 2015 19:41:44 +0000 (15:41 -0400)]
Add test for multiple SPIR-V instructions.
- OpConstantNull
- OpConstantComposite
- OpLine
- OpNoLine
- OpSource
- OpSourceContinued
- OpUndef
Also change input to random numbers for the OpNop test.
Change-Id: I131122b6bef34c1ec78da834e0d0c11b910ab60d
Dae Kim [Thu, 19 Nov 2015 15:40:20 +0000 (15:40 +0000)]
Added missing channel mapping for BGR formats.
Pyry Haulos [Thu, 19 Nov 2015 01:02:07 +0000 (20:02 -0500)]
Merge branch 'cts_mlentine' into 'master'
Use NotificationBuilder instead of Notification
Use of new Notification(...) was deprecated in API 11 and is fully
removed as of API 23. NotificationBuilder is the preferred replacement.
See merge request !73
Michael Lentine [Thu, 19 Nov 2015 00:31:55 +0000 (16:31 -0800)]
Use NotificationBuilder instead of Notification
Use of new Notification(...) was deprecated in API 11 and is fully
removed as of API 23. NotificationBuilder is the preferred replacement.
Pyry Haulos [Wed, 18 Nov 2015 21:58:05 +0000 (13:58 -0800)]
Merge trivial fix from Khronos repository
Pyry Haulos [Wed, 18 Nov 2015 21:57:36 +0000 (16:57 -0500)]
Merge branch '35-typo-fix' into 'master'
Typo fix in vkGlslToSpirV.cpp
Fixes issue #35
See merge request !72
Pyry Haulos [Wed, 18 Nov 2015 21:52:25 +0000 (13:52 -0800)]
Merge changes from Khronos repository
Change-Id: Ia8057616905a6ca2c44e0a76c4404e3302e666fd
Pyry Haulos [Wed, 18 Nov 2015 21:38:09 +0000 (16:38 -0500)]
Merge branch '18-image-view-tests' into 'master'
18 image view tests.
See merge request !38
Dae Kim [Wed, 18 Nov 2015 14:00:40 +0000 (14:00 +0000)]
Added pipeline image view tests.
Pyry Haulos [Wed, 18 Nov 2015 21:29:11 +0000 (13:29 -0800)]
Fix a few trivial compiler warnings
Pyry Haulos [Wed, 18 Nov 2015 21:19:39 +0000 (16:19 -0500)]
Merge branch '15-sampler-tests' into 'master'
15 sampler tests.
See merge request !35
Dae Kim [Wed, 18 Nov 2015 16:16:39 +0000 (16:16 +0000)]
Added pipeline sampler tests.
Kalle Raita [Wed, 18 Nov 2015 20:51:09 +0000 (20:51 +0000)]
Merge "Fix copy-paste typos in expect* functions"
am:
6a330a7624
* commit '
6a330a762457efe6d8eebc719e9e582b218d7bee':
Fix copy-paste typos in expect* functions
Kalle Raita [Wed, 18 Nov 2015 20:42:47 +0000 (20:42 +0000)]
Merge "Fix copy-paste typos in expect* functions"
Dejan Mircevski [Wed, 18 Nov 2015 04:38:23 +0000 (23:38 -0500)]
Update the spirv-tools revision to just before 1.0.
Change-Id: Icdaae5360781a863d86f3567554fe9cba6024df0
Kalle Raita [Wed, 18 Nov 2015 18:24:24 +0000 (10:24 -0800)]
Fix copy-paste typos in expect* functions
expectNoDisplay, expectNoSurface, and expectNull were testing against
EGL_NO_CONTEXT. This usually works as all the defines tend to be 0 on
all platforms.
Change-Id: I1893a32e8ad438fd4ebe0307582a2330679f9cd4
Csaba Osztrogonác [Wed, 18 Nov 2015 18:06:35 +0000 (19:06 +0100)]
Typo fix in vkGlslToSpirV.cpp
Fixes issue #35
Pyry Haulos [Wed, 18 Nov 2015 17:01:06 +0000 (12:01 -0500)]
Merge branch '14-image-tests' into 'master'
14 image tests.
See merge request !34
Pyry Haulos [Wed, 18 Nov 2015 16:39:50 +0000 (11:39 -0500)]
Merge branch '34-shader_render_case_bufferView' into 'master'
34 vktShaderRenderCase: remove buffer views from test
BufferViews should be used only with TEXEL_BUFFER descriptors, while this test tries to use them for UNIFORM_BUFFERS
Fixes issue #34
See merge request !68
Pyry Haulos [Tue, 17 Nov 2015 18:41:17 +0000 (13:41 -0500)]
Merge branch 'fix-tools-hash' into 'master'
Fix spirv tools hash
It seems that the old hash vanished from the repository.
The new hash should point to the same commit as before.
Well at least the commit message seems to be the same as before.
Fixes #32
See merge request !66
scygan [Tue, 17 Nov 2015 18:32:10 +0000 (19:32 +0100)]
vktShaderRenderCase: remove buffer views from test
BufferViews should be used only with TEXEL_BUFFER descriptors, while this test tries to use them for UNIFORM_BUFFERS
Dae Kim [Tue, 17 Nov 2015 16:18:42 +0000 (16:18 +0000)]
Added pipeline image tests.
Peter Gal [Tue, 17 Nov 2015 15:03:14 +0000 (16:03 +0100)]
Fix spirv tools hash
It seems that the old hash vanished from the repository.
The new hash should point to the same commit as before.
Well at least the commit message seems to be the same as before.
Kalle Raita [Tue, 27 Oct 2015 22:23:40 +0000 (15:23 -0700)]
Exclude RGB565 blending cases from the must-pass
The verification logic of the groups below do not account for all the
possible valid results in the RGB565 output.
The change removes following in the group
dEQP-GLES3.functional.fragment_ops.blend.default_framebuffer
.rgb_func_alpha_func.*
.equation_src_func_dst_func.*
Bug:
23278613
Change-Id: Ic4cb194c1bf6326d7a12005ada12ab05c1ab669b
Kalle Raita [Mon, 16 Nov 2015 23:00:33 +0000 (15:00 -0800)]
DO NOT MERGE Restore accidentally commented line
Change 178937 accidentally commented out the binary build step of the
android mustpass list build. The original change is not supposed to
merge forwards.
Change-Id: I03c1f410025821a4d712ceb327486e76805e68d6
Pyry Haulos [Mon, 16 Nov 2015 19:25:36 +0000 (19:25 +0000)]
New EGL mustpass candidate
am:
9da487f0cc
* commit '
9da487f0cca90ce89e72bc7e827d849bdb8a4ebc':
New EGL mustpass candidate
Pyry Haulos [Mon, 16 Nov 2015 19:09:22 +0000 (14:09 -0500)]
Merge branch '11-shader-render-case' into 'master'
ShaderRenderCase
* Add ShaderRenderCase implementation
* Add discard tests just to show how to use the base classes
See merge request !28
Pyry Haulos [Fri, 13 Nov 2015 22:38:22 +0000 (14:38 -0800)]
New EGL mustpass candidate
Change-Id: I2f2938ccda824ae466bb0e57fb757618c749e082
Peter Gal [Thu, 12 Nov 2015 19:06:42 +0000 (20:06 +0100)]
Improve file and namespace names
Peter Gal [Fri, 30 Oct 2015 12:21:03 +0000 (13:21 +0100)]
ShaderRenderCase: add anonymous namespace and fix error reporting in the TextureBinding
Peter Gal [Fri, 30 Oct 2015 12:13:33 +0000 (13:13 +0100)]
ShaderRenderCase: renamed static variables
Peter Gal [Fri, 30 Oct 2015 12:01:47 +0000 (13:01 +0100)]
ShaderDiscardTests: use MovePtr when returning a ShaderDiscardCase
Peter Gal [Thu, 29 Oct 2015 19:11:04 +0000 (20:11 +0100)]
ShaderRenderCase: allow uniforms in all shader stages
Peter Gal [Thu, 29 Oct 2015 19:09:53 +0000 (20:09 +0100)]
ShaderRenderCase: remove UniquePtr from the AllocationSp typedef and use UniquePtrs for UniformSetup and ShaderEvaluator
Peter Gal [Thu, 29 Oct 2015 17:32:26 +0000 (18:32 +0100)]
ShaderDiscardTests: use anonymous namespace
Peter Gal [Thu, 29 Oct 2015 17:13:05 +0000 (18:13 +0100)]
ShaderRenderCase: improve filter mode mapping
Peter Gal [Thu, 29 Oct 2015 13:13:27 +0000 (14:13 +0100)]
ShaderRenderCase: use default allocator provided by the Context
Peter Gal [Wed, 28 Oct 2015 15:30:24 +0000 (16:30 +0100)]
ShaderRenderCase: multiple texture handling improvements
* Use loadImage instead of loadPNG
* Use MovePtr when loading, passing images
* Improve TextureBinding instance passing
Peter Gal [Thu, 22 Oct 2015 16:47:00 +0000 (18:47 +0200)]
ShaderRenderCase: minor style fixes (indentation)
Peter Gal [Thu, 22 Oct 2015 16:22:59 +0000 (18:22 +0200)]
ShaderRenderCase: use the host ptr from the Allocation class instead mapping the memory directly
Peter Gal [Thu, 22 Oct 2015 07:48:03 +0000 (09:48 +0200)]
ShaderRenderCase: use utility method to invalidate memory range
Peter Gal [Thu, 22 Oct 2015 07:47:28 +0000 (09:47 +0200)]
ShaderRenderCase: correctly specify the bufferRowLength and bufferImageHeight for the image copy
Peter Gal [Wed, 21 Oct 2015 17:53:36 +0000 (19:53 +0200)]
ShaderRenderCase: update based on review
* Use HostVisible memory requirement where we copy data to image/buffer.
* Check if linear tiling or optimal tiling is supported for 2D textures.
* Check length of barrier array before getting the first element.
Peter Gal [Tue, 20 Oct 2015 14:08:19 +0000 (16:08 +0200)]
ShaderRenderCase: remove leftover vktTexture.* files from CMakeList.txt and include paths
Peter Gal [Tue, 20 Oct 2015 14:03:14 +0000 (16:03 +0200)]
ShaderRenderCase: minor style fixes.
Peter Gal [Tue, 20 Oct 2015 13:59:16 +0000 (15:59 +0200)]
ShaderRenderCase: moved texture utiles from vktTexture.cpp to vkImageUtil.cpp
Peter Gal [Fri, 9 Oct 2015 15:48:24 +0000 (17:48 +0200)]
ShaderRenderCase: rebase implementation on sdk-0.9
Peter Gal [Thu, 8 Oct 2015 17:19:59 +0000 (19:19 +0200)]
ShaderRenderCase: moved VkImage creation from the Texture2D to the ShaderRenderCaseInstance class
Peter Gal [Thu, 8 Oct 2015 13:26:41 +0000 (15:26 +0200)]
ShaderDiscardTests: minor code cleanup
Peter Gal [Thu, 8 Oct 2015 13:21:51 +0000 (15:21 +0200)]
ShaderRenderCase: updated naming of a few image information mapping methods
Peter Gal [Tue, 6 Oct 2015 14:36:58 +0000 (16:36 +0200)]
ShaderRenderCase: use safe containers for uniform information storage
Peter Gal [Tue, 6 Oct 2015 13:31:51 +0000 (15:31 +0200)]
ShaderRenderCase: use safe containers for vertex buffers and allocs
Peter Gal [Tue, 29 Sep 2015 16:01:42 +0000 (18:01 +0200)]
ShaderRenderCase: fix initializer syntax when creating an image view
Peter Gal [Mon, 28 Sep 2015 17:51:52 +0000 (19:51 +0200)]
ShaderRenderCase: add const qualifiers
Peter Gal [Mon, 28 Sep 2015 16:49:43 +0000 (18:49 +0200)]
ShaderRenderCase: use ConstPixelBufferAcccess to copy the result image
Peter Gal [Mon, 28 Sep 2015 16:37:01 +0000 (18:37 +0200)]
ShaderRenderCase:
* Use vulkan/data dir instead of data/
* Also list .hpp files in CMakeLists.txt
Peter Gal [Mon, 28 Sep 2015 16:29:49 +0000 (18:29 +0200)]
ShaderRenderCase: style fixes
Peter Gal [Fri, 18 Sep 2015 13:48:48 +0000 (15:48 +0200)]
ShaderRenderCase: fix typo eigth -> eight
Peter Gal [Thu, 17 Sep 2015 15:26:15 +0000 (17:26 +0200)]
ShaderRenderCase: Remove template argument from the ShaderRenderCase
Peter Gal [Thu, 17 Sep 2015 14:08:59 +0000 (16:08 +0200)]
ShaderRenderCase: minor cleanup