Merge branch '259-fix-arm-gcc-issue' into 'vulkan-cts-1.0'

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

diff --git a/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.hpp b/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.hpp
index b875f92..241ad77 100644 (file)
--- a/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.hpp
+++ b/external/vulkancts/modules/vulkan/compute/vktComputeTestsUtil.hpp
@@ -52,8 +52,8 @@ public:
                                                                                                         const vk::VkBufferCreateInfo&  bufferCreateInfo,
                                                                                                         const vk::MemoryRequirement    memoryRequirement);
 
-       vk::VkBuffer                                    get                             (void) const { return *m_buffer; }
-       vk::VkBuffer                                    operator*               (void) const { return get(); }
+       const vk::VkBuffer&                             get                             (void) const { return *m_buffer; }
+       const vk::VkBuffer&                             operator*               (void) const { return get(); }
        vk::Allocation&                                 getAllocation   (void) const { return *m_allocation; }
 
 private:
@@ -73,8 +73,8 @@ public:
                                                                                                         const vk::VkImageCreateInfo&   imageCreateInfo,
                                                                                                         const vk::MemoryRequirement    memoryRequirement);
 
-       vk::VkImage                                             get                             (void) const { return *m_image; }
-       vk::VkImage                                             operator*               (void) const { return get(); }
+       const vk::VkImage&                              get                             (void) const { return *m_image; }
+       const vk::VkImage&                              operator*               (void) const { return get(); }
        vk::Allocation&                                 getAllocation   (void) const { return *m_allocation; }
 
 private:
@@ -85,23 +85,6 @@ private:
        Image&                                                  operator=               (const Image&);
 };
 
-template<typename T>
-class DynArray
-{
-public:
-                               DynArray        (std::size_t size)                      { data = new T[size]; }
-                               ~DynArray       ()                                                      { delete [] data; }
-
-       T&                      operator[]      (std::size_t idx)                       { return data[idx]; }
-       const T&        operator[]      (std::size_t idx) const         { return data[idx]; }
-
-private:
-       T* data;
-
-                               DynArray        (const DynArray&);  // "deleted"
-       DynArray&       operator=       (const DynArray&);
-};
-
 vk::Move<vk::VkCommandPool>                    makeCommandPool                         (const vk::DeviceInterface&                     vk,
                                                                                                                                 const vk::VkDevice                                     device,
                                                                                                                                 const deUint32                                         queueFamilyIndex);