2006-07-29 Vesa Jaaskelainen <chaac@nic.fi>
* include/grub/video.h: Code cleanup.
* include/grub/i386/pc/vbe.h: Likewise.
* video/i386/pc/vbe.c: Likewise.
* video/i386/pc/vbeblit.c: Likewise.
* video/i386/pc/vbefill.c: Likewise.
* video/video.c: Likewise. Also added more comments.
This commit is contained in:
chaac
parent
5915059b61
commit
684a8eff89
7 changed files with 316 additions and 339 deletions
|
|
@ -36,10 +36,10 @@
|
|||
#define GRUB_VBE_MEMORY_MODEL_DIRECT_COLOR 0x06
|
||||
|
||||
/* Note:
|
||||
|
||||
|
||||
Please refer to VESA BIOS Extension 3.0 Specification for more descriptive
|
||||
meanings of following structures and how they should be used.
|
||||
|
||||
|
||||
I have tried to maintain field name comatibility against specification
|
||||
while following naming convetions used in GRUB. */
|
||||
|
||||
|
|
@ -206,11 +206,9 @@ grub_err_t grub_vbe_get_video_mode_info (grub_uint32_t mode,
|
|||
|
||||
/* 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,
|
||||
grub_uint32_t x,
|
||||
grub_uint32_t y);
|
||||
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_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,
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ struct grub_video_mode_info
|
|||
{
|
||||
/* Width of the screen. */
|
||||
unsigned int width;
|
||||
|
||||
|
||||
/* Height of the screen. */
|
||||
unsigned int height;
|
||||
|
||||
|
|
@ -74,10 +74,10 @@ struct grub_video_mode_info
|
|||
|
||||
/* Bits per pixel. */
|
||||
unsigned int bpp;
|
||||
|
||||
|
||||
/* Bytes per pixel. */
|
||||
unsigned int bytes_per_pixel;
|
||||
|
||||
|
||||
/* Pitch of one scanline. How many bytes there are for scanline. */
|
||||
unsigned int pitch;
|
||||
|
||||
|
|
@ -130,7 +130,7 @@ struct grub_video_render_target
|
|||
/* 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;
|
||||
|
|
@ -158,78 +158,52 @@ struct grub_video_adapter
|
|||
/* Clean up the video adapter. */
|
||||
grub_err_t (*fini) (void);
|
||||
|
||||
grub_err_t (*setup) (unsigned int width,
|
||||
unsigned int height,
|
||||
unsigned int mode_type);
|
||||
grub_err_t (*setup) (unsigned int width, unsigned int height,
|
||||
unsigned int mode_type);
|
||||
|
||||
grub_err_t (*get_info) (struct grub_video_mode_info *mode_info);
|
||||
|
||||
grub_err_t (*set_palette) (unsigned int start,
|
||||
unsigned int count,
|
||||
struct grub_video_palette_data *palette_data);
|
||||
|
||||
grub_err_t (*get_palette) (unsigned int start,
|
||||
unsigned int count,
|
||||
struct grub_video_palette_data *palette_data);
|
||||
grub_err_t (*set_palette) (unsigned int start, unsigned int count,
|
||||
struct grub_video_palette_data *palette_data);
|
||||
|
||||
grub_err_t (*set_viewport) (unsigned int x,
|
||||
unsigned int y,
|
||||
unsigned int width,
|
||||
unsigned int height);
|
||||
grub_err_t (*get_palette) (unsigned int start, unsigned int count,
|
||||
struct grub_video_palette_data *palette_data);
|
||||
|
||||
grub_err_t (*get_viewport) (unsigned int *x,
|
||||
unsigned int *y,
|
||||
unsigned int *width,
|
||||
unsigned int *height);
|
||||
grub_err_t (*set_viewport) (unsigned int x, unsigned int y,
|
||||
unsigned int width, unsigned int height);
|
||||
|
||||
grub_err_t (*get_viewport) (unsigned int *x, unsigned int *y,
|
||||
unsigned int *width, unsigned int *height);
|
||||
|
||||
grub_video_color_t (*map_color) (grub_uint32_t color_name);
|
||||
|
||||
grub_video_color_t (*map_rgb) (grub_uint8_t red,
|
||||
grub_uint8_t green,
|
||||
grub_uint8_t blue);
|
||||
|
||||
grub_video_color_t (*map_rgba) (grub_uint8_t red,
|
||||
grub_uint8_t green,
|
||||
grub_uint8_t blue,
|
||||
grub_uint8_t alpha);
|
||||
grub_video_color_t (*map_rgb) (grub_uint8_t red, grub_uint8_t green,
|
||||
grub_uint8_t blue);
|
||||
|
||||
grub_err_t (*fill_rect) (grub_video_color_t color,
|
||||
int x,
|
||||
int y,
|
||||
unsigned int width,
|
||||
unsigned int height);
|
||||
grub_video_color_t (*map_rgba) (grub_uint8_t red, grub_uint8_t green,
|
||||
grub_uint8_t blue, grub_uint8_t alpha);
|
||||
|
||||
grub_err_t (*fill_rect) (grub_video_color_t color, int x, int y,
|
||||
unsigned int width, unsigned int height);
|
||||
|
||||
grub_err_t (*blit_glyph) (struct grub_font_glyph *glyph,
|
||||
grub_video_color_t color,
|
||||
int x,
|
||||
int y);
|
||||
grub_video_color_t color, int x, int y);
|
||||
|
||||
grub_err_t (*blit_bitmap) (struct grub_video_bitmap *bitmap,
|
||||
int x,
|
||||
int y,
|
||||
int offset_x,
|
||||
int offset_y,
|
||||
unsigned int width,
|
||||
unsigned int height);
|
||||
int x, int y, int offset_x, int offset_y,
|
||||
unsigned int width, unsigned int height);
|
||||
|
||||
grub_err_t (*blit_render_target) (struct grub_video_render_target *source,
|
||||
int x,
|
||||
int y,
|
||||
int offset_x,
|
||||
int offset_y,
|
||||
unsigned int width,
|
||||
unsigned int height);
|
||||
int x, int y, int offset_x, int offset_y,
|
||||
unsigned int width, unsigned int height);
|
||||
|
||||
grub_err_t (*scroll) (grub_video_color_t color,
|
||||
int dx,
|
||||
int dy);
|
||||
grub_err_t (*scroll) (grub_video_color_t color, int dx, int dy);
|
||||
|
||||
grub_err_t (*swap_buffers) (void);
|
||||
|
||||
grub_err_t (*create_render_target) (struct grub_video_render_target **result,
|
||||
unsigned int width,
|
||||
unsigned int height,
|
||||
unsigned int mode_type);
|
||||
unsigned int width, unsigned int height,
|
||||
unsigned int mode_type);
|
||||
|
||||
grub_err_t (*delete_render_target) (struct grub_video_render_target *target);
|
||||
|
||||
|
|
@ -244,9 +218,8 @@ void grub_video_register (grub_video_adapter_t adapter);
|
|||
void grub_video_unregister (grub_video_adapter_t adapter);
|
||||
void grub_video_iterate (int (*hook) (grub_video_adapter_t adapter));
|
||||
|
||||
grub_err_t grub_video_setup (unsigned int width,
|
||||
unsigned int height,
|
||||
unsigned int mode_type);
|
||||
grub_err_t grub_video_setup (unsigned int width, unsigned int height,
|
||||
unsigned int mode_type);
|
||||
|
||||
grub_err_t grub_video_restore (void);
|
||||
|
||||
|
|
@ -254,72 +227,50 @@ grub_err_t grub_video_get_info (struct grub_video_mode_info *mode_info);
|
|||
|
||||
enum grub_video_blit_format grub_video_get_blit_format (struct grub_video_mode_info *mode_info);
|
||||
|
||||
grub_err_t grub_video_set_palette (unsigned int start,
|
||||
unsigned int count,
|
||||
struct grub_video_palette_data *palette_data);
|
||||
grub_err_t grub_video_set_palette (unsigned int start, unsigned int count,
|
||||
struct grub_video_palette_data *palette_data);
|
||||
|
||||
grub_err_t grub_video_get_palette (unsigned int start,
|
||||
unsigned int count,
|
||||
struct grub_video_palette_data *palette_data);
|
||||
grub_err_t grub_video_get_palette (unsigned int start, unsigned int count,
|
||||
struct grub_video_palette_data *palette_data);
|
||||
|
||||
grub_err_t grub_video_set_viewport (unsigned int x,
|
||||
unsigned int y,
|
||||
unsigned int width,
|
||||
unsigned int height);
|
||||
grub_err_t grub_video_set_viewport (unsigned int x, unsigned int y,
|
||||
unsigned int width, unsigned int height);
|
||||
|
||||
grub_err_t grub_video_get_viewport (unsigned int *x,
|
||||
unsigned int *y,
|
||||
unsigned int *width,
|
||||
unsigned int *height);
|
||||
grub_err_t grub_video_get_viewport (unsigned int *x, unsigned int *y,
|
||||
unsigned int *width, unsigned int *height);
|
||||
|
||||
grub_video_color_t grub_video_map_color (grub_uint32_t color_name);
|
||||
|
||||
grub_video_color_t grub_video_map_rgb (grub_uint8_t red,
|
||||
grub_uint8_t green,
|
||||
grub_uint8_t blue);
|
||||
grub_video_color_t grub_video_map_rgb (grub_uint8_t red, grub_uint8_t green,
|
||||
grub_uint8_t blue);
|
||||
|
||||
grub_video_color_t grub_video_map_rgba (grub_uint8_t red,
|
||||
grub_uint8_t green,
|
||||
grub_uint8_t blue,
|
||||
grub_uint8_t alpha);
|
||||
grub_video_color_t grub_video_map_rgba (grub_uint8_t red, grub_uint8_t green,
|
||||
grub_uint8_t blue, grub_uint8_t alpha);
|
||||
|
||||
grub_err_t grub_video_fill_rect (grub_video_color_t color,
|
||||
int x,
|
||||
int y,
|
||||
unsigned int width,
|
||||
unsigned int height);
|
||||
grub_err_t grub_video_fill_rect (grub_video_color_t color, int x, int y,
|
||||
unsigned int width, unsigned int height);
|
||||
|
||||
grub_err_t grub_video_blit_glyph (struct grub_font_glyph *glyph,
|
||||
grub_video_color_t color,
|
||||
int x,
|
||||
int y);
|
||||
grub_video_color_t color, int x, int y);
|
||||
|
||||
grub_err_t grub_video_blit_bitmap (struct grub_video_bitmap *bitmap,
|
||||
int x,
|
||||
int y,
|
||||
int offset_x,
|
||||
int offset_y,
|
||||
unsigned int width,
|
||||
unsigned int height);
|
||||
int x, int y, int offset_x, int offset_y,
|
||||
unsigned int width, unsigned int height);
|
||||
|
||||
grub_err_t grub_video_blit_render_target (struct grub_video_render_target *source,
|
||||
int x,
|
||||
int y,
|
||||
int offset_x,
|
||||
int offset_y,
|
||||
unsigned int width,
|
||||
unsigned int height);
|
||||
int x, int y,
|
||||
int offset_x, int offset_y,
|
||||
unsigned int width,
|
||||
unsigned int height);
|
||||
|
||||
grub_err_t grub_video_scroll (grub_video_color_t color,
|
||||
int dx,
|
||||
int dy);
|
||||
grub_err_t grub_video_scroll (grub_video_color_t color, int dx, int dy);
|
||||
|
||||
grub_err_t grub_video_swap_buffers (void);
|
||||
|
||||
grub_err_t grub_video_create_render_target (struct grub_video_render_target **result,
|
||||
unsigned int width,
|
||||
unsigned int height,
|
||||
unsigned int mode_type);
|
||||
unsigned int width,
|
||||
unsigned int height,
|
||||
unsigned int mode_type);
|
||||
|
||||
grub_err_t grub_video_delete_render_target (struct grub_video_render_target *target);
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue