From cf6735d8451c2884bfc17e001f39e3b41f5c5935 Mon Sep 17 00:00:00 2001 From: Jeff Bolz Date: Tue, 4 Dec 2018 11:00:04 -0600 Subject: [PATCH] Fix ubo.random to only use scalar_block_layout in 'scalar' tests Components: Vulkan Affects: dEQP-VK.ubo.random* VK-GL-CTS issue: 1493 Change-Id: I1f5c9b3d8269973c33de1908673d942e67ea3184 --- external/vulkancts/modules/vulkan/ubo/vktUniformBlockTests.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/external/vulkancts/modules/vulkan/ubo/vktUniformBlockTests.cpp b/external/vulkancts/modules/vulkan/ubo/vktUniformBlockTests.cpp index 475b0c6..0de184c 100644 --- a/external/vulkancts/modules/vulkan/ubo/vktUniformBlockTests.cpp +++ b/external/vulkancts/modules/vulkan/ubo/vktUniformBlockTests.cpp @@ -904,7 +904,8 @@ void UniformBlockTests::init (void) const deUint32 allBasicTypes = FEATURE_VECTORS|FEATURE_MATRICES; const deUint32 unused = FEATURE_UNUSED_MEMBERS|FEATURE_UNUSED_UNIFORMS; const deUint32 matFlags = FEATURE_MATRIX_LAYOUT; - const deUint32 allFeatures = ~FEATURE_OUT_OF_ORDER_OFFSETS & ~FEATURE_16BIT_STORAGE & ~FEATURE_8BIT_STORAGE; // OOO offsets handled in a dedicated case group + const deUint32 allFeatures = ~FEATURE_OUT_OF_ORDER_OFFSETS & ~FEATURE_16BIT_STORAGE & ~FEATURE_8BIT_STORAGE + & ~FEATURE_STD430_LAYOUT & ~FEATURE_SCALAR_LAYOUT; // OOO offsets handled in a dedicated case group const deUint32 allScalar = ~allLayouts & ~FEATURE_16BIT_STORAGE & ~FEATURE_8BIT_STORAGE; tcu::TestCaseGroup* randomGroup = new tcu::TestCaseGroup(m_testCtx, "random", "Random Uniform Block cases"); -- 2.7.4