vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix video on platforms where unaligned access is forbidden.

Browse source 
Make several optimisations while on it.

	* grub-core/video/fb/fbblit.c (grub_video_fbblit_replace_directN):
	Optimise and use GRUB_VIDEO_FB_ADVANCE_POINTER.
	(grub_video_fbblit_replace_32bit_1bit): Likewise.
	(grub_video_fbblit_replace_24bit_1bit) [!GRUB_HAVE_UNALIGNED_ACCESS]:
	Disable.
	(grub_video_fbblit_replace_16bit_1bit):
	Optimise and use GRUB_VIDEO_FB_ADVANCE_POINTER.
	(grub_video_fbblit_replace_8bit_1bit): Likewise.
	(grub_video_fbblit_replace_BGRX8888_RGBX8888): Likewise.
	(grub_video_fbblit_replace_BGRX8888_RGB888): Likewise.
	(grub_video_fbblit_replace_BGR888_RGBX8888): Likewise.
	(grub_video_fbblit_replace_BGR888_RGBX8888): Likewise.
	(grub_video_fbblit_replace_BGR888_RGB888): Likewise.
	(grub_video_fbblit_replace_RGBX8888_RGB88): Likewise.
	(grub_video_fbblit_replace_RGB888_RGBX888): Likewise.
	(grub_video_fbblit_replace_RGB888_RGBX8888): Likewise.
	(grub_video_fbblit_replace_index_RGBX8888): Likewise.
	(grub_video_fbblit_replace_index_RGB888): Likewise.
	(grub_video_fbblit_blend_BGRA8888_RGBA8888): Likewise.
	(grub_video_fbblit_blend_BGR888_RGBA8888): Likewise.
	(grub_video_fbblit_blend_RGBA8888_RGBA8888): Likewise.
	(grub_video_fbblit_blend_RGB888_RGBA8888): Likewise.
	(grub_video_fbblit_blend_index_RGBA8888): Likewise.
	(grub_video_fbblit_blend_XXXA8888_1bit): Likewise.
	(grub_video_fbblit_blend_XXX888_1bit) [!GRUB_HAVE_UNALIGNED_ACCESS]:
	Disable.
	(grub_video_fbblit_blend_XXX565_1bit):
	Optimise and use GRUB_VIDEO_FB_ADVANCE_POINTER.
	* grub-core/video/fb/fbfill.c (grub_video_fbfill_direct32): Likewise.
	* grub-core/video/fb/fbutil.c (grub_video_fb_get_video_ptr): Return
	void *.
	* grub-core/video/fb/video_fb.c (common_blitter)
	[!GRUB_HAVE_UNALIGNED_ACCESS]: Skip disabled blitters.
	(grub_video_fb_create_render_target_from_pointer)
	[!GRUB_HAVE_UNALIGNED_ACCESS]: Check alignment.
	* include/grub/fbutil.h (grub_video_fb_get_video_ptr): Return void *.
	* include/grub/i386/types.h (GRUB_HAVE_UNALIGNED_ACCESS): New
	definition.
	* include/grub/x86_64/types.h (GRUB_HAVE_UNALIGNED_ACCESS): Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-12-13 20:07:33 +01:00
parent ace96609b6
commit 12e9d4d152
8 changed files with 206 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

13
grub-core/video/fb/video_fb.c
View file

@ -622,6 +622,7 @@ common_blitter (struct grub_video_fbblit_info *target,
offset_x, offset_y);
return;
}
#ifdef GRUB_HAVE_UNALIGNED_ACCESS
else if (target->mode_info->bpp == 24)
{
grub_video_fbblit_replace_24bit_1bit (target, source,
@ -629,6 +630,7 @@ common_blitter (struct grub_video_fbblit_info *target,
offset_x, offset_y);
return;
}
#endif
else if (target->mode_info->bpp == 16)
{
grub_video_fbblit_replace_16bit_1bit (target, source,
@ -743,6 +745,7 @@ common_blitter (struct grub_video_fbblit_info *target,
offset_x, offset_y);
return;
}
#ifdef GRUB_HAVE_UNALIGNED_ACCESS
else if (target->mode_info->blit_format
== GRUB_VIDEO_BLIT_FORMAT_BGR_888
|| target->mode_info->blit_format
@ -753,6 +756,7 @@ common_blitter (struct grub_video_fbblit_info *target,
offset_x, offset_y);
return;
}
#endif
else if (target->mode_info->blit_format
== GRUB_VIDEO_BLIT_FORMAT_BGR_565
|| target->mode_info->blit_format
@ -1195,6 +1199,15 @@ grub_video_fb_create_render_target_from_pointer (struct grub_video_fbrender_targ
struct grub_video_fbrender_target *target;
unsigned y;
#ifndef GRUB_HAVE_UNALIGNED_ACCESS
if (!(mode_info->bytes_per_pixel & (mode_info->bytes_per_pixel - 1))
&& ((grub_addr_t) ptr & (mode_info->bytes_per_pixel - 1)))
return grub_error (GRUB_ERR_BAD_ARGUMENT, "unaligned pointer");
if (!(mode_info->bytes_per_pixel & (mode_info->bytes_per_pixel - 1))
&& (mode_info->pitch & (mode_info->bytes_per_pixel - 1)))
return grub_error (GRUB_ERR_BAD_ARGUMENT, "unaligned pitch");
#endif
/* Allocate memory for render target. */
target = grub_malloc (sizeof (struct grub_video_fbrender_target));
if (! target)