Sampler::syncState now returns angle::Result

src/libANGLE/Sampler.cpp

@@ -178,10 +178,10 @@ rx::SamplerImpl *Sampler::getImplementation() const
     return mImpl;
 }
 
-void Sampler::syncState(const Context *context)
+angle::Result Sampler::syncState(const Context *context)
 {
     // TODO(jmadill): Use actual dirty bits for sampler.
-    mImpl->syncState(context);
+    return mImpl->syncState(context);
 }
 
 }  // namespace gl

src/libANGLE/Sampler.h

@@ -75,7 +75,7 @@ class Sampler final : public RefCountObject, public LabeledObject, public angle:
 
     rx::SamplerImpl *getImplementation() const;
 
-    void syncState(const Context *context);
+    angle::Result syncState(const Context *context);
 
   private:
     SamplerState mState;

src/libANGLE/State.cpp

@@ -2689,7 +2689,7 @@ angle::Result State::syncSamplers(const Context *context)
         BindingPointer<Sampler> &sampler = mSamplers[samplerIndex];
         if (sampler.get())
         {
-            sampler->syncState(context);
+            ANGLE_TRY(sampler->syncState(context));
         }
     }
 

src/libANGLE/renderer/SamplerImpl.h

@@ -10,6 +10,7 @@
 #define LIBANGLE_RENDERER_SAMPLERIMPL_H_
 
 #include "common/angleutils.h"
+#include "libANGLE/Error.h"
 
 namespace gl
 {
@@ -26,10 +27,7 @@ class SamplerImpl : angle::NonCopyable
     SamplerImpl(const gl::SamplerState &state) : mState(state) {}
     virtual ~SamplerImpl() {}
 
-    virtual void syncState(const gl::Context *context)
-    {
-        // Default implementation: no-op.
-    }
+    virtual angle::Result syncState(const gl::Context *context) = 0;
 
   protected:
     const gl::SamplerState &mState;

src/libANGLE/renderer/d3d/SamplerD3D.h

@@ -19,7 +19,15 @@ class SamplerD3D : public SamplerImpl
   public:
     SamplerD3D(const gl::SamplerState &state) : SamplerImpl(state) {}
     ~SamplerD3D() override {}
+
+    angle::Result syncState(const gl::Context *context) override;
 };
+
+inline angle::Result SamplerD3D::syncState(const gl::Context *context)
+{
+    return angle::Result::Continue;
+}
+
 }  // namespace rx
 
 #endif  // LIBANGLE_RENDERER_D3D_SAMPLERD3D_H_

src/libANGLE/renderer/gl/SamplerGL.cpp

@@ -83,7 +83,7 @@ SamplerGL::~SamplerGL()
     mSamplerID = 0;
 }
 
-void SamplerGL::syncState(const gl::Context *context)
+angle::Result SamplerGL::syncState(const gl::Context *context)
 {
     // clang-format off
     SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_MIN_FILTER, &gl::SamplerState::getMinFilter, &gl::SamplerState::setMinFilter);
@@ -99,6 +99,7 @@ void SamplerGL::syncState(const gl::Context *context)
     SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_SRGB_DECODE_EXT, &gl::SamplerState::getSRGBDecode, &gl::SamplerState::setSRGBDecode);
     SyncSamplerStateMember(mFunctions, mSamplerID, mState, mAppliedSamplerState, GL_TEXTURE_BORDER_COLOR, &gl::SamplerState::getBorderColor, &gl::SamplerState::setBorderColor);
     // clang-format on
+    return angle::Result::Continue;
 }
 
 GLuint SamplerGL::getSamplerID() const

src/libANGLE/renderer/gl/SamplerGL.h

@@ -26,7 +26,7 @@ class SamplerGL : public SamplerImpl
               StateManagerGL *stateManager);
     ~SamplerGL() override;
 
-    void syncState(const gl::Context *context) override;
+    angle::Result syncState(const gl::Context *context) override;
 
     GLuint getSamplerID() const;
 

src/libANGLE/renderer/null/SamplerNULL.cpp

@@ -18,4 +18,9 @@ SamplerNULL::SamplerNULL(const gl::SamplerState &state) : SamplerImpl(state) {}
 
 SamplerNULL::~SamplerNULL() {}
 
+angle::Result SamplerNULL::syncState(const gl::Context *context)
+{
+    return angle::Result::Continue;
+}
+
 }  // namespace rx

src/libANGLE/renderer/null/SamplerNULL.h

@@ -20,6 +20,8 @@ class SamplerNULL : public SamplerImpl
   public:
     SamplerNULL(const gl::SamplerState &state);
     ~SamplerNULL() override;
+
+    angle::Result syncState(const gl::Context *context) override;
 };
 
 }  // namespace rx

src/libANGLE/renderer/vulkan/SamplerVk.cpp

@@ -18,4 +18,9 @@ SamplerVk::SamplerVk(const gl::SamplerState &state) : SamplerImpl(state) {}
 
 SamplerVk::~SamplerVk() {}
 
+angle::Result SamplerVk::syncState(const gl::Context *context)
+{
+    return angle::Result::Continue;
+}
+
 }  // namespace rx

src/libANGLE/renderer/vulkan/SamplerVk.h

@@ -20,6 +20,8 @@ class SamplerVk : public SamplerImpl
   public:
     SamplerVk(const gl::SamplerState &state);
     ~SamplerVk() override;
+
+    angle::Result syncState(const gl::Context *context) override;
 };
 
 }  // namespace rx