Merge 43-occlusion_query_tests

diff --cc external/vulkancts/modules/vulkan/CMakeLists.txt
index 237604a,4c84f35..6e2ec75
--- 1/external/vulkancts/modules/vulkan/CMakeLists.txt
--- 2/external/vulkancts/modules/vulkan/CMakeLists.txt
+++ b/external/vulkancts/modules/vulkan/CMakeLists.txt
@@@ -5,11 -5,8 +5,12 @@@ add_subdirectory(pipeline
  add_subdirectory(binding_model)
  add_subdirectory(spirv_assembly)
  add_subdirectory(shaderrender)
 +add_subdirectory(shaderexecutor)
  add_subdirectory(memory)
 +add_subdirectory(ubo)
 +add_subdirectory(dynamic_state)
 +add_subdirectory(ssbo)
+ add_subdirectory(query_pool)
  
  include_directories(
        api
@@@ -17,11 -14,8 +18,12 @@@
        binding_model
        spirv_assembly
        shaderrender
 +      shaderexecutor
        memory
 +      ubo
 +      dynamic_state
 +      ssbo
+       query_pool
        )
  
  set(DEQP_VK_COMMON_SRCS
@@@ -46,11 -42,8 +48,12 @@@ set(DEQP_VK_COMMON_LIB
        deqp-vk-binding-model
        deqp-vk-spirv-assembly
        deqp-vk-shaderrender
 +      deqp-vk-shaderexecutor
        deqp-vk-memory
 +      deqp-vk-ubo
 +      deqp-vk-dynamic-state
 +      deqp-vk-ssbo
+       deqp-vk-query-pool
        )
  
  if (DE_OS_IS_WIN32 OR DE_OS_IS_UNIX OR DE_OS_IS_OSX)

diff --cc external/vulkancts/modules/vulkan/vktTestPackage.cpp
index 35bfc40,5d46b3a..164e192
--- 1/external/vulkancts/modules/vulkan/vktTestPackage.cpp
--- 2/external/vulkancts/modules/vulkan/vktTestPackage.cpp
+++ b/external/vulkancts/modules/vulkan/vktTestPackage.cpp
@@@ -54,17 -55,7 +54,18 @@@
  #include "vktRenderPassTests.hpp"
  #include "vktMemoryTests.hpp"
  #include "vktShaderRenderDiscardTests.hpp"
 +#include "vktShaderRenderIndexingTests.hpp"
 +#include "vktShaderRenderLoopTests.hpp"
 +#include "vktShaderRenderMatrixTests.hpp"
 +#include "vktShaderRenderOperatorTests.hpp"
 +#include "vktShaderRenderReturnTests.hpp"
 +#include "vktShaderRenderStructTests.hpp"
 +#include "vktShaderRenderSwitchTests.hpp"
 +#include "vktShaderExecutorTests.hpp"
 +#include "vktUniformBlockTests.hpp"
 +#include "vktDynamicStateTests.hpp"
 +#include "vktSSBOLayoutTests.hpp"
+ #include "vktQueryPoolTests.hpp"
  
  #include <vector>
  #include <sstream>
@@@ -312,9 -294,7 +313,10 @@@ void TestPackage::init (void
        addChild(createGlslTests                        (m_testCtx));
        addChild(createRenderPassTests          (m_testCtx));
        addChild(memory::createTests            (m_testCtx));
 +      addChild(ubo::createTests                       (m_testCtx));
 +      addChild(DynamicState::createTests      (m_testCtx));
 +      addChild(ssbo::createTests                      (m_testCtx));
+       addChild(QueryPool::createTests         (m_testCtx));
  }
  
  } // vkt