Rename BitSetIterator.h to bitset_utils.h

src/common/BitSetIterator.h → src/common/bitset_utils.h

@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// BitSetIterator:
-//   A helper class to quickly bitscan bitsets for set bits.
+// bitset_utils:
+//   Bitset-related helper classes, such as a fast iterator to scan for set bits.
 //
 
 #ifndef COMMON_BITSETITERATOR_H_
@@ -56,14 +56,12 @@ class BitSetIterator final
 };
 
 template <size_t N>
-BitSetIterator<N>::BitSetIterator(const std::bitset<N> &bitset)
-    : mBits(bitset)
+BitSetIterator<N>::BitSetIterator(const std::bitset<N> &bitset) : mBits(bitset)
 {
 }
 
 template <size_t N>
-BitSetIterator<N>::BitSetIterator(const BitSetIterator &other)
-    : mBits(other.mBits)
+BitSetIterator<N>::BitSetIterator(const BitSetIterator &other) : mBits(other.mBits)
 {
 }
 

src/common/BitSetIterator_unittest.cpp → src/common/bitset_utils_unittest.cpp

@@ -3,13 +3,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// BitSetIteratorTest:
-//   Test the IterableBitSet class.
+// bitset_utils_unittest:
+//   Tests bitset helpers and custom classes.
 //
 
 #include <gtest/gtest.h>
 
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 
 using namespace angle;
 

src/libANGLE/Framebuffer.cpp

@@ -9,7 +9,7 @@
 
 #include "libANGLE/Framebuffer.h"
 
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 #include "common/Optional.h"
 #include "common/utilities.h"
 #include "libANGLE/Config.h"

src/libANGLE/Program.cpp

@@ -11,7 +11,7 @@
 
 #include <algorithm>
 
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 #include "common/debug.h"
 #include "common/platform.h"
 #include "common/utilities.h"

src/libANGLE/State.cpp

@@ -11,7 +11,7 @@
 #include <limits>
 #include <string.h>
 
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 #include "common/matrix_utils.h"
 #include "common/mathutil.h"
 #include "libANGLE/Context.h"

src/libANGLE/VertexArray_unittest.cpp

@@ -9,7 +9,7 @@
 #include "gmock/gmock.h"
 #include "gtest/gtest.h"
 
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 #include "common/utilities.h"
 #include "libANGLE/VertexArray.h"
 

src/libANGLE/renderer/d3d/FramebufferD3D.cpp

@@ -8,7 +8,7 @@
 
 #include "libANGLE/renderer/d3d/FramebufferD3D.h"
 
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 #include "libANGLE/formatutils.h"
 #include "libANGLE/Framebuffer.h"
 #include "libANGLE/FramebufferAttachment.h"

src/libANGLE/renderer/d3d/ProgramD3D.cpp

@@ -8,7 +8,7 @@
 
 #include "libANGLE/renderer/d3d/ProgramD3D.h"
 
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 #include "common/utilities.h"
 #include "libANGLE/Framebuffer.h"
 #include "libANGLE/FramebufferAttachment.h"

src/libANGLE/renderer/d3d/VertexDataManager.cpp

@@ -9,7 +9,7 @@
 
 #include "libANGLE/renderer/d3d/VertexDataManager.h"
 
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 #include "libANGLE/Buffer.h"
 #include "libANGLE/formatutils.h"
 #include "libANGLE/Program.h"

src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp

@@ -9,7 +9,7 @@
 #include "libANGLE/renderer/d3d/d3d11/Framebuffer11.h"
 
 #include "common/debug.h"
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 #include "libANGLE/renderer/d3d/d3d11/Buffer11.h"
 #include "libANGLE/renderer/d3d/d3d11/Clear11.h"
 #include "libANGLE/renderer/d3d/d3d11/TextureStorage11.h"

src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp

@@ -9,7 +9,7 @@
 
 #include "libANGLE/renderer/d3d/d3d11/InputLayoutCache.h"
 
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 #include "common/utilities.h"
 #include "libANGLE/Program.h"
 #include "libANGLE/VertexAttribute.h"

