Pass Context to setLabel.

src/libANGLE/Buffer.cpp

@@ -58,7 +58,7 @@ void Buffer::onDestroy(const Context *context)
         mImpl->destroy(context);
 }
 
-void Buffer::setLabel(const std::string &label)
+void Buffer::setLabel(const Context *context, const std::string &label)
 {
     mState.mLabel = label;
 }

src/libANGLE/Buffer.h

@@ -73,7 +73,7 @@ class Buffer final : public RefCountObject,
     ~Buffer() override;
     void onDestroy(const Context *context) override;
 
-    void setLabel(const std::string &label) override;
+    void setLabel(const Context *context, const std::string &label) override;
     const std::string &getLabel() const override;
 
     angle::Result bufferData(Context *context,

src/libANGLE/Context.cpp

@@ -1030,7 +1030,7 @@ void Context::objectLabel(GLenum identifier, GLuint name, GLsizei length, const
     ASSERT(object != nullptr);
 
     std::string labelName = GetObjectLabelFromPointer(length, label);
-    object->setLabel(labelName);
+    object->setLabel(this, labelName);
 
     // TODO(jmadill): Determine if the object is dirty based on 'name'. Conservatively assume the
     // specified object is active until we do this.
@@ -1043,7 +1043,7 @@ void Context::objectPtrLabel(const void *ptr, GLsizei length, const GLchar *labe
     ASSERT(object != nullptr);
 
     std::string labelName = GetObjectLabelFromPointer(length, label);
-    object->setLabel(labelName);
+    object->setLabel(this, labelName);
 }
 
 void Context::getObjectLabel(GLenum identifier,

src/libANGLE/Debug.h

@@ -20,12 +20,13 @@
 
 namespace gl
 {
+class Context;
 
 class LabeledObject
 {
   public:
     virtual ~LabeledObject() {}
-    virtual void setLabel(const std::string &label) = 0;
+    virtual void setLabel(const Context *context, const std::string &label) = 0;
     virtual const std::string &getLabel() const     = 0;
 };
 

src/libANGLE/Fence.cpp

@@ -73,7 +73,7 @@ Sync::~Sync()
     SafeDelete(mFence);
 }
 
-void Sync::setLabel(const std::string &label)
+void Sync::setLabel(const Context *context, const std::string &label)
 {
     mLabel = label;
 }

src/libANGLE/Fence.h

@@ -56,7 +56,7 @@ class Sync final : public RefCountObject, public LabeledObject
 
     void onDestroy(const Context *context) override;
 
-    void setLabel(const std::string &label) override;
+    void setLabel(const Context *context, const std::string &label) override;
     const std::string &getLabel() const override;
 
     angle::Result set(const Context *context, GLenum condition, GLbitfield flags);

src/libANGLE/Framebuffer.cpp

@@ -707,7 +707,7 @@ void Framebuffer::onDestroy(const Context *context)
     mImpl->destroy(context);
 }
 
-void Framebuffer::setLabel(const std::string &label)
+void Framebuffer::setLabel(const Context *context, const std::string &label)
 {
     mState.mLabel = label;
 }

src/libANGLE/Framebuffer.h

@@ -164,7 +164,7 @@ class Framebuffer final : public angle::ObserverInterface,
     ~Framebuffer() override;
     void onDestroy(const Context *context);
 
-    void setLabel(const std::string &label) override;
+    void setLabel(const Context *context, const std::string &label) override;
     const std::string &getLabel() const override;
 
     rx::FramebufferImpl *getImplementation() const { return mImpl; }

src/libANGLE/Program.cpp

@@ -931,7 +931,7 @@ GLuint Program::id() const
     return mHandle;
 }
 
-void Program::setLabel(const std::string &label)
+void Program::setLabel(const Context *context, const std::string &label)
 {
     ASSERT(mLinkResolved);
     mState.mLabel = label;

src/libANGLE/Program.h

@@ -497,7 +497,7 @@ class Program final : angle::NonCopyable, public LabeledObject
 
     GLuint id() const;
 
-    void setLabel(const std::string &label) override;
+    void setLabel(const Context *context, const std::string &label) override;
     const std::string &getLabel() const override;
 
     ANGLE_INLINE rx::ProgramImpl *getImplementation() const

src/libANGLE/ProgramPipeline.cpp

@@ -39,7 +39,7 @@ ProgramPipeline::~ProgramPipeline()
 
 void ProgramPipeline::onDestroy(const Context *context) {}
 
-void ProgramPipeline::setLabel(const std::string &label)
+void ProgramPipeline::setLabel(const Context *context, const std::string &label)
 {
     mState.mLabel = label;
 }

src/libANGLE/ProgramPipeline.h

@@ -50,7 +50,7 @@ class ProgramPipeline final : public RefCountObject, public LabeledObject
 
     void onDestroy(const Context *context) override;
 
-    void setLabel(const std::string &label) override;
+    void setLabel(const Context *context, const std::string &label) override;
     const std::string &getLabel() const override;
 
     rx::ProgramPipelineImpl *getImplementation() const;

src/libANGLE/Query.cpp

@@ -24,7 +24,7 @@ void Query::onDestroy(const Context *context)
     mQuery->onDestroy(context);
 }
 
-void Query::setLabel(const std::string &label)
+void Query::setLabel(const Context *context, const std::string &label)
 {
     mLabel = label;
 }

src/libANGLE/Query.h

@@ -33,7 +33,7 @@ class Query final : public RefCountObject, public LabeledObject
     ~Query() override;
     void onDestroy(const Context *context) override;
 
-    void setLabel(const std::string &label) override;
+    void setLabel(const Context *context, const std::string &label) override;
     const std::string &getLabel() const override;
 
     angle::Result begin(const Context *context);

src/libANGLE/Renderbuffer.cpp

@@ -82,7 +82,7 @@ void Renderbuffer::onDestroy(const Context *context)
 
 Renderbuffer::~Renderbuffer() {}
 
-void Renderbuffer::setLabel(const std::string &label)
+void Renderbuffer::setLabel(const Context *context, const std::string &label)
 {
     mLabel = label;
 }

src/libANGLE/Renderbuffer.h

@@ -69,7 +69,7 @@ class Renderbuffer final : public RefCountObject, public egl::ImageSibling, publ
 
     void onDestroy(const Context *context) override;
 
-    void setLabel(const std::string &label) override;
+    void setLabel(const Context *context, const std::string &label) override;
     const std::string &getLabel() const override;
 
     angle::Result setStorage(const Context *context,

src/libANGLE/Sampler.cpp

@@ -26,7 +26,7 @@ Sampler::~Sampler()
 
 void Sampler::onDestroy(const Context *context) {}
 
-void Sampler::setLabel(const std::string &label)
+void Sampler::setLabel(const Context *context, const std::string &label)
 {
     mLabel = label;
 }

src/libANGLE/Sampler.h

@@ -32,7 +32,7 @@ class Sampler final : public RefCountObject, public LabeledObject, public angle:
 
     void onDestroy(const Context *context) override;
 
-    void setLabel(const std::string &label) override;
+    void setLabel(const Context *context, const std::string &label) override;
     const std::string &getLabel() const override;
 
     void setMinFilter(GLenum minFilter);

src/libANGLE/Shader.cpp

@@ -186,7 +186,7 @@ Shader::~Shader()
     ASSERT(!mImplementation);
 }
 
-void Shader::setLabel(const std::string &label)
+void Shader::setLabel(const Context *context, const std::string &label)
 {
     mState.mLabel = label;
 }

src/libANGLE/Shader.h

@@ -131,7 +131,7 @@ class Shader final : angle::NonCopyable, public LabeledObject
 
     void onDestroy(const Context *context);
 
-    void setLabel(const std::string &label) override;
+    void setLabel(const Context *context, const std::string &label) override;
     const std::string &getLabel() const override;
 
     ShaderType getType() const { return mType; }

src/libANGLE/Texture.cpp

@@ -627,7 +627,7 @@ Texture::~Texture()
     SafeDelete(mTexture);
 }
 
