summaryrefslogtreecommitdiff
path: root/Source/Core/VideoCommon
diff options
context:
space:
mode:
authorGlenn Rice <glennricster@gmail.com>2011-02-14 02:18:03 +0000
committerGlenn Rice <glennricster@gmail.com>2011-02-14 02:18:03 +0000
commit0ae8d33149025435dd5eaf49f69abce2ad54887f (patch)
tree36f29de3e23d80e356f0cc5786368354d2cf2afc /Source/Core/VideoCommon
parentcd308e2358c57acafd6b834352cebdcdb0b9e45d (diff)
Some work on changing comments, log messages, and variable and function names to reflect that the plugins are not plugins anymore.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7170 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/VideoCommon')
-rw-r--r--Source/Core/VideoCommon/Src/BPFunctions.cpp2
-rw-r--r--Source/Core/VideoCommon/Src/BPFunctions.h2
-rw-r--r--Source/Core/VideoCommon/Src/BPMemory.cpp2
-rw-r--r--Source/Core/VideoCommon/Src/CommandProcessor.cpp10
-rw-r--r--Source/Core/VideoCommon/Src/CommandProcessor.h4
-rw-r--r--Source/Core/VideoCommon/Src/Debugger.cpp2
-rw-r--r--Source/Core/VideoCommon/Src/EmuWindow.cpp2
-rw-r--r--Source/Core/VideoCommon/Src/Fifo.cpp4
-rw-r--r--Source/Core/VideoCommon/Src/Fifo.h2
-rw-r--r--Source/Core/VideoCommon/Src/IndexGenerator.h4
-rw-r--r--Source/Core/VideoCommon/Src/MainBase.cpp8
-rw-r--r--Source/Core/VideoCommon/Src/MainBase.h2
-rw-r--r--Source/Core/VideoCommon/Src/NativeVertexFormat.h2
-rw-r--r--Source/Core/VideoCommon/Src/OpcodeDecoding.cpp2
-rw-r--r--Source/Core/VideoCommon/Src/OpcodeDecoding.h2
-rw-r--r--Source/Core/VideoCommon/Src/OpenCL.cpp2
-rw-r--r--Source/Core/VideoCommon/Src/PixelEngine.cpp4
-rw-r--r--Source/Core/VideoCommon/Src/PixelEngine.h2
-rw-r--r--Source/Core/VideoCommon/Src/VertexManagerBase.h6
-rw-r--r--Source/Core/VideoCommon/Src/VideoCommon.h2
-rw-r--r--Source/Core/VideoCommon/Src/VideoConfig.cpp2
-rw-r--r--Source/Core/VideoCommon/Src/VideoConfig.h6
22 files changed, 37 insertions, 37 deletions
diff --git a/Source/Core/VideoCommon/Src/BPFunctions.cpp b/Source/Core/VideoCommon/Src/BPFunctions.cpp
index 8e854b4690..5255b6cb54 100644
--- a/Source/Core/VideoCommon/Src/BPFunctions.cpp
+++ b/Source/Core/VideoCommon/Src/BPFunctions.cpp
@@ -88,7 +88,7 @@ void CopyEFB(const BPCmd &bp, const EFBRectangle &rc, const u32 &address, const
/* Explanation of the magic behind ClearScreen:
There's numerous possible formats for the pixel data in the EFB.
- However, in the HW accelerated plugins we're always using RGBA8
+ However, in the HW accelerated backends we're always using RGBA8
for the EFB format, which causes some problems:
- We're using an alpha channel although the game doesn't
- If the actual EFB format is RGBA6_Z24 or R5G6B5_Z16, we are using more bits per channel than the native HW
diff --git a/Source/Core/VideoCommon/Src/BPFunctions.h b/Source/Core/VideoCommon/Src/BPFunctions.h
index b38681a1b9..e2a184f65e 100644
--- a/Source/Core/VideoCommon/Src/BPFunctions.h
+++ b/Source/Core/VideoCommon/Src/BPFunctions.h
@@ -17,7 +17,7 @@
// ------------------------------------------
-// Video plugin must define these functions
+// Video backend must define these functions
// ------------------------------------------
#ifndef _BPFUNCTIONS_H
diff --git a/Source/Core/VideoCommon/Src/BPMemory.cpp b/Source/Core/VideoCommon/Src/BPMemory.cpp
index a232fc7fe5..da09893f35 100644
--- a/Source/Core/VideoCommon/Src/BPMemory.cpp
+++ b/Source/Core/VideoCommon/Src/BPMemory.cpp
@@ -22,7 +22,7 @@
// STATE_TO_SAVE
BPMemory bpmem;
-// The plugin must implement this.
+// The backend must implement this.
void BPWritten(const BPCmd& bp);
// Call browser: OpcodeDecoding.cpp ExecuteDisplayList > Decode() > LoadBPReg()
diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.cpp b/Source/Core/VideoCommon/Src/CommandProcessor.cpp
index 05ebd1ede2..1391ed657b 100644
--- a/Source/Core/VideoCommon/Src/CommandProcessor.cpp
+++ b/Source/Core/VideoCommon/Src/CommandProcessor.cpp
@@ -36,7 +36,7 @@
// PPC have a frame-finish watchdog. Handled by system timming stuff like the decrementer.
// (DualCore mode): I have observed, after ZTP logos, a fifo-recovery start when DECREMENTER_EXCEPTION is throwned.
// The frame setting (by GP) took too much time and didn't finish properly due to this watchdog.
-// Faster GX plugins required, indeed :p
+// Faster GX backends required, indeed :p
// * BPs are needed for some game GP/CPU sync.
// But it could slowdown (MP1 at least) because our GP in DC is faster than "expected" in some area.
@@ -751,7 +751,7 @@ void CatchUpGPU()
break;
}
- // read the data and send it to the VideoPlugin
+ // read the data and send it to the VideoBackend
// We are going to do FP math on the main thread so have to save the current state
SaveSSEState();
LoadDefaultSSEState();
@@ -808,12 +808,12 @@ void UpdateInterrupts(u64 userdata)
interruptWaiting = false;
}
-void UpdateInterruptsFromVideoPlugin(u64 userdata)
+void UpdateInterruptsFromVideoBackend(u64 userdata)
{
CoreTiming::ScheduleEvent_Threadsafe(0, et_UpdateInterrupts, userdata);
}
-void SetFifoIdleFromVideoPlugin()
+void SetFifoIdleFromVideoBackend()
{
s_fifoIdleEvent.Set();
}
@@ -901,7 +901,7 @@ void SetStatus()
if (IsOnThread())
{
interruptWaiting = true;
- CommandProcessor::UpdateInterruptsFromVideoPlugin(userdata);
+ CommandProcessor::UpdateInterruptsFromVideoBackend(userdata);
}
else
CommandProcessor::UpdateInterrupts(userdata);
diff --git a/Source/Core/VideoCommon/Src/CommandProcessor.h b/Source/Core/VideoCommon/Src/CommandProcessor.h
index dc49cdf9fe..ec1d1234c3 100644
--- a/Source/Core/VideoCommon/Src/CommandProcessor.h
+++ b/Source/Core/VideoCommon/Src/CommandProcessor.h
@@ -157,9 +157,9 @@ void SetStatus();
void GatherPipeBursted();
void UpdateFifoRegister();
void UpdateInterrupts(u64 userdata);
-void UpdateInterruptsFromVideoPlugin(u64 userdata);
+void UpdateInterruptsFromVideoBackend(u64 userdata);
void UpdateInterruptsScMode();
-void SetFifoIdleFromVideoPlugin();
+void SetFifoIdleFromVideoBackend();
bool AllowIdleSkipping();
diff --git a/Source/Core/VideoCommon/Src/Debugger.cpp b/Source/Core/VideoCommon/Src/Debugger.cpp
index d723570fe5..b808c63c11 100644
--- a/Source/Core/VideoCommon/Src/Debugger.cpp
+++ b/Source/Core/VideoCommon/Src/Debugger.cpp
@@ -31,7 +31,7 @@ extern NativeVertexFormat *g_nativeVertexFmt;
void GFXDebuggerUpdateScreen()
{
- // TODO: Implement this in a plugin-independent way
+ // TODO: Implement this in a backend-independent way
/* // update screen
if (D3D::bFrameInProgress)
{
diff --git a/Source/Core/VideoCommon/Src/EmuWindow.cpp b/Source/Core/VideoCommon/Src/EmuWindow.cpp
index c92a4cacb1..4cd8bb007d 100644
--- a/Source/Core/VideoCommon/Src/EmuWindow.cpp
+++ b/Source/Core/VideoCommon/Src/EmuWindow.cpp
@@ -186,7 +186,7 @@ LRESULT CALLBACK WndProc( HWND hWnd, UINT iMsg, WPARAM wParam, LPARAM lParam )
// This is called when we close the window when we render to a separate window
case WM_CLOSE:
// When the user closes the window, we post an event to the main window to call Stop()
- // Which then handles all the necessary steps to Shutdown the core + the plugins
+ // Which then handles all the necessary steps to Shutdown the core
if (m_hParent == NULL)
{
// Stop the game
diff --git a/Source/Core/VideoCommon/Src/Fifo.cpp b/Source/Core/VideoCommon/Src/Fifo.cpp
index f459fd4ef6..9f0ec05187 100644
--- a/Source/Core/VideoCommon/Src/Fifo.cpp
+++ b/Source/Core/VideoCommon/Src/Fifo.cpp
@@ -148,7 +148,7 @@ void Fifo_EnterLoop()
if (!fifoStateRun) break;
- // Create pointer to video data and send it to the VideoPlugin
+ // Create pointer to video data and send it to the VideoBackend
u32 readPtr = _fifo.CPReadPointer;
u8 *uData = Memory::GetPointer(readPtr);
@@ -182,7 +182,7 @@ void Fifo_EnterLoop()
_fifo.isFifoProcesingData = false;
- CommandProcessor::SetFifoIdleFromVideoPlugin();
+ CommandProcessor::SetFifoIdleFromVideoBackend();
if (EmuRunning)
Common::YieldCPU();
diff --git a/Source/Core/VideoCommon/Src/Fifo.h b/Source/Core/VideoCommon/Src/Fifo.h
index c4470b7208..90f0d9ed33 100644
--- a/Source/Core/VideoCommon/Src/Fifo.h
+++ b/Source/Core/VideoCommon/Src/Fifo.h
@@ -43,7 +43,7 @@ void ResetVideoBuffer();
void Fifo_SetRendering(bool bEnabled);
bool IsFifoProcesingData();
-// Implemented by the Video Plugin
+// Implemented by the Video Backend
void VideoFifo_CheckAsyncRequest();
void VideoFifo_CheckStateRequest();
diff --git a/Source/Core/VideoCommon/Src/IndexGenerator.h b/Source/Core/VideoCommon/Src/IndexGenerator.h
index 67871117b1..d1ed143d98 100644
--- a/Source/Core/VideoCommon/Src/IndexGenerator.h
+++ b/Source/Core/VideoCommon/Src/IndexGenerator.h
@@ -15,8 +15,8 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
-// This is currently only used by the DX plugin, but it may make sense to
-// use it in the GL plugin or a future DX10 plugin too.
+// This is currently only used by the DX backend, but it may make sense to
+// use it in the GL backend or a future DX10 backend too.
#ifndef _INDEXGENERATOR_H
#define _INDEXGENERATOR_H
diff --git a/Source/Core/VideoCommon/Src/MainBase.cpp b/Source/Core/VideoCommon/Src/MainBase.cpp
index 2316262b19..485db54f39 100644
--- a/Source/Core/VideoCommon/Src/MainBase.cpp
+++ b/Source/Core/VideoCommon/Src/MainBase.cpp
@@ -15,7 +15,7 @@
#include "VideoBackendBase.h"
#include "ConfigManager.h"
-bool s_PluginInitialized = false;
+bool s_BackendInitialized = false;
volatile u32 s_swapRequested = false;
u32 s_efbAccessRequested = false;
@@ -96,7 +96,7 @@ void VideoFifo_CheckSwapRequestAt(u32 xfbAddr, u32 fbWidth, u32 fbHeight)
// Run from the CPU thread (from VideoInterface.cpp)
void VideoBackendHLE::Video_BeginField(u32 xfbAddr, FieldType field, u32 fbWidth, u32 fbHeight)
{
- if (s_PluginInitialized && g_ActiveConfig.bUseXFB)
+ if (s_BackendInitialized && g_ActiveConfig.bUseXFB)
{
if (!SConfig::GetInstance().m_LocalCoreStartupParameter.bCPUThread)
VideoFifo_CheckSwapRequest();
@@ -110,7 +110,7 @@ void VideoBackendHLE::Video_BeginField(u32 xfbAddr, FieldType field, u32 fbWidth
// Run from the CPU thread (from VideoInterface.cpp)
void VideoBackendHLE::Video_EndField()
{
- if (s_PluginInitialized)
+ if (s_BackendInitialized)
{
Common::AtomicStoreRelease(s_swapRequested, true);
}
@@ -145,7 +145,7 @@ void VideoFifo_CheckEFBAccess()
u32 VideoBackendHLE::Video_AccessEFB(EFBAccessType type, u32 x, u32 y, u32 InputData)
{
- if (s_PluginInitialized)
+ if (s_BackendInitialized)
{
s_accessEFBArgs.type = type;
s_accessEFBArgs.x = x;
diff --git a/Source/Core/VideoCommon/Src/MainBase.h b/Source/Core/VideoCommon/Src/MainBase.h
index 4d0ea05dbc..ed48db4b75 100644
--- a/Source/Core/VideoCommon/Src/MainBase.h
+++ b/Source/Core/VideoCommon/Src/MainBase.h
@@ -4,7 +4,7 @@
#include "CommonTypes.h"
-extern bool s_PluginInitialized;
+extern bool s_BackendInitialized;
extern u32 s_efbAccessRequested;
extern volatile u32 s_FifoShuttingDown;
extern volatile u32 s_swapRequested;
diff --git a/Source/Core/VideoCommon/Src/NativeVertexFormat.h b/Source/Core/VideoCommon/Src/NativeVertexFormat.h
index 0013e05845..02184fde1c 100644
--- a/Source/Core/VideoCommon/Src/NativeVertexFormat.h
+++ b/Source/Core/VideoCommon/Src/NativeVertexFormat.h
@@ -89,7 +89,7 @@ struct PortableVertexDeclaration
};
// The implementation of this class is specific for GL/DX, so NativeVertexFormat.cpp
-// is in the respective plugin, not here in VideoCommon.
+// is in the respective backend, not here in VideoCommon.
// Note that this class can't just invent arbitrary vertex formats out of its input -
// all the data loading code must always be made compatible.
diff --git a/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp b/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp
index 47d3fbd4ac..f30bfd0b41 100644
--- a/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp
+++ b/Source/Core/VideoCommon/Src/OpcodeDecoding.cpp
@@ -124,7 +124,7 @@ void InterpretDisplayList(u32 address, u32 size)
g_pVideoData = old_pVideoData;
}
-// Defer to plugin-specific DL cache.
+// Defer to backend-specific DL cache.
extern bool HandleDisplayList(u32 address, u32 size);
void ExecuteDisplayList(u32 address, u32 size)
diff --git a/Source/Core/VideoCommon/Src/OpcodeDecoding.h b/Source/Core/VideoCommon/Src/OpcodeDecoding.h
index db83a8a554..9989f0fd24 100644
--- a/Source/Core/VideoCommon/Src/OpcodeDecoding.h
+++ b/Source/Core/VideoCommon/Src/OpcodeDecoding.h
@@ -44,7 +44,7 @@
#define GX_DRAW_LINES 0x5 // 0xA8
#define GX_DRAW_LINE_STRIP 0x6 // 0xB0
#define GX_DRAW_POINTS 0x7 // 0xB8
-#define GX_DRAW_NONE 0x1; //Tis is a fake value to used in the plugins
+#define GX_DRAW_NONE 0x1; //Tis is a fake value to used in the backends
void OpcodeDecoder_Init();
void OpcodeDecoder_Shutdown();
void OpcodeDecoder_Run(bool skipped_frame);
diff --git a/Source/Core/VideoCommon/Src/OpenCL.cpp b/Source/Core/VideoCommon/Src/OpenCL.cpp
index d1658ae486..0fc18017af 100644
--- a/Source/Core/VideoCommon/Src/OpenCL.cpp
+++ b/Source/Core/VideoCommon/Src/OpenCL.cpp
@@ -15,7 +15,7 @@
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
-// TODO: Make a more centralized version of this (for now every plugin that will use it will create its own context, which is weird). An object maybe?
+// TODO: Make a more centralized version of this (for now every backend that will use it will create its own context, which is weird). An object maybe?
#include "OpenCL.h"
#include "Common.h"
diff --git a/Source/Core/VideoCommon/Src/PixelEngine.cpp b/Source/Core/VideoCommon/Src/PixelEngine.cpp
index 05fc65ae12..9aff12a780 100644
--- a/Source/Core/VideoCommon/Src/PixelEngine.cpp
+++ b/Source/Core/VideoCommon/Src/PixelEngine.cpp
@@ -342,13 +342,13 @@ void SetToken_OnMainThread(u64 userdata, int cyclesLate)
//{
g_bSignalTokenInterrupt = true;
//_dbg_assert_msg_(PIXELENGINE, (CommandProcessor::fifo.PEToken == (userdata&0xFFFF)), "WTF? BPMEM_PE_TOKEN_INT_ID's token != BPMEM_PE_TOKEN_ID's token" );
- INFO_LOG(PIXELENGINE, "VIDEO Plugin raises INT_CAUSE_PE_TOKEN (btw, token: %04x)", CommandProcessor::fifo.PEToken);
+ INFO_LOG(PIXELENGINE, "VIDEO Backend raises INT_CAUSE_PE_TOKEN (btw, token: %04x)", CommandProcessor::fifo.PEToken);
UpdateInterrupts();
CommandProcessor::interruptTokenWaiting = false;
IncrementCheckContextId();
//}
//else
- // LOGV(PIXELENGINE, 1, "VIDEO Plugin wrote token: %i", CommandProcessor::fifo.PEToken);
+ // LOGV(PIXELENGINE, 1, "VIDEO Backend wrote token: %i", CommandProcessor::fifo.PEToken);
}
void SetFinish_OnMainThread(u64 userdata, int cyclesLate)
diff --git a/Source/Core/VideoCommon/Src/PixelEngine.h b/Source/Core/VideoCommon/Src/PixelEngine.h
index 9bbf277055..dd0304fbe1 100644
--- a/Source/Core/VideoCommon/Src/PixelEngine.h
+++ b/Source/Core/VideoCommon/Src/PixelEngine.h
@@ -75,7 +75,7 @@ void Read16(u16& _uReturnValue, const u32 _iAddress);
void Write16(const u16 _iValue, const u32 _iAddress);
void Write32(const u32 _iValue, const u32 _iAddress);
-// gfx plugin support
+// gfx backend support
void SetToken(const u16 _token, const int _bSetTokenAcknowledge);
void SetFinish(void);
void ResetSetFinish(void);
diff --git a/Source/Core/VideoCommon/Src/VertexManagerBase.h b/Source/Core/VideoCommon/Src/VertexManagerBase.h
index 258d7e0c67..12dc02ae4b 100644
--- a/Source/Core/VideoCommon/Src/VertexManagerBase.h
+++ b/Source/Core/VideoCommon/Src/VertexManagerBase.h
@@ -10,15 +10,15 @@ public:
enum
{
- // values from OGL plugin
+ // values from OGL backend
//MAXVBUFFERSIZE = 0x1FFFF,
//MAXIBUFFERSIZE = 0xFFFF,
- // values from DX9 plugin
+ // values from DX9 backend
//MAXVBUFFERSIZE = 0x50000,
//MAXIBUFFERSIZE = 0xFFFF,
- // values from DX11 plugin
+ // values from DX11 backend
MAXVBUFFERSIZE = 0x50000,
MAXIBUFFERSIZE = 0x10000,
};
diff --git a/Source/Core/VideoCommon/Src/VideoCommon.h b/Source/Core/VideoCommon/Src/VideoCommon.h
index 4084773470..b0e01012fd 100644
--- a/Source/Core/VideoCommon/Src/VideoCommon.h
+++ b/Source/Core/VideoCommon/Src/VideoCommon.h
@@ -80,7 +80,7 @@ struct EFBRectangle : public MathUtil::Rectangle<int>
struct TargetRectangle : public MathUtil::Rectangle<int>
{
#ifdef _WIN32
- // Only used by D3D plugin.
+ // Only used by D3D backend.
const RECT *AsRECT() const
{
// The types are binary compatible so this works.
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.cpp b/Source/Core/VideoCommon/Src/VideoConfig.cpp
index 42be83cf32..3f8713e825 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.cpp
+++ b/Source/Core/VideoCommon/Src/VideoConfig.cpp
@@ -222,7 +222,7 @@ void VideoConfig::GameIniLoad(const char *ini_file)
void VideoConfig::VerifyValidity()
{
// TODO: Check iMaxAnisotropy value
- if (iAdapter >= backend_info.Adapters.size()) iAdapter = 0;
+ if (iAdapter >= (int)backend_info.Adapters.size()) iAdapter = 0;
if (!backend_info.bSupportsEFBToRAM) bCopyEFBToTexture = true;
if (iMultisampleMode < 0 || iMultisampleMode >= (int)backend_info.AAModes.size()) iMultisampleMode = 0;
if (!backend_info.bSupportsRealXFB) bUseRealXFB = false;
diff --git a/Source/Core/VideoCommon/Src/VideoConfig.h b/Source/Core/VideoCommon/Src/VideoConfig.h
index e0eea387c5..49871e93ae 100644
--- a/Source/Core/VideoCommon/Src/VideoConfig.h
+++ b/Source/Core/VideoCommon/Src/VideoConfig.h
@@ -22,8 +22,8 @@
// at the start of every frame. Noone should ever change members of g_ActiveConfig
// directly.
-#ifndef _PLUGIN_VIDEO_CONFIG_H_
-#define _PLUGIN_VIDEO_CONFIG_H_
+#ifndef _VIDEO_CONFIG_H_
+#define _VIDEO_CONFIG_H_
#include "Common.h"
#include "VideoCommon.h"
@@ -173,4 +173,4 @@ void UpdateActiveConfig();
void ComputeDrawRectangle(int backbuffer_width, int backbuffer_height, bool flip, TargetRectangle *rc);
-#endif // _PLUGIN_VIDEO_CONFIG_H_
+#endif // _VIDEO_CONFIG_H_