canvas/android: keep GL textures while the app is paused

This resumes the work started 5 years ago by commit e127aeb and finally obsoletes the GLSurfaceListener interface and removes a lot of complexity from the Bitmap class.
XCSoar · Aug 19, 2021 · 6eef309 · 6eef309
1 parent 7400390
commit 6eef309
Show file tree

Hide file tree

Showing 20 changed files with 10 additions and 369 deletions.
diff --git a/build/screen.mk b/build/screen.mk
@@ -112,7 +112,6 @@ SCREEN_SOURCES += \
 	$(CANVAS_SRC_DIR)/opengl/UncompressedImage.cpp \
 	$(CANVAS_SRC_DIR)/opengl/Buffer.cpp \
 	$(CANVAS_SRC_DIR)/opengl/Shapes.cpp \
-	$(CANVAS_SRC_DIR)/opengl/Surface.cpp \
 	$(CANVAS_SRC_DIR)/opengl/Shaders.cpp \
 	$(CANVAS_SRC_DIR)/opengl/CanvasRotateShift.cpp \
 	$(CANVAS_SRC_DIR)/opengl/Triangulate.cpp

diff --git a/src/Android/Main.cpp b/src/Android/Main.cpp
@@ -75,11 +75,6 @@ Copyright_License {
 #include "NunchuckDevice.hpp"
 #include "VoltageDevice.hpp"
 
-#ifndef NDEBUG
-#include "ui/canvas/opengl/Texture.hpp"
-#include "ui/canvas/opengl/Buffer.hpp"
-#endif
-
 #include <cassert>
 #include <stdlib.h>
 
@@ -315,9 +310,6 @@ Java_org_xcsoar_NativeView_pauseNative(JNIEnv *env, jobject obj)
     /* event subsystem is not initialized, there is nothing to pause */
 
   CommonInterface::main_window->Pause();
-
-  assert(num_textures == 0);
-  assert(num_buffers == 0);
 }
 
 gcc_visibility_default

diff --git a/src/Topography/TopographyFileRenderer.cpp b/src/Topography/TopographyFileRenderer.cpp
@@ -65,17 +65,11 @@ TopographyFileRenderer::TopographyFileRenderer(const TopographyFile &_file,
   ResourceId icon_ID = file.GetIcon();
   if (icon_ID.IsDefined())
     icon.LoadResource(icon_ID, file.GetBigIcon());
-
-#ifdef ENABLE_OPENGL
-  AddSurfaceListener(*this);
-#endif
 }
 
 TopographyFileRenderer::~TopographyFileRenderer()
 {
 #ifdef ENABLE_OPENGL
-  RemoveSurfaceListener(*this);
-
   delete array_buffer;
 #endif
 }
@@ -510,19 +504,3 @@ TopographyFileRenderer::PaintLabels(Canvas &canvas,
     }
   }
 }
