From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web12.4159.1588993337131753509 for ; Fri, 08 May 2020 20:02:17 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: ray.ni@intel.com) IronPort-SDR: 0BmxfzwiZuPncZYtLd/h6sQ9gRcsv5jhPyL3ShzeqmvP3+sJR9HxCMvgLIt88R72VG9vTpg+ZK xT3ykEjEQZcA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2020 20:02:16 -0700 IronPort-SDR: O0y9TIPpYKGCuo940L0XepdvCxXCHQ3+oe8/YZ+ltJaINg6i3zp1F6rYA6/evZ4f2BKSJvczDC yayv6YgTMRiQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,370,1583222400"; d="scan'208";a="279219871" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga002.jf.intel.com with ESMTP; 08 May 2020 20:02:16 -0700 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.439.0; Fri, 8 May 2020 20:02:16 -0700 Received: from fmsmsx605.amr.corp.intel.com (10.18.126.85) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1713.5; Fri, 8 May 2020 20:02:15 -0700 Received: from shsmsx105.ccr.corp.intel.com (10.239.4.158) by fmsmsx605.amr.corp.intel.com (10.18.126.85) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.1.1713.5 via Frontend Transport; Fri, 8 May 2020 20:02:15 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.210]) by SHSMSX105.ccr.corp.intel.com ([169.254.11.92]) with mapi id 14.03.0439.000; Sat, 9 May 2020 11:02:13 +0800 From: "Ni, Ray" To: "Jiang, Guomin" , "devel@edk2.groups.io" CC: GuoMinJ , "Justen, Jordan L" , Andrew Fish Subject: Re: [PATCH 07/18] EmulatorPkg: Remove All UGA Support Thread-Topic: [PATCH 07/18] EmulatorPkg: Remove All UGA Support Thread-Index: AQHWJRQZpTrEiUaQxkW8nC9mes7q+KifEijw Date: Sat, 9 May 2020 03:02:12 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5C530AE0@SHSMSX104.ccr.corp.intel.com> References: <20200508083824.1785-1-guomin.jiang@intel.com> <20200508083824.1785-8-guomin.jiang@intel.com> In-Reply-To: <20200508083824.1785-8-guomin.jiang@intel.com> Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: ray.ni@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Guomin, Have you tested the EmulatorPkg in Linux environment with this change? What's the result? Thanks, Ray > -----Original Message----- > From: Jiang, Guomin > Sent: Friday, May 8, 2020 4:38 PM > To: devel@edk2.groups.io > Cc: GuoMinJ ; Justen, Jordan L ; Andrew Fish ; > Ni, Ray > Subject: [PATCH 07/18] EmulatorPkg: Remove All UGA Support >=20 > From: GuoMinJ >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2368 >=20 > Remove All UGA Support in EmulatorPkg. >=20 > Cc: Jordan Justen > Cc: Andrew Fish > Cc: Ray Ni > Signed-off-by: Guomin Jiang > --- > EmulatorPkg/EmuGopDxe/Gop.h | 8 ++- > EmulatorPkg/EmuGopDxe/GopScreen.c | 14 ++--- > EmulatorPkg/Include/Protocol/EmuFileSystem.h | 18 +++---- > .../Include/Protocol/EmuGraphicsWindow.h | 18 +++---- > .../Library/PlatformBmLib/PlatformBm.h | 2 +- > .../Library/PlatformBmLib/PlatformBmData.c | 4 +- > EmulatorPkg/Unix/Host/Gasket.h | 9 +--- > EmulatorPkg/Unix/Host/Host.h | 1 - > EmulatorPkg/Unix/Host/Ia32/Gasket.S | 2 +- > EmulatorPkg/Unix/Host/X11GraphicsWindow.c | 54 +++++++++---------- > EmulatorPkg/Unix/Host/X64/Gasket.S | 2 +- > EmulatorPkg/Win/Host/WinGopScreen.c | 4 +- > 12 files changed, 64 insertions(+), 72 deletions(-) >=20 > diff --git a/EmulatorPkg/EmuGopDxe/Gop.h b/EmulatorPkg/EmuGopDxe/Gop.h > index 389666327651..5376e8077ea2 100644 > --- a/EmulatorPkg/EmuGopDxe/Gop.h > +++ b/EmulatorPkg/EmuGopDxe/Gop.h > @@ -6,8 +6,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ >=20 > -#ifndef __UGA_H_ > -#define __UGA_H_ > +#ifndef __GOP_H_ > +#define __GOP_H_ >=20 > #include >=20 > @@ -63,8 +63,6 @@ typedef struct { > extern EFI_DRIVER_BINDING_PROTOCOL gEmuGopDriverBinding; > extern EFI_COMPONENT_NAME_PROTOCOL gEmuGopComponentName; >=20 > -#define EMU_UGA_CLASS_NAME L"EmuGopWindow" > - > #define GOP_PRIVATE_DATA_SIGNATURE SIGNATURE_32 ('G', 'o', 'p', 'N') > typedef struct { > UINT64 Signature; > @@ -87,7 +85,7 @@ typedef struct { >=20 >=20 > // > - // UGA Private Data knowing when to start hardware > + // @todo GOP?? Private Data knowing when to start hardware > // > BOOLEAN HardwareNeedsStarting; >=20 > diff --git a/EmulatorPkg/EmuGopDxe/GopScreen.c b/EmulatorPkg/EmuGopDxe/Go= pScreen.c > index fbac649f8b3e..6ae5a07ba0c5 100644 > --- a/EmulatorPkg/EmuGopDxe/GopScreen.c > +++ b/EmulatorPkg/EmuGopDxe/GopScreen.c > @@ -10,7 +10,7 @@ Module Name: >=20 > Abstract: >=20 > - This file produces the graphics abstration of UGA. It is called by > + This file produces the graphics abstration of GOP. It is called by > EmuGopDriver.c file which deals with the EFI 1.1 driver model. > This file just does graphics. >=20 > @@ -215,7 +215,7 @@ EmuGopBlt ( > // the number of bytes in each row can be computed. > // > if (Delta =3D=3D 0) { > - Delta =3D Width * sizeof (EFI_UGA_PIXEL); > + Delta =3D Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL); > } >=20 > // > @@ -226,8 +226,8 @@ EmuGopBlt ( > OriginalTPL =3D gBS->RaiseTPL (TPL_NOTIFY); >=20 > // > - // Pack UGA Draw protocol parameters to EMU_GRAPHICS_WINDOWS__BLT_ARGS= structure to adapt to > - // GopBlt() API of Unix UGA IO protocol. > + // Pack GOP protocol parameters to EMU_GRAPHICS_WINDOWS__BLT_ARGS stru= cture to adapt to > + // GopBlt() API of GOP protocol. > // > GopBltArgs.DestinationX =3D DestinationX; > GopBltArgs.DestinationY =3D DestinationY; > @@ -238,8 +238,8 @@ EmuGopBlt ( > GopBltArgs.Delta =3D Delta; > Status =3D Private->EmuGraphicsWindow->Blt ( > Private->EmuGraphicsWindow, > - (EFI_UGA_PIXEL *)BltBuffer, > - (EFI_UGA_BLT_OPERATION)BltOperation, > + BltBuffer, > + BltOperation, > &GopBltArgs > ); >=20 > @@ -391,7 +391,7 @@ ShutdownGopEvent ( >=20 > Routine Description: >=20 > - This is the UGA screen's callback notification function for exit-boot-= services. > + This is the screen's callback notification function for exit-boot-serv= ices. > All we do here is call EmuGopDestructor(). >=20 > Arguments: > diff --git a/EmulatorPkg/Include/Protocol/EmuFileSystem.h b/EmulatorPkg/I= nclude/Protocol/EmuFileSystem.h > index 8ac9d9ba5dd3..eba747062c44 100644 > --- a/EmulatorPkg/Include/Protocol/EmuFileSystem.h > +++ b/EmulatorPkg/Include/Protocol/EmuFileSystem.h > @@ -13,13 +13,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ >=20 > -#ifndef _EMU_UGA_IO_H_ > -#define _EMU_UGA_IO_H_ > +#ifndef _EMU_GRAPHICS_WINDOW_H_ > +#define _EMU_GRAPHICS_WINDOW_H_ >=20 > #include > #include > #include > -#include > +#include >=20 > #define EMU_GRAPHICS_WINDOW_PROTOCOL_GUID \ > { 0x30FD316A, 0x6728, 0x2E41, { 0xA6, 0x90, 0x0D, 0x13, 0x33, 0xD8, 0xC= A, 0xC1 } } > @@ -29,13 +29,13 @@ typedef struct _EMU_GRAPHICS_WINDOW_PROTOCOL EMU_GRAP= HICS_WINDOW_PROTOCOL; > typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_CLOSE)( > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows > ); >=20 > typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_SIZE)( > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga, > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, > UINT32 Width, > UINT32 Height > ); > @@ -43,13 +43,13 @@ EFI_STATUS > typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_CHECK_KEY)( > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows > ); >=20 > typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_GET_KEY)( > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga, > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, > EFI_KEY_DATA *key > ); >=20 > @@ -91,8 +91,8 @@ typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_BLT)( > IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, > - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, > - IN EFI_UGA_BLT_OPERATION BltOperation, > + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, > + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, > IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args > ); >=20 > diff --git a/EmulatorPkg/Include/Protocol/EmuGraphicsWindow.h b/EmulatorP= kg/Include/Protocol/EmuGraphicsWindow.h > index 07d4070b3584..e9b85c8eb373 100644 > --- a/EmulatorPkg/Include/Protocol/EmuGraphicsWindow.h > +++ b/EmulatorPkg/Include/Protocol/EmuGraphicsWindow.h > @@ -6,13 +6,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >=20 > **/ >=20 > -#ifndef _EMU_UGA_IO_H_ > -#define _EMU_UGA_IO_H_ > +#ifndef _EMU_GRAPHICS_WINDOW_H_ > +#define _EMU_GRAPHICS_WINDOW_H_ >=20 > #include > #include > #include > -#include > +#include >=20 > #define EMU_GRAPHICS_WINDOW_PROTOCOL_GUID \ > { 0x30FD316A, 0x6728, 0x2E41, { 0xA6, 0x90, 0x0D, 0x13, 0x33, 0xD8, 0xC= A, 0xC1 } } > @@ -22,13 +22,13 @@ typedef struct _EMU_GRAPHICS_WINDOW_PROTOCOL EMU_GRAP= HICS_WINDOW_PROTOCOL; > typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_CLOSE)( > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindow > ); >=20 > typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_SIZE)( > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga, > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindow, > UINT32 Width, > UINT32 Height > ); > @@ -36,13 +36,13 @@ EFI_STATUS > typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_CHECK_KEY)( > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindow > ); >=20 > typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_GET_KEY)( > - EMU_GRAPHICS_WINDOW_PROTOCOL *Uga, > + EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindow, > EFI_KEY_DATA *key > ); >=20 > @@ -85,8 +85,8 @@ typedef > EFI_STATUS > (EFIAPI *EMU_GRAPHICS_WINDOWS_BLT)( > IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, > - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, > - IN EFI_UGA_BLT_OPERATION BltOperation, > + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, > + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, > IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args > ); >=20 > diff --git a/EmulatorPkg/Library/PlatformBmLib/PlatformBm.h b/EmulatorPkg= /Library/PlatformBmLib/PlatformBm.h > index ce508b6b58f5..7bf9909511f0 100644 > --- a/EmulatorPkg/Library/PlatformBmLib/PlatformBm.h > +++ b/EmulatorPkg/Library/PlatformBmLib/PlatformBm.h > @@ -61,7 +61,7 @@ typedef struct { > EMU_VENDOR_DEVICE_PATH_NODE EmuBus; > EMU_VENDOR_DEVICE_PATH_NODE EmuGraphicsWindow; > EFI_DEVICE_PATH_PROTOCOL End; > -} EMU_PLATFORM_UGA_DEVICE_PATH; > +} EMU_PLATFORM_GRAPHICS_WINDOW_DEVICE_PATH; >=20 >=20 > // > diff --git a/EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c > b/EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c > index 115102160605..5c2f9a6a4df4 100644 > --- a/EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c > +++ b/EmulatorPkg/Library/PlatformBmLib/PlatformBmData.c > @@ -10,7 +10,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent >=20 >=20 >=20 > -EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath =3D { > +EMU_PLATFORM_GRAPHICS_WINDOW_DEVICE_PATH gGopDevicePath =3D { > { > { > { > @@ -42,7 +42,7 @@ EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath =3D { > gEndEntire > }; >=20 > -EMU_PLATFORM_UGA_DEVICE_PATH gGopDevicePath2 =3D { > +EMU_PLATFORM_GRAPHICS_WINDOW_DEVICE_PATH gGopDevicePath2 =3D { > { > { > { > diff --git a/EmulatorPkg/Unix/Host/Gasket.h b/EmulatorPkg/Unix/Host/Gaske= t.h > index e082397d23fb..1b67264f3e0e 100644 > --- a/EmulatorPkg/Unix/Host/Gasket.h > +++ b/EmulatorPkg/Unix/Host/Gasket.h > @@ -206,11 +206,6 @@ ReverseGasketUint64Uint64 ( > VOID *Key > ); >=20 > -// > -// Gasket functions for EFI_EMU_UGA_IO_PROTOCOL > -// > - > - > EFI_STATUS > EFIAPI > GasketX11Size ( > @@ -253,8 +248,8 @@ EFI_STATUS > EFIAPI > GasketX11Blt ( > IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsWindows, > - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, > - IN EFI_UGA_BLT_OPERATION BltOperation, > + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, > + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, > IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args > ); >=20 > diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h > index 9791cf8c370e..ccae162ed4a6 100644 > --- a/EmulatorPkg/Unix/Host/Host.h > +++ b/EmulatorPkg/Unix/Host/Host.h > @@ -106,7 +106,6 @@ SPDX-License-Identifier: BSD-2-Clause-Patent > #include > #include > #include > -#include > #include >=20 > #include > diff --git a/EmulatorPkg/Unix/Host/Ia32/Gasket.S b/EmulatorPkg/Unix/Host/= Ia32/Gasket.S > index 36197ff26028..6fcdd265cf30 100644 > --- a/EmulatorPkg/Unix/Host/Ia32/Gasket.S > +++ b/EmulatorPkg/Unix/Host/Ia32/Gasket.S > @@ -371,7 +371,7 @@ ASM_PFX(GasketSecEmuThunkAddress): > ret >=20 > // > -// Gasket functions for EFI_EMU_UGA_IO_PROTOCOL > +// Gasket functions for EFI_EMU_GRAPHICS_WINDOW_PROTOCOL > // >=20 > ASM_GLOBAL ASM_PFX(GasketX11Size) > diff --git a/EmulatorPkg/Unix/Host/X11GraphicsWindow.c b/EmulatorPkg/Unix= /Host/X11GraphicsWindow.c > index 5325a0e35bf9..d4ef053db1bc 100644 > --- a/EmulatorPkg/Unix/Host/X11GraphicsWindow.c > +++ b/EmulatorPkg/Unix/Host/X11GraphicsWindow.c > @@ -591,8 +591,8 @@ HandleEvents ( >=20 > unsigned long > X11PixelToColor ( > - IN GRAPHICS_IO_PRIVATE *Drv, > - IN EFI_UGA_PIXEL pixel > + IN GRAPHICS_IO_PRIVATE *Drv, > + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL pixel > ) > { > return ((pixel.Red >> Drv->r.csize) << Drv->r.shift) > @@ -600,15 +600,15 @@ X11PixelToColor ( > | ((pixel.Blue >> Drv->b.csize) << Drv->b.shift); > } >=20 > -EFI_UGA_PIXEL > +EFI_GRAPHICS_OUTPUT_BLT_PIXEL > X11ColorToPixel ( > IN GRAPHICS_IO_PRIVATE *Drv, > IN unsigned long val > ) > { > - EFI_UGA_PIXEL Pixel; > + EFI_GRAPHICS_OUTPUT_BLT_PIXEL Pixel; >=20 > - memset (&Pixel, 0, sizeof (EFI_UGA_PIXEL)); > + memset (&Pixel, 0, sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); >=20 > // Truncation not an issue since X11 and EFI are both using 8 bits per= color > Pixel.Red =3D (val >> Drv->r.shift) << Drv->r.csize; > @@ -675,7 +675,7 @@ X11KeySetState ( > if ((Drv->KeyState.KeyToggleState & EFI_CAPS_LOCK_ACTIVE) =3D=3D 0) = { > // > // We could create an XKeyEvent and send a XK_Caps_Lock to > - // the UGA/GOP Window > + // the GOP Window > // > } > } > @@ -708,8 +708,8 @@ X11RegisterKeyNotify ( > EFI_STATUS > X11Blt ( > IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo, > - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, > - IN EFI_UGA_BLT_OPERATION BltOperation, > + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, > + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, > IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args > ) > { > @@ -719,7 +719,7 @@ X11Blt ( > UINTN DstX; > UINTN SrcX; > UINTN Index; > - EFI_UGA_PIXEL *Blt; > + EFI_GRAPHICS_OUTPUT_BLT_PIXEL *Blt; > UINT8 *Dst; > UINT8 *Src; > UINTN Nbr; > @@ -732,8 +732,8 @@ X11Blt ( > // > // Check bounds > // > - if (BltOperation =3D=3D EfiUgaVideoToBltBuffer > - || BltOperation =3D=3D EfiUgaVideoToVideo) { > + if (BltOperation =3D=3D EfiBltVideoToBltBuffer > + || BltOperation =3D=3D EfiBltVideoToVideo) { > // > // Source is Video. > // > @@ -746,9 +746,9 @@ X11Blt ( > } > } >=20 > - if (BltOperation =3D=3D EfiUgaBltBufferToVideo > - || BltOperation =3D=3D EfiUgaVideoToVideo > - || BltOperation =3D=3D EfiUgaVideoFill) { > + if (BltOperation =3D=3D EfiBltBufferToVideo > + || BltOperation =3D=3D EfiBltVideoToVideo > + || BltOperation =3D=3D EfiBltVideoFill) { > // > // Destination is Video > // > @@ -762,28 +762,28 @@ X11Blt ( > } >=20 > switch (BltOperation) { > - case EfiUgaVideoToBltBuffer: > - Blt =3D (EFI_UGA_PIXEL *)((UINT8 *)BltBuffer + (Args->DestinationY *= Args->Delta) + Args->DestinationX * sizeof > (EFI_UGA_PIXEL)); > - Args->Delta -=3D Args->Width * sizeof (EFI_UGA_PIXEL); > + case EfiBltVideoToBltBuffer: > + Blt =3D (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)((UINT8 *)BltBuffer + (Args= ->DestinationY * Args->Delta) + Args- > >DestinationX * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); > + Args->Delta -=3D Args->Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL= ); > for (SrcY =3D Args->SourceY; SrcY < (Args->Height + Args->SourceY); = SrcY++) { > for (SrcX =3D Args->SourceX; SrcX < (Args->Width + Args->SourceX);= SrcX++) { > *Blt++ =3D X11ColorToPixel (Private, XGetPixel (Private->image, = SrcX, SrcY)); > } > - Blt =3D (EFI_UGA_PIXEL *) ((UINT8 *) Blt + Args->Delta); > + Blt =3D (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)((UINT8 *) Blt + Args->De= lta); > } > break; > - case EfiUgaBltBufferToVideo: > - Blt =3D (EFI_UGA_PIXEL *)((UINT8 *)BltBuffer + (Args->SourceY * Args= ->Delta) + Args->SourceX * sizeof (EFI_UGA_PIXEL)); > - Args->Delta -=3D Args->Width * sizeof (EFI_UGA_PIXEL); > + case EfiBltBufferToVideo: > + Blt =3D (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)((UINT8 *)BltBuffer + (Args= ->SourceY * Args->Delta) + Args->SourceX * sizeof > (EFI_GRAPHICS_OUTPUT_BLT_PIXEL)); > + Args->Delta -=3D Args->Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL= ); > for (DstY =3D Args->DestinationY; DstY < (Args->Height + Args->Desti= nationY); DstY++) { > for (DstX =3D Args->DestinationX; DstX < (Args->Width + Args->Dest= inationX); DstX++) { > XPutPixel(Private->image, DstX, DstY, X11PixelToColor(Private, *= Blt)); > Blt++; > } > - Blt =3D (EFI_UGA_PIXEL *) ((UINT8 *) Blt + Args->Delta); > + Blt =3D (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)((UINT8 *) Blt + Args->D= elta); > } > break; > - case EfiUgaVideoToVideo: > + case EfiBltVideoToVideo: > Dst =3D Private->image_data + (Args->DestinationX << Private->pixel_= shift) > + Args->DestinationY * Private->line_bytes; > Src =3D Private->image_data + (Args->SourceX << Private->pixel_shift= ) > @@ -809,7 +809,7 @@ X11Blt ( > } > } > break; > - case EfiUgaVideoFill: > + case EfiBltVideoFill: > Color =3D X11PixelToColor(Private, *BltBuffer); > for (DstY =3D Args->DestinationY; DstY < (Args->Height + Args->Desti= nationY); DstY++) { > for (DstX =3D Args->DestinationX; DstX < (Args->Width + Args->Dest= inationX); DstX++) { > @@ -825,7 +825,7 @@ X11Blt ( > // Refresh screen. > // > switch (BltOperation) { > - case EfiUgaVideoToVideo: > + case EfiBltVideoToVideo: > XCopyArea( > Private->display, Private->win, Private->win, Private->gc, > Args->SourceX, Args->SourceY, Args->Width, Args->Height, > @@ -840,7 +840,7 @@ X11Blt ( > } > } > break; > - case EfiUgaVideoFill: > + case EfiBltVideoFill: > Color =3D X11PixelToColor (Private, *BltBuffer); > XSetForeground (Private->display, Private->gc, Color); > XFillRectangle ( > @@ -849,7 +849,7 @@ X11Blt ( > ); > XFlush (Private->display); > break; > - case EfiUgaBltBufferToVideo: > + case EfiBltBufferToVideo: > Redraw (Private, Args->DestinationX, Args->DestinationY, Args->Width= , Args->Height); > break; > default: > diff --git a/EmulatorPkg/Unix/Host/X64/Gasket.S b/EmulatorPkg/Unix/Host/X= 64/Gasket.S > index 030faa8e4c36..1b4614ab618d 100644 > --- a/EmulatorPkg/Unix/Host/X64/Gasket.S > +++ b/EmulatorPkg/Unix/Host/X64/Gasket.S > @@ -427,7 +427,7 @@ ASM_PFX(GasketSecEmuThunkAddress): > ret >=20 > // > -// Gasket functions for EFI_EMU_UGA_IO_PROTOCOL > +// Gasket functions for EFI_EMU_GRAPHICS_WINDOW_PROTOCOL > // >=20 > ASM_GLOBAL ASM_PFX(GasketX11Size) > diff --git a/EmulatorPkg/Win/Host/WinGopScreen.c b/EmulatorPkg/Win/Host/W= inGopScreen.c > index 74011e225e30..9c51cc326ba5 100644 > --- a/EmulatorPkg/Win/Host/WinGopScreen.c > +++ b/EmulatorPkg/Win/Host/WinGopScreen.c > @@ -322,8 +322,8 @@ WinNtWndSize ( > EFI_STATUS > WinNtWndBlt ( > IN EMU_GRAPHICS_WINDOW_PROTOCOL *GraphicsIo, > - IN EFI_UGA_PIXEL *BltBuffer OPTIONAL, > - IN EFI_UGA_BLT_OPERATION BltOperation, > + IN EFI_GRAPHICS_OUTPUT_BLT_PIXEL *BltBuffer OPTIONAL, > + IN EFI_GRAPHICS_OUTPUT_BLT_OPERATION BltOperation, > IN EMU_GRAPHICS_WINDOWS__BLT_ARGS *Args > ) > { > -- > 2.25.1.windows.1