SDL: revert back to surface drawing for performance

Author: chrisws

Makefile.am

@@ -14,40 +14,14 @@ EXTRA_DIST =                                    \
     NEWS                                        \
     README                                      \
     autogen.sh                                  \
-    src/platform/gtk/sbgtk.glade                \
-    src/platform/gtk/sbgtk.gladep               \
-    src/platform/gtk/debian/changelog           \
-    src/platform/gtk/debian/control             \
-    src/platform/gtk/debian/copyright           \
-    src/platform/gtk/debian/rules               \
-    src/platform/gtk/debian/sbasic.links        \
-    src/platform/sdl/fonts/BI1.c                \
-    src/platform/sdl/fonts/BI2.c                \
-    src/platform/sdl/fonts/BI5.c                \
-    src/platform/sdl/fonts/BI7.c                \
-    src/platform/sdl/fonts/psf2c.c              \
     documentation/export_csv.bas                \
     documentation/sbasic_ref.csv                \
     documentation/HOWTO/HOWTO-DOCUMENT.TXT      \
     documentation/HOWTO/HOWTO-PORT.TXT          \
     documentation/HOWTO/DEVELOP.TXT             \
     documentation/LICENSE                       \
     documentation/README                        \
-    documentation/README.BCC                    \
-    documentation/README.DEV                    \
-    documentation/README.DOS                    \
-    documentation/README.HELIO                  \
-    documentation/README.PALM                   \
     documentation/README.UNIX                   \
-    plugins/publish.bas                         \
-    plugins/comment_in.bas                      \
-    plugins/comment_out.bas                     \
-    plugins/dos2unix.bas                        \
-    plugins/indent.bas                          \
-    plugins/help.bas                            \
-    translator/SB.g                             \
-    translator/Makefile                         \
-    translator/Translator.java                  \
     images/logo.gif                             \
     images/sb16x16.png                          \
     images/sb32x32.png                          \

src/lib/maapi.h

@@ -160,16 +160,6 @@ void maDrawText(int left, int top, const char *str, int length);
  */
 void maUpdateScreen(void);
 
-/**
- * Normally, a phone's backlight turns itself off after
- * a few seconds of the user not pressing any keys.
- * To avoid this behaviour, call this function periodically.
- * As the timeout period is different for every device, and sometimes even user-configurable,
- * it's recommended that you call this function at least once every 500 milliseconds
- * to ensure that the light stays on at all times.
- */
-void maResetBacklight(void);
-
 /**
  * Returns the size in pixels of Latin-1 text as it would appear on-screen.
  */

src/platform/android/jni/display.cpp

@@ -15,20 +15,20 @@
 #define FONT_FACE_REGULAR "Envy Code R.ttf"
 #define FONT_FACE_BOLD    "Envy Code R Bold.ttf"
 
-extern common::Graphics *graphics;
+extern ui::Graphics *graphics;
 
 //
 // Canvas implementation
 //
 Canvas::Canvas() :
-  _canvas(NULL),
+  _pixels(NULL),
   _clip(NULL) {
 }
 
 Canvas::~Canvas() {
-  delete _canvas;
+  delete _pixels;
   delete _clip;
-  _canvas = NULL;
+  _pixels = NULL;
   _clip = NULL;
 }
 
