Merge changes I2b52f28b,I87252491
* changes:
Update Marl to 49e4e31
Squashed 'third_party/marl/' changes from 12872a0df..49e4e3141
diff --git a/src/Vulkan/VkDevice.hpp b/src/Vulkan/VkDevice.hpp
index b27fa50..3fa0afe 100644
--- a/src/Vulkan/VkDevice.hpp
+++ b/src/Vulkan/VkDevice.hpp
@@ -72,7 +72,6 @@
uint32_t imageView;
inline bool operator == (const Key& rhs) const;
- inline bool operator < (const Key& rhs) const;
struct Hash
{
@@ -121,11 +120,6 @@
return instruction == rhs.instruction && sampler == rhs.sampler && imageView == rhs.imageView;
}
-inline bool vk::Device::SamplingRoutineCache::Key::operator < (const Key& rhs) const
-{
- return std::tie(instruction, sampler, imageView) < std::tie(rhs.instruction, rhs.sampler, rhs.imageView);
-}
-
inline std::size_t vk::Device::SamplingRoutineCache::Key::Hash::operator() (const Key& key) const noexcept
{
// Combine three 32-bit integers into a 64-bit hash.
