Merge GOP related code from r8->r9.

[mirror_edk2.git] / EdkModulePkg / Universal / Console / GraphicsConsole / Dxe / GraphicsConsole.h

diff --git a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.h b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.h
index cfbbbb2fa278d3ac5a89f40e8210649f7677e6aa..45a2ec4764e326a266b501b4573fa505aeceb662 100644 (file)
--- a/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.h
+++ b/EdkModulePkg/Universal/Console/GraphicsConsole/Dxe/GraphicsConsole.h
@@ -50,19 +50,21 @@ typedef struct {
   UINTN   Rows;\r
   INTN    DeltaX;\r
   INTN    DeltaY;\r
-  UINT32  UgaWidth;\r
-  UINT32  UgaHeight;\r
+  UINT32  GopWidth;\r
+  UINT32  GopHeight;\r
+  UINT32  GopModeNumber;\r
 } GRAPHICS_CONSOLE_MODE_DATA;\r
 \r
 #define GRAPHICS_MAX_MODE 3\r
 \r
 typedef struct {\r
   UINTN                         Signature;\r
+  EFI_GRAPHICS_OUTPUT_PROTOCOL  *GraphicsOutput;\r
   EFI_UGA_DRAW_PROTOCOL         *UgaDraw;\r
   EFI_SIMPLE_TEXT_OUT_PROTOCOL  SimpleTextOutput;\r
   EFI_SIMPLE_TEXT_OUTPUT_MODE   SimpleTextOutputMode;\r
   GRAPHICS_CONSOLE_MODE_DATA    ModeData[GRAPHICS_MAX_MODE];\r
-  EFI_UGA_PIXEL                 *LineBuffer;\r
+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL *LineBuffer;\r
   EFI_HII_HANDLE                HiiHandle;\r
 } GRAPHICS_CONSOLE_DEV;\r
 \r