mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-24 06:39:46 -06:00
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
This commit is contained in:
@ -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
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
// ------------------------------------------
|
||||
// Video plugin must define these functions
|
||||
// Video backend must define these functions
|
||||
// ------------------------------------------
|
||||
|
||||
#ifndef _BPFUNCTIONS_H
|
||||
|
@ -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()
|
||||
|
@ -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);
|
||||
|
@ -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();
|
||||
|
||||
|
@ -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)
|
||||
{
|
||||
|
@ -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
|
||||
|
@ -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();
|
||||
|
@ -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();
|
||||
|
||||
|
@ -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
|
||||
|
@ -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;
|
||||
|
@ -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;
|
||||
|
@ -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.
|
||||
|
@ -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)
|
||||
|
@ -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);
|
||||
|
@ -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"
|
||||
|
@ -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)
|
||||
|
@ -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);
|
||||
|
@ -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,
|
||||
};
|
||||
|
@ -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.
|
||||
|
@ -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;
|
||||
|
@ -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_
|
||||
|
Reference in New Issue
Block a user