-
-#ifdef ENABLE_OPENGL
-
-void
-TopographyFileRenderer::SurfaceCreated()
-{
-}
-
-void
-TopographyFileRenderer::SurfaceDestroyed()
-{
-  delete array_buffer;
-  array_buffer = nullptr;
-}
-
-#endif
diff --git a/src/Topography/TopographyFileRenderer.hpp b/src/Topography/TopographyFileRenderer.hpp
@@ -30,7 +30,6 @@ Copyright_License {
 #include "Geo/GeoBounds.hpp"
 
 #ifdef ENABLE_OPENGL
-#include "ui/canvas/opengl/Surface.hpp"
 #else
 #include "ui/canvas/Brush.hpp"
 #include "Topography/ShapeRenderer.hpp"
@@ -51,9 +50,6 @@ struct TopographyLook;
  * Class used to manage and render vector topography layers
  */
 class TopographyFileRenderer final
-#ifdef ENABLE_OPENGL
-  : GLSurfaceListener
-#endif
 {
   const TopographyFile &file;
 
@@ -115,9 +111,6 @@ class TopographyFileRenderer final
 
   void PaintPoint(Canvas &canvas, const WindowProjection &projection,
                   const XShape &shape, const float *opengl_matrix) const;
-
-  virtual void SurfaceCreated() override;
-  virtual void SurfaceDestroyed() override;
 #else
   void PaintPoint(Canvas &canvas, const WindowProjection &projection,
                   const unsigned short *lines, const unsigned short *end_lines,

diff --git a/src/ui/canvas/Bitmap.hpp b/src/ui/canvas/Bitmap.hpp
@@ -34,8 +34,6 @@ Copyright_License {
 #endif
 
 #ifdef ANDROID
-#include "ui/canvas/custom/UncompressedImage.hpp"
-#include "ui/canvas/opengl/Surface.hpp"
 #include <jni.h>
 #endif
 
@@ -65,9 +63,6 @@ using BitmapPixelTraits = BGRAPixelTraits;
  * An image loaded from storage.
  */
 class Bitmap final
-#ifdef ANDROID
-             : private GLSurfaceListener
-#endif
 {
 public:
   enum class Type {
@@ -84,14 +79,6 @@ class Bitmap final
   };
 
 protected:
-#ifdef ANDROID
-  jobject bmp = nullptr;
-
-  UncompressedImage uncompressed;
-
-  Type type;
-#endif
-
 #ifdef ENABLE_OPENGL
   GLTexture *texture = nullptr;
   PixelSize size;
@@ -127,9 +114,7 @@ class Bitmap final
   Bitmap &operator=(const Bitmap &other) = delete;
 public:
   bool IsDefined() const noexcept {
-#ifdef ANDROID
-    return bmp != nullptr || uncompressed.IsDefined();
-#elif defined(ENABLE_OPENGL)
+#ifdef ENABLE_OPENGL
     return texture != nullptr;
 #elif defined(USE_MEMORY_CANVAS)
     return buffer.data != nullptr;
@@ -236,10 +221,6 @@ class Bitmap final
            bool flipped = false) noexcept;
   bool MakeTexture(jobject _bmp, Type _type,
                    bool flipped = false) noexcept;
-
-  /* from GLSurfaceListener */
-  virtual void SurfaceCreated() override;
-  virtual void SurfaceDestroyed() override;
 #endif
 #endif
 };

diff --git a/src/ui/canvas/RawBitmap.hpp b/src/ui/canvas/RawBitmap.hpp
@@ -15,7 +15,6 @@
 #include "util/ByteOrder.hxx"
 
 #ifdef ENABLE_OPENGL
-#include "opengl/Surface.hpp"
 #include "ui/opengl/Features.hpp"
 #endif
 
@@ -87,9 +86,6 @@ struct RawColor
  * This class provides fast drawing methods and offscreen buffer.
  */
 class RawBitmap final
-#ifdef ENABLE_OPENGL
-  :private GLSurfaceListener
-#endif
 {
 protected:
   const unsigned width;
@@ -217,13 +213,6 @@ class RawBitmap final
   void StretchTo(PixelSize src_size,
                  Canvas &dest_canvas, PixelSize dest_size,
                  bool transparent_white=false) const;
-
-#ifdef ENABLE_OPENGL
-private:
-  /* from GLSurfaceListener */
-  void SurfaceCreated() override;
-  void SurfaceDestroyed() override;
-#endif
 };
 
 #endif // !defined(AFX_STSCREENBUFFER_H__22D62F5D_32E2_4785_B3D9_2341C11F84A3__INCLUDED_)
diff --git a/src/ui/canvas/android/Bitmap.cpp b/src/ui/canvas/android/Bitmap.cpp
@@ -23,7 +23,6 @@ Copyright_License {
 
 #include "ui/canvas/Bitmap.hpp"
 #include "ui/canvas/opengl/Texture.hpp"
-#include "ui/canvas/opengl/Surface.hpp"
 #include "Android/Bitmap.hpp"
 #include "Android/NativeView.hpp"
 #include "Android/Main.hpp"
@@ -36,24 +35,6 @@ Bitmap::Bitmap(ResourceId id)
   Load(id);
 }
 
-Bitmap::Bitmap(Bitmap &&src) noexcept
-  :bmp(src.bmp),
-   uncompressed(std::move(src.uncompressed)),
-   type(src.type),
-   texture(src.texture),
-   size(src.size),
-   interpolation(src.interpolation),
-   flipped(src.flipped)
-{
-  src.bmp = nullptr;
-  src.texture = nullptr;
-
-  if (IsDefined()) {
-    RemoveSurfaceListener(src);
-    AddSurfaceListener(*this);
-  }
-}
-
 static const char *
 find_resource_name(unsigned id) noexcept
 {
@@ -75,21 +56,14 @@ LoadResourceBitmap(ResourceId id)
 }
 
 bool
-Bitmap::Set(JNIEnv *env, jobject _bmp, Type _type, bool flipped) noexcept
+Bitmap::Set(JNIEnv *env, jobject bmp, Type type, bool flipped) noexcept
 {
-  assert(bmp == nullptr);
-  assert(_bmp != nullptr);
-
-  bmp = env->NewGlobalRef(_bmp);
-
-  type = _type;
+  assert(bmp != nullptr);
 
   size.width = AndroidBitmap::GetWidth(env, bmp);
   size.height = AndroidBitmap::GetHeight(env, bmp);
 
-  AddSurfaceListener(*this);
-
-  if (surface_valid && !MakeTexture(bmp, type, flipped)) {
+  if (!MakeTexture(bmp, type, flipped)) {
     Reset();
     return false;
   }
@@ -150,42 +124,3 @@ Bitmap::LoadFile(Path path)
 
   return Set(Java::GetEnv(), new_bmp, Type::STANDARD, flipped);
 }
-
-void
-Bitmap::Reset() noexcept
-{
-  if (bmp != nullptr) {
-    auto *env = Java::GetEnv();
-    AndroidBitmap::Recycle(env, bmp);
-    env->DeleteGlobalRef(bmp);
-    bmp = nullptr;
-
-    RemoveSurfaceListener(*this);
-  } else if (uncompressed.IsDefined()) {
-    uncompressed = UncompressedImage();
-    RemoveSurfaceListener(*this);
-  }
-
-  delete texture;
-  texture = nullptr;
-}
-
-void
-Bitmap::SurfaceCreated()
-{
-  assert(bmp != nullptr || uncompressed.IsDefined());
-
-  if (bmp != nullptr)
-    MakeTexture(bmp, type);
-  else if (uncompressed.IsDefined())
-    MakeTexture(uncompressed, type);
-}
-
-void
-Bitmap::SurfaceDestroyed()
-{
-  assert(bmp != nullptr || uncompressed.IsDefined());
-
-  delete texture;
-  texture = nullptr;
-}
diff --git a/src/ui/canvas/opengl/Bitmap.cpp b/src/ui/canvas/opengl/Bitmap.cpp
@@ -28,8 +28,6 @@ Copyright_License {
 #include "Texture.hpp"
 #include "Debug.hpp"
 
-#ifndef ANDROID
-
 Bitmap::Bitmap(Bitmap &&src) noexcept
   :texture(src.texture),
    size(src.size),
@@ -39,8 +37,6 @@ Bitmap::Bitmap(Bitmap &&src) noexcept
   src.texture = nullptr;
 }
 
-#endif /* !ANDROID */
-
 void
 Bitmap::EnableInterpolation() noexcept
 {
@@ -80,31 +76,14 @@ Bitmap::Load(UncompressedImage &&_uncompressed, Type _type)
   size = { _uncompressed.GetWidth(), _uncompressed.GetHeight() };
   flipped = _uncompressed.IsFlipped();
 
-#ifdef ANDROID
-  uncompressed = std::move(_uncompressed);
-  type = _type;
-
-  AddSurfaceListener(*this);
-
-  if (!surface_valid)
-    return true;
-
-  if (!MakeTexture(uncompressed, type)) {
-    Reset();
-    return false;
-  }
-#else
   if (!MakeTexture(_uncompressed, _type)) {
     Reset();
     return false;
   }
-#endif
 
   return true;
 }
 
-#ifndef ANDROID
-
 void
 Bitmap::Reset() noexcept
 {
@@ -114,5 +93,3 @@ Bitmap::Reset() noexcept
   delete texture;
   texture = nullptr;
 }
-
-#endif /* !ANDROID */
diff --git a/src/ui/canvas/opengl/Buffer.cpp b/src/ui/canvas/opengl/Buffer.cpp
@@ -22,7 +22,3 @@ Copyright_License {
 */
 
 #include "Buffer.hpp"
-
-#ifndef NDEBUG
-unsigned num_buffers;
-#endif
diff --git a/src/ui/canvas/opengl/Buffer.hpp b/src/ui/canvas/opengl/Buffer.hpp
@@ -35,10 +35,6 @@ Copyright_License {
 #include <cassert>
 #include <stdlib.h>
 
-#ifndef NDEBUG
-extern unsigned num_buffers;
-#endif
-
 /**
  * This class represents an OpenGL buffer object.
  */
@@ -56,7 +52,6 @@ class GLBuffer {
 
 #ifndef NDEBUG
     p = nullptr;
-    ++num_buffers;
 #endif
   }
 
@@ -66,8 +61,6 @@ class GLBuffer {
   ~GLBuffer() noexcept {
 #ifndef NDEBUG
     assert(p == nullptr);
-    assert(num_buffers > 0);
-    --num_buffers;
 #endif
 
     glDeleteBuffers(1, &id);