Modify data type of ActiveTextureMask and ImageUnitMask

ActiveTextureMask and ImageUnitMask need more than 64bits. We can now use the BitSetArray datatype and avoid the perf penalty of using std::bitset Bug: angleproject:3877 Tests: angle_perftests.exe --gtest_filter=TexturesBenchmark* Change-Id: Ic82e09d1aa2c1904d06ad48ba6200f35896665ac Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2664734 Commit-Queue: Mohan Maiya <m.maiya@samsung.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>

Modify data type of ActiveTextureMask and ImageUnitMask
f6784006 · Mohan Maiya · Commit Bot · f1cbcaba · f6784006 · f6784006
Commit f6784006 authored Feb 08, 2021 by Mohan Maiya Committed by Commit Bot Feb 10, 2021
Showing with 4 additions and 7 deletions

ProgramExecutable.cpp src/libANGLE/ProgramExecutable.cpp +0 -2

State.cpp src/libANGLE/State.cpp +0 -1

State.h src/libANGLE/State.h +2 -2

angletypes.h src/libANGLE/angletypes.h +2 -2

No files found.
--- a/src/libANGLE/ProgramExecutable.cpp
+++ b/src/libANGLE/ProgramExecutable.cpp
@@ -68,9 +68,7 @@ ProgramExecutable::ProgramExecutable()
    : mMaxActiveAttribLocation(0),
      mAttributesTypeMask(0),
      mAttributesMask(0),
-      mActiveSamplersMask(0),
      mActiveSamplerRefCounts{},
-      mActiveImagesMask(0),
      mCanDrawWith(false),
      mYUVOutput(false),
      mTransformFeedbackBufferMode(GL_INTERLEAVED_ATTRIBS),

--- a/src/libANGLE/State.cpp
+++ b/src/libANGLE/State.cpp
@@ -347,7 +347,6 @@ State::State(const State *shareContextState,
      mProvokingVertex(gl::ProvokingVertexConvention::LastVertexConvention),
      mVertexArray(nullptr),
      mActiveSampler(0),
-      mTexturesIncompatibleWithSamplers(0),
      mValidAtomicCounterBufferCount(0),
      mPrimitiveRestart(false),
      mDebug(debug),

--- a/src/libANGLE/State.h
+++ b/src/libANGLE/State.h
@@ -786,8 +786,8 @@ class State : angle::NonCopyable
    ANGLE_INLINE bool validateSamplerFormats() const
    {
-        return (!mExecutable ||
+        return (!mExecutable || !(mTexturesIncompatibleWithSamplers.intersects(
-                (mTexturesIncompatibleWithSamplers & mExecutable->getActiveSamplersMask()).none());
+                                    mExecutable->getActiveSamplersMask())));
    }
    ProvokingVertexConvention getProvokingVertex() const { return mProvokingVertex; }

--- a/src/libANGLE/angletypes.h
+++ b/src/libANGLE/angletypes.h
@@ -829,7 +829,7 @@ using DrawBuffersVector = angle::FixedVector<T, IMPLEMENTATION_MAX_DRAW_BUFFERS>
 template <typename T>
 using AttribArray = std::array<T, MAX_VERTEX_ATTRIBS>;
-using ActiveTextureMask = angle::BitSet<IMPLEMENTATION_MAX_ACTIVE_TEXTURES>;
+using ActiveTextureMask = angle::BitSetArray<IMPLEMENTATION_MAX_ACTIVE_TEXTURES>;
 template <typename T>
 using ActiveTextureArray = std::array<T, IMPLEMENTATION_MAX_ACTIVE_TEXTURES>;
@@ -846,7 +846,7 @@ using AtomicCounterBufferMask   = angle::BitSet<IMPLEMENTATION_MAX_ATOMIC_COUNTE
 template <typename T>
 using ImagesArray = std::array<T, IMPLEMENTATION_MAX_IMAGE_UNITS>;
-using ImageUnitMask = angle::BitSet<IMPLEMENTATION_MAX_IMAGE_UNITS>;
+using ImageUnitMask = angle::BitSetArray<IMPLEMENTATION_MAX_IMAGE_UNITS>;
 using SupportedSampleSet = std::set<GLuint>;