Fix compile error in iterating ShaderBitSet

src/common/bitset_utils.h

@@ -54,7 +54,7 @@ class BitSetT final
 
         bool operator==(const Iterator &other) const;
         bool operator!=(const Iterator &other) const;
-        std::size_t operator*() const;
+        ParamT operator*() const;
 
       private:
         std::size_t getNextBit();
@@ -423,7 +423,7 @@ template <size_t N, typename BitsT, typename ParamT>
 typename BitSetT<N, BitsT, ParamT>::Iterator &BitSetT<N, BitsT, ParamT>::Iterator::operator++()
 {
     ASSERT(mBitsCopy.any());
-    mBitsCopy.reset(mCurrentBit);
+    mBitsCopy.reset(static_cast<ParamT>(mCurrentBit));
     mCurrentBit = getNextBit();
     return *this;
 }
@@ -441,9 +441,9 @@ bool BitSetT<N, BitsT, ParamT>::Iterator::operator!=(const Iterator &other) cons
 }
 
 template <size_t N, typename BitsT, typename ParamT>
-std::size_t BitSetT<N, BitsT, ParamT>::Iterator::operator*() const
+ParamT BitSetT<N, BitsT, ParamT>::Iterator::operator*() const
 {
-    return mCurrentBit;
+    return static_cast<ParamT>(mCurrentBit);
 }
 
 template <size_t N, typename BitsT, typename ParamT>

src/libANGLE/renderer/d3d/ProgramD3D.cpp

@@ -1695,11 +1695,10 @@ void ProgramD3D::initializeUniformStorage(const gl::ShaderBitSet &availableShade
             continue;
         }
 
-        for (gl::ShaderType shaderType : gl::AllShaderTypes())
+        for (gl::ShaderType shaderType : availableShaderStages)
         {
             if (d3dUniform->isReferencedByShader(shaderType))
             {
-                ASSERT(availableShaderStages[shaderType]);
                 shaderRegisters[shaderType] = std::max(
                     shaderRegisters[shaderType],
                     d3dUniform->mShaderRegisterIndexes[shaderType] + d3dUniform->registerCount);
@@ -1709,13 +1708,10 @@ void ProgramD3D::initializeUniformStorage(const gl::ShaderBitSet &availableShade
 
     // We only reset uniform storages for the shader stages available in the program (attached
     // shaders in ProgramD3D::link() and linkedShaderStages in ProgramD3D::load()).
-    for (gl::ShaderType shaderType : gl::AllShaderTypes())
+    for (gl::ShaderType shaderType : availableShaderStages)
     {
-        if (availableShaderStages[shaderType])
-        {
-            mShaderUniformStorages[shaderType].reset(
-                mRenderer->createUniformStorage(shaderRegisters[shaderType] * 16u));
-        }
+        mShaderUniformStorages[shaderType].reset(
+            mRenderer->createUniformStorage(shaderRegisters[shaderType] * 16u));
     }
 
     // Iterate the uniforms again to assign data pointers to default block uniforms.
@@ -1727,7 +1723,7 @@ void ProgramD3D::initializeUniformStorage(const gl::ShaderBitSet &availableShade
             continue;
         }
 
-        for (gl::ShaderType shaderType : gl::AllShaderTypes())
+        for (gl::ShaderType shaderType : availableShaderStages)
         {
             if (d3dUniform->isReferencedByShader(shaderType))
             {