[impeller] Add missing pieces to the OpenGLES backend. (flutter#33223)

chinmaygarde · web-flow · commit 0b5a6a95259b · 2022-05-09T23:59:04.000-07:00
diff --git a/impeller/playground/imgui/imgui_impl_impeller.cc b/impeller/playground/imgui/imgui_impl_impeller.cc
@@ -78,6 +78,7 @@ bool ImGui_ImplImpeller_Init(std::shared_ptr<impeller::Context> context) {
         impeller::StorageMode::kHostVisible, texture_descriptor);
     IM_ASSERT(bd->font_texture != nullptr &&
               "Could not allocate ImGui font texture.");
+    bd->font_texture->SetLabel("ImGui Font Texture");
 
     [[maybe_unused]] bool uploaded = bd->font_texture->SetContents(
         pixels, texture_descriptor.GetByteSizeOfBaseMipLevel());
diff --git a/impeller/playground/playground.cc b/impeller/playground/playground.cc
@@ -203,6 +203,7 @@ bool Playground::OpenPlaygroundHere(Renderer::RenderCallback render_callback) {
       []() { ImGui_ImplImpeller_Shutdown(); });
 
   ::glfwSetWindowSize(window, GetWindowSize().width, GetWindowSize().height);
+  ::glfwSetWindowPos(window, 200, 100);
   ::glfwShowWindow(window);
 
   while (true) {
diff --git a/impeller/renderer/backend/gles/buffer_bindings_gles.cc b/impeller/renderer/backend/gles/buffer_bindings_gles.cc
@@ -4,6 +4,7 @@
 
 #include "impeller/renderer/backend/gles/buffer_bindings_gles.h"
 
+#include <algorithm>
 #include <sstream>
 
 #include "impeller/base/config.h"
@@ -21,7 +22,14 @@ BufferBindingsGLES::~BufferBindingsGLES() = default;
 
 bool BufferBindingsGLES::RegisterVertexStageInput(
     const ProcTableGLES& gl,
-    const std::vector<ShaderStageIOSlot>& inputs) {
+    const std::vector<ShaderStageIOSlot>& p_inputs) {
+  // Attrib locations have to be iterated over in order of location because we
+  // will be calculating offsets later.
+  auto inputs = p_inputs;
+  std::sort(inputs.begin(), inputs.end(), [](const auto& lhs, const auto& rhs) {
+    return lhs.location < rhs.location;
+  });
+
   std::vector<VertexAttribPointer> vertex_attrib_arrays;
   size_t offset = 0u;
   for (const auto& input : inputs) {
diff --git a/impeller/renderer/backend/gles/device_buffer_gles.cc b/impeller/renderer/backend/gles/device_buffer_gles.cc
@@ -21,7 +21,7 @@ DeviceBufferGLES::DeviceBufferGLES(ReactorGLES::Ref reactor,
 
 // |DeviceBuffer|
 DeviceBufferGLES::~DeviceBufferGLES() {
-  if (!reactor_) {
+  if (!handle_.IsDead()) {
     reactor_->CollectHandle(handle_);
   }
 }
diff --git a/impeller/renderer/backend/gles/gles_handle.h b/impeller/renderer/backend/gles/gles_handle.h
@@ -21,6 +21,8 @@ enum class HandleType {
   kTexture,
   kBuffer,
   kProgram,
+  kRenderBuffer,
+  kFrameBuffer,
 };
 
 class ReactorGLES;
diff --git a/impeller/renderer/backend/gles/proc_table_gles.cc b/impeller/renderer/backend/gles/proc_table_gles.cc
@@ -6,6 +6,7 @@
 
 #include <sstream>
 
+#include "impeller/base/comparable.h"
 #include "impeller/base/validation.h"
 
 namespace impeller {
@@ -43,6 +44,10 @@ ProcTableGLES::Resolver WrappedResolver(ProcTableGLES::Resolver resolver) {
       auto truncated = function.substr(0u, function.size() - 3);
       return resolver(truncated.c_str());
     }
+    if (function.find("EXT", function.size() - 3) != std::string::npos) {
+      auto truncated = function.substr(0u, function.size() - 3);
+      return resolver(truncated.c_str());
+    }
     return nullptr;
   };
 }
@@ -95,6 +100,12 @@ ProcTableGLES::ProcTableGLES(Resolver resolver) {
     PushDebugGroupKHR.Reset();
     PopDebugGroupKHR.Reset();
     ObjectLabelKHR.Reset();
+  } else {
+    GetIntegerv(GL_MAX_LABEL_LENGTH_KHR, &debug_label_max_length_);
+  }
+
+  if (!description_->HasExtension("GL_EXT_discard_framebuffer")) {
+    DiscardFramebufferEXT.Reset();
   }
 
   is_valid_ = true;
@@ -223,27 +234,30 @@ bool ProcTableGLES::IsCurrentFramebufferComplete() const {
 static std::optional<GLenum> ToDebugIdentifier(DebugResourceType type) {
   switch (type) {
     case DebugResourceType::kTexture:
-      // No entry in GL_KHR_debug headers.
-      return std::nullopt;
+      return GL_TEXTURE;
     case DebugResourceType::kBuffer:
       return GL_BUFFER_KHR;
     case DebugResourceType::kProgram:
       return GL_PROGRAM_KHR;
     case DebugResourceType::kShader:
       return GL_SHADER_KHR;
+    case DebugResourceType::kRenderBuffer:
+      return GL_RENDERBUFFER;
+    case DebugResourceType::kFrameBuffer:
+      return GL_FRAMEBUFFER;
   }
   FML_UNREACHABLE();
 }
 
 void ProcTableGLES::SetDebugLabel(DebugResourceType type,
                                   GLint name,
                                   const std::string& label) const {
-  if (!ObjectLabelKHR.IsAvailable()) {
+  if (debug_label_max_length_ <= 0) {
     return;
   }
   const auto identifier = ToDebugIdentifier(type);
   const auto label_length =
-      std::min<GLsizei>(GL_MAX_LABEL_LENGTH_KHR - 1, label.size());
+      std::min<GLsizei>(debug_label_max_length_ - 1, label.size());
   if (!identifier.has_value()) {
     return;
   }
@@ -254,4 +268,25 @@ void ProcTableGLES::SetDebugLabel(DebugResourceType type,
   );
 }
 
+void ProcTableGLES::PushDebugGroup(const std::string& label) const {
+  if (debug_label_max_length_ <= 0) {
+    return;
+  }
+  UniqueID id;
+  const auto label_length =
+      std::min<GLsizei>(debug_label_max_length_ - 1, label.size());
+  PushDebugGroupKHR(GL_DEBUG_SOURCE_APPLICATION_KHR,  // source
+                    static_cast<GLuint>(id.id),       // id
+                    label_length,                     // length
+                    label.data()                      // message
+  );
+}
+
+void ProcTableGLES::PopDebugGroup() const {
+  if (debug_label_max_length_ <= 0) {
+    return;
+  }
+  PopDebugGroupKHR();
+}
+
 }  // namespace impeller
diff --git a/impeller/renderer/backend/gles/proc_table_gles.h b/impeller/renderer/backend/gles/proc_table_gles.h
@@ -80,6 +80,8 @@ struct GLProc {
   PROC(AttachShader);                        \
   PROC(BindAttribLocation);                  \
   PROC(BindBuffer);                          \
+  PROC(BindFramebuffer);                     \
+  PROC(BindRenderbuffer);                    \
   PROC(BindTexture);                         \
   PROC(BlendEquationSeparate);               \
   PROC(BlendFuncSeparate);                   \
@@ -95,7 +97,9 @@ struct GLProc {
   PROC(CreateShader);                        \
   PROC(CullFace);                            \
   PROC(DeleteBuffers);                       \
+  PROC(DeleteFramebuffers);                  \
   PROC(DeleteProgram);                       \
+  PROC(DeleteRenderbuffers);                 \
   PROC(DeleteShader);                        \
   PROC(DeleteTextures);                      \
   PROC(DepthFunc);                           \
@@ -107,8 +111,12 @@ struct GLProc {
   PROC(DrawElements);                        \
   PROC(Enable);                              \
   PROC(EnableVertexAttribArray);             \
+  PROC(FramebufferRenderbuffer);             \
+  PROC(FramebufferTexture2D);                \
   PROC(FrontFace);                           \
   PROC(GenBuffers);                          \
+  PROC(GenFramebuffers);                     \
+  PROC(GenRenderbuffers);                    \
   PROC(GenTextures);                         \
   PROC(GetActiveUniform);                    \
   PROC(GetBooleanv);                         \
@@ -123,6 +131,7 @@ struct GLProc {
   PROC(IsFramebuffer);                       \
   PROC(IsProgram);                           \
   PROC(LinkProgram);                         \
+  PROC(RenderbufferStorage);                 \
   PROC(Scissor);                             \
   PROC(ShaderBinary);                        \
   PROC(ShaderSource);                        \
@@ -141,6 +150,7 @@ struct GLProc {
   PROC(Viewport);
 
 #define FOR_EACH_IMPELLER_EXT_PROC(PROC) \
+  PROC(DiscardFramebufferEXT);           \
   PROC(PushDebugGroupKHR);               \
   PROC(PopDebugGroupKHR);                \
   PROC(ObjectLabelKHR);
@@ -150,6 +160,8 @@ enum class DebugResourceType {
   kBuffer,
   kProgram,
   kShader,
+  kRenderBuffer,
+  kFrameBuffer,
 };
 
 class ProcTableGLES {
@@ -181,9 +193,14 @@ class ProcTableGLES {
                      GLint name,
                      const std::string& label) const;
 
+  void PushDebugGroup(const std::string& string) const;
+
+  void PopDebugGroup() const;
+
  private:
   bool is_valid_ = false;
   std::unique_ptr<GLDescription> description_;
+  GLint debug_label_max_length_ = 0;
 
   FML_DISALLOW_COPY_AND_ASSIGN(ProcTableGLES);
 };
diff --git a/impeller/renderer/backend/gles/reactor_gles.cc b/impeller/renderer/backend/gles/reactor_gles.cc
@@ -66,6 +66,12 @@ static std::optional<GLuint> CreateGLHandle(const ProcTableGLES& gl,
       return handle;
     case HandleType::kProgram:
       return gl.CreateProgram();
+    case HandleType::kRenderBuffer:
+      gl.GenRenderbuffers(1u, &handle);
+      return handle;
+    case HandleType::kFrameBuffer:
+      gl.GenFramebuffers(1u, &handle);
+      return handle;
   }
   return std::nullopt;
 }
@@ -85,6 +91,12 @@ static bool CollectGLHandle(const ProcTableGLES& gl,
     case HandleType::kProgram:
       gl.DeleteProgram(handle);
       return true;
+    case HandleType::kRenderBuffer:
+      gl.DeleteRenderbuffers(1u, &handle);
+      return true;
+    case HandleType::kFrameBuffer:
+      gl.DeleteFramebuffers(1u, &handle);
+      return true;
   }
   return false;
 }
@@ -135,6 +147,10 @@ static DebugResourceType ToDebugResourceType(HandleType type) {
       return DebugResourceType::kBuffer;
     case HandleType::kProgram:
       return DebugResourceType::kProgram;
+    case HandleType::kRenderBuffer:
+      return DebugResourceType::kRenderBuffer;
+    case HandleType::kFrameBuffer:
+      return DebugResourceType::kFrameBuffer;
   }
   FML_UNREACHABLE();
 }
@@ -213,6 +229,17 @@ void ReactorGLES::SetDebugLabel(const GLESHandle& handle, std::string label) {
   if (handle.IsDead()) {
     return;
   }
+  if (in_reaction_) {
+    if (auto found = live_gl_handles_.find(handle);
+        found != live_gl_handles_.end() && found->second.has_value()) {
+      GetProcTable().SetDebugLabel(
+          ToDebugResourceType(found->first.type),  // type
+          found->second.value(),                   // name
+          label                                    // label
+      );
+      return;
+    }
+  }
   pending_debug_labels_[handle] = std::move(label);
 }
 
diff --git a/impeller/renderer/backend/gles/render_pass_gles.cc b/impeller/renderer/backend/gles/render_pass_gles.cc
diff --git a/impeller/renderer/backend/gles/surface_gles.cc b/impeller/renderer/backend/gles/surface_gles.cc
diff --git a/impeller/renderer/backend/gles/texture_gles.cc b/impeller/renderer/backend/gles/texture_gles.cc
diff --git a/impeller/renderer/backend/gles/texture_gles.h b/impeller/renderer/backend/gles/texture_gles.h

Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ DeviceBufferGLES::DeviceBufferGLES(ReactorGLES::Ref reactor,`
`21`	`21`
`22`	`22`	`// \|DeviceBuffer\|`
`23`	`23`	`DeviceBufferGLES::~DeviceBufferGLES() {`
`24`		`- if (!reactor_) {`
	`24`	`+ if (!handle_.IsDead()) {`
`25`	`25`	`reactor_->CollectHandle(handle_);`
`26`	`26`	`}`
`27`	`27`	`}`