tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdeModulePkg/FrameBufferBltLib: Refine ConfigurePixelBitMaskFormat 

https://bugzilla.tianocore.org/show_bug.cgi?id=339
The patch refines ConfigurePixelBitMaskFormat() to prepare the
enhancement in next commit: Enhance this library to use dynamic
allocated line buffer to reduce memory usage of frame buffer
configure.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>
This commit is contained in:
Ruiyu Ni 2017-01-11 15:06:25 +08:00
parent 6671cd7444
commit 5af29d0d86
1 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
MdeModulePkg/Library/FrameBufferBltLib/FrameBufferBltLib.c
View File

@ -1,7 +1,7 @@
/** @file /** @file
FrameBufferBltLib - Library to perform blt operations on a frame buffer. FrameBufferBltLib - Library to perform blt operations on a frame buffer.
Copyright (c) 2007 - 2016, Intel Corporation. All rights reserved.<BR> Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>
This program and the accompanying materials This program and the accompanying materials
are licensed and made available under the terms and conditions of the BSD License are licensed and made available under the terms and conditions of the BSD License
which accompanies this distribution. The full text of the license may be found at which accompanies this distribution. The full text of the license may be found at
@ -30,8 +30,8 @@ struct FRAME_BUFFER_CONFIGURE {
UINT8 *FrameBuffer; UINT8 *FrameBuffer;
EFI_GRAPHICS_PIXEL_FORMAT PixelFormat; EFI_GRAPHICS_PIXEL_FORMAT PixelFormat;
EFI_PIXEL_BITMASK PixelMasks; EFI_PIXEL_BITMASK PixelMasks;
INTN PixelShl[4]; // R-G-B-Rsvd INT8 PixelShl[4]; // R-G-B-Rsvd
INTN PixelShr[4]; // R-G-B-Rsvd INT8 PixelShr[4]; // R-G-B-Rsvd
}; };
CONST EFI_PIXEL_BITMASK mRgbPixelMasks = { CONST EFI_PIXEL_BITMASK mRgbPixelMasks = {
@ -45,43 +45,47 @@ CONST EFI_PIXEL_BITMASK mBgrPixelMasks = {
/** /**
Initialize the bit mask in frame buffer configure. Initialize the bit mask in frame buffer configure.
@param Configure The frame buffer configure.
@param BitMask The bit mask of pixel. @param BitMask The bit mask of pixel.
@param BytesPerPixel Size in bytes of pixel.
@param PixelShl Left shift array.
@param PixelShr Right shift array.
**/ **/
VOID VOID
ConfigurePixelBitMaskFormat ( FrameBufferBltLibConfigurePixelFormat (
IN FRAME_BUFFER_CONFIGURE *Configure, IN CONST EFI_PIXEL_BITMASK *BitMask,
IN CONST EFI_PIXEL_BITMASK *BitMask OUT UINTN *BytesPerPixel,
OUT INT8 *PixelShl,
OUT INT8 *PixelShr
) )
{ {
UINTN Loop; UINT8 Index;
UINT32 *Masks; UINT32 *Masks;
UINT32 MergedMasks; UINT32 MergedMasks;
ASSERT (BytesPerPixel != NULL);
MergedMasks = 0; MergedMasks = 0;
Masks = (UINT32*) BitMask; Masks = (UINT32*) BitMask;
for (Loop = 0; Loop < 3; Loop++) { for (Index = 0; Index < 3; Index++) {
ASSERT ((Loop == 3) || (Masks[Loop] != 0)); ASSERT ((MergedMasks & Masks[Index]) == 0);
ASSERT ((MergedMasks & Masks[Loop]) == 0);
Configure->PixelShl[Loop] = HighBitSet32 (Masks[Loop]) - 23 + (Loop * 8); PixelShl[Index] = (INT8) HighBitSet32 (Masks[Index]) - 23 + (Index * 8);
if (Configure->PixelShl[Loop] < 0) { if (PixelShl[Index] < 0) {
Configure->PixelShr[Loop] = -Configure->PixelShl[Loop]; PixelShr[Index] = -PixelShl[Index];
Configure->PixelShl[Loop] = 0; PixelShl[Index] = 0;
} else { } else {
Configure->PixelShr[Loop] = 0; PixelShr[Index] = 0;
} }
MergedMasks = (UINT32) (MergedMasks | Masks[Loop]); DEBUG ((DEBUG_INFO, "%d: shl:%d shr:%d mask:%x\n", Index,
DEBUG ((EFI_D_VERBOSE, "%d: shl:%d shr:%d mask:%x\n", Loop, PixelShl[Index], PixelShr[Index], Masks[Index]));
Configure->PixelShl[Loop], Configure->PixelShr[Loop], Masks[Loop]));
MergedMasks = (UINT32) (MergedMasks | Masks[Index]);
} }
MergedMasks = (UINT32) (MergedMasks | Masks[3]); MergedMasks = (UINT32) (MergedMasks | Masks[3]);
ASSERT (MergedMasks != 0); ASSERT (MergedMasks != 0);
Configure->BytesPerPixel = (UINTN) ((HighBitSet32 (MergedMasks) + 7) / 8); *BytesPerPixel = (UINTN) ((HighBitSet32 (MergedMasks) + 7) / 8);
DEBUG ((DEBUG_INFO, "Bytes per pixel: %d\n", *BytesPerPixel));
DEBUG ((EFI_D_VERBOSE, "Bytes per pixel: %d\n", Configure->BytesPerPixel));
CopyMem (&Configure->PixelMasks, BitMask, sizeof (*BitMask));
} }
/** /**
@ -110,6 +114,11 @@ FrameBufferBltConfigure (
IN OUT UINTN *ConfigureSize IN OUT UINTN *ConfigureSize
) )
{ {
CONST EFI_PIXEL_BITMASK *BitMask;
UINTN BytesPerPixel;
INT8 PixelShl[4];
INT8 PixelShr[4];
if (ConfigureSize == NULL) { if (ConfigureSize == NULL) {
return RETURN_INVALID_PARAMETER; return RETURN_INVALID_PARAMETER;
} }
@ -125,15 +134,15 @@ FrameBufferBltConfigure (
switch (FrameBufferInfo->PixelFormat) { switch (FrameBufferInfo->PixelFormat) {
case PixelRedGreenBlueReserved8BitPerColor: case PixelRedGreenBlueReserved8BitPerColor:
ConfigurePixelBitMaskFormat (Configure, &mRgbPixelMasks); BitMask = &mRgbPixelMasks;
break; break;
case PixelBlueGreenRedReserved8BitPerColor: case PixelBlueGreenRedReserved8BitPerColor:
ConfigurePixelBitMaskFormat (Configure, &mBgrPixelMasks); BitMask = &mBgrPixelMasks;
break; break;
case PixelBitMask: case PixelBitMask:
ConfigurePixelBitMaskFormat (Configure, &(FrameBufferInfo->PixelInformation)); BitMask = &FrameBufferInfo->PixelInformation;
break; break;
case PixelBltOnly: case PixelBltOnly:
@ -145,6 +154,12 @@ FrameBufferBltConfigure (
return RETURN_INVALID_PARAMETER; return RETURN_INVALID_PARAMETER;
} }
FrameBufferBltLibConfigurePixelFormat (BitMask, &BytesPerPixel, PixelShl, PixelShr);
CopyMem (&Configure->PixelMasks, BitMask, sizeof (*BitMask));
CopyMem (Configure->PixelShl, PixelShl, sizeof (PixelShl));
CopyMem (Configure->PixelShr, PixelShr, sizeof (PixelShr));
Configure->BytesPerPixel = BytesPerPixel;
Configure->PixelFormat = FrameBufferInfo->PixelFormat; Configure->PixelFormat = FrameBufferInfo->PixelFormat;
Configure->FrameBuffer = (UINT8*) FrameBuffer; Configure->FrameBuffer = (UINT8*) FrameBuffer;
Configure->WidthInPixels = (UINTN) FrameBufferInfo->HorizontalResolution; Configure->WidthInPixels = (UINTN) FrameBufferInfo->HorizontalResolution;