removed mutable fields form texture_gles

gaaclarke · gaaclarke · commit e36064c68a4a · 2026-05-11T15:04:20.000-07:00
diff --git a/engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles.cc b/engine/src/flutter/impeller/renderer/backend/gles/buffer_bindings_gles.cc
@@ -474,7 +474,7 @@ std::optional<size_t> BufferBindingsGLES::BindTextures(
     //--------------------------------------------------------------------------
     /// Bind the texture.
     ///
-    if (!texture_gles.Bind()) {
+    if (!const_cast<TextureGLES&>(texture_gles).Bind()) {
       return std::nullopt;
     }
 
diff --git a/engine/src/flutter/impeller/renderer/backend/gles/texture_gles.cc b/engine/src/flutter/impeller/renderer/backend/gles/texture_gles.cc
@@ -349,7 +349,7 @@ TextureGLES::Type TextureGLES::ComputeTypeForBinding(GLenum target) const {
   return type_;
 }
 
-void TextureGLES::InitializeContentsIfNecessary() const {
+void TextureGLES::InitializeContentsIfNecessary() {
   if (!IsValid() || slices_initialized_[0]) {
     return;
   }
@@ -450,7 +450,7 @@ std::optional<GLuint> TextureGLES::GetGLHandle() const {
   return reactor_->GetGLHandle(handle_);
 }
 
-bool TextureGLES::Bind() const {
+bool TextureGLES::Bind() {
   auto handle = GetGLHandle();
   if (!handle.has_value()) {
     return false;
@@ -491,7 +491,7 @@ void TextureGLES::MarkContentsInitialized() {
   }
 }
 
-void TextureGLES::MarkSliceInitialized(size_t slice) const {
+void TextureGLES::MarkSliceInitialized(size_t slice) {
   slices_initialized_[slice] = true;
 }
 
@@ -548,9 +548,8 @@ static GLenum ToAttachmentType(TextureGLES::AttachmentType point) {
   }
 }
 
-bool TextureGLES::SetAsFramebufferAttachment(
-    GLenum target,
-    AttachmentType attachment_type) const {
+bool TextureGLES::SetAsFramebufferAttachment(GLenum target,
+                                             AttachmentType attachment_type) {
   if (!IsValid()) {
     return false;
   }
diff --git a/engine/src/flutter/impeller/renderer/backend/gles/texture_gles.h b/engine/src/flutter/impeller/renderer/backend/gles/texture_gles.h
@@ -87,7 +87,7 @@ class TextureGLES final : public Texture,
 
   std::optional<GLuint> GetGLHandle() const;
 
-  [[nodiscard]] bool Bind() const;
+  [[nodiscard]] bool Bind();
 
   [[nodiscard]] bool GenerateMipmap();
 
@@ -96,9 +96,8 @@ class TextureGLES final : public Texture,
     kDepth,
     kStencil,
   };
-  [[nodiscard]] bool SetAsFramebufferAttachment(
-      GLenum target,
-      AttachmentType attachment_type) const;
+  [[nodiscard]] bool SetAsFramebufferAttachment(GLenum target,
+                                                AttachmentType attachment_type);
 
   Type GetType() const;
 
@@ -126,7 +125,7 @@ class TextureGLES final : public Texture,
   ///
   /// @param[in]  slice  The slice to mark as being initialized.
   ///
-  void MarkSliceInitialized(size_t slice) const;
+  void MarkSliceInitialized(size_t slice);
 
   bool IsSliceInitialized(size_t slice) const;
 
@@ -157,8 +156,8 @@ class TextureGLES final : public Texture,
   std::shared_ptr<ReactorGLES> reactor_;
   const Type type_;
   HandleGLES handle_;
-  mutable std::optional<HandleGLES> fence_ = std::nullopt;
-  mutable std::bitset<6> slices_initialized_ = 0;
+  std::optional<HandleGLES> fence_ = std::nullopt;
+  std::bitset<6> slices_initialized_ = 0;
   const bool is_wrapped_;
   const std::optional<GLuint> wrapped_fbo_;
   HandleGLES cached_fbo_ = HandleGLES::DeadHandle();
@@ -191,7 +190,7 @@ class TextureGLES final : public Texture,
   // |Texture|
   Scalar GetYCoordScale() const override;
 
-  void InitializeContentsIfNecessary() const;
+  void InitializeContentsIfNecessary();
 
   TextureGLES(const TextureGLES&) = delete;
 

Original file line number	Diff line number	Diff line change
`@@ -474,7 +474,7 @@ std::optional<size_t> BufferBindingsGLES::BindTextures(`
`474`	`474`	`//--------------------------------------------------------------------------`
`475`	`475`	`/// Bind the texture.`
`476`	`476`	`///`
`477`		`- if (!texture_gles.Bind()) {`
	`477`	`+ if (!const_cast<TextureGLES&>(texture_gles).Bind()) {`
`478`	`478`	`return std::nullopt;`
`479`	`479`	`}`
`480`	`480`
Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ TextureGLES::Type TextureGLES::ComputeTypeForBinding(GLenum target) const {`
`349`	`349`	`return type_;`
`350`	`350`	`}`
`351`	`351`
`352`		`-void TextureGLES::InitializeContentsIfNecessary() const {`
	`352`	`+void TextureGLES::InitializeContentsIfNecessary() {`
`353`	`353`	`if (!IsValid() \|\| slices_initialized_[0]) {`
`354`	`354`	`return;`
`355`	`355`	`}`
`@@ -450,7 +450,7 @@ std::optional<GLuint> TextureGLES::GetGLHandle() const {`
`450`	`450`	`return reactor_->GetGLHandle(handle_);`
`451`	`451`	`}`
`452`	`452`
`453`		`-bool TextureGLES::Bind() const {`
	`453`	`+bool TextureGLES::Bind() {`
`454`	`454`	`auto handle = GetGLHandle();`
`455`	`455`	`if (!handle.has_value()) {`
`456`	`456`	`return false;`
`@@ -491,7 +491,7 @@ void TextureGLES::MarkContentsInitialized() {`
`491`	`491`	`}`
`492`	`492`	`}`
`493`	`493`
`494`		`-void TextureGLES::MarkSliceInitialized(size_t slice) const {`
	`494`	`+void TextureGLES::MarkSliceInitialized(size_t slice) {`
`495`	`495`	`slices_initialized_[slice] = true;`
`496`	`496`	`}`
`497`	`497`
`@@ -548,9 +548,8 @@ static GLenum ToAttachmentType(TextureGLES::AttachmentType point) {`
`548`	`548`	`}`
`549`	`549`	`}`
`550`	`550`
`551`		`-bool TextureGLES::SetAsFramebufferAttachment(`
`552`		`- GLenum target,`
`553`		`- AttachmentType attachment_type) const {`
	`551`	`+bool TextureGLES::SetAsFramebufferAttachment(GLenum target,`
	`552`	`+ AttachmentType attachment_type) {`
`554`	`553`	`if (!IsValid()) {`
`555`	`554`	`return false;`
`556`	`555`	`}`