ada-libraries
/
Ada_Drivers_Library
mirror of https://github.com/AdaCore/Ada_Drivers_Library
1
0
Fork 0
Code Issues Releases Wiki Activity

Add optimized version of Fill and Copy_Rect

This commit is contained in:
Maxim Reznik 2023-11-14 19:59:54 +02:00
parent 639e9031fb
commit b60639de8b
2 changed files with 107 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
components/src/screen/ili9341/ili9341-device-bitmap.adb
View File

@ -33,6 +33,7 @@ pragma Ada_2022;
with ILI9341.Regs; use ILI9341.Regs;
with Bitmap_Color_Conversion;
with System.Storage_Elements;
package body ILI9341.Device.Bitmap is
use HAL;
@ -41,6 +42,95 @@ package body ILI9341.Device.Bitmap is
(From : HAL.Bitmap.Point;
To : HAL.Bitmap.Point);
---------------
-- Copy_Rect --
---------------
overriding
procedure Copy_Rect
(Src_Buffer : HAL.Bitmap.Bitmap_Buffer'Class;
Src_Pt : HAL.Bitmap.Point;
This : in out Bitmap_Buffer;
Dst_Pt : HAL.Bitmap.Point;
Width : Natural;
Height : Natural;
Synchronous : Boolean)
is
use type HAL.Bitmap.Bitmap_Color_Mode;
use type System.Storage_Elements.Storage_Offset;
Mode : constant HAL.Bitmap.Bitmap_Color_Mode := Src_Buffer.Color_Mode;
Pixel_Size : constant Positive := HAL.Bitmap.Bits_Per_Pixel (Mode);
Src_Width : constant Natural := Src_Buffer.Width;
begin
-- TODO: speed up if Src_Buffet=This by r/w a bunch of pixels
if Pixel_Size < 8
or Mode = HAL.Bitmap.A_8
or not Src_Buffer.Mapped_In_RAM
then
-- Fallback to the slow copying
Soft_Drawing_Bitmap.Copy_Rect
(Src_Buffer, Src_Pt, Parent (This), Dst_Pt,
Width, Height, Synchronous);
return;
end if;
if Width = Src_Buffer.Width then
-- Copy rectangle in one go
Set_Cursor_Position
(Dst_Pt,
(Dst_Pt.X + Width - 1, Dst_Pt.Y + Height - 1));
Send_Command (Connector, ILI9341_GRAM, []);
Write_Pixels
(This => Connector,
Mode => Src_Buffer.Color_Mode,
Address => Src_Buffer.Memory_Address +
System.Storage_Elements.Storage_Offset
(Src_Pt.Y * Width * Pixel_Size / 8),
Count => Width * Height,
Repeat => 1);
else
for DY in 0 .. 0 + Height - 1 loop
Set_Cursor_Position
((Y => Dst_Pt.Y + DY, X => Dst_Pt.X),
(Y => Dst_Pt.Y + DY, X => Dst_Pt.X + Width - 1));
Send_Command (Connector, ILI9341_GRAM, []);
Write_Pixels
(This => Connector,
Mode => Src_Buffer.Color_Mode,
Address => Src_Buffer.Memory_Address +
System.Storage_Elements.Storage_Offset
((Src_Pt.Y + DY) * Src_Width * Pixel_Size / 8),
Count => Width,
Repeat => 1);
end loop;
end if;
end Copy_Rect;
----------
-- Fill --
----------
overriding
procedure Fill (This : in out Bitmap_Buffer) is
begin
Set_Cursor_Position ((0, 0), (This.Width - 1, This.Height - 1));
Send_Command (Connector, ILI9341_GRAM, []);
Write_Pixels
(This => Connector,
Mode => HAL.Bitmap.RGB_888,
Address => This.Source'Address,
Count => 1,
Repeat => This.Width * This.Height);
end Fill;
----------------
-- Get_Bitmap --
----------------
@ -64,6 +154,10 @@ package body ILI9341.Device.Bitmap is
(HAL.Bitmap.RGB_888, This.Pixel (Point));
end Pixel;
-----------
-- Pixel --
-----------
overriding
function Pixel
(This : Bitmap_Buffer;

13
components/src/screen/ili9341/ili9341-device-bitmap.ads
View File

@ -114,6 +114,19 @@ package ILI9341.Device.Bitmap is
function Buffer_Size (This : Bitmap_Buffer) return Natural is
(This.Width * This.Height * 18 / 8);
overriding
procedure Fill (This : in out Bitmap_Buffer);
overriding
procedure Copy_Rect
(Src_Buffer : HAL.Bitmap.Bitmap_Buffer'Class;
Src_Pt : HAL.Bitmap.Point;
This : in out Bitmap_Buffer;
Dst_Pt : HAL.Bitmap.Point;
Width : Natural;
Height : Natural;
Synchronous : Boolean);
private
type Bitmap_Buffer