Added bitmap support to Video API

diff -u -r1.1 videotest.c
@@ -36,7 +36,7 @@
   if (grub_video_setup (1024, 768,
                         GRUB_VIDEO_MODE_TYPE_INDEX_COLOR) != GRUB_ERR_NONE)
     return grub_errno;
-  
+
   grub_getkey ();
 
   grub_video_color_t color;

@@ -48,21 +48,21 @@
   struct grub_font_glyph glyph;
   struct grub_video_render_target *text_layer;
   grub_video_color_t palette[16];
-  
+
   grub_video_get_viewport (&x, &y, &width, &height);
 
   grub_video_create_render_target (&text_layer, width, height,
                                    GRUB_VIDEO_MODE_TYPE_RGB
                                    | GRUB_VIDEO_MODE_TYPE_ALPHA);
 
-  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);                                   
+  grub_video_set_active_render_target (GRUB_VIDEO_RENDER_TARGET_DISPLAY);
 
   color = grub_video_map_rgb (0, 0, 0);
   grub_video_fill_rect (color, 0, 0, width, height);
-  
+
   color = grub_video_map_rgb (255, 0, 0);
   grub_video_fill_rect (color, 0, 0, 100, 100);
-  
+
   color = grub_video_map_rgb (0, 255, 255);
   grub_video_fill_rect (color, 100, 100, 100, 100);
 

@@ -73,18 +73,18 @@
                            width - 150 * 2, height - 150 * 2);
   color = grub_video_map_rgb (77, 33, 77);
   grub_video_fill_rect (color, 0, 0, width, height);
-  
+
   grub_video_set_active_render_target (text_layer);
-  
+
   color = grub_video_map_rgb (255, 255, 255);
-  
-  grub_font_get_glyph ('A', &glyph);  
+
+  grub_font_get_glyph ('A', &glyph);
   grub_video_blit_glyph (&glyph, color, 16, 16);
-  grub_font_get_glyph ('B', &glyph);  
+  grub_font_get_glyph ('B', &glyph);
   grub_video_blit_glyph (&glyph, color, 16 * 2, 16);
 
-  grub_font_get_glyph ('*', &glyph);  
-  
+  grub_font_get_glyph ('*', &glyph);
+
   for (i = 0; i < 16; i++)
     {
       color = grub_video_map_color (i);

@@ -98,18 +98,19 @@
     {
       color = grub_video_map_rgb (i, 33, 77);
       grub_video_fill_rect (color, 0, 0, width, height);
-      grub_video_blit_render_target (text_layer, 0, 0, 0, 0, width, height);
+      grub_video_blit_render_target (text_layer, GRUB_VIDEO_BLIT_BLEND, 0, 0,
+                                     0, 0, width, height);
     }
-  
+
   grub_getkey ();
-  
+
   grub_video_delete_render_target (text_layer);
-  
+
   grub_video_restore ();
-  
+
   for (i = 0; i < 16; i++)
     grub_printf("color %d: %08x\n", i, palette[i]);
-  
+
   grub_errno = GRUB_ERR_NONE;
   return grub_errno;
 }

71 lines not on this page · raw message

95 lines not on this page · raw message

diff -u -r1.6 vbe.h
@@ -205,13 +205,43 @@
                                          struct grub_vbe_mode_info_block *mode_info);
 
 /* VBE module internal prototypes (should not be used from elsewhere).  */
