Merge 42-ubo

diff --combined external/vulkancts/modules/vulkan/CMakeLists.txt
index 3b6c693,8d75651..88e1c18
--- 1/external/vulkancts/modules/vulkan/CMakeLists.txt
--- 2/external/vulkancts/modules/vulkan/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/CMakeLists.txt
@@@ -7,6 -7,7 +7,7 @@@ add_subdirectory(spirv_assembly
  add_subdirectory(shaderrender)
  add_subdirectory(shaderexecutor)
  add_subdirectory(memory)
+ add_subdirectory(ubo)
  
  include_directories(
        api
@@@ -16,6 -17,7 +17,7 @@@
        shaderrender
        shaderexecutor
        memory
+       ubo
        )
  
  set(DEQP_VK_COMMON_SRCS
@@@ -25,6 -27,8 +27,6 @@@
        vktTestCaseUtil.hpp
        vktTestPackage.cpp
        vktTestPackage.hpp
 -      vktInfo.cpp
 -      vktInfo.hpp
        vktShaderLibrary.cpp
        vktShaderLibrary.hpp
        vktRenderPassTests.cpp
@@@ -42,6 -46,7 +44,7 @@@ set(DEQP_VK_COMMON_LIB
        deqp-vk-shaderrender
        deqp-vk-shaderexecutor
        deqp-vk-memory
+       deqp-vk-ubo
        )
  
  if (DE_OS_IS_WIN32 OR DE_OS_IS_UNIX OR DE_OS_IS_OSX)

diff --combined external/vulkancts/modules/vulkan/vktTestPackage.cpp
index 8d578e7,e60d6d9..9ff6a28
--- 1/external/vulkancts/modules/vulkan/vktTestPackage.cpp
--- 2/external/vulkancts/modules/vulkan/vktTestPackage.cpp
+++ b/external/vulkancts/modules/vulkan/vktTestPackage.cpp
@@@ -46,6 -46,7 +46,6 @@@
  
  #include "deUniquePtr.hpp"
  
 -#include "vktInfo.hpp"
  #include "vktApiTests.hpp"
  #include "vktPipelineTests.hpp"
  #include "vktBindingModelTests.hpp"
@@@ -62,6 -63,7 +62,7 @@@
  #include "vktShaderRenderStructTests.hpp"
  #include "vktShaderRenderSwitchTests.hpp"
  #include "vktShaderExecutorTests.hpp"
+ #include "vktUniformBlockTests.hpp"
  
  #include <vector>
  #include <sstream>
@@@ -302,6 -304,7 +303,6 @@@ tcu::TestCaseExecutor* TestPackage::cre
  
  void TestPackage::init (void)
  {
 -      addChild(createInfoTests                        (m_testCtx));
        addChild(api::createTests                       (m_testCtx));
        addChild(pipeline::createTests          (m_testCtx));
        addChild(BindingModel::createTests      (m_testCtx));
@@@ -309,6 -312,7 +310,7 @@@
        addChild(createGlslTests                        (m_testCtx));
        addChild(createRenderPassTests          (m_testCtx));
        addChild(memory::createTests            (m_testCtx));
+       addChild(ubo::createTests                       (m_testCtx));
  }
  
  } // vkt