Rename BitSetIterator.h to bitset_utils.h
BUG=angleproject:1814
Change-Id: I152ae13b6b7cf0ba72259967f0f124e199b20e07
Reviewed-on: https://chromium-review.googlesource.com/471826
Reviewed-by: Geoff Lang <geofflang@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
diff --git a/src/common/BitSetIterator.h b/src/common/bitset_utils.h
similarity index 91%
rename from src/common/BitSetIterator.h
rename to src/common/bitset_utils.h
index 874f50f..6bddedd 100644
--- a/src/common/BitSetIterator.h
+++ b/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 @@
};
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)
{
}
diff --git a/src/common/BitSetIterator_unittest.cpp b/src/common/bitset_utils_unittest.cpp
similarity index 94%
rename from src/common/BitSetIterator_unittest.cpp
rename to src/common/bitset_utils_unittest.cpp
index e965f2c..61eff56 100644
--- a/src/common/BitSetIterator_unittest.cpp
+++ b/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;
diff --git a/src/libANGLE/Framebuffer.cpp b/src/libANGLE/Framebuffer.cpp
index bcbbd02..a2574e7 100644
--- a/src/libANGLE/Framebuffer.cpp
+++ b/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"
diff --git a/src/libANGLE/Program.cpp b/src/libANGLE/Program.cpp
index 366483b..ebedc4b 100644
--- a/src/libANGLE/Program.cpp
+++ b/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"
diff --git a/src/libANGLE/State.cpp b/src/libANGLE/State.cpp
index f6649f4..408aa26 100644
--- a/src/libANGLE/State.cpp
+++ b/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"
diff --git a/src/libANGLE/VertexArray_unittest.cpp b/src/libANGLE/VertexArray_unittest.cpp
index 04eac7e..6d9a09b 100644
--- a/src/libANGLE/VertexArray_unittest.cpp
+++ b/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"
diff --git a/src/libANGLE/renderer/d3d/FramebufferD3D.cpp b/src/libANGLE/renderer/d3d/FramebufferD3D.cpp
index 4ef149d..68b2917 100644
--- a/src/libANGLE/renderer/d3d/FramebufferD3D.cpp
+++ b/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"
diff --git a/src/libANGLE/renderer/d3d/ProgramD3D.cpp b/src/libANGLE/renderer/d3d/ProgramD3D.cpp
index 07db179..c2f478a 100644
--- a/src/libANGLE/renderer/d3d/ProgramD3D.cpp
+++ b/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"
diff --git a/src/libANGLE/renderer/d3d/VertexDataManager.cpp b/src/libANGLE/renderer/d3d/VertexDataManager.cpp
index c574494..35b2405 100644
--- a/src/libANGLE/renderer/d3d/VertexDataManager.cpp
+++ b/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"
diff --git a/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp b/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp
index 5a51f14..32df8b1 100644
--- a/src/libANGLE/renderer/d3d/d3d11/Framebuffer11.cpp
+++ b/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"
diff --git a/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp b/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp
index 06ac347..efa685e 100644
--- a/src/libANGLE/renderer/d3d/d3d11/InputLayoutCache.cpp
+++ b/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"
diff --git a/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp b/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp
index 224e0fb..b427e6f 100644
--- a/src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp
+++ b/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"
diff --git a/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp b/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
index d5768d6..8e2223c 100644
--- a/src/libANGLE/renderer/d3d/d3d11/VertexArray11.cpp
+++ b/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;
diff --git a/src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp b/src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp
index 17ece72..1291899 100644
--- a/src/libANGLE/renderer/d3d/d3d9/StateManager9.cpp
+++ b/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"
diff --git a/src/libANGLE/renderer/gl/FramebufferGL.cpp b/src/libANGLE/renderer/gl/FramebufferGL.cpp
index 7c41638..e586082 100644
--- a/src/libANGLE/renderer/gl/FramebufferGL.cpp
+++ b/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"
diff --git a/src/libANGLE/renderer/gl/ProgramGL.cpp b/src/libANGLE/renderer/gl/ProgramGL.cpp
index bc1c8f0..124c0e5 100644
--- a/src/libANGLE/renderer/gl/ProgramGL.cpp
+++ b/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"
diff --git a/src/libANGLE/renderer/gl/StateManagerGL.cpp b/src/libANGLE/renderer/gl/StateManagerGL.cpp
index 2b95742..97f662c 100644
--- a/src/libANGLE/renderer/gl/StateManagerGL.cpp
+++ b/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"
diff --git a/src/libANGLE/renderer/gl/TextureGL.cpp b/src/libANGLE/renderer/gl/TextureGL.cpp
index ecba5d6..7817a0e 100644
--- a/src/libANGLE/renderer/gl/TextureGL.cpp
+++ b/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"
diff --git a/src/libANGLE/renderer/gl/VertexArrayGL.cpp b/src/libANGLE/renderer/gl/VertexArrayGL.cpp
index 51faf86..183baa4 100644
--- a/src/libANGLE/renderer/gl/VertexArrayGL.cpp
+++ b/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"
diff --git a/src/libANGLE/renderer/vulkan/ContextVk.cpp b/src/libANGLE/renderer/vulkan/ContextVk.cpp
index 56af4d0..1361893 100644
--- a/src/libANGLE/renderer/vulkan/ContextVk.cpp
+++ b/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"
diff --git a/src/libGLESv2.gypi b/src/libGLESv2.gypi
index d05198d..3b3dfcf 100644
--- a/src/libGLESv2.gypi
+++ b/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',
diff --git a/src/tests/angle_unittests.gypi b/src/tests/angle_unittests.gypi
index 35026e4..3309bbc 100644
--- a/src/tests/angle_unittests.gypi
+++ b/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',
