SDL: minor performance changes

Author: chrisws

configure.ac

@@ -218,7 +218,7 @@ function buildSDL() {
      PACKAGE_LIBS="${PACKAGE_LIBS} ${FONTCONFIG_LIBS}"
    esac
 
-   PACKAGE_CFLAGS="${PACKAGE_CFLAGS} `sdl2-config --cflags` `freetype-config --cflags`"
+   PACKAGE_CFLAGS="${PACKAGE_CFLAGS} `sdl2-config --cflags` `freetype-config --cflags` -fno-exceptions"
    case "${host_os}" in
      *mingw*)
      PACKAGE_LIBS="-Wl,-Bstatic ${PACKAGE_LIBS} `sdl2-config --static-libs` `freetype-config --libs`"

src/platform/android/jni/display.cpp

@@ -47,6 +47,19 @@ bool Canvas::create(int w, int h) {
   return result;
 }
 
+void Canvas::copy(Canvas *src, const MAPoint2d *dstPoint, const MARect *srcRect) {
+  int destY = dstPoint->y;
+  int srcH = srcRect->height;
+  if (srcRect->top + srcRect->height > src->_h) {
+    srcH = src->_h - srcRect->top;
+  }
+  for (int y = 0; y < srcH && destY < _h; y++, destY++) {
+    pixel_t *line = src->getLine(y + srcRect->top) + srcRect->left;
+    pixel_t *dstLine = getLine(destY) + dstPoint->x;
+    memcpy(dstLine, line, srcRect->width * sizeof(pixel_t));
+  }
+}
+
 void Canvas::setClip(int x, int y, int w, int h) {
   delete _clip;
   if (x != 0 || y != 0 || _w != w || _h != h) {

src/platform/android/jni/runtime.cpp

@@ -189,7 +189,7 @@ void Runtime::alert(const char *title, const char *message) {
   _app->activity->vm->DetachCurrentThread();
 }
 
-int Runtime::ask(const char *title, const char *prompt, bool cancel) {,
+int Runtime::ask(const char *title, const char *prompt, bool cancel) {
   JNIEnv *env;
   _app->activity->vm->AttachCurrentThread(&env, NULL);
   jclass clazz = env->GetObjectClass(_app->activity->clazz);

src/platform/android/jni/runtime.h

@@ -21,8 +21,8 @@ struct Runtime : public System {
   Runtime(android_app *app);
   virtual ~Runtime();
 
-  void alert(const char *title, const char *message, bool cancel);
-  int ask(const char *title, const char *prompt);
+  void alert(const char *title, const char *message);
+  int ask(const char *title, const char *prompt, bool cancel);
   void clearSoundQueue();
   void construct();
   bool getUntrusted();

src/platform/sdl/display.cpp

@@ -46,6 +46,22 @@ bool Canvas::create(int w, int h) {
   return _canvas != NULL;
 }
 
+void Canvas::copy(Canvas *src, const MARect *srcRect, int dstx, int dsty) {
+  SDL_Rect srcrect;
+  srcrect.x = srcRect->left;
+  srcrect.y = srcRect->top;
+  srcrect.w = srcRect->width;
+  srcrect.h = srcRect->height;
+
+  SDL_Rect dstrect;
+  dstrect.x = dstx;
+  dstrect.y = dsty;
+  dstrect.w = _w;
+  dstrect.h = _h;
+
+  SDL_BlitSurface(src->_canvas, &srcrect, _canvas, &dstrect);
+}
+
 pixel_t *Canvas::getLine(int y) { 
   pixel_t *pixels = (pixel_t *)_canvas->pixels;
   return pixels + (y * _w); 

src/ui/canvas.h

@@ -24,6 +24,7 @@ struct Canvas {
   virtual ~Canvas();
 
   bool create(int w, int h);
+  void copy(Canvas *src, const MARect *srcRect, int dstx, int dsty);
   void setClip(int x, int y, int w, int h);
   pixel_t *getLine(int y);
   int x() { return _clip ? _clip->x : 0; }
@@ -46,6 +47,7 @@ struct Canvas {
   virtual ~Canvas();
 
   bool create(int w, int h);
+  void copy(Canvas *src, const MARect *srcRect, int dstx, int dsty);
   void setClip(int x, int y, int w, int h);
   pixel_t *getLine(int y) { return _canvas + (y * _w); }
   int x() { return _clip ? _clip->left : 0; }

src/ui/graphics.cpp

@@ -66,14 +66,13 @@ inline pixel_t RGB888_to_RGBA8888(unsigned c) {
   #define GET_FROM_RGB888(c) (c)
 #endif
 
-#define GET_LINE(y) \
-  pixel_t *line; \
-  if (_cacheY == y) { \
+#define GET_LINE(line, y) \
+  if (_cacheY == y && !_cacheLine) { \
     line = _cacheLine; \
   } else { \
     line = _drawTarget->getLine(y); \
     _cacheLine = line; \
-    _cacheY = posY; \
+    _cacheY = y; \
   }
 
 
@@ -146,10 +145,10 @@ Graphics::Graphics() :
   _screen(NULL),
   _drawTarget(NULL),
   _font(NULL),
-  _w(0),
-  _h(0),
+  _cacheLine(NULL),
   _cacheY(-1),
-  _cacheLine(NULL) {
+  _w(0),
+  _h(0) {
   graphics = this;
 }
 
@@ -182,16 +181,7 @@ void Graphics::deleteFont(Font *font) {
 
 void Graphics::drawImageRegion(Canvas *src, const MAPoint2d *dstPoint, const MARect *srcRect) {
   if (_drawTarget && _drawTarget != src) {
-    int destY = dstPoint->y;
-    int srcH = srcRect->height;
-    if (srcRect->top + srcRect->height > src->_h) {
-      srcH = src->_h - srcRect->top;
-    }
-    for (int y = 0; y < srcH && destY < _drawTarget->_h; y++, destY++) {
-      pixel_t *line = src->getLine(y + srcRect->top) + srcRect->left;
-      pixel_t *dstLine = _drawTarget->getLine(destY) + dstPoint->x;
-      memcpy(dstLine, line, srcRect->width * sizeof(pixel_t));
-    }
+    _drawTarget->copy(src, srcRect, dstPoint->x, dstPoint->y);
   }
 }
 
@@ -212,7 +202,8 @@ void Graphics::drawLine(int startX, int startY, int endX, int endY) {
         x2 = _w -1;
       }
       if (startY >= 0 && startY < _h) {
-        pixel_t *line = _drawTarget->getLine(startY);
+        pixel_t *line;
+        GET_LINE(line, startY);
         for (int x = x1; x <= x2; x++) {
           if (x >= _drawTarget->x() && x < _drawTarget->w()) {
             line[x] = _drawColor;
@@ -256,7 +247,8 @@ void Graphics::drawPixel(int posX, int posY) {
       && posY >= _drawTarget->y()
       && posX < _drawTarget->w()
       && posY < _drawTarget->h()) {
-    GET_LINE(posY);
+    pixel_t *line;
+    GET_LINE(line, posY);
     line[posX] = _drawColor;
   }
 }
@@ -423,7 +415,8 @@ int Graphics::getPixel(Canvas *canvas, int posX, int posY) {
       && posY > -1
       && posX < canvas->_w
       && posY < canvas->_h - 1) {
-    pixel_t *line = canvas->getLine(posY);
+    pixel_t *line;
+    GET_LINE(line, posY);
     result = line[posX];
   }
   return result;
@@ -527,7 +520,8 @@ void Graphics::wuPlot(int posX, int posY, double c) {
       && posY >= _drawTarget->y()
       && posX < _drawTarget->w()
       && posY < _drawTarget->h()) {
-    pixel_t *line = _drawTarget->getLine(posY);
+    pixel_t *line;
+    GET_LINE(line, posY);
     uint8_t sR, sG, sB;
     uint8_t dR, dG, dB;
 

src/ui/graphics.h

@@ -74,9 +74,9 @@ struct Graphics {
   Canvas *_drawTarget;
   Font *_font;
   pixel_t _drawColor;
-  int _w, _h;
-  int _cacheY;
   pixel_t *_cacheLine;
+  int _cacheY;
+  int _w, _h;
 };
 
 }