Merge "Add clear() to de::AppendList" into nyc-dev

diff --git a/external/vulkancts/framework/vulkan/vkGlslToSpirV.cpp b/external/vulkancts/framework/vulkan/vkGlslToSpirV.cpp
index 87dd218..d9ad652 100644 (file)
--- a/external/vulkancts/framework/vulkan/vkGlslToSpirV.cpp
+++ b/external/vulkancts/framework/vulkan/vkGlslToSpirV.cpp
@@ -201,7 +201,7 @@ void getDefaultBuiltInResources (TBuiltInResource* builtin)
 
 } // anonymous
 
-bool getNumShaderStages (const glu::ProgramSources& program)
+int getNumShaderStages (const glu::ProgramSources& program)
 {
        int numShaderStages = 0;
 

diff --git a/external/vulkancts/modules/vulkan/vktTestCase.cpp b/external/vulkancts/modules/vulkan/vktTestCase.cpp
index 693873f..14ccd83 100644 (file)
--- a/external/vulkancts/modules/vulkan/vktTestCase.cpp
+++ b/external/vulkancts/modules/vulkan/vktTestCase.cpp
@@ -183,16 +183,16 @@ Context::~Context (void)
 {
 }
 
-vk::VkInstance                                         Context::getInstance                                    (void) const { return m_device->getInstance();                                  }
-const vk::InstanceInterface&           Context::getInstanceInterface                   (void) const { return m_device->getInstanceInterface();                 }
-vk::VkPhysicalDevice                           Context::getPhysicalDevice                              (void) const { return m_device->getPhysicalDevice();                    }
-const vk::VkPhysicalDeviceFeatures&    Context::getDeviceFeatures                              (void) const { return m_device->getDeviceFeatures();                    }
-const vk::VkPhysicalDeviceProperties&  Context::getDeviceProperties            (void) const { return m_device->getDeviceProperties();                  }
-vk::VkDevice                                           Context::getDevice                                              (void) const { return m_device->getDevice();                                    }
-const vk::DeviceInterface&                     Context::getDeviceInterface                             (void) const { return m_device->getDeviceInterface();                   }
-deUint32                                                       Context::getUniversalQueueFamilyIndex   (void) const { return m_device->getUniversalQueueFamilyIndex(); }
-vk::VkQueue                                                    Context::getUniversalQueue                              (void) const { return m_device->getUniversalQueue();                    }
-vk::Allocator&                                         Context::getDefaultAllocator                    (void) const { return *m_allocator;                                                             }
+vk::VkInstance                                                 Context::getInstance                                    (void) const { return m_device->getInstance();                                  }
+const vk::InstanceInterface&                   Context::getInstanceInterface                   (void) const { return m_device->getInstanceInterface();                 }
+vk::VkPhysicalDevice                                   Context::getPhysicalDevice                              (void) const { return m_device->getPhysicalDevice();                    }
+const vk::VkPhysicalDeviceFeatures&            Context::getDeviceFeatures                              (void) const { return m_device->getDeviceFeatures();                    }
+const vk::VkPhysicalDeviceProperties&  Context::getDeviceProperties                    (void) const { return m_device->getDeviceProperties();                  }
+vk::VkDevice                                                   Context::getDevice                                              (void) const { return m_device->getDevice();                                    }
+const vk::DeviceInterface&                             Context::getDeviceInterface                             (void) const { return m_device->getDeviceInterface();                   }
+deUint32                                                               Context::getUniversalQueueFamilyIndex   (void) const { return m_device->getUniversalQueueFamilyIndex(); }
+vk::VkQueue                                                            Context::getUniversalQueue                              (void) const { return m_device->getUniversalQueue();                    }
+vk::Allocator&                                                 Context::getDefaultAllocator                    (void) const { return *m_allocator;                                                             }
 
 // TestCase