-grub_uint8_t * grub_video_vbe_get_video_ptr (struct grub_video_render_target *source,
+struct grub_video_i386_vbeblit_info;
+
+struct grub_video_render_target
+{
+  /* Copy of the screen's mode info structure, except that width, height and
+     mode_type has been re-adjusted to requested render target settings.  */
+  struct grub_video_mode_info mode_info;
+
+  struct
+  {
+    unsigned int x;
+    unsigned int y;
+    unsigned int width;
+    unsigned int height;
+  } viewport;
+
+  /* Indicates wether the data has been allocated by us and must be freed
+     when render target is destroyed.  */
+  int is_allocated;
+
+  /* Pointer to data.  Can either be in video card memory or in local host's
+     memory.  */
+  void *data;
+};
+
+grub_uint8_t * grub_video_vbe_get_video_ptr (struct grub_video_i386_vbeblit_info *source,
                                              grub_uint32_t x, grub_uint32_t y);
 
 grub_video_color_t grub_video_vbe_map_rgb (grub_uint8_t red, grub_uint8_t green,
                                            grub_uint8_t blue);
 
-void grub_video_vbe_unmap_color (struct grub_video_render_target * source,
+grub_video_color_t grub_video_vbe_map_rgba (grub_uint8_t red,
+                                            grub_uint8_t green,
+                                            grub_uint8_t blue,
+                                            grub_uint8_t alpha);
+
+void grub_video_vbe_unmap_color (struct grub_video_i386_vbeblit_info *source,
                                  grub_video_color_t color, grub_uint8_t *red,
                                  grub_uint8_t *green, grub_uint8_t *blue,
                                  grub_uint8_t *alpha);

95 lines not on this page · raw message

diff -u -r1.1 vbefill.h
@@ -20,21 +20,29 @@
 #ifndef GRUB_VBEFILL_MACHINE_HEADER
 #define GRUB_VBEFILL_MACHINE_HEADER	1
 
-#include <grub/video.h>
+/* NOTE: This header is private header for vbe driver and should not be used
+   in other parts of the code.  */
+
+struct grub_video_i386_vbeblit_info;
 
 void
-grub_video_i386_vbefill_R8G8B8A8 (struct grub_video_render_target *dst,
+grub_video_i386_vbefill_R8G8B8A8 (struct grub_video_i386_vbeblit_info *dst,
                                   grub_video_color_t color,  int x, int y,
                                   int width, int height);
 
 void
-grub_video_i386_vbefill_R8G8B8 (struct grub_video_render_target *dst,
+grub_video_i386_vbefill_R8G8B8 (struct grub_video_i386_vbeblit_info *dst,
                                 grub_video_color_t color, int x, int y,
                                 int width, int height);
 
 void
-grub_video_i386_vbefill_index (struct grub_video_render_target *dst,
+grub_video_i386_vbefill_index (struct grub_video_i386_vbeblit_info *dst,
                                grub_video_color_t color, int x, int y,
                                int width, int height);
 
+void
+grub_video_i386_vbefill (struct grub_video_i386_vbeblit_info *dst,
+                         grub_video_color_t color, int x, int y,
+                         int width, int height);
+
 #endif /* ! GRUB_VBEFILL_MACHINE_HEADER */

44 lines not on this page · raw message

396 lines not on this page · raw message

257 lines not on this page · raw message

diff -u -r1.3 video.c
@@ -82,7 +82,7 @@
   /* Loop thru all possible video adapter trying to find requested mode.  */
   for (p = grub_video_adapter_list; p; p = p->next)
     {
-      /* Try to initialize adapter, if can't skip to next.  */
+      /* Try to initialize adapter, if it fails, skip to next adapter.  */
       p->init ();
       if (grub_errno != GRUB_ERR_NONE)
         {

@@ -142,7 +142,7 @@
 enum grub_video_blit_format
 grub_video_get_blit_format (struct grub_video_mode_info *mode_info)
 {
-  /* Check if we have any knwon 32 bit modes.  */
+  /* Check if we have any known 32 bit modes.  */
   if (mode_info->bpp == 32)
     {
       if ((mode_info->red_mask_size == 8)

@@ -286,13 +286,14 @@
 /* Blit bitmap to screen.  */
 grub_err_t
 grub_video_blit_bitmap (struct grub_video_bitmap *bitmap,
+                        enum grub_video_blit_operators oper,
                         int x, int y, int offset_x, int offset_y,
                         unsigned int width, unsigned int height)
 {
   if (! grub_video_adapter_active)
     return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated");
 
-  return grub_video_adapter_active->blit_bitmap (bitmap, x, y,
+  return grub_video_adapter_active->blit_bitmap (bitmap, oper, x, y,
                                                  offset_x, offset_y,
                                                  width, height);
 }

@@ -300,14 +301,15 @@
 /* Blit render target to active render target.  */
 grub_err_t
 grub_video_blit_render_target (struct grub_video_render_target *target,
+                               enum grub_video_blit_operators oper,
                                int x, int y, int offset_x, int offset_y,
                                unsigned int width, unsigned int height)
 {
   if (! grub_video_adapter_active)
     return grub_error (GRUB_ERR_BAD_DEVICE, "No video mode activated");
 
-  return grub_video_adapter_active->blit_render_target (target, x, y,
-                                                        offset_x, offset_y, 
+  return grub_video_adapter_active->blit_render_target (target, oper, x, y,
+                                                        offset_x, offset_y,
                                                         width, height);
 }
 

826 lines not on this page · raw message

405 lines not on this page · raw message

diff -u -r1.2 vbefill.c
@@ -17,19 +17,25 @@
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#include <grub/err.h>
-#include <grub/machine/memory.h>
+/* SPECIAL NOTES!
+
+   Please note following when reading the code below:
+
+   - In this driver we assume that every memory can be accessed by same memory
+     bus.  If there are different address spaces do not use this code as a base
+     code for other archs.
+
+   - Every function in this code assumes that bounds checking has been done in
+     previous phase and they are opted out in here.  */
+
 #include <grub/machine/vbe.h>
 #include <grub/machine/vbefill.h>
+#include <grub/machine/vbeutil.h>
 #include <grub/types.h>
-#include <grub/dl.h>
-#include <grub/misc.h>
-#include <grub/font.h>
-#include <grub/mm.h>
 #include <grub/video.h>
 
 void
-grub_video_i386_vbefill_R8G8B8A8 (struct grub_video_render_target *dst,
+grub_video_i386_vbefill_R8G8B8A8 (struct grub_video_i386_vbeblit_info *dst,
                                   grub_video_color_t color, int x, int y,
                                   int width, int height)
 {

@@ -50,7 +56,7 @@
 }
 
 void
-grub_video_i386_vbefill_R8G8B8 (struct grub_video_render_target *dst,
+grub_video_i386_vbefill_R8G8B8 (struct grub_video_i386_vbeblit_info *dst,
                                 grub_video_color_t color, int x, int y,
                                 int width, int height)
 {

@@ -78,7 +84,7 @@
 }
 
 void
-grub_video_i386_vbefill_index (struct grub_video_render_target *dst,
+grub_video_i386_vbefill_index (struct grub_video_i386_vbeblit_info *dst,
                                grub_video_color_t color, int x, int y,
                                int width, int height)
 {

@@ -98,3 +104,19 @@
         *dstptr++ = fill;
     }
 }
+
+void
+grub_video_i386_vbefill (struct grub_video_i386_vbeblit_info *dst,
+                         grub_video_color_t color, int x, int y,
+                         int width, int height)
+{
+  int i;
+  int j;
+
+  /* We do not need to worry about data being out of bounds
+     as we assume that everything has been checked before.  */
+
+  for (j = 0; j < height; j++)
+    for (i = 0; i < width; i++)
+      set_pixel (dst, x+i, y+j, color);
+}

150 lines not on this page · raw message

265 lines not on this page · raw message