From nobody Mon Feb 9 12:43:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) client-ip=66.175.222.12; envelope-from=bounce+27952+58853+1787277+3901457@groups.io; helo=web01.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58853+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1588927130; cv=none; d=zohomail.com; s=zohoarc; b=kn50nwfemARnr7usScY8WPBKVHr2YaGow7qBmvkXodiI8px9K5G1irojK3MuSj5IG7sGkjOMiu0uA0nseV6wX0pyL2jfD64+muc87iG9JKYkksPiHvC6FrDuLl2JuNgZHB6McOlL8a012cgvbvXeyno29vT9/3/4yoYGO7F0DnU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1588927130; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Id:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=JrdWkerb9bh4fmacIDBA74YHw+YWiHld3A1NRlEVF00=; b=nLvWD/pvy7SzmYPlKFhvXpPrqMszicTQ3GJcLl3clV1qBEobfrKISnWB676D8SM2WqVl6M2FGf1ptiABCYn/7czzPT+nCIRIfnxBGvIgIRnRniZrcgonvI1noif/KsgGkBxBXuC9dkJHz2z46Uzt1bOTdYzCH+K38NvdmjbxA9U= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.12 as permitted sender) smtp.mailfrom=bounce+27952+58853+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) header.from= Received: from web01.groups.io (web01.groups.io [66.175.222.12]) by mx.zohomail.com with SMTPS id 1588927130044936.6812956713243; Fri, 8 May 2020 01:38:50 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id YkfGYY1788612xtMnehl9ISp; Fri, 08 May 2020 01:38:49 -0700 X-Received: from mga01.intel.com (mga01.intel.com []) by mx.groups.io with SMTP id smtpd.web12.6878.1588927126653624329 for ; Fri, 08 May 2020 01:38:48 -0700 IronPort-SDR: g3xJPy8Ck6G3f+c2aA/OTB+abrTOokJ9tgZ6MSfoSyDEnz3cm3UhV3/7d+HHGhGQexZrdvb6jI XBl8LqPsAemA== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 May 2020 01:38:38 -0700 IronPort-SDR: Gz+0MEBR98WRzrOfEh6EMgLydmAjq25S/cuqjnjoZHhulYd7vfrCevqBSsKamDHwWweD5qi6c8 pqEX4/7KCIUA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,367,1583222400"; d="scan'208";a="305366601" X-Received: from guominji-mobl.ccr.corp.intel.com ([10.238.4.95]) by FMSMGA003.fm.intel.com with ESMTP; 08 May 2020 01:38:36 -0700 From: "Guomin Jiang" To: devel@edk2.groups.io Cc: GuoMinJ , Jordan Justen , Andrew Fish , Ray Ni Subject: [edk2-devel] [PATCH 07/18] EmulatorPkg: Remove All UGA Support Date: Fri, 8 May 2020 16:38:13 +0800 Message-Id: <20200508083824.1785-8-guomin.jiang@intel.com> In-Reply-To: <20200508083824.1785-1-guomin.jiang@intel.com> References: <20200508083824.1785-1-guomin.jiang@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,guomin.jiang@intel.com X-Gm-Message-State: KaBK2Q7UNEnP5lkRyIwj5zy5x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1588927129; bh=gY1Hl7Rq4IWKJyXRKqCSstcPMM8GmsEVt+wvRSiC1NU=; h=Cc:Date:From:Reply-To:Subject:To; b=Vp47LkwdXjogJjaPlWqDNFDrTP0xjhGVbWRqaudEcMC7BOFycVKtO6wJ9prxo0T2ckE AZyIZAcUmes/kPaOS8iwhcsLSRojt1CDCMhYbbvsNwjavpPWGQFElvdj0hTZQI5m4PWFr Z9Qxro1HTzciCeZ31BsxGd8v7UrcFm8UC/U= X-ZohoMail-DKIM: pass (identity @groups.io) Content-Type: text/plain; charset="utf-8" From: GuoMinJ REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2368 Remove All UGA Support in EmulatorPkg. 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(-) 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/GopS= creen.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 s= tructure to adapt to - // GopBlt() API of Unix UGA IO protocol. + // Pack GOP protocol parameters to EMU_GRAPHICS_WINDOWS__BLT_ARGS struct= ure 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-se= rvices. + This is the screen's callback notification function for exit-boot-servic= es. All we do here is call EmuGopDestructor(). =20 Arguments: diff --git a/EmulatorPkg/Include/Protocol/EmuFileSystem.h b/EmulatorPkg/Inc= lude/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, 0xCA,= 0xC1 } } @@ -29,13 +29,13 @@ typedef struct _EMU_GRAPHICS_WINDOW_PROTOCOL EMU_GRAPHI= CS_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/EmulatorPkg= /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, 0xCA,= 0xC1 } } @@ -22,13 +22,13 @@ typedef struct _EMU_GRAPHICS_WINDOW_PROTOCOL EMU_GRAPHI= CS_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/L= ibrary/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/EmulatorP= kg/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/Gasket.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/Ia= 32/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/H= ost/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 c= olor 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 * A= rgs->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_OUT= PUT_BLT_PIXEL)); + Args->Delta -=3D Args->Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL); for (SrcY =3D Args->SourceY; SrcY < (Args->Height + Args->SourceY); Sr= cY++) { for (SrcX =3D Args->SourceX; SrcX < (Args->Width + Args->SourceX); S= rcX++) { *Blt++ =3D X11ColorToPixel (Private, XGetPixel (Private->image, Sr= cX, SrcY)); } - Blt =3D (EFI_UGA_PIXEL *) ((UINT8 *) Blt + Args->Delta); + Blt =3D (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)((UINT8 *) Blt + Args->Delt= a); } 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_PI= XEL)); + Args->Delta -=3D Args->Width * sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL); for (DstY =3D Args->DestinationY; DstY < (Args->Height + Args->Destina= tionY); DstY++) { for (DstX =3D Args->DestinationX; DstX < (Args->Width + Args->Destin= ationX); DstX++) { XPutPixel(Private->image, DstX, DstY, X11PixelToColor(Private, *Bl= t)); Blt++; } - Blt =3D (EFI_UGA_PIXEL *) ((UINT8 *) Blt + Args->Delta); + Blt =3D (EFI_GRAPHICS_OUTPUT_BLT_PIXEL *)((UINT8 *) Blt + Args->Del= ta); } break; - case EfiUgaVideoToVideo: + case EfiBltVideoToVideo: Dst =3D Private->image_data + (Args->DestinationX << Private->pixel_sh= ift) + 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->Destina= tionY); DstY++) { for (DstX =3D Args->DestinationX; DstX < (Args->Width + Args->Destin= ationX); 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/X64= /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/Win= GopScreen.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 ) { --=20 2.25.1.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#58853): https://edk2.groups.io/g/devel/message/58853 Mute This Topic: https://groups.io/mt/74068786/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-