5 files changed, 66 insertions, 7 deletions
diff --git a/tests/runner.py b/tests/runner.py
index 9d6eea1f..d358a97f 100755
--- a/tests/runner.py
+++ b/tests/runner.py
@@ -13142,8 +13142,11 @@ Press any key to continue.'''
       self.btest('sdl_maprgba.c', reference='sdl_maprgba.png', reference_slack=3)
 
     def test_sdl_rotozoom(self):
-      shutil.copyfile(path_from_root('tests', 'screenshot.png'), os.path.join(self.get_dir(), 'example.png'))
-      self.btest('sdl_rotozoom.c', reference='sdl_rotozoom.png', args=['--preload-file', 'example.png'])
+      shutil.copyfile(path_from_root('tests', 'screenshot.png'), os.path.join(self.get_dir(), 'screenshot.png'))
+      self.btest('sdl_rotozoom.c', reference='sdl_rotozoom.png', args=['--preload-file', 'screenshot.png'], reference_slack=3)
+
+    def test_sdl_gfx_primitives(self):
+      self.btest('sdl_gfx_primitives.c', reference='sdl_gfx_primitives.png', reference_slack=1)
 
     def test_sdl_canvas_palette_2(self):
       open(os.path.join(self.get_dir(), 'pre.js'), 'w').write('''
diff --git a/tests/sdl_gfx_primitives.c b/tests/sdl_gfx_primitives.c
new file mode 100644
index 00000000..db0c6181
--- /dev/null
+++ b/tests/sdl_gfx_primitives.c
@@ -0,0 +1,46 @@
+#include "SDL/SDL.h"
+#include "SDL/SDL_gfxPrimitives.h"
+
+#ifdef EMSCRIPTEN
+#include "emscripten.h"
+#endif
+
+int main(int argc, char **argv) {
+    SDL_Init(SDL_INIT_VIDEO);
+
+    const int width = 400;
+    const int height = 400;
+    SDL_Surface *screen = SDL_SetVideoMode(width, height, 32, SDL_SWSURFACE);
+    boxColor(screen, 0, 0, width, height, 0xff);
+
+    boxColor(screen, 0, 0, 98, 98, 0xff0000ff);
+    boxRGBA(screen, 100, 0, 198, 98, 0, 0, 0xff, 0xff);
+    // check that the x2 > x1 case is handled correctly
+    boxColor(screen, 298, 98, 200, 0, 0x00ff00ff);
+    boxColor(screen, 398, 98, 300, 0, 0xff0000ff);
+
+    rectangleColor(screen, 0, 100, 98, 198, 0x000ffff);
+    rectangleRGBA(screen, 100, 100, 198, 198, 0xff, 0, 0, 0xff);
+
+    ellipseColor(screen, 300, 150, 99, 49, 0x00ff00ff);
+    filledEllipseColor(screen, 100, 250, 99, 49, 0x00ff00ff);
+    filledEllipseRGBA(screen, 250, 300, 49, 99, 0, 0, 0xff, 0xff);
+
+    lineColor(screen, 300, 200, 400, 300, 0x00ff00ff);
+    lineRGBA(screen, 300, 300, 400, 400, 0, 0xff, 0, 0xff);
+
+    SDL_UpdateRect(screen, 0, 0, 0, 0);
+
+#ifndef EMSCRIPTEN
+    SDL_Event evt;
+    SDL_SaveBMP(screen, "native_output.bmp");
+    while (1) {
+       if (SDL_PollEvent(&evt) != 0 && evt.type == SDL_QUIT) break;
+       SDL_Delay(33);
+    }
+#endif
+
+    SDL_Quit();
+
+    return 1;
+}
diff --git a/tests/sdl_gfx_primitives.png b/tests/sdl_gfx_primitives.png
new file mode 100644
index 00000000..525b4f8f
--- /dev/null
+++ b/tests/sdl_gfx_primitives.png
diff --git a/tests/sdl_rotozoom.c b/tests/sdl_rotozoom.c
index b3970f6c..e81258d9 100644
--- a/tests/sdl_rotozoom.c
+++ b/tests/sdl_rotozoom.c
@@ -6,15 +6,18 @@
 #include "emscripten.h"
 #endif
 
+const int numSprites = 8;
 SDL_Surface *screen;
-SDL_Surface *sprite[6];
+SDL_Surface *sprite[numSprites];
 
 void mainloop() {
     int i;
+    int row = 0;
     SDL_Rect rect = { 0, 0, 100, 100 };
-    for (i = 0; i < 6; i++) {
+    for (i = 0; i < numSprites; i++) {
         rect.x = i & 1 ? 200 : 0;
-        rect.y = i & 2 ? 200 : 0;
+        rect.y = row * 200;
+        row += i & 1;
         SDL_BlitSurface(sprite[i], 0, screen, &rect);
         SDL_UpdateRect(screen, 0, 0, 0, 0);
     }
@@ -23,20 +26,27 @@ void mainloop() {
 int main(int argc, char **argv) {
     SDL_Init(SDL_INIT_VIDEO);
 
-    screen = SDL_SetVideoMode(400, 400, 32, SDL_SWSURFACE);
+    const int width = 400;
+    const int height = 200 * (numSprites + 1) / 2;
+    screen = SDL_SetVideoMode(width, height, 32, SDL_SWSURFACE);
+    SDL_Rect rect = { 0, 0, width, height };
+    SDL_FillRect(screen, &rect, SDL_MapRGBA(screen->format, 0, 0, 0, 0xff));
 
-    sprite[0] = IMG_Load("example.png");
+    sprite[0] = IMG_Load("screenshot.png");
     sprite[1] = SDL_CreateRGBSurface(SDL_SWSURFACE, 100, 100, 32, 0xFF000000, 0xFF0000, 0xFF00, 0xFF);
     SDL_FillRect(sprite[1], 0, 0xA0A0A0A0);
     sprite[2] = zoomSurface(sprite[0], 0.5, 0.5, SMOOTHING_ON);
     sprite[3] = zoomSurface(sprite[1], 0.5, 0.5, SMOOTHING_ON);
     sprite[4] = rotozoomSurface(sprite[0], -20, 0.3, SMOOTHING_ON);
     sprite[5] = rotozoomSurface(sprite[1], 45, 0.5, SMOOTHING_ON);
+    sprite[6] = zoomSurface(sprite[0], -0.5, 0.5, SMOOTHING_ON);
+    sprite[7] = zoomSurface(sprite[0], -0.5, -0.5, SMOOTHING_ON);
 
     mainloop();
 
 #ifndef EMSCRIPTEN
     SDL_Event evt;
+    SDL_SaveBMP(screen, "native_output.bmp");
     while (1) {
        if (SDL_PollEvent(&evt) != 0 && evt.type == SDL_QUIT) break;
        //mainloop();
diff --git a/tests/sdl_rotozoom.png b/tests/sdl_rotozoom.png
index 3ca8da70..5c5dec2f 100644
--- a/tests/sdl_rotozoom.png
+++ b/tests/sdl_rotozoom.png