eersoy93/exectos
1
0
Fork 0
forked from xt-sys/exectos
Code Pull Requests Activity

Fixes to FbpGetPixelInformation() and FbpGetColorMask() routines

Browse Source
This commit is contained in:
Rafal Kupiec 2024-05-12 22:20:22 +02:00
parent 3d08be4fac
commit 615a1457bf
Signed by: belliash
GPG Key ID: 4E829243E0CFE6B4
3 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sdk/xtdk/bltypes.h
View File

@ -269,14 +269,14 @@ typedef struct _XTBL_FRAMEBUFFER_MODE_INFORMATION
EFI_GRAPHICS_PIXEL_FORMAT PixelFormat;
struct
{
USHORT BlueMask;
USHORT BlueShift;
USHORT GreenMask;
USHORT BlueSize;
USHORT GreenShift;
USHORT RedMask;
USHORT GreenSize;
USHORT RedShift;
USHORT ReservedMask;
USHORT RedSize;
USHORT ReservedShift;
USHORT ReservedSize;
} PixelInformation;
} XTBL_FRAMEBUFFER_MODE_INFORMATION, *PXTBL_FRAMEBUFFER_MODE_INFORMATION;

71
xtldr/modules/framebuf/framebuf.c
View File

@ -524,8 +524,8 @@ FbpFindFramebufferAddress(OUT PEFI_PHYSICAL_ADDRESS Address)
* @param PixelBitMask
* Provides a pixel bit mask.
*
* @param ColorMask
* Supplies a pointer to the memory area where the color mask will be stored.
* @param ColorSize
* Supplies a pointer to the memory area where the color size will be stored.
*
* @param ColorShift
* Supplies a pointer to the memory area where the color shift (position) will be stored.
@ -537,34 +537,37 @@ FbpFindFramebufferAddress(OUT PEFI_PHYSICAL_ADDRESS Address)
XTCDECL
VOID
FbpGetColorMask(IN UINT PixelBitMask,
OUT PUSHORT ColorMask,
OUT PUSHORT ColorSize,
OUT PUSHORT ColorShift)
{
UINT Index, Mask;
UINT Shift, Size;
/* Initialize variables */
Index = 0;
Mask = 1;
Shift = 0;
Size = 0;
/* Make sure EfiMask is not zero */
if(PixelBitMask)
{
while((Index < 32) && ((PixelBitMask & Mask) == 0))
/* Get color shift */
while((PixelBitMask & 1) == 0)
{
Index++;
Mask <<= 1;
Shift++;
PixelBitMask >>= 1;
}
/* Get color size */
while((PixelBitMask & 1) == 1)
{
Size++;
PixelBitMask >>= 1;
}
}
/* Set color mask and shift */
*ColorShift = Index;
*ColorMask = (Mask >> Index);
}
else
{
/* Set default color mask and shift */
*ColorMask = 0;
*ColorShift = 0;
}
*ColorShift = Shift;
*ColorSize = Size;
}
/**
@ -672,26 +675,26 @@ FbpGetPixelInformation(IN PEFI_PIXEL_BITMASK PixelsBitMask)
case PixelBlueGreenRedReserved8BitPerColor:
/* BGRR, 32 bits per pixel */
FbpDisplayInfo.ModeInfo.BitsPerPixel = 32;
FbpDisplayInfo.ModeInfo.PixelInformation.BlueMask = 0xFF;
FbpDisplayInfo.ModeInfo.PixelInformation.BlueShift = 0;
FbpDisplayInfo.ModeInfo.PixelInformation.GreenMask = 0xFF;
FbpDisplayInfo.ModeInfo.PixelInformation.BlueSize = 8;
FbpDisplayInfo.ModeInfo.PixelInformation.GreenShift = 8;
FbpDisplayInfo.ModeInfo.PixelInformation.RedMask = 0xFF;
FbpDisplayInfo.ModeInfo.PixelInformation.GreenSize = 8;
FbpDisplayInfo.ModeInfo.PixelInformation.RedShift = 16;
FbpDisplayInfo.ModeInfo.PixelInformation.ReservedMask = 0xFF;
FbpDisplayInfo.ModeInfo.PixelInformation.RedSize = 8;
FbpDisplayInfo.ModeInfo.PixelInformation.ReservedShift = 24;
FbpDisplayInfo.ModeInfo.PixelInformation.ReservedSize = 8;
break;
case PixelRedGreenBlueReserved8BitPerColor:
/* RGBR, 32 bits per pixel */
FbpDisplayInfo.ModeInfo.BitsPerPixel = 32;
FbpDisplayInfo.ModeInfo.PixelInformation.BlueMask = 0xFF;
FbpDisplayInfo.ModeInfo.PixelInformation.BlueShift = 16;
FbpDisplayInfo.ModeInfo.PixelInformation.GreenMask = 0xFF;
FbpDisplayInfo.ModeInfo.PixelInformation.BlueSize = 8;
FbpDisplayInfo.ModeInfo.PixelInformation.GreenShift = 8;
FbpDisplayInfo.ModeInfo.PixelInformation.RedMask = 0xFF;
FbpDisplayInfo.ModeInfo.PixelInformation.GreenSize = 8;
FbpDisplayInfo.ModeInfo.PixelInformation.RedShift = 0;
FbpDisplayInfo.ModeInfo.PixelInformation.ReservedMask = 0xFF;
FbpDisplayInfo.ModeInfo.PixelInformation.RedSize = 8;
FbpDisplayInfo.ModeInfo.PixelInformation.ReservedShift = 24;
FbpDisplayInfo.ModeInfo.PixelInformation.ReservedSize = 8;
break;
case PixelBitMask:
/* Assume 32 bits per pixel */
@ -711,26 +714,26 @@ FbpGetPixelInformation(IN PEFI_PIXEL_BITMASK PixelsBitMask)
}
/* Set pixel information */
FbpGetColorMask(PixelsBitMask->RedMask, &FbpDisplayInfo.ModeInfo.PixelInformation.RedMask,
FbpGetColorMask(PixelsBitMask->RedMask, &FbpDisplayInfo.ModeInfo.PixelInformation.RedSize,
&FbpDisplayInfo.ModeInfo.PixelInformation.RedShift);
FbpGetColorMask(PixelsBitMask->GreenMask, &FbpDisplayInfo.ModeInfo.PixelInformation.GreenMask,
FbpGetColorMask(PixelsBitMask->GreenMask, &FbpDisplayInfo.ModeInfo.PixelInformation.GreenSize,
&FbpDisplayInfo.ModeInfo.PixelInformation.GreenShift);
FbpGetColorMask(PixelsBitMask->BlueMask, &FbpDisplayInfo.ModeInfo.PixelInformation.BlueMask,
FbpGetColorMask(PixelsBitMask->BlueMask, &FbpDisplayInfo.ModeInfo.PixelInformation.BlueSize,
&FbpDisplayInfo.ModeInfo.PixelInformation.BlueShift);
FbpGetColorMask(PixelsBitMask->ReservedMask, &FbpDisplayInfo.ModeInfo.PixelInformation.ReservedMask,
FbpGetColorMask(PixelsBitMask->ReservedMask, &FbpDisplayInfo.ModeInfo.PixelInformation.ReservedSize,
&FbpDisplayInfo.ModeInfo.PixelInformation.ReservedShift);
break;
default:
/* Unknown pixel format */
FbpDisplayInfo.ModeInfo.BitsPerPixel = 0;
FbpDisplayInfo.ModeInfo.PixelInformation.BlueMask = 0x0;
FbpDisplayInfo.ModeInfo.PixelInformation.BlueShift = 0;
FbpDisplayInfo.ModeInfo.PixelInformation.GreenMask = 0x0;
FbpDisplayInfo.ModeInfo.PixelInformation.BlueSize = 0;
FbpDisplayInfo.ModeInfo.PixelInformation.GreenShift = 0;
FbpDisplayInfo.ModeInfo.PixelInformation.RedMask = 0x0;
FbpDisplayInfo.ModeInfo.PixelInformation.GreenSize = 0;
FbpDisplayInfo.ModeInfo.PixelInformation.RedShift = 0;
FbpDisplayInfo.ModeInfo.PixelInformation.ReservedMask = 0x0;
FbpDisplayInfo.ModeInfo.PixelInformation.RedSize = 0;
FbpDisplayInfo.ModeInfo.PixelInformation.ReservedShift = 0;
FbpDisplayInfo.ModeInfo.PixelInformation.ReservedSize = 0;
break;
}

2
xtldr/modules/framebuf/includes/framebuf.h
View File

@ -45,7 +45,7 @@ FbpFindFramebufferAddress(OUT PEFI_PHYSICAL_ADDRESS Address);
XTCDECL
VOID
FbpGetColorMask(IN UINT EfiMask,
OUT PUSHORT ColorMask,
OUT PUSHORT ColorSize,
OUT PUSHORT ColorShift);
XTCDECL