[display] Refactor to avoid implicit framebuffer allocation.

lib/gfx/gfx.c

 /*
  * Copyright (c) 2008-2010, 2015 Travis Geiselbrecht
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files
  * (the "Software"), to deal in the Software without restriction,
  * including without limitation the rights to use, copy, modify, merge,
  * publish, distribute, sublicense, and/or sell copies of the Software,
  * and to permit persons to whom the Software is furnished to do so,
  * subject to the following conditions:
@@ skipping 639 matching lines @@
         surface->free_on_destroy = true;
     }
     surface->ptr = ptr;
 
     return surface;
 }
 
 /**
  * @brief  Create a new graphics surface object from a display
  */
-gfx_surface *gfx_create_surface_from_display(struct display_info *info)
+gfx_surface *gfx_create_surface_from_display(struct display_framebuffer *fb)

[gkalsi, 2016/03/09 21:13:37]

DEBUG_ASSERT(fb);

[cdotstout, 2016/03/09 22:48:00]

Done.

 {
     gfx_surface *surface;
     gfx_format format;
-    switch (info->format) {
-        case DISPLAY_FORMAT_RGB_565:
+    switch (fb->image.format) {
+        case IMAGE_FORMAT_RGB_565:
             format = GFX_FORMAT_RGB_565;
             break;
-        case DISPLAY_FORMAT_RGB_332:
+        case IMAGE_FORMAT_RGB_332:
             format = GFX_FORMAT_RGB_332;
             break;
-        case DISPLAY_FORMAT_RGB_2220:
+        case IMAGE_FORMAT_RGB_2220:
             format = GFX_FORMAT_RGB_2220;
             break;
-        case DISPLAY_FORMAT_ARGB_8888:
+        case IMAGE_FORMAT_ARGB_8888:
             format = GFX_FORMAT_ARGB_8888;
             break;
-        case DISPLAY_FORMAT_RGB_x888:
+        case IMAGE_FORMAT_RGB_x888:
             format = GFX_FORMAT_RGB_x888;
             break;
-        case DISPLAY_FORMAT_MONO_8:
+        case IMAGE_FORMAT_MONO_8:
             format = GFX_FORMAT_MONO;
             break;
         default:
             dprintf(INFO, "invalid graphics format)");
             DEBUG_ASSERT(0);
             return NULL;
     }
 
-    surface = gfx_create_surface(info->framebuffer, info->width, info->height, info->stride, format);
+    surface = gfx_create_surface(fb->image.pixels, fb->image.width, fb->image.height, fb->image.rowbytes, format);
 
-    surface->flush = info->flush;
+    surface->flush = fb->flush;
 
     return surface;
 }
 
 /**
  * @brief  Destroy a graphics surface and free all resources allocated to it.
  *
  * @param  surface  Surface to destroy.  This pointer is no longer valid after
  *    this call.
  */
 void gfx_surface_destroy(struct gfx_surface *surface)
 {
     if (surface->free_on_destroy)
         free(surface->ptr);
     free(surface);
 }
 
 /**
  * @brief  Write a test pattern to the default display.
  */
 void gfx_draw_pattern(void)
 {
-    struct display_info info;
-    if (display_get_info(&info) < 0)
+    struct display_framebuffer fb;
+    if (display_get_framebuffer(&fb) < 0)
         return;
 
-    gfx_surface *surface = gfx_create_surface_from_display(&info);
+    gfx_surface *surface = gfx_create_surface_from_display(&fb);
 
     uint x, y;
     for (y = 0; y < surface->height; y++) {
         for (x = 0; x < surface->width; x++) {
             uint scaledx;
             uint scaledy;
 
             scaledx = x * 256 / surface->width;
             scaledy = y * 256 / surface->height;
 
             gfx_putpixel(surface, x, y, (0xff << 24) | (scaledx * scaledy) << 16 | (scaledx >> 1) << 8 | scaledy >> 1);
         }
     }
 
     gfx_flush(surface);
 
     gfx_surface_destroy(surface);
 }
 
 /**
  * @brief  Fill default display with white
  */
 void gfx_draw_pattern_white(void)
 {
-    struct display_info info;
-    if (display_get_info(&info) < 0)
+    struct display_framebuffer fb;
+    if (display_get_framebuffer(&fb) < 0)
         return;
 
-    gfx_surface *surface = gfx_create_surface_from_display(&info);
+    gfx_surface *surface = gfx_create_surface_from_display(&fb);
 
     uint x, y;
     for (y = 0; y < surface->height; y++) {
         for (x = 0; x < surface->width; x++) {
             gfx_putpixel(surface, x, y, 0xFFFFFFFF);
         }
     }
 
     gfx_flush(surface);
 
@@ skipping 44 matching lines @@
     if (argc < 2) {
         printf("not enough arguments:\n");
         printf("%s display_info : output information bout the current display\n", argv[0].str);
         printf("%s rgb_bars   : Fill frame buffer with rgb bars\n", argv[0].str);
         printf("%s test_pattern : Fill frame with test pattern\n", argv[0].str);
         printf("%s fill r g b   : Fill frame buffer with RGB888 value and force update\n", argv[0].str);
 
         return -1;
     }
 
-    struct display_info info;
-    if (display_get_info(&info) < 0) {
+    struct display_framebuffer fb;
+    if (display_get_framebuffer(&fb) < 0) {
         printf("no display to draw on!\n");
         return -1;
     }
 
-    gfx_surface *surface = gfx_create_surface_from_display(&info);
+    gfx_surface *surface = gfx_create_surface_from_display(&fb);
 
     if (!strcmp(argv[1].str, "display_info")) {
         printf("display:\n");
-        printf("\tframebuffer %p\n", info.framebuffer);
-        printf("\twidth %u height %u stride %u\n", info.width, info.height, info.stride);
-        printf("\tformat %u\n", info.format);
+        printf("\tframebuffer %p\n", fb.image.pixels);
+        printf("\twidth %u height %u stride %u\n", fb.image.width, fb.image.height, fb.image.rowbytes);
+        printf("\tformat %u\n", fb.image.format);
     } else if (!strcmp(argv[1].str, "rgb_bars")) {
         gfx_draw_rgb_bars(surface);
     } else if (!strcmp(argv[1].str, "test_pattern")) {
         gfx_draw_pattern();
     } else if (!strcmp(argv[1].str, "fill")) {
         uint x, y;
 
         for (y = 0; y < surface->height; y++) {
             for (x = 0; x < surface->width; x++) {
                 /* write pixel to frame buffer */
                 gfx_putpixel(surface, x, y, (0xff << 24) | (argv[2].i << 16) | (argv[3].i << 8) | argv[4].i);
             }
         }
     }
 
     gfx_flush(surface);
 
     gfx_surface_destroy(surface);
 
     return 0;
 }
 
 #endif
 #endif