* [PATCH] GSoC #06 VBE optimization for BGR/BGRA color modes
@ 2008-08-31 6:56 Colin D Bennett
2008-09-07 15:59 ` Vesa Jääskeläinen
0 siblings, 1 reply; 2+ messages in thread
From: Colin D Bennett @ 2008-08-31 6:56 UTC (permalink / raw)
To: grub-devel
[-- Attachment #1.1: Type: text/plain, Size: 565 bytes --]
This patch adds optimized routines for video modes using BGR/BGRA color
format. Most PC video cards use BGR (24-bit) or BGRA (32-bit) color
modes, so this is an extremely important change and provides a massive
performance benefit.
I also renamed the R8G8B8A8 and R8B8B8 modes to RGBA8888 and RGB888,
etc., since it began to be highly unreadable when B8G8R8A8 was added
into the mix. It seems that having the color components (letters)
grouped together in the name makes it much easier for me to determine
the mode name at a glance.
Regards,
Colin
[-- Attachment #1.2: 06_ChangeLog.txt --]
[-- Type: text/plain, Size: 4586 bytes --]
2008-08-30 Colin D Bennett <colin@gibibit.com>
VBE performance optimization. Added optimized rendering functions for
BGR/BGRA render targets.
* include/grub/i386/pc/vbeblit.h
(grub_video_i386_vbeblit_R8G8B8A8_R8G8B8A8): Renamed from this...
(grub_video_i386_vbeblit_RGBA8888_RGBA8888): ...to this.
(grub_video_i386_vbeblit_R8G8B8_R8G8B8A8): Renamed from this...
(grub_video_i386_vbeblit_RGB888_RGBA8888): ...to this.
(grub_video_i386_vbeblit_R8G8B8_R8G8B8X8): Renamed from this...
(grub_video_i386_vbeblit_RGB888_RGBX8888): ...to this.
(grub_video_i386_vbeblit_index_R8G8B8A8): Renamed from this...
(grub_video_i386_vbeblit_index_RGBA8888): ...to this.
(grub_video_i386_vbeblit_index_R8G8B8X8): Renamed from this...
(grub_video_i386_vbeblit_index_RGBX8888): ...to this.
(grub_video_i386_vbeblit_R8G8B8A8_R8G8B8): Renamed from this...
(grub_video_i386_vbeblit_RGBA8888_RGB888): ...to this.
(grub_video_i386_vbeblit_R8G8B8_R8G8B8): Renamed from this...
(grub_video_i386_vbeblit_RGB888_RGB888): ...to this.
(grub_video_i386_vbeblit_index_R8G8B8): Renamed from this...
(grub_video_i386_vbeblit_index_RGB888): ...to this.
(grub_video_i386_vbeblit_BGRX8888_RGBX8888): New prototype.
(grub_video_i386_vbeblit_BGRA8888_RGB888): New prototype.
(grub_video_i386_vbeblit_BGR888_RGB888): New prototype.
(grub_video_i386_vbeblit_BGRA8888_RGBA8888): New prototype.
(grub_video_i386_vbeblit_BGR888_RGBA8888): New prototype.
(grub_video_i386_vbeblit_BGR888_RGBX8888): New prototype.
(grub_video_i386_vbeblit_R8G8B8X8_R8G8B8X8): Renamed from this...
(grub_video_i386_vbeblit_direct32_copy): ...to this.
* video/i386/pc/vbeblit.c
(grub_video_i386_vbeblit_R8G8B8A8_R8G8B8A8): Renamed from this...
(grub_video_i386_vbeblit_RGBA8888_RGBA8888): ...to this.
(grub_video_i386_vbeblit_R8G8B8_R8G8B8A8): Renamed from this...
(grub_video_i386_vbeblit_RGB888_RGBA8888): ...to this.
(grub_video_i386_vbeblit_R8G8B8_R8G8B8X8): Renamed from this...
(grub_video_i386_vbeblit_RGB888_RGBX8888): ...to this.
(grub_video_i386_vbeblit_index_R8G8B8A8): Renamed from this...
(grub_video_i386_vbeblit_index_RGBA8888): ...to this.
(grub_video_i386_vbeblit_index_R8G8B8X8): Renamed from this...
(grub_video_i386_vbeblit_index_RGBX8888): ...to this.
(grub_video_i386_vbeblit_R8G8B8A8_R8G8B8): Renamed from this...
(grub_video_i386_vbeblit_RGBA8888_RGB888): ...to this.
(grub_video_i386_vbeblit_R8G8B8_R8G8B8): Renamed from this...
(grub_video_i386_vbeblit_RGB888_RGB888): ...to this.
(grub_video_i386_vbeblit_index_R8G8B8): Renamed from this...
(grub_video_i386_vbeblit_index_RGB888): ...to this.
(grub_video_i386_vbeblit_BGRX8888_RGBX8888): New function.
(grub_video_i386_vbeblit_BGRA8888_RGB888): New function.
(grub_video_i386_vbeblit_BGR888_RGB888): New function.
(grub_video_i386_vbeblit_BGRA8888_RGBA8888): New function.
(grub_video_i386_vbeblit_BGR888_RGBA8888): New function.
(grub_video_i386_vbeblit_BGR888_RGBX8888): New function.
(grub_video_i386_vbeblit_R8G8B8X8_R8G8B8X8): Renamed from this...
(grub_video_i386_vbeblit_direct32_copy): ...to this.
* include/grub/i386/pc/vbefill.h
(grub_video_i386_vbefill_R8G8B8A8): Renamed from this..
(grub_video_i386_vbefill_direct32): ...to this.
(grub_video_i386_vbefill_R8G8B8): Renamed from this...
(grub_video_i386_vbefill_direct24): ...to this.
* include/grub/video.h (grub_video_blit_format): Added BGR/BGRA modes
and renamed R8G8B8A->RGBA_8888.
* video/bitmap.c (grub_video_bitmap_create): Use new blit format
names.
* video/i386/pc/vbe.c (grub_video_vbe_fill_rect): Use optimized
BGR/BGRA fill routines; use new RGB/RGBA blit format names.
(common_blitter): Use optimized BGR/BGRA blit routines; use new
RGB/RGBA blit format names.
* video/i386/pc/vbefill.c
(grub_video_i386_vbefill_R8G8B8A8): Renamed from this...
(grub_video_i386_vbefill_direct32): ...to this; don't re-calculate the
video pointer position every row.
(grub_video_i386_vbefill_R8G8B8): Renamed from this...
(grub_video_i386_vbefill_direct24): ...to this; don't re-calculate the
video pointer position every row.
(grub_video_i386_vbefill_index): Don't re-calculate the video pointer
position every row.
* video/readers/jpeg.c (grub_jpeg_decode_sos): Use new blit format
name.
* video/readers/png.c (grub_png_decode_image_header): Likewise.
* video/readers/tga.c (grub_video_reader_tga): Likewise.
* video/video.c (grub_video_get_blit_format): Detect BGR/BGRA blit
formats, and also detect a wider range of RGB/RGBA formats.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 06_vbe-bgr-optimization.patch --]
[-- Type: text/x-patch; name=06_vbe-bgr-optimization.patch, Size: 45668 bytes --]
=== modified file 'include/grub/i386/pc/vbeblit.h'
--- include/grub/i386/pc/vbeblit.h 2007-07-21 22:32:33 +0000
+++ include/grub/i386/pc/vbeblit.h 2008-08-31 05:52:21 +0000
@@ -25,55 +25,93 @@
struct grub_video_i386_vbeblit_info;
void
-grub_video_i386_vbeblit_R8G8B8A8_R8G8B8A8 (struct grub_video_i386_vbeblit_info *dst,
- struct grub_video_i386_vbeblit_info *src,
- int x, int y, int width, int height,
- int offset_x, int offset_y);
-
-void
-grub_video_i386_vbeblit_R8G8B8X8_R8G8B8X8 (struct grub_video_i386_vbeblit_info *dst,
- struct grub_video_i386_vbeblit_info *src,
- int x, int y, int width, int height,
- int offset_x, int offset_y);
-
-void
-grub_video_i386_vbeblit_R8G8B8_R8G8B8A8 (struct grub_video_i386_vbeblit_info *dst,
- struct grub_video_i386_vbeblit_info *src,
- int x, int y, int width, int height,
- int offset_x, int offset_y);
-
-void
-grub_video_i386_vbeblit_R8G8B8_R8G8B8X8 (struct grub_video_i386_vbeblit_info *dst,
- struct grub_video_i386_vbeblit_info *src,
- int x, int y, int width, int height,
- int offset_x, int offset_y);
-
-void
-grub_video_i386_vbeblit_index_R8G8B8A8 (struct grub_video_i386_vbeblit_info *dst,
- struct grub_video_i386_vbeblit_info *src,
- int x, int y, int width, int height,
- int offset_x, int offset_y);
-
-void
-grub_video_i386_vbeblit_index_R8G8B8X8 (struct grub_video_i386_vbeblit_info *dst,
- struct grub_video_i386_vbeblit_info *src,
- int x, int y, int width, int height,
- int offset_x, int offset_y);
-
-void
-grub_video_i386_vbeblit_R8G8B8A8_R8G8B8 (struct grub_video_i386_vbeblit_info *dst,
- struct grub_video_i386_vbeblit_info *src,
- int x, int y, int width, int height,
- int offset_x, int offset_y);
-
-void
-grub_video_i386_vbeblit_R8G8B8_R8G8B8 (struct grub_video_i386_vbeblit_info *dst,
- struct grub_video_i386_vbeblit_info *src,
- int x, int y, int width, int height,
- int offset_x, int offset_y);
-
-void
-grub_video_i386_vbeblit_index_R8G8B8 (struct grub_video_i386_vbeblit_info *dst,
+grub_video_i386_vbeblit_BGRX8888_RGBX8888 (struct grub_video_i386_vbeblit_info *dst,
+ struct grub_video_i386_vbeblit_info *src,
+ int x, int y, int width, int height,
+ int offset_x, int offset_y);
+
+void
+grub_video_i386_vbeblit_BGRA8888_RGB888 (struct grub_video_i386_vbeblit_info *dst,
+ struct grub_video_i386_vbeblit_info *src,
+ int x, int y, int width, int height,
+ int offset_x, int offset_y);
+
+void
+grub_video_i386_vbeblit_BGR888_RGB888 (struct grub_video_i386_vbeblit_info *dst,
+ struct grub_video_i386_vbeblit_info *src,
+ int x, int y, int width, int height,
+ int offset_x, int offset_y);
+
+void
+grub_video_i386_vbeblit_BGRA8888_RGBA8888 (struct grub_video_i386_vbeblit_info *dst,
+ struct grub_video_i386_vbeblit_info *src,
+ int x, int y, int width, int height,
+ int offset_x, int offset_y);
+
+void
+grub_video_i386_vbeblit_BGR888_RGBA8888 (struct grub_video_i386_vbeblit_info *dst,
+ struct grub_video_i386_vbeblit_info *src,
+ int x, int y, int width, int height,
+ int offset_x, int offset_y);
+
+void
+grub_video_i386_vbeblit_BGR888_RGBX8888 (struct grub_video_i386_vbeblit_info *dst,
+ struct grub_video_i386_vbeblit_info *src,
+ int x, int y, int width, int height,
+ int offset_x, int offset_y);
+
+void
+grub_video_i386_vbeblit_RGBA8888_RGBA8888 (struct grub_video_i386_vbeblit_info *dst,
+ struct grub_video_i386_vbeblit_info *src,
+ int x, int y, int width, int height,
+ int offset_x, int offset_y);
+
+/* Direct copy for compatible 32 bpp blit formats.
+ * (RGBA8888->RGBA8888, BGRA8888->BGRA8888, etc.) */
+void
+grub_video_i386_vbeblit_direct32_copy (struct grub_video_i386_vbeblit_info *dst,
+ struct grub_video_i386_vbeblit_info *src,
+ int x, int y, int width, int height,
+ int offset_x, int offset_y);
+
+void
+grub_video_i386_vbeblit_RGB888_RGBA8888 (struct grub_video_i386_vbeblit_info *dst,
+ struct grub_video_i386_vbeblit_info *src,
+ int x, int y, int width, int height,
+ int offset_x, int offset_y);
+
+void
+grub_video_i386_vbeblit_RGB888_RGBX8888 (struct grub_video_i386_vbeblit_info *dst,
+ struct grub_video_i386_vbeblit_info *src,
+ int x, int y, int width, int height,
+ int offset_x, int offset_y);
+
+void
+grub_video_i386_vbeblit_index_RGBA8888 (struct grub_video_i386_vbeblit_info *dst,
+ struct grub_video_i386_vbeblit_info *src,
+ int x, int y, int width, int height,
+ int offset_x, int offset_y);
+
+void
+grub_video_i386_vbeblit_index_RGBX8888 (struct grub_video_i386_vbeblit_info *dst,
+ struct grub_video_i386_vbeblit_info *src,
+ int x, int y, int width, int height,
+ int offset_x, int offset_y);
+
+void
+grub_video_i386_vbeblit_RGBA8888_RGB888 (struct grub_video_i386_vbeblit_info *dst,
+ struct grub_video_i386_vbeblit_info *src,
+ int x, int y, int width, int height,
+ int offset_x, int offset_y);
+
+void
+grub_video_i386_vbeblit_RGB888_RGB888 (struct grub_video_i386_vbeblit_info *dst,
+ struct grub_video_i386_vbeblit_info *src,
+ int x, int y, int width, int height,
+ int offset_x, int offset_y);
+
+void
+grub_video_i386_vbeblit_index_RGB888 (struct grub_video_i386_vbeblit_info *dst,
struct grub_video_i386_vbeblit_info *src,
int x, int y, int width, int height,
int offset_x, int offset_y);
=== modified file 'include/grub/i386/pc/vbefill.h'
--- include/grub/i386/pc/vbefill.h 2007-07-21 22:32:33 +0000
+++ include/grub/i386/pc/vbefill.h 2008-08-31 05:52:21 +0000
@@ -25,14 +25,14 @@
struct grub_video_i386_vbeblit_info;
void
-grub_video_i386_vbefill_R8G8B8A8 (struct grub_video_i386_vbeblit_info *dst,
+grub_video_i386_vbefill_direct32 (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_i386_vbeblit_info *dst,
- grub_video_color_t color, int x, int y,
- int width, int height);
+grub_video_i386_vbefill_direct24 (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_i386_vbeblit_info *dst,
=== modified file 'include/grub/video.h'
--- include/grub/video.h 2008-01-01 12:02:07 +0000
+++ include/grub/video.h 2008-08-31 05:52:21 +0000
@@ -55,14 +55,12 @@
/* Defined blitting formats. */
enum grub_video_blit_format
{
- /* Follow exactly field & mask information. */
- GRUB_VIDEO_BLIT_FORMAT_RGBA,
- /* Make optimization assumption. */
- GRUB_VIDEO_BLIT_FORMAT_R8G8B8A8,
- /* Follow exactly field & mask information. */
- GRUB_VIDEO_BLIT_FORMAT_RGB,
- /* Make optimization assumption. */
- GRUB_VIDEO_BLIT_FORMAT_R8G8B8,
+ GRUB_VIDEO_BLIT_FORMAT_RGBA, /* General: Use fields & masks. */
+ GRUB_VIDEO_BLIT_FORMAT_RGBA_8888, /* Optimized format. */
+ GRUB_VIDEO_BLIT_FORMAT_BGRA_8888, /* Optimized format. */
+ GRUB_VIDEO_BLIT_FORMAT_RGB, /* General: Use fields & masks. */
+ GRUB_VIDEO_BLIT_FORMAT_RGB_888, /* Optimized format. */
+ GRUB_VIDEO_BLIT_FORMAT_BGR_888, /* Optimized format. */
/* When needed, decode color or just use value as is. */
GRUB_VIDEO_BLIT_FORMAT_INDEXCOLOR
};
=== modified file 'video/bitmap.c'
--- video/bitmap.c 2007-07-21 22:32:33 +0000
+++ video/bitmap.c 2008-08-31 05:52:21 +0000
@@ -78,7 +78,7 @@
switch (blit_format)
{
- case GRUB_VIDEO_BLIT_FORMAT_R8G8B8A8:
+ case GRUB_VIDEO_BLIT_FORMAT_RGBA_8888:
mode_info->mode_type = GRUB_VIDEO_MODE_TYPE_RGB
| GRUB_VIDEO_MODE_TYPE_ALPHA;
mode_info->bpp = 32;
@@ -94,7 +94,7 @@
mode_info->reserved_field_pos = 24;
break;
- case GRUB_VIDEO_BLIT_FORMAT_R8G8B8:
+ case GRUB_VIDEO_BLIT_FORMAT_RGB_888:
mode_info->mode_type = GRUB_VIDEO_MODE_TYPE_RGB;
mode_info->bpp = 24;
mode_info->bytes_per_pixel = 3;
=== modified file 'video/i386/pc/vbe.c'
--- video/i386/pc/vbe.c 2008-01-21 15:48:27 +0000
+++ video/i386/pc/vbe.c 2008-08-31 05:52:21 +0000
@@ -876,17 +876,24 @@
target.data = render_target->data;
/* Try to figure out more optimized version. */
- if (target.mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_R8G8B8A8)
- {
- grub_video_i386_vbefill_R8G8B8A8 (&target, color, x, y,
- width, height);
- return GRUB_ERR_NONE;
- }
-
- if (target.mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_R8G8B8)
- {
- grub_video_i386_vbefill_R8G8B8 (&target, color, x, y,
- width, height);
+ if (target.mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_BGRA_8888)
+ {
+ grub_video_i386_vbefill_direct32 (&target, color, x, y,
+ width, height);
+ return GRUB_ERR_NONE;
+ }
+
+ if (target.mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_RGBA_8888)
+ {
+ grub_video_i386_vbefill_direct32 (&target, color, x, y,
+ width, height);
+ return GRUB_ERR_NONE;
+ }
+
+ if (target.mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_RGB_888)
+ {
+ grub_video_i386_vbefill_direct24 (&target, color, x, y,
+ width, height);
return GRUB_ERR_NONE;
}
@@ -985,19 +992,35 @@
if (oper == GRUB_VIDEO_BLIT_REPLACE)
{
/* Try to figure out more optimized version for replace operator. */
- if (source->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_R8G8B8A8)
+ if (source->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_RGBA_8888)
{
- if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_R8G8B8A8)
- {
- grub_video_i386_vbeblit_R8G8B8X8_R8G8B8X8 (target, source,
+ if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_RGBA_8888)
+ {
+ grub_video_i386_vbeblit_direct32_copy (target, source,
+ x, y, width, height,
+ offset_x, offset_y);
+ return;
+ }
+
+ if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_BGRA_8888)
+ {
+ grub_video_i386_vbeblit_BGRX8888_RGBX8888 (target, source,
x, y, width, height,
offset_x, offset_y);
return;
}
- if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_R8G8B8)
- {
- grub_video_i386_vbeblit_R8G8B8_R8G8B8X8 (target, source,
+ if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_BGR_888)
+ {
+ grub_video_i386_vbeblit_BGR888_RGBX8888 (target, source,
+ x, y, width, height,
+ offset_x, offset_y);
+ return;
+ }
+
+ if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_RGB_888)
+ {
+ grub_video_i386_vbeblit_RGB888_RGBX8888 (target, source,
x, y, width, height,
offset_x, offset_y);
return;
@@ -1005,26 +1028,42 @@
if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_INDEXCOLOR)
{
- grub_video_i386_vbeblit_index_R8G8B8X8 (target, source,
+ grub_video_i386_vbeblit_index_RGBX8888 (target, source,
x, y, width, height,
offset_x, offset_y);
return;
}
}
- if (source->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_R8G8B8)
+ if (source->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_RGB_888)
{
- if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_R8G8B8A8)
- {
- grub_video_i386_vbeblit_R8G8B8A8_R8G8B8 (target, source,
- x, y, width, height,
- offset_x, offset_y);
- return;
- }
-
- if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_R8G8B8)
- {
- grub_video_i386_vbeblit_R8G8B8_R8G8B8 (target, source,
+ if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_BGRA_8888)
+ {
+ grub_video_i386_vbeblit_BGRA8888_RGB888 (target, source,
+ x, y, width, height,
+ offset_x, offset_y);
+ return;
+ }
+
+ if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_RGBA_8888)
+ {
+ grub_video_i386_vbeblit_RGBA8888_RGB888 (target, source,
+ x, y, width, height,
+ offset_x, offset_y);
+ return;
+ }
+
+ if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_BGR_888)
+ {
+ grub_video_i386_vbeblit_BGR888_RGB888 (target, source,
+ x, y, width, height,
+ offset_x, offset_y);
+ return;
+ }
+
+ if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_RGB_888)
+ {
+ grub_video_i386_vbeblit_RGB888_RGB888 (target, source,
x, y, width, height,
offset_x, offset_y);
return;
@@ -1032,13 +1071,24 @@
if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_INDEXCOLOR)
{
- grub_video_i386_vbeblit_index_R8G8B8 (target, source,
+ grub_video_i386_vbeblit_index_RGB888 (target, source,
x, y, width, height,
offset_x, offset_y);
return;
}
}
+ if (source->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_BGRA_8888)
+ {
+ if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_BGRA_8888)
+ {
+ grub_video_i386_vbeblit_direct32_copy (target, source,
+ x, y, width, height,
+ offset_x, offset_y);
+ return;
+ }
+ }
+
if (source->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_INDEXCOLOR)
{
if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_INDEXCOLOR)
@@ -1057,19 +1107,35 @@
else
{
/* Try to figure out more optimized blend operator. */
- if (source->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_R8G8B8A8)
+ if (source->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_RGBA_8888)
{
- if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_R8G8B8A8)
- {
- grub_video_i386_vbeblit_R8G8B8A8_R8G8B8A8 (target, source,
- x, y, width, height,
- offset_x, offset_y);
- return;
- }
-
- if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_R8G8B8)
- {
- grub_video_i386_vbeblit_R8G8B8_R8G8B8A8 (target, source,
+ if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_BGRA_8888)
+ {
+ grub_video_i386_vbeblit_BGRA8888_RGBA8888 (target, source,
+ x, y, width, height,
+ offset_x, offset_y);
+ return;
+ }
+
+ if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_RGBA_8888)
+ {
+ grub_video_i386_vbeblit_RGBA8888_RGBA8888 (target, source,
+ x, y, width, height,
+ offset_x, offset_y);
+ return;
+ }
+
+ if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_BGR_888)
+ {
+ grub_video_i386_vbeblit_BGR888_RGBA8888 (target, source,
+ x, y, width, height,
+ offset_x, offset_y);
+ return;
+ }
+
+ if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_RGB_888)
+ {
+ grub_video_i386_vbeblit_RGB888_RGBA8888 (target, source,
x, y, width, height,
offset_x, offset_y);
return;
@@ -1077,26 +1143,42 @@
if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_INDEXCOLOR)
{
- grub_video_i386_vbeblit_index_R8G8B8A8 (target, source,
+ grub_video_i386_vbeblit_index_RGBA8888 (target, source,
x, y, width, height,
offset_x, offset_y);
return;
}
}
- if (source->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_R8G8B8)
+ if (source->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_RGB_888)
{
- if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_R8G8B8A8)
- {
- grub_video_i386_vbeblit_R8G8B8A8_R8G8B8 (target, source,
- x, y, width, height,
- offset_x, offset_y);
- return;
- }
-
- if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_R8G8B8)
- {
- grub_video_i386_vbeblit_R8G8B8_R8G8B8 (target, source,
+ if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_BGRA_8888)
+ {
+ grub_video_i386_vbeblit_BGRA8888_RGB888 (target, source,
+ x, y, width, height,
+ offset_x, offset_y);
+ return;
+ }
+
+ if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_RGBA_8888)
+ {
+ grub_video_i386_vbeblit_RGBA8888_RGB888 (target, source,
+ x, y, width, height,
+ offset_x, offset_y);
+ return;
+ }
+
+ if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_BGR_888)
+ {
+ grub_video_i386_vbeblit_BGR888_RGB888 (target, source,
+ x, y, width, height,
+ offset_x, offset_y);
+ return;
+ }
+
+ if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_RGB_888)
+ {
+ grub_video_i386_vbeblit_RGB888_RGB888 (target, source,
x, y, width, height,
offset_x, offset_y);
return;
@@ -1104,7 +1186,7 @@
if (target->mode_info->blit_format == GRUB_VIDEO_BLIT_FORMAT_INDEXCOLOR)
{
- grub_video_i386_vbeblit_index_R8G8B8 (target, source,
+ grub_video_i386_vbeblit_index_RGB888 (target, source,
x, y, width, height,
offset_x, offset_y);
return;
=== modified file 'video/i386/pc/vbeblit.c'
--- video/i386/pc/vbeblit.c 2008-01-01 12:02:07 +0000
+++ video/i386/pc/vbeblit.c 2008-08-31 05:52:21 +0000
@@ -35,7 +35,343 @@
#include <grub/video.h>
void
-grub_video_i386_vbeblit_R8G8B8A8_R8G8B8A8 (struct grub_video_i386_vbeblit_info *dst,
+grub_video_i386_vbeblit_BGRX8888_RGBX8888 (struct grub_video_i386_vbeblit_info
+ *dst,
+ struct grub_video_i386_vbeblit_info
+ *src, int x, int y, int width,
+ int height, int offset_x,
+ int offset_y)
+{
+ int i;
+ int j;
+ grub_uint8_t *srcptr;
+ grub_uint8_t *dstptr;
+ unsigned srcrowskip;
+ unsigned dstrowskip;
+
+ /* Calculate the number of bytes to advance from the end of one line
+ * to the beginning of the next line. */
+ srcrowskip =
+ src->mode_info->pitch - src->mode_info->bytes_per_pixel * width;
+ dstrowskip =
+ dst->mode_info->pitch - dst->mode_info->bytes_per_pixel * width;
+
+ srcptr = (grub_uint8_t *) get_data_ptr (src, offset_x, offset_y);
+ dstptr = (grub_uint8_t *) get_data_ptr (dst, x, y);
+ for (j = 0; j < height; j++)
+ {
+ for (i = 0; i < width; i++)
+ {
+ grub_uint8_t r = *srcptr++;
+ grub_uint8_t g = *srcptr++;
+ grub_uint8_t b = *srcptr++;
+ grub_uint8_t a = *srcptr++;
+
+ *dstptr++ = b;
+ *dstptr++ = g;
+ *dstptr++ = r;
+ *dstptr++ = a;
+ }
+ srcptr += srcrowskip;
+ dstptr += dstrowskip;
+ }
+}
+
+void
+grub_video_i386_vbeblit_BGRA8888_RGB888 (struct grub_video_i386_vbeblit_info
+ *dst,
+ struct grub_video_i386_vbeblit_info
+ *src, int x, int y, int width,
+ int height, int offset_x,
+ int offset_y)
+{
+ int i;
+ int j;
+ grub_uint8_t *srcptr;
+ grub_uint8_t *dstptr;
+ unsigned srcrowskip;
+ unsigned dstrowskip;
+
+ /* Calculate the number of bytes to advance from the end of one line
+ * to the beginning of the next line. */
+ srcrowskip =
+ src->mode_info->pitch - src->mode_info->bytes_per_pixel * width;
+ dstrowskip =
+ dst->mode_info->pitch - dst->mode_info->bytes_per_pixel * width;
+
+ srcptr = (grub_uint8_t *) get_data_ptr (src, offset_x, offset_y);
+ dstptr = (grub_uint8_t *) get_data_ptr (dst, x, y);
+ for (j = 0; j < height; j++)
+ {
+ for (i = 0; i < width; i++)
+ {
+ grub_uint8_t r = *srcptr++;
+ grub_uint8_t g = *srcptr++;
+ grub_uint8_t b = *srcptr++;
+
+ *dstptr++ = b;
+ *dstptr++ = g;
+ *dstptr++ = r;
+ *dstptr++ = 255; /* Alpha component: Set opaque. */
+ }
+ srcptr += srcrowskip;
+ dstptr += dstrowskip;
+ }
+}
+
+void
+grub_video_i386_vbeblit_BGR888_RGB888 (struct grub_video_i386_vbeblit_info
+ *dst,
+ struct grub_video_i386_vbeblit_info
+ *src, int x, int y, int width,
+ int height, int offset_x,
+ int offset_y)
+{
+ int i;
+ int j;
+ grub_uint8_t *srcptr;
+ grub_uint8_t *dstptr;
+ unsigned srcrowskip;
+ unsigned dstrowskip;
+
+ /* Calculate the number of bytes to advance from the end of one line
+ * to the beginning of the next line. */
+ srcrowskip =
+ src->mode_info->pitch - src->mode_info->bytes_per_pixel * width;
+ dstrowskip =
+ dst->mode_info->pitch - dst->mode_info->bytes_per_pixel * width;
+
+ srcptr = (grub_uint8_t *) get_data_ptr (src, offset_x, offset_y);
+ dstptr = (grub_uint8_t *) get_data_ptr (dst, x, y);
+ for (j = 0; j < height; j++)
+ {
+ for (i = 0; i < width; i++)
+ {
+ grub_uint8_t r = *srcptr++;
+ grub_uint8_t g = *srcptr++;
+ grub_uint8_t b = *srcptr++;
+
+ *dstptr++ = b;
+ *dstptr++ = g;
+ *dstptr++ = r;
+ }
+ srcptr += srcrowskip;
+ dstptr += dstrowskip;
+ }
+}
+
+void
+grub_video_i386_vbeblit_BGRA8888_RGBA8888 (struct grub_video_i386_vbeblit_info *dst,
+ struct grub_video_i386_vbeblit_info *src,
+ int x, int y, int width, int height,
+ int offset_x, int offset_y)
+{
+ grub_uint32_t *srcptr;
+ grub_uint32_t *dstptr;
+ unsigned srcrowskip;
+ unsigned dstrowskip;
+ int i;
+ int j;
+
+ /* Calculate the number of bytes to advance from the end of one line
+ * to the beginning of the next line. */
+ srcrowskip =
+ src->mode_info->pitch - src->mode_info->bytes_per_pixel * width;
+ dstrowskip =
+ dst->mode_info->pitch - dst->mode_info->bytes_per_pixel * width;
+
+ srcptr = (grub_uint32_t *) get_data_ptr (src, offset_x, offset_y);
+ dstptr = (grub_uint32_t *) get_data_ptr (dst, x, y);
+
+ for (j = 0; j < height; j++)
+ {
+ for (i = 0; i < width; i++)
+ {
+ grub_uint32_t color;
+ unsigned int sr;
+ unsigned int sg;
+ unsigned int sb;
+ unsigned int a;
+ unsigned int dr;
+ unsigned int dg;
+ unsigned int db;
+
+ color = *srcptr++;
+
+ a = color >> 24;
+
+ if (a == 0)
+ {
+ /* Skip transparent source pixels. */
+ dstptr++;
+ continue;
+ }
+
+ sr = (color >> 0) & 0xFF;
+ sg = (color >> 8) & 0xFF;
+ sb = (color >> 16) & 0xFF;
+
+ if (a == 255)
+ {
+ /* Opaque pixel shortcut. */
+ dr = sr;
+ dg = sg;
+ db = sb;
+ }
+ else
+ {
+ /* General pixel color blending. */
+ color = *dstptr;
+
+ dr = (color >> 16) & 0xFF;
+ dr = (dr * (255 - a) + sr * a) / 255;
+ dg = (color >> 8) & 0xFF;
+ dg = (dg * (255 - a) + sg * a) / 255;
+ db = (color >> 0) & 0xFF;
+ db = (db * (255 - a) + sb * a) / 255;
+ }
+
+ color = (a << 24) | (dr << 16) | (dg << 8) | db;
+
+ *dstptr++ = color;
+ }
+
+ srcptr = (grub_uint32_t *) (((grub_uint8_t *) srcptr) + srcrowskip);
+ dstptr = (grub_uint32_t *) (((grub_uint8_t *) dstptr) + dstrowskip);
+ }
+}
+
+void
+grub_video_i386_vbeblit_BGR888_RGBA8888 (struct grub_video_i386_vbeblit_info *dst,
+ struct grub_video_i386_vbeblit_info *src,
+ int x, int y, int width, int height,
+ int offset_x, int offset_y)
+{
+ grub_uint32_t *srcptr;
+ grub_uint8_t *dstptr;
+ unsigned srcrowskip;
+ unsigned dstrowskip;
+ int i;
+ int j;
+
+ /* Calculate the number of bytes to advance from the end of one line
+ * to the beginning of the next line. */
+ srcrowskip =
+ src->mode_info->pitch - src->mode_info->bytes_per_pixel * width;
+ dstrowskip =
+ dst->mode_info->pitch - dst->mode_info->bytes_per_pixel * width;
+
+ srcptr = (grub_uint32_t *) get_data_ptr (src, offset_x, offset_y);
+ dstptr = (grub_uint8_t *) get_data_ptr (dst, x, y);
+
+ for (j = 0; j < height; j++)
+ {
+ for (i = 0; i < width; i++)
+ {
+ grub_uint32_t color;
+ unsigned int sr;
+ unsigned int sg;
+ unsigned int sb;
+ unsigned int a;
+ unsigned int dr;
+ unsigned int dg;
+ unsigned int db;
+
+ color = *srcptr++;
+
+ a = color >> 24;
+
+ if (a == 0)
+ {
+ /* Skip transparent source pixels. */
+ dstptr += 3;
+ continue;
+ }
+
+ sr = (color >> 0) & 0xFF;
+ sg = (color >> 8) & 0xFF;
+ sb = (color >> 16) & 0xFF;
+
+ if (a == 255)
+ {
+ /* Opaque pixel shortcut. */
+ dr = sr;
+ dg = sg;
+ db = sb;
+ }
+ else
+ {
+ /* General pixel color blending. */
+ color = *dstptr;
+
+ db = dstptr[0];
+ db = (db * (255 - a) + sb * a) / 255;
+ dg = dstptr[1];
+ dg = (dg * (255 - a) + sg * a) / 255;
+ dr = dstptr[2];
+ dr = (dr * (255 - a) + sr * a) / 255;
+ }
+
+ *dstptr++ = db;
+ *dstptr++ = dg;
+ *dstptr++ = dr;
+ }
+
+ srcptr = (grub_uint32_t *) (((grub_uint8_t *) srcptr) + srcrowskip);
+ dstptr += dstrowskip;
+ }
+}
+
+void
+grub_video_i386_vbeblit_BGR888_RGBX8888 (struct grub_video_i386_vbeblit_info *dst,
+ struct grub_video_i386_vbeblit_info *src,
+ int x, int y, int width, int height,
+ int offset_x, int offset_y)
+{
+ grub_uint32_t *srcptr;
+ grub_uint8_t *dstptr;
+ unsigned srcrowskip;
+ unsigned dstrowskip;
+ int i;
+ int j;
+
+ /* Calculate the number of bytes to advance from the end of one line
+ * to the beginning of the next line. */
+ srcrowskip =
+ src->mode_info->pitch - src->mode_info->bytes_per_pixel * width;
+ dstrowskip =
+ dst->mode_info->pitch - dst->mode_info->bytes_per_pixel * width;
+
+ srcptr = (grub_uint32_t *) get_data_ptr (src, offset_x, offset_y);
+ dstptr = (grub_uint8_t *) get_data_ptr (dst, x, y);
+
+ for (j = 0; j < height; j++)
+ {
+ for (i = 0; i < width; i++)
+ {
+ grub_uint32_t color;
+ grub_uint8_t sr;
+ grub_uint8_t sg;
+ grub_uint8_t sb;
+
+ color = *srcptr++;
+
+ sr = (color >> 0) & 0xFF;
+ sg = (color >> 8) & 0xFF;
+ sb = (color >> 16) & 0xFF;
+
+ *dstptr++ = sb;
+ *dstptr++ = sg;
+ *dstptr++ = sr;
+ }
+
+ srcptr = (grub_uint32_t *) (((grub_uint8_t *) srcptr) + srcrowskip);
+ dstptr += dstrowskip;
+ }
+}
+
+void
+grub_video_i386_vbeblit_RGBA8888_RGBA8888 (struct grub_video_i386_vbeblit_info *dst,
struct grub_video_i386_vbeblit_info *src,
int x, int y, int width, int height,
int offset_x, int offset_y)
@@ -101,10 +437,10 @@
}
void
-grub_video_i386_vbeblit_R8G8B8X8_R8G8B8X8 (struct grub_video_i386_vbeblit_info *dst,
- struct grub_video_i386_vbeblit_info *src,
- int x, int y, int width, int height,
- int offset_x, int offset_y)
+grub_video_i386_vbeblit_direct32_copy (struct grub_video_i386_vbeblit_info *dst,
+ struct grub_video_i386_vbeblit_info *src,
+ int x, int y, int width, int height,
+ int offset_x, int offset_y)
{
int j;
grub_uint32_t *srcptr;
@@ -126,7 +462,7 @@
}
void
-grub_video_i386_vbeblit_R8G8B8_R8G8B8A8 (struct grub_video_i386_vbeblit_info *dst,
+grub_video_i386_vbeblit_RGB888_RGBA8888 (struct grub_video_i386_vbeblit_info *dst,
struct grub_video_i386_vbeblit_info *src,
int x, int y, int width, int height,
int offset_x, int offset_y)
@@ -193,7 +529,7 @@
}
void
-grub_video_i386_vbeblit_R8G8B8_R8G8B8X8 (struct grub_video_i386_vbeblit_info *dst,
+grub_video_i386_vbeblit_RGB888_RGBX8888 (struct grub_video_i386_vbeblit_info *dst,
struct grub_video_i386_vbeblit_info *src,
int x, int y, int width, int height,
int offset_x, int offset_y)
@@ -231,7 +567,7 @@
}
void
-grub_video_i386_vbeblit_index_R8G8B8A8 (struct grub_video_i386_vbeblit_info *dst,
+grub_video_i386_vbeblit_index_RGBA8888 (struct grub_video_i386_vbeblit_info *dst,
struct grub_video_i386_vbeblit_info *src,
int x, int y, int width, int height,
int offset_x, int offset_y)
@@ -295,7 +631,7 @@
}
void
-grub_video_i386_vbeblit_index_R8G8B8X8 (struct grub_video_i386_vbeblit_info *dst,
+grub_video_i386_vbeblit_index_RGBX8888 (struct grub_video_i386_vbeblit_info *dst,
struct grub_video_i386_vbeblit_info *src,
int x, int y, int width, int height,
int offset_x, int offset_y)
@@ -332,7 +668,7 @@
}
void
-grub_video_i386_vbeblit_R8G8B8A8_R8G8B8 (struct grub_video_i386_vbeblit_info *dst,
+grub_video_i386_vbeblit_RGBA8888_RGB888 (struct grub_video_i386_vbeblit_info *dst,
struct grub_video_i386_vbeblit_info *src,
int x, int y, int width, int height,
int offset_x, int offset_y)
@@ -368,7 +704,7 @@
}
void
-grub_video_i386_vbeblit_R8G8B8_R8G8B8 (struct grub_video_i386_vbeblit_info *dst,
+grub_video_i386_vbeblit_RGB888_RGB888 (struct grub_video_i386_vbeblit_info *dst,
struct grub_video_i386_vbeblit_info *src,
int x, int y, int width, int height,
int offset_x, int offset_y)
@@ -393,7 +729,7 @@
}
void
-grub_video_i386_vbeblit_index_R8G8B8 (struct grub_video_i386_vbeblit_info *dst,
+grub_video_i386_vbeblit_index_RGB888 (struct grub_video_i386_vbeblit_info *dst,
struct grub_video_i386_vbeblit_info *src,
int x, int y, int width, int height,
int offset_x, int offset_y)
=== modified file 'video/i386/pc/vbefill.c'
--- video/i386/pc/vbefill.c 2007-07-21 22:32:33 +0000
+++ video/i386/pc/vbefill.c 2008-08-31 05:52:21 +0000
@@ -34,51 +34,63 @@
#include <grub/video.h>
void
-grub_video_i386_vbefill_R8G8B8A8 (struct grub_video_i386_vbeblit_info *dst,
+grub_video_i386_vbefill_direct32 (struct grub_video_i386_vbeblit_info *dst,
grub_video_color_t color, int x, int y,
int width, int height)
{
int i;
int j;
grub_uint32_t *dstptr;
-
- /* We do not need to worry about data being out of bounds
- as we assume that everything has been checked before. */
+ grub_size_t rowskip;
+
+ /* Calculate the number of bytes to advance from the end of one line
+ * to the beginning of the next line. */
+ rowskip = dst->mode_info->pitch - dst->mode_info->bytes_per_pixel * width;
+
+ /* Get the start address. */
+ dstptr = (grub_uint32_t *) grub_video_vbe_get_video_ptr (dst, x, y);
for (j = 0; j < height; j++)
{
- dstptr = (grub_uint32_t *)grub_video_vbe_get_video_ptr (dst, x, y + j);
-
for (i = 0; i < width; i++)
*dstptr++ = color;
+
+ /* Advance the dest pointer to the right location on the next line. */
+ dstptr = (grub_uint32_t *) (((char *) dstptr) + rowskip);
}
}
void
-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)
+grub_video_i386_vbefill_direct24 (struct grub_video_i386_vbeblit_info *dst,
+ grub_video_color_t color, int x, int y,
+ int width, int height)
{
int i;
int j;
+ grub_size_t rowskip;
grub_uint8_t *dstptr;
- grub_uint8_t fillr = (grub_uint8_t)((color >> 0) & 0xFF);
- grub_uint8_t fillg = (grub_uint8_t)((color >> 8) & 0xFF);
- grub_uint8_t fillb = (grub_uint8_t)((color >> 16) & 0xFF);
+ grub_uint8_t fill0 = (grub_uint8_t)((color >> 0) & 0xFF);
+ grub_uint8_t fill1 = (grub_uint8_t)((color >> 8) & 0xFF);
+ grub_uint8_t fill2 = (grub_uint8_t)((color >> 16) & 0xFF);
- /* We do not need to worry about data being out of bounds
- as we assume that everything has been checked before. */
+ /* Calculate the number of bytes to advance from the end of one line
+ * to the beginning of the next line. */
+ rowskip = dst->mode_info->pitch - dst->mode_info->bytes_per_pixel * width;
+
+ /* Get the start address. */
+ dstptr = (grub_uint8_t *) grub_video_vbe_get_video_ptr (dst, x, y);
for (j = 0; j < height; j++)
{
- dstptr = (grub_uint8_t *)grub_video_vbe_get_video_ptr (dst, x, y + j);
-
for (i = 0; i < width; i++)
{
- *dstptr++ = fillr;
- *dstptr++ = fillg;
- *dstptr++ = fillb;
+ *dstptr++ = fill0;
+ *dstptr++ = fill1;
+ *dstptr++ = fill2;
}
+
+ /* Advance the dest pointer to the right location on the next line. */
+ dstptr += rowskip;
}
}
@@ -89,18 +101,24 @@
{
int i;
int j;
+ grub_size_t rowskip;
grub_uint8_t *dstptr;
grub_uint8_t fill = (grub_uint8_t)color & 0xFF;
- /* We do not need to worry about data being out of bounds
- as we assume that everything has been checked before. */
+ /* Calculate the number of bytes to advance from the end of one line
+ * to the beginning of the next line. */
+ rowskip = dst->mode_info->pitch - dst->mode_info->bytes_per_pixel * width;
+
+ /* Get the start address. */
+ dstptr = (grub_uint8_t *) grub_video_vbe_get_video_ptr (dst, x, y);
for (j = 0; j < height; j++)
{
- dstptr = (grub_uint8_t *)grub_video_vbe_get_video_ptr (dst, x, y + j);
-
for (i = 0; i < width; i++)
*dstptr++ = fill;
+
+ /* Advance the dest pointer to the right location on the next line. */
+ dstptr += rowskip;
}
}
@@ -112,9 +130,6 @@
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);
=== modified file 'video/readers/jpeg.c'
--- video/readers/jpeg.c 2008-08-01 03:06:55 +0000
+++ video/readers/jpeg.c 2008-08-31 05:52:21 +0000
@@ -542,7 +542,7 @@
if (grub_video_bitmap_create (data->bitmap, data->image_width,
data->image_height,
- GRUB_VIDEO_BLIT_FORMAT_R8G8B8))
+ GRUB_VIDEO_BLIT_FORMAT_RGB_888))
return grub_errno;
data->bit_mask = 0x0;
=== modified file 'video/readers/png.c'
--- video/readers/png.c 2008-08-01 03:06:55 +0000
+++ video/readers/png.c 2008-08-31 05:52:21 +0000
@@ -231,7 +231,7 @@
{
if (grub_video_bitmap_create (data->bitmap, data->image_width,
data->image_height,
- GRUB_VIDEO_BLIT_FORMAT_R8G8B8))
+ GRUB_VIDEO_BLIT_FORMAT_RGB_888))
return grub_errno;
data->bpp = 3;
}
@@ -239,7 +239,7 @@
{
if (grub_video_bitmap_create (data->bitmap, data->image_width,
data->image_height,
- GRUB_VIDEO_BLIT_FORMAT_R8G8B8A8))
+ GRUB_VIDEO_BLIT_FORMAT_RGBA_8888))
return grub_errno;
data->bpp = 4;
}
=== modified file 'video/readers/tga.c'
--- video/readers/tga.c 2008-08-01 03:06:55 +0000
+++ video/readers/tga.c 2008-08-31 05:52:21 +0000
@@ -397,7 +397,7 @@
{
grub_video_bitmap_create (bitmap, header.image_width,
header.image_height,
- GRUB_VIDEO_BLIT_FORMAT_R8G8B8A8);
+ GRUB_VIDEO_BLIT_FORMAT_RGBA_8888);
if (grub_errno != GRUB_ERR_NONE)
{
grub_file_close (file);
@@ -420,7 +420,7 @@
{
grub_video_bitmap_create (bitmap, header.image_width,
header.image_height,
- GRUB_VIDEO_BLIT_FORMAT_R8G8B8);
+ GRUB_VIDEO_BLIT_FORMAT_RGB_888);
if (grub_errno != GRUB_ERR_NONE)
{
grub_file_close (file);
=== modified file 'video/video.c'
--- video/video.c 2008-01-01 12:02:07 +0000
+++ video/video.c 2008-08-31 05:52:21 +0000
@@ -152,15 +152,22 @@
if (mode_info->bpp == 32)
{
if ((mode_info->red_mask_size == 8)
+ && (mode_info->red_field_pos == 16)
+ && (mode_info->green_mask_size == 8)
+ && (mode_info->green_field_pos == 8)
+ && (mode_info->blue_mask_size == 8)
+ && (mode_info->blue_field_pos == 0))
+ {
+ return GRUB_VIDEO_BLIT_FORMAT_BGRA_8888;
+ }
+ if ((mode_info->red_mask_size == 8)
&& (mode_info->red_field_pos == 0)
&& (mode_info->green_mask_size == 8)
&& (mode_info->green_field_pos == 8)
&& (mode_info->blue_mask_size == 8)
- && (mode_info->blue_field_pos == 16)
- && (mode_info->reserved_mask_size == 8)
- && (mode_info->reserved_field_pos == 24))
+ && (mode_info->blue_field_pos == 16))
{
- return GRUB_VIDEO_BLIT_FORMAT_R8G8B8A8;
+ return GRUB_VIDEO_BLIT_FORMAT_RGBA_8888;
}
}
@@ -168,13 +175,22 @@
if (mode_info->bpp == 24)
{
if ((mode_info->red_mask_size == 8)
+ && (mode_info->red_field_pos == 16)
+ && (mode_info->green_mask_size == 8)
+ && (mode_info->green_field_pos == 8)
+ && (mode_info->blue_mask_size == 8)
+ && (mode_info->blue_field_pos == 0))
+ {
+ return GRUB_VIDEO_BLIT_FORMAT_BGR_888;
+ }
+ if ((mode_info->red_mask_size == 8)
&& (mode_info->red_field_pos == 0)
&& (mode_info->green_mask_size == 8)
&& (mode_info->green_field_pos == 8)
&& (mode_info->blue_mask_size == 8)
&& (mode_info->blue_field_pos == 16))
{
- return GRUB_VIDEO_BLIT_FORMAT_R8G8B8;
+ return GRUB_VIDEO_BLIT_FORMAT_RGB_888;
}
}
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 197 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] GSoC #06 VBE optimization for BGR/BGRA color modes
2008-08-31 6:56 [PATCH] GSoC #06 VBE optimization for BGR/BGRA color modes Colin D Bennett
@ 2008-09-07 15:59 ` Vesa Jääskeläinen
0 siblings, 0 replies; 2+ messages in thread
From: Vesa Jääskeläinen @ 2008-09-07 15:59 UTC (permalink / raw)
To: The development of GRUB 2
Colin D Bennett wrote:
> This patch adds optimized routines for video modes using BGR/BGRA color
> format. Most PC video cards use BGR (24-bit) or BGRA (32-bit) color
> modes, so this is an extremely important change and provides a massive
> performance benefit.
>
> I also renamed the R8G8B8A8 and R8B8B8 modes to RGBA8888 and RGB888,
> etc., since it began to be highly unreadable when B8G8R8A8 was added
> into the mix. It seems that having the color components (letters)
> grouped together in the name makes it much easier for me to determine
> the mode name at a glance.
Thanks for the patch. I have committed similar version to SVN.
I made some changes there so apologies if it broke something in between.
I was only able to test it on qemu and it was ok there, but that is far
from complete test. So please test it on real hardware with different
cards and if problems are found report them back.
Thanks,
Vesa Jääskeläinen
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2008-09-07 15:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-31 6:56 [PATCH] GSoC #06 VBE optimization for BGR/BGRA color modes Colin D Bennett
2008-09-07 15:59 ` Vesa Jääskeläinen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.