resolve merge conflicts of a9ffcc1 to master

[platform/upstream/VK-GL-CTS.git] / external / vulkancts / modules / vulkan / ubo / vktUniformBlockCase.hpp

diff --git a/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.hpp b/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.hpp
index d369288..bb7cdef 100644 (file)
--- a/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.hpp
+++ b/external/vulkancts/modules/vulkan/ubo/vktUniformBlockCase.hpp
@@ -298,7 +298,8 @@ public:
                                                                UniformBlockCase                        (tcu::TestContext&      testCtx,
                                                                                                                         const std::string&     name,
                                                                                                                         const std::string&     description,
-                                                                                                                        BufferMode                     bufferMode);
+                                                                                                                        BufferMode                     bufferMode,
+                                                                                                                        MatrixLoadFlags        matrixLoadFlag);
                                                                ~UniformBlockCase                       (void);
 
        virtual void                            initPrograms                            (vk::SourceCollections& programCollection) const;
@@ -309,6 +310,7 @@ protected:
 
        BufferMode                                      m_bufferMode;
        ShaderInterface                         m_interface;
+       MatrixLoadFlags                         m_matrixLoadFlag;
 
 private:
        std::string                                     m_vertShaderSource;