Remove TextureCommand

src/libANGLE/State.cpp

@@ -3123,7 +3123,7 @@ angle::Result State::syncTextures(const Context *context, Command command)
         Texture *texture = mActiveTexturesCache[textureIndex];
         if (texture && texture->hasAnyDirtyBit())
         {
-            ANGLE_TRY(texture->syncState(context, TextureCommand::Other));
+            ANGLE_TRY(texture->syncState(context, Command::Other));
         }
     }
 
@@ -3141,7 +3141,7 @@ angle::Result State::syncImages(const Context *context, Command command)
         Texture *texture = mImageUnits[imageUnitIndex].texture.get();
         if (texture && texture->hasAnyDirtyBit())
         {
-            ANGLE_TRY(texture->syncState(context, TextureCommand::Other));
+            ANGLE_TRY(texture->syncState(context, Command::Other));
         }
     }
 
@@ -3297,7 +3297,7 @@ angle::Result State::onProgramExecutableChange(const Context *context, Program *
 
         if (image->hasAnyDirtyBit())
         {
-            ANGLE_TRY(image->syncState(context, TextureCommand::Other));
+            ANGLE_TRY(image->syncState(context, Command::Other));
         }
 
         if (mRobustResourceInit && image->initState() == InitState::MayNeedInit)
@@ -3342,7 +3342,7 @@ angle::Result State::onProgramPipelineExecutableChange(const Context *context,
 
         if (image->hasAnyDirtyBit())
         {
-            ANGLE_TRY(image->syncState(context, TextureCommand::Other));
+            ANGLE_TRY(image->syncState(context, Command::Other));
         }
 
         if (mRobustResourceInit && image->initState() == InitState::MayNeedInit)

src/libANGLE/State.h

@@ -70,17 +70,6 @@ using TextureBindingMap    = angle::PackedEnumMap<TextureType, TextureBindingVec
 using ActiveQueryMap       = angle::PackedEnumMap<QueryType, BindingPointer<Query>>;
 using BufferVector         = std::vector<OffsetBindingPointer<Buffer>>;
 
-enum class Command
-{
-    Other,
-    Blit,
-    CopyImage,
-    Dispatch,
-    Draw,
-    ReadPixels,
-    TexImage
-};
-
 class ActiveTexturesCache final : angle::NonCopyable
 {
   public:

src/libANGLE/Texture.cpp

@@ -1503,7 +1503,7 @@ angle::Result Texture::generateMipmap(Context *context)
         return angle::Result::Continue;
     }
 
-    ANGLE_TRY(syncState(context, TextureCommand::GenerateMipmap));
+    ANGLE_TRY(syncState(context, Command::GenerateMipmap));
 
     // Clear the base image(s) immediately if needed
     if (context->isRobustResourceInitEnabled())
@@ -1794,9 +1794,9 @@ GLuint Texture::getNativeID() const
     return mTexture->getNativeID();
 }
 
-angle::Result Texture::syncState(const Context *context, TextureCommand source)
+angle::Result Texture::syncState(const Context *context, Command source)
 {
-    ASSERT(hasAnyDirtyBit() || source == TextureCommand::GenerateMipmap);
+    ASSERT(hasAnyDirtyBit() || source == Command::GenerateMipmap);
     ANGLE_TRY(mTexture->syncState(context, mDirtyBits, source));
     mDirtyBits.reset();
     return angle::Result::Continue;
@@ -2010,7 +2010,7 @@ angle::Result Texture::getTexImage(const Context *context,
 {
     if (hasAnyDirtyBit())
     {
-        ANGLE_TRY(syncState(context, TextureCommand::Other));
+        ANGLE_TRY(syncState(context, Command::Other));
     }
 
     return mTexture->getTexImage(context, packState, packBuffer, target, level, format, type,

src/libANGLE/Texture.h

@@ -101,14 +101,6 @@ struct ContextBindingCount
     uint32_t imageBindingCount;
 };
 
-// The source of the syncState call.  Knowing why syncState is being called can help the back-end
-// make more-informed decisions.
-enum class TextureCommand
-{
-    GenerateMipmap,
-    Other,
-};
-
 // State from Table 6.9 (state per texture object) in the OpenGL ES 3.0.2 spec.
 class TextureState final : private angle::NonCopyable
 {
@@ -605,7 +597,7 @@ class Texture final : public RefCountObject<TextureID>,
     };
     using DirtyBits = angle::BitSet<DIRTY_BIT_COUNT>;
 
-    angle::Result syncState(const Context *context, TextureCommand source);
+    angle::Result syncState(const Context *context, Command source);
     bool hasAnyDirtyBit() const { return mDirtyBits.any(); }
 
     // ObserverInterface implementation.

src/libANGLE/angletypes.h

@@ -30,6 +30,18 @@ namespace gl
 class Buffer;
 class Texture;
 
+enum class Command
+{
+    Blit,
+    CopyImage,
+    Dispatch,
+    Draw,
+    GenerateMipmap,
+    ReadPixels,
+    TexImage,
+    Other
+};
+
 struct Rectangle
 {
     Rectangle() : x(0), y(0), width(0), height(0) {}

src/libANGLE/renderer/TextureImpl.h

@@ -190,7 +190,7 @@ class TextureImpl : public FramebufferAttachmentObjectImpl
 
     virtual angle::Result syncState(const gl::Context *context,
                                     const gl::Texture::DirtyBits &dirtyBits,
-                                    gl::TextureCommand source) = 0;
+                                    gl::Command source) = 0;
 
     virtual GLenum getColorReadFormat(const gl::Context *context);
     virtual GLenum getColorReadType(const gl::Context *context);

src/libANGLE/renderer/TextureImpl_mock.h

@@ -134,7 +134,7 @@ class MockTextureImpl : public TextureImpl
     MOCK_METHOD3(syncState,
                  angle::Result(const gl::Context *,
                                const gl::Texture::DirtyBits &,
-                               gl::TextureCommand source));
+                               gl::Command source));
 
     MOCK_METHOD0(destructor, void());
 

src/libANGLE/renderer/d3d/TextureD3D.cpp

@@ -684,7 +684,7 @@ angle::Result TextureD3D::setBaseLevel(const gl::Context *context, GLuint baseLe
 
 angle::Result TextureD3D::syncState(const gl::Context *context,
                                     const gl::Texture::DirtyBits &dirtyBits,
-                                    gl::TextureCommand source)
+                                    gl::Command source)
 {
     // This could be improved using dirty bits.
     return angle::Result::Continue;

src/libANGLE/renderer/d3d/TextureD3D.h

@@ -110,7 +110,7 @@ class TextureD3D : public TextureImpl, public angle::ObserverInterface
 
     angle::Result syncState(const gl::Context *context,
                             const gl::Texture::DirtyBits &dirtyBits,
-                            gl::TextureCommand source) override;
+                            gl::Command source) override;
 
     angle::Result initializeContents(const gl::Context *context,
                                      const gl::ImageIndex &imageIndex) override;

src/libANGLE/renderer/gl/TextureGL.cpp

@@ -1389,7 +1389,7 @@ GLint TextureGL::getNativeID() const
 
 angle::Result TextureGL::syncState(const gl::Context *context,
                                    const gl::Texture::DirtyBits &dirtyBits,
-                                   gl::TextureCommand source)
+                                   gl::Command source)
 {
     if (dirtyBits.none() && mLocalDirtyBits.none())
     {

src/libANGLE/renderer/gl/TextureGL.h

@@ -193,7 +193,7 @@ class TextureGL : public TextureImpl
 
     angle::Result syncState(const gl::Context *context,
                             const gl::Texture::DirtyBits &dirtyBits,
-                            gl::TextureCommand source) override;
+                            gl::Command source) override;
     bool hasAnyDirtyBit() const;
 
     angle::Result setBaseLevel(const gl::Context *context, GLuint baseLevel) override;

src/libANGLE/renderer/metal/TextureMtl.h

@@ -134,7 +134,7 @@ class TextureMtl : public TextureImpl
 
     angle::Result syncState(const gl::Context *context,
                             const gl::Texture::DirtyBits &dirtyBits,
-                            gl::TextureCommand source) override;
+                            gl::Command source) override;
 
     angle::Result setStorageMultisample(const gl::Context *context,
                                         gl::TextureType type,

src/libANGLE/renderer/metal/TextureMtl.mm

@@ -795,7 +795,7 @@ angle::Result TextureMtl::getAttachmentRenderTarget(const gl::Context *context,
 
 angle::Result TextureMtl::syncState(const gl::Context *context,
                                     const gl::Texture::DirtyBits &dirtyBits,
-                                    gl::TextureCommand source)
+                                    gl::Command source)
 {
     if (dirtyBits.any())
     {

src/libANGLE/renderer/null/TextureNULL.cpp

@@ -176,7 +176,7 @@ angle::Result TextureNULL::releaseTexImage(const gl::Context *context)
 
 angle::Result TextureNULL::syncState(const gl::Context *context,
                                      const gl::Texture::DirtyBits &dirtyBits,
-                                     gl::TextureCommand source)
+                                     gl::Command source)
 {
     return angle::Result::Continue;
 }

src/libANGLE/renderer/null/TextureNULL.h

@@ -121,7 +121,7 @@ class TextureNULL : public TextureImpl
 
     angle::Result syncState(const gl::Context *context,
                             const gl::Texture::DirtyBits &dirtyBits,
-                            gl::TextureCommand source) override;
+                            gl::Command source) override;
 
     angle::Result setStorageMultisample(const gl::Context *context,
                                         gl::TextureType type,

src/libANGLE/renderer/renderer_utils.cpp

@@ -622,7 +622,7 @@ angle::Result IncompleteTextureSet::getIncompleteTexture(
                                  GL_UNSIGNED_BYTE, color));
     }
 
-    ANGLE_TRY(t->syncState(context, gl::TextureCommand::Other));
+    ANGLE_TRY(t->syncState(context, gl::Command::Other));
 
     mIncompleteTextures[type].set(context, t.release());
     *textureOut = mIncompleteTextures[type].get();

src/libANGLE/renderer/vulkan/TextureVk.cpp

@@ -2055,7 +2055,7 @@ void TextureVk::prepareForGenerateMipmap(ContextVk *contextVk)
 
 angle::Result TextureVk::syncState(const gl::Context *context,
                                    const gl::Texture::DirtyBits &dirtyBits,
-                                   gl::TextureCommand source)
+                                   gl::Command source)
 {
     ContextVk *contextVk = vk::GetImpl(context);
     RendererVk *renderer = contextVk->getRenderer();
@@ -2082,7 +2082,7 @@ angle::Result TextureVk::syncState(const gl::Context *context,
     // Before redefining the image for any reason, check to see if it's about to go through mipmap
     // generation.  In that case, drop every staged change for the subsequent mips after base, and
     // make sure the image is created with the complete mipchain.
-    bool isGenerateMipmap = source == gl::TextureCommand::GenerateMipmap;
+    bool isGenerateMipmap = source == gl::Command::GenerateMipmap;
     if (isGenerateMipmap)
     {
         prepareForGenerateMipmap(contextVk);

src/libANGLE/renderer/vulkan/TextureVk.h

@@ -143,7 +143,7 @@ class TextureVk : public TextureImpl, public angle::ObserverInterface
 
     angle::Result syncState(const gl::Context *context,
                             const gl::Texture::DirtyBits &dirtyBits,
-                            gl::TextureCommand source) override;
+                            gl::Command source) override;
 
     angle::Result setStorageMultisample(const gl::Context *context,
                                         gl::TextureType type,