From 7cbb1fb8ecd43d7019d7d800154679ee4dacebdb Mon Sep 17 00:00:00 2001 From: death2droid Date: Wed, 6 May 2009 21:31:33 +0000 Subject: [PATCH] Moved the enum from the main file to the header. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3163 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Core/Src/HW/PixelEngine.cpp | 16 ---------------- Source/Core/Core/Src/HW/PixelEngine.h | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Source/Core/Core/Src/HW/PixelEngine.cpp b/Source/Core/Core/Src/HW/PixelEngine.cpp index e01ff90a12..590a59402d 100644 --- a/Source/Core/Core/Src/HW/PixelEngine.cpp +++ b/Source/Core/Core/Src/HW/PixelEngine.cpp @@ -36,22 +36,6 @@ namespace PixelEngine { -// internal hardware addresses -enum -{ - PE_ZCONF = 0x000, // Z Config - PE_ALPHACONF = 0x002, // Alpha Config - PE_DSTALPHACONF = 0x004, // Destination Alpha Config - PE_ALPHAMODE = 0x006, // Alpha Mode Config - PE_ALPHAREAD = 0x008, // Alpha Read - PE_CTRL_REGISTER = 0x00a, // Control - PE_TOKEN_REG = 0x00e, // Token - PE_BBOX_LEFT = 0x010, // Flip Left - PE_BBOX_RIGHT = 0x012, // Flip Right - PE_BBOX_TOP = 0x014, // Flip Top - PE_BBOX_BOTTOM = 0x016, // Flip Bottom -}; - // fifo Control Register union UPECtrlReg { diff --git a/Source/Core/Core/Src/HW/PixelEngine.h b/Source/Core/Core/Src/HW/PixelEngine.h index 50d5c0be68..ef59b10753 100644 --- a/Source/Core/Core/Src/HW/PixelEngine.h +++ b/Source/Core/Core/Src/HW/PixelEngine.h @@ -20,6 +20,22 @@ #include "CommonTypes.h" class PointerWrap; +// internal hardware addresses +enum +{ + PE_ZCONF = 0x000, // Z Config + PE_ALPHACONF = 0x002, // Alpha Config + PE_DSTALPHACONF = 0x004, // Destination Alpha Config + PE_ALPHAMODE = 0x006, // Alpha Mode Config + PE_ALPHAREAD = 0x008, // Alpha Read + PE_CTRL_REGISTER = 0x00a, // Control + PE_TOKEN_REG = 0x00e, // Token + PE_BBOX_LEFT = 0x010, // Flip Left + PE_BBOX_RIGHT = 0x012, // Flip Right + PE_BBOX_TOP = 0x014, // Flip Top + PE_BBOX_BOTTOM = 0x016, // Flip Bottom +}; + namespace PixelEngine { void Init();