-void Texture::setLabel(const std::string &label)
+void Texture::setLabel(const Context *context, const std::string &label)
 {
     mLabel = label;
     mDirtyBits.set(DIRTY_BIT_LABEL);

src/libANGLE/Texture.h

@@ -201,7 +201,7 @@ class Texture final : public RefCountObject,
 
     void onDestroy(const Context *context) override;
 
-    void setLabel(const std::string &label) override;
+    void setLabel(const Context *context, const std::string &label) override;
     const std::string &getLabel() const override;
 
     TextureType getType() const { return mState.mType; }

src/libANGLE/TransformFeedback.cpp

@@ -98,7 +98,7 @@ TransformFeedback::~TransformFeedback()
     SafeDelete(mImplementation);
 }
 
-void TransformFeedback::setLabel(const std::string &label)
+void TransformFeedback::setLabel(const Context *context, const std::string &label)
 {
     mState.mLabel = label;
 }

src/libANGLE/TransformFeedback.h

@@ -60,7 +60,7 @@ class TransformFeedback final : public RefCountObject, public LabeledObject
     ~TransformFeedback() override;
     void onDestroy(const Context *context) override;
 
-    void setLabel(const std::string &label) override;
+    void setLabel(const Context *context, const std::string &label) override;
     const std::string &getLabel() const override;
 
     void begin(const Context *context, PrimitiveMode primitiveMode, Program *program);

src/libANGLE/VertexArray.cpp

@@ -127,7 +127,7 @@ GLuint VertexArray::id() const
     return mId;
 }
 
-void VertexArray::setLabel(const std::string &label)
+void VertexArray::setLabel(const Context *context, const std::string &label)
 {
     mState.mLabel = label;
 }

src/libANGLE/VertexArray.h

@@ -106,7 +106,7 @@ class VertexArray final : public angle::ObserverInterface,
 
     GLuint id() const;
 
-    void setLabel(const std::string &label) override;
+    void setLabel(const Context *context, const std::string &label) override;
     const std::string &getLabel() const override;
 
     const VertexBinding &getVertexBinding(size_t bindingIndex) const;