diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt
index 5cb7440a4..42da09054 100644
--- a/renderdoc/CMakeLists.txt
+++ b/renderdoc/CMakeLists.txt
@@ -115,6 +115,8 @@ set(sources
     core/replay_proxy.h
     core/intervals.h
     core/intervals_tests.cpp
+    core/bit_flag_iterator.h
+    core/bit_flag_iterator_tests.cpp
     android/android.cpp
     android/android_patch.cpp
     android/android_tools.cpp
diff --git a/renderdoc/core/bit_flag_iterator.h b/renderdoc/core/bit_flag_iterator.h
new file mode 100644
index 000000000..b2c2b79be
--- /dev/null
+++ b/renderdoc/core/bit_flag_iterator.h
@@ -0,0 +1,46 @@
+/******************************************************************************
+* The MIT License (MIT)
+*
+* Copyright (c) 2018-2019 Baldur Karlsson
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+******************************************************************************/
+#pragma once
+
+template <typename BitType, typename FlagType, typename SignedType>
+class BitFlagIterator
+{
+private:
+  FlagType flags;
+
+public:
+  inline BitFlagIterator() : flags(0) {}
+  inline BitFlagIterator(FlagType mask) : flags(mask) {}
+  static inline BitFlagIterator begin(FlagType mask) { return BitFlagIterator(mask); }
+  static inline BitFlagIterator end() { return BitFlagIterator(0); }
+  inline BitType operator*() const { return (BitType)(flags & (FlagType)(-(SignedType)flags)); }
+  inline BitFlagIterator &operator++()
+  {
+    flags ^= **this;
+    return *this;
+  }
+  inline bool operator==(const BitFlagIterator &rhs) const { return flags == rhs.flags; }
+  inline bool operator!=(const BitFlagIterator &rhs) const { return flags != rhs.flags; }
+  inline BitFlagIterator &operator=(const BitFlagIterator &rhs) { flags = rhs.flags; }
+};
diff --git a/renderdoc/core/bit_flag_iterator_tests.cpp b/renderdoc/core/bit_flag_iterator_tests.cpp
new file mode 100644
index 000000000..d9813a112
--- /dev/null
+++ b/renderdoc/core/bit_flag_iterator_tests.cpp
@@ -0,0 +1,88 @@
+/******************************************************************************
+* The MIT License (MIT)
+*
+* Copyright (c) 2019 Baldur Karlsson
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+******************************************************************************/
+
+#include "bit_flag_iterator.h"
+#include "common/globalconfig.h"
+
+#if ENABLED(ENABLE_UNIT_TESTS)
+
+#include "3rdparty/catch/catch.hpp"
+
+#include <stdint.h>
+#include <vector>
+
+typedef BitFlagIterator<uint32_t, uint32_t, int32_t> TestFlagIter;
+
+std::vector<uint32_t> get_bits(const TestFlagIter &begin, const TestFlagIter &end)
+{
+  std::vector<uint32_t> bits;
+  for(TestFlagIter it = begin; it != end; ++it)
+  {
+    bits.push_back(*it);
+  }
+  return bits;
+}
+
+TEST_CASE("Test BitFlagIterator type", "[bit_flag_iterator]")
+{
+  SECTION("empty")
+  {
+    std::vector<uint32_t> expected = {};
+    CHECK(get_bits(TestFlagIter::begin(0x0), TestFlagIter::end()) == expected);
+  };
+  SECTION("full")
+  {
+    std::vector<uint32_t> expected = {
+        0x1,       0x2,       0x4,       0x8,       0x10,       0x20,       0x40,       0x80,
+        0x100,     0x200,     0x400,     0x800,     0x1000,     0x2000,     0x4000,     0x8000,
+        0x10000,   0x20000,   0x40000,   0x80000,   0x100000,   0x200000,   0x400000,   0x800000,
+        0x1000000, 0x2000000, 0x4000000, 0x8000000, 0x10000000, 0x20000000, 0x40000000, 0x80000000};
+    CHECK(get_bits(TestFlagIter::begin(UINT32_MAX), TestFlagIter::end()) == expected);
+  };
+  SECTION("even")
+  {
+    std::vector<uint32_t> expected = {
+        0x1,     0x4,     0x10,     0x40,     0x100,     0x400,     0x1000,     0x4000,
+        0x10000, 0x40000, 0x100000, 0x400000, 0x1000000, 0x4000000, 0x10000000, 0x40000000};
+    CHECK(get_bits(TestFlagIter::begin(0x55555555), TestFlagIter::end()) == expected);
+  };
+  SECTION("odd")
+  {
+    std::vector<uint32_t> expected = {
+        0x2,     0x8,     0x20,     0x80,     0x200,     0x800,     0x2000,     0x8000,
+        0x20000, 0x80000, 0x200000, 0x800000, 0x2000000, 0x8000000, 0x20000000, 0x80000000};
+    CHECK(get_bits(TestFlagIter::begin(0xAAAAAAAA), TestFlagIter::end()) == expected);
+  };
+  SECTION("single")
+  {
+    for(int i = 0; i < 32; i++)
+    {
+      uint32_t b = 1 << i;
+      std::vector<uint32_t> expected = {b};
+      CHECK(get_bits(TestFlagIter::begin(b), TestFlagIter::end()) == expected);
+    }
+  };
+};
+
+#endif    // ENABLED(ENABLE_UNIT_TESTS)
diff --git a/renderdoc/renderdoc.vcxproj b/renderdoc/renderdoc.vcxproj
index 096da9eb6..a6f0a7055 100644
--- a/renderdoc/renderdoc.vcxproj
+++ b/renderdoc/renderdoc.vcxproj
@@ -182,6 +182,7 @@
     <ClInclude Include="common\threading.h" />
     <ClInclude Include="common\timing.h" />
     <ClInclude Include="common\wrapped_pool.h" />
+    <ClInclude Include="core\bit_flag_iterator.h" />
     <ClInclude Include="core\core.h" />
     <ClInclude Include="core\crash_handler.h" />
     <ClInclude Include="core\intervals.h" />
@@ -411,6 +412,7 @@
     <ClCompile Include="common\common.cpp" />
     <ClCompile Include="common\dds_readwrite.cpp" />
     <ClCompile Include="common\threading_tests.cpp" />
+    <ClCompile Include="core\bit_flag_iterator_tests.cpp" />
     <ClCompile Include="core\core.cpp" />
     <ClCompile Include="core\image_viewer.cpp" />
     <ClCompile Include="core\intervals_tests.cpp" />
diff --git a/renderdoc/renderdoc.vcxproj.filters b/renderdoc/renderdoc.vcxproj.filters
index 434ced1b7..6ce951b35 100644
--- a/renderdoc/renderdoc.vcxproj.filters
+++ b/renderdoc/renderdoc.vcxproj.filters
@@ -483,6 +483,9 @@
     <ClInclude Include="api\replay\rdcstr.h">
       <Filter>API\Replay</Filter>
     </ClInclude>
+    <ClInclude Include="core\bit_flag_iterator.h">
+      <Filter>Core</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="maths\camera.cpp">
@@ -857,6 +860,9 @@
     <ClCompile Include="os\posix\ggp\ggp_threading.cpp">
       <Filter>OS\Posix\GGP</Filter>
     </ClCompile>
+    <ClCompile Include="core\bit_flag_iterator_tests.cpp">
+      <Filter>Core</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="os\win32\comexport.def">