@@ -37,17 +37,17 @@ bool Canvas::create(int w, int h) {
   bool result;
   _w = w;
   _h = h;
-  _canvas = new pixel_t[w * h];
-  if (_canvas) {
-    memset(_canvas, 0, w * h);
+  _pixels = new pixel_t[w * h];
+  if (_pixels) {
+    memset(_pixels, 0, w * h);
     result = true;
   } else {
     result = false;
   }
   return result;
 }
 
-void Canvas::copy(Canvas *src, const MARect *srcRect, int destX, int destY) {
+void Canvas::drawRegion(Canvas *src, const MARect *srcRect, int destX, int destY) {
   int srcH = srcRect->height;
   if (srcRect->top + srcRect->height > src->_h) {
     srcH = src->_h - srcRect->top;
@@ -59,6 +59,40 @@ void Canvas::copy(Canvas *src, const MARect *srcRect, int destX, int destY) {
   }
 }
 
+void Canvas::fillRect(int left, int top, int width, int height, pixel_t drawColor) {
+  int dtX = x();
+  int dtY = y();
+  uint8_t dR, dG, dB;
+
+  GET_RGB(drawColor, dR, dG, dB);
+  if (left == 0 && _w == width && top < _h && top > -1 &&
+      dR == dG && dR == dB) {
+    // contiguous block of uniform colour
+    unsigned blockH = height;
+    if (top + height > _h) {
+      blockH = height - top;
+    }
+    memset(getLine(top), drawColor, width * blockH);
+  } else {
+    for (int y = 0; y < height; y++) {
+      int posY = y + top;
+      if (posY == _h) {
+        break;
+      } else if (posY >= dtY) {
+        pixel_t *line = getLine(posY);
+        for (int x = 0; x < width; x++) {
+          int posX = x + left;
+          if (posX == _w) {
+            break;
+          } else if (posX >= dtX) {
+            line[posX] = drawColor;
+          }
+        }
+      }
+    }
+  }
+}
+
 void Canvas::setClip(int x, int y, int w, int h) {
   delete _clip;
   if (x != 0 || y != 0 || _w != w || _h != h) {
@@ -75,10 +109,12 @@ void Canvas::setClip(int x, int y, int w, int h) {
 //
 // Graphics implementation
 //
-Graphics::Graphics(android_app *app) : common::Graphics(),
+Graphics::Graphics(android_app *app) : ui::Graphics(),
   _fontBuffer(NULL),
   _fontBufferB(NULL),
-  _app(app) {
+  _app(app),
+  _w(0),
+  _h(0) {
 }
 
 Graphics::~Graphics() {
@@ -99,7 +135,7 @@ bool Graphics::construct() {
   bool result = false;
   if (loadFonts()) {
     _screen = new Canvas();
-    if (_screen && _screen->create(getWidth(), getHeight())) {
+    if (_screen && _screen->create(_w, _h)) {
       _drawTarget = _screen;
       maSetColor(DEFAULT_BACKGROUND);
 #if defined(PIXELFORMAT_RGBA8888)
@@ -140,7 +176,7 @@ void Graphics::redraw() {
 void Graphics::resize() {
   delete _screen;
   _screen = new Canvas();
-  _screen->create(getWidth(), getHeight());
+  _screen->create(_w, _h);
   _drawTarget = NULL;
 }
 

src/platform/android/jni/display.h

@@ -18,13 +18,14 @@
 
 using namespace strlib;
 
-struct Graphics : common::Graphics {
+struct Graphics : ui::Graphics {
   Graphics(android_app *app);
   virtual ~Graphics();
 
   bool construct();
   void redraw();
   void resize();
+  void setSize(int w, int h) { _w = w; _h = h; }
 
 private:
   bool loadFonts();
@@ -33,6 +34,7 @@ struct Graphics : common::Graphics {
   FT_Byte *_fontBuffer;
   FT_Byte *_fontBufferB;
   android_app *_app;
+  int _w, _h;
 };
 
 #endif

src/platform/sdl/display.cpp

@@ -11,24 +11,24 @@
 #include "ui/utils.h"
 #include "platform/sdl/display.h"
 
-extern common::Graphics *graphics;
+extern ui::Graphics *graphics;
 
-#if defined(PIXELFORMAT_RGB565)
-#define PIXEL_FORMAT SDL_PIXELFORMAT_RGB565
-#else
-#define PIXEL_FORMAT SDL_PIXELFORMAT_RGB888
-#endif
+#define PIXELFORMAT SDL_PIXELFORMAT_RGB888
 
 //
 // Canvas implementation
 //
 Canvas::Canvas() :
+  _w(0),
+  _h(0),
+  _ownerSurface(false),
+  _pixels(NULL),
   _surface(NULL),
   _clip(NULL) {
 }
 
 Canvas::~Canvas() {
-  if (_surface != NULL) {
+  if (_surface != NULL && _ownerSurface) {
     SDL_FreeSurface(_surface);
   }
   delete _clip;
@@ -42,12 +42,14 @@ bool Canvas::create(int w, int h) {
   _h = h;
   int bpp;
   Uint32 rmask, gmask, bmask, amask;
-  SDL_PixelFormatEnumToMasks(PIXEL_FORMAT, &bpp, &rmask, &gmask, &bmask, &amask);
+  SDL_PixelFormatEnumToMasks(PIXELFORMAT, &bpp, &rmask, &gmask, &bmask, &amask);
+  _ownerSurface = true;
   _surface = SDL_CreateRGBSurface(0, w, h, bpp, rmask, gmask, bmask, amask);
+  _pixels = (pixel_t *)_surface->pixels;
   return _surface != NULL;
 }
 
-void Canvas::copy(Canvas *src, const MARect *srcRect, int destX, int destY) {
+void Canvas::drawRegion(Canvas *src, const MARect *srcRect, int destX, int destY) {
   SDL_Rect srcrect;
   srcrect.x = srcRect->left;
   srcrect.y = srcRect->top;
@@ -63,9 +65,13 @@ void Canvas::copy(Canvas *src, const MARect *srcRect, int destX, int destY) {
   SDL_BlitSurface(src->_surface, &srcrect, _surface, &dstrect);
 }
 
-pixel_t *Canvas::getLine(int y) {
-  pixel_t *pixels = (pixel_t *)_surface->pixels;
-  return pixels + (y * _w);
+void Canvas::fillRect(int x, int y, int w, int h, pixel_t color) {
+  SDL_Rect rect;
+  rect.x = x;
+  rect.y = y;
+  rect.w = w;
+  rect.h = h;
+  SDL_FillRect(_surface, &rect, color);
 }
 
 void Canvas::setClip(int x, int y, int w, int h) {
@@ -81,60 +87,78 @@ void Canvas::setClip(int x, int y, int w, int h) {
   }
 }
 
+void Canvas::setSurface(SDL_Surface *surface, int w, int h) {
+  _surface = surface;
+  _pixels = (pixel_t *)_surface->pixels;
+  _ownerSurface = false;
+  _w = w;
+  _h = h;
+}
+
 //
 // Graphics implementation
 //
-Graphics::Graphics(SDL_Window *window) : common::Graphics(),
-  _renderer(NULL),
-  _texture(NULL),
-  _window(window) {
+Graphics::Graphics(SDL_Window *window) : ui::Graphics(),
+  _window(window),
+  _surface(NULL) {
 }
 
 Graphics::~Graphics() {
   logEntered();
-  SDL_DestroyTexture(_texture);
-  SDL_DestroyRenderer(_renderer);
 }
 
 bool Graphics::construct(const char *font, const char *boldFont) {
   logEntered();
 
+  int w, h;
   bool result = false;
-  SDL_GetWindowSize(_window, &_w, &_h);
-  _renderer = SDL_CreateRenderer(_window, -1, 0);
-  if (_renderer != NULL) {
-    _texture = SDL_CreateTexture(_renderer, PIXEL_FORMAT,
-                                 SDL_TEXTUREACCESS_STREAMING, _w, _h);
+  SDL_GetWindowSize(_window, &w, &h);
+
+  SDL_Surface *surface = SDL_GetWindowSurface(_window);
+  if (surface->format->format != PIXELFORMAT) {
+    deviceLog("Unexpected window surface format %d", surface->format->format);
+    _surface = surface;
   }
-  if (_texture != NULL && loadFonts(font, boldFont)) {
+
+  if (loadFonts(font, boldFont)) {
     _screen = new Canvas();
-    if (_screen && _screen->create(getWidth(), getHeight())) {
+    result = _screen != NULL;
+    if (result) {
+      if (_surface == NULL) {
+        _screen->setSurface(SDL_GetWindowSurface(_window), w, h);
+      } else {
+        result = _screen->create(w, h);
+      }
+    }
+    if (result) {
       _drawTarget = _screen;
       maSetColor(DEFAULT_BACKGROUND);
-      result = true;
     }
   }
   return result;
 }
 
 void Graphics::redraw() {
-  SDL_UpdateTexture(_texture, NULL, _screen->_surface->pixels, _w * sizeof (pixel_t));
-  SDL_RenderClear(_renderer);
-  SDL_RenderCopy(_renderer, _texture, NULL, NULL);
-  SDL_RenderPresent(_renderer);
+  if (_surface != NULL) {
+    SDL_Surface *src = ((Canvas *)_screen)->_surface;
+    SDL_BlitSurface(src, NULL, _surface, NULL);
+  }
+  SDL_UpdateWindowSurface(_window);
 }
 
-void Graphics::resize() {
+void Graphics::resize(int w, int h) {
   logEntered();
-  bool drawScreen = (_drawTarget == _screen);
-  delete _screen;
-  _screen = new ::Canvas();
-  _screen->create(getWidth(), getHeight());
-  _drawTarget = drawScreen ? _screen : NULL;
-
-  SDL_DestroyTexture(_texture);
-  _texture = SDL_CreateTexture(_renderer, PIXEL_FORMAT,
-                               SDL_TEXTUREACCESS_STREAMING, _w, _h);
+  SDL_Surface *surface = SDL_GetWindowSurface(_window);
+  if (_surface == NULL) {
+    _screen->setSurface(surface, w, h);
+  } else {
+    bool drawScreen = (_drawTarget == _screen);
+    delete _screen;
+    _screen = new ::Canvas();
+    _screen->create(w, h);
+    _drawTarget = drawScreen ? _screen : NULL;
+    _surface = surface;
+  }
 }
 
 bool Graphics::loadFonts(const char *font, const char *boldFont) {