From db2888538b477baf488001c9c0ab294c848183eb Mon Sep 17 00:00:00 2001 From: Peter Gal Date: Thu, 29 Oct 2015 14:13:27 +0100 Subject: [PATCH] ShaderRenderCase: use default allocator provided by the Context --- .../vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp | 2 +- .../vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp b/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp index 27cc748..a8e709e 100644 --- a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp +++ b/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.cpp @@ -470,7 +470,7 @@ ShaderRenderCaseInstance::ShaderRenderCaseInstance (Context& context, const AttributeSetupFunc attribFunc) : vkt::TestInstance (context) , m_clearColor (DEFAULT_CLEAR_COLOR) - , m_memAlloc (m_context.getDeviceInterface(), m_context.getDevice(), getPhysicalDeviceMemoryProperties(m_context.getInstanceInterface(), m_context.getPhysicalDevice())) + , m_memAlloc (context.getDefaultAllocator()) , m_isVertexCase (isVertexCase) , m_evaluator (evaluator) , m_uniformSetup (uniformSetup) diff --git a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.hpp b/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.hpp index e7f9721..07f155c 100644 --- a/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.hpp +++ b/external/vulkancts/modules/vulkan/shaderrendercase/vktShaderRenderCase.hpp @@ -400,7 +400,7 @@ protected: const tcu::Vec4 m_clearColor; std::vector m_textures; - vk::SimpleAllocator m_memAlloc; + vk::Allocator& m_memAlloc; private: -- 2.7.4