src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp

@@ -8,7 +8,7 @@
 
 #include "libANGLE/renderer/d3d/d3d11/StateManager11.h"
 
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 #include "common/utilities.h"
 #include "libANGLE/Query.h"
 #include "libANGLE/VertexArray.h"

src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp

@@ -9,7 +9,7 @@
 
 #include "libANGLE/renderer/d3d/d3d11/VertexArray11.h"
 
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 #include "libANGLE/renderer/d3d/d3d11/Buffer11.h"
 
 using namespace angle;

src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp

@@ -7,7 +7,7 @@
 // StateManager9.cpp: Defines a class for caching D3D9 state
 #include "libANGLE/renderer/d3d/d3d9/StateManager9.h"
 
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 #include "common/utilities.h"
 #include "libANGLE/formatutils.h"
 #include "libANGLE/renderer/d3d/d3d9/renderer9_utils.h"

src/libANGLE/renderer/gl/FramebufferGL.cpp

@@ -8,7 +8,7 @@
 
 #include "libANGLE/renderer/gl/FramebufferGL.h"
 
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 #include "common/debug.h"
 #include "libANGLE/ContextState.h"
 #include "libANGLE/State.h"

src/libANGLE/renderer/gl/ProgramGL.cpp

@@ -8,7 +8,7 @@
 
 #include "libANGLE/renderer/gl/ProgramGL.h"
 
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 #include "common/angleutils.h"
 #include "common/debug.h"
 #include "common/string_utils.h"

src/libANGLE/renderer/gl/StateManagerGL.cpp

@@ -11,7 +11,7 @@
 #include <limits>
 #include <string.h>
 
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 #include "common/mathutil.h"
 #include "common/matrix_utils.h"
 #include "libANGLE/ContextState.h"

src/libANGLE/renderer/gl/TextureGL.cpp

@@ -8,7 +8,7 @@
 
 #include "libANGLE/renderer/gl/TextureGL.h"
 
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 #include "common/debug.h"
 #include "common/utilities.h"
 #include "libANGLE/State.h"

src/libANGLE/renderer/gl/VertexArrayGL.cpp

@@ -8,7 +8,7 @@
 
 #include "libANGLE/renderer/gl/VertexArrayGL.h"
 
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 #include "common/debug.h"
 #include "common/mathutil.h"
 #include "common/utilities.h"

src/libANGLE/renderer/vulkan/ContextVk.cpp

@@ -9,7 +9,7 @@
 
 #include "libANGLE/renderer/vulkan/ContextVk.h"
 
-#include "common/BitSetIterator.h"
+#include "common/bitset_utils.h"
 #include "common/debug.h"
 #include "libANGLE/Program.h"
 #include "libANGLE/renderer/vulkan/BufferVk.h"

src/libGLESv2.gypi

@@ -8,7 +8,6 @@
         # These file lists are shared with the GN build.
         'libangle_common_sources':
         [
-            'common/BitSetIterator.h',
             'common/Color.h',
             'common/Color.inl',
             'common/Float16ToFloat32.cpp',
@@ -17,6 +16,7 @@
             'common/Optional.h',
             'common/angleutils.cpp',
             'common/angleutils.h',
+            'common/bitset_utils.h',
             'common/debug.cpp',
             'common/debug.h',
             'common/mathutil.cpp',

src/tests/angle_unittests.gypi

@@ -14,8 +14,8 @@
     {
         'angle_unittests_sources':
         [
-            '<(angle_path)/src/common/BitSetIterator_unittest.cpp',
             '<(angle_path)/src/common/Optional_unittest.cpp',
+            '<(angle_path)/src/common/bitset_utils_unittest.cpp',
             '<(angle_path)/src/common/mathutil_unittest.cpp',
             '<(angle_path)/src/common/matrix_utils_unittest.cpp',
             '<(angle_path)/src/common/string_utils_unittest.cpp',