StateManagerGL: Use arrays to store texture and sampler bindings.

src/libANGLE/renderer/gl/StateManagerGL.cpp

@@ -77,8 +77,8 @@ StateManagerGL::StateManagerGL(const FunctionsGL *functions,
       mBuffers(),
       mIndexedBuffers(),
       mTextureUnitIndex(0),
-      mTextures(),
-      mSamplers(rendererCaps.maxCombinedTextureImageUnits, 0),
+      mTextures{},
+      mSamplers{},
       mImages(rendererCaps.maxImageUnits, ImageUnitBinding()),
       mTransformFeedback(0),
       mCurrentTransformFeedback(nullptr),
@@ -168,13 +168,6 @@ StateManagerGL::StateManagerGL(const FunctionsGL *functions,
     ASSERT(mFunctions);
     ASSERT(extensions.maxViews >= 1u);
 
-    mTextures[gl::TextureType::_2D].resize(rendererCaps.maxCombinedTextureImageUnits);
-    mTextures[gl::TextureType::Rectangle].resize(rendererCaps.maxCombinedTextureImageUnits);
-    mTextures[gl::TextureType::CubeMap].resize(rendererCaps.maxCombinedTextureImageUnits);
-    mTextures[gl::TextureType::_2DArray].resize(rendererCaps.maxCombinedTextureImageUnits);
-    mTextures[gl::TextureType::_3D].resize(rendererCaps.maxCombinedTextureImageUnits);
-    mTextures[gl::TextureType::_2DMultisample].resize(rendererCaps.maxCombinedTextureImageUnits);
-
     mIndexedBuffers[gl::BufferBinding::Uniform].resize(rendererCaps.maxUniformBufferBindings);
     mIndexedBuffers[gl::BufferBinding::AtomicCounter].resize(
         rendererCaps.maxAtomicCounterBufferBindings);
@@ -240,7 +233,7 @@ void StateManagerGL::deleteTexture(GLuint texture)
     {
         for (gl::TextureType type : angle::AllEnums<gl::TextureType>())
         {
-            const std::vector<GLuint> &textureVector = mTextures[type];
+            const auto &textureVector = mTextures[type];
             for (size_t textureUnitIndex = 0; textureUnitIndex < textureVector.size();
                  textureUnitIndex++)
             {

src/libANGLE/renderer/gl/StateManagerGL.h

@@ -230,8 +230,8 @@ class StateManagerGL final : angle::NonCopyable
     angle::PackedEnumMap<gl::BufferBinding, std::vector<IndexedBufferBinding>> mIndexedBuffers;
 
     size_t mTextureUnitIndex;
-    angle::PackedEnumMap<gl::TextureType, std::vector<GLuint>> mTextures;
-    std::vector<GLuint> mSamplers;
+    angle::PackedEnumMap<gl::TextureType, gl::ActiveTextureArray<GLuint>> mTextures;
+    gl::ActiveTextureArray<GLuint> mSamplers;
 
     struct ImageUnitBinding
     {