1 change: 0 additions & 1 deletion Data/Sys/GameSettings/RHAW01.ini
View file
Expand Up @@ -26,5 +26,4 @@ PH_ZNear =
PH_ZFar =

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/RHMEE9.ini
View file
Expand Up @@ -26,5 +26,4 @@ PH_ZNear =
PH_ZFar =

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/RHMP99.ini
View file
Expand Up @@ -26,5 +26,4 @@ PH_ZNear =
PH_ZFar =

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/RM8E01.ini
View file
Expand Up @@ -21,4 +21,3 @@ ForceFiltering = False
[Video_Hacks]
EFBToTextureEnable = False
EFBCopyEnable = True
DlistCachingEnable = False
1 change: 0 additions & 1 deletion Data/Sys/GameSettings/RM8J01.ini
View file
Expand Up @@ -21,4 +21,3 @@ ForceFiltering = False
[Video_Hacks]
EFBToTextureEnable = False
EFBCopyEnable = True
DlistCachingEnable = False
1 change: 0 additions & 1 deletion Data/Sys/GameSettings/RM8K01.ini
View file
Expand Up @@ -21,4 +21,3 @@ ForceFiltering = False
[Video_Hacks]
EFBToTextureEnable = False
EFBCopyEnable = True
DlistCachingEnable = False
1 change: 0 additions & 1 deletion Data/Sys/GameSettings/RM8P01.ini
View file
Expand Up @@ -21,4 +21,3 @@ ForceFiltering = False
[Video_Hacks]
EFBToTextureEnable = False
EFBCopyEnable = True
DlistCachingEnable = False
1 change: 0 additions & 1 deletion Data/Sys/GameSettings/RPJE7U.ini
View file
Expand Up @@ -29,5 +29,4 @@ PH_ZFar =
SafeTextureCacheColorSamples = 512

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/RPJJ99.ini
View file
Expand Up @@ -29,5 +29,4 @@ PH_ZFar =
SafeTextureCacheColorSamples = 512

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/RWRE4F.ini
View file
Expand Up @@ -26,5 +26,4 @@ PH_ZNear =
PH_ZFar =

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/RWRP4F.ini
View file
Expand Up @@ -26,5 +26,4 @@ PH_ZNear =
PH_ZFar =

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/S3BEWR.ini
View file
Expand Up @@ -29,5 +29,4 @@ PH_ZFar =
SafeTextureCacheColorSamples = 0

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/S3BPWR.ini
View file
Expand Up @@ -29,5 +29,4 @@ PH_ZFar =
SafeTextureCacheColorSamples = 0

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SC2E8P.ini
View file
Expand Up @@ -27,5 +27,4 @@ PH_ZNear =
PH_ZFar =

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SC2P8P.ini
View file
Expand Up @@ -76,5 +76,4 @@ PH_ZNear =
PH_ZFar =

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SC4E64.ini
View file
Expand Up @@ -26,5 +26,4 @@ PH_ZNear =
PH_ZFar =

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SC4P64.ini
View file
Expand Up @@ -26,5 +26,4 @@ PH_ZNear =
PH_ZFar =

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SEME4Q.ini
View file
Expand Up @@ -33,5 +33,4 @@ SafeTextureCacheColorSamples = 0
ForceFiltering = False

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SEMJ01.ini
View file
Expand Up @@ -33,5 +33,4 @@ SafeTextureCacheColorSamples = 0
ForceFiltering = False

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SEMP4Q.ini
View file
Expand Up @@ -33,5 +33,4 @@ SafeTextureCacheColorSamples = 0
ForceFiltering = False

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SEMX4Q.ini
View file
Expand Up @@ -33,5 +33,4 @@ SafeTextureCacheColorSamples = 0
ForceFiltering = False

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SEMY4Q.ini
View file
Expand Up @@ -33,5 +33,4 @@ SafeTextureCacheColorSamples = 0
ForceFiltering = False

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SEMZ4Q.ini
View file
Expand Up @@ -33,5 +33,4 @@ SafeTextureCacheColorSamples = 0
ForceFiltering = False

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SMNE01.ini
View file
Expand Up @@ -53,5 +53,4 @@ PH_ZFar =
SafeTextureCacheColorSamples = 512

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SMNJ01.ini
View file
Expand Up @@ -29,5 +29,4 @@ PH_ZFar =
SafeTextureCacheColorSamples = 512

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SMNK01.ini
View file
Expand Up @@ -29,5 +29,4 @@ PH_ZFar =
SafeTextureCacheColorSamples = 512

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SMNP01.ini
View file
Expand Up @@ -38,5 +38,4 @@ PH_ZFar =
SafeTextureCacheColorSamples = 512

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SMNW01.ini
View file
Expand Up @@ -29,5 +29,4 @@ PH_ZFar =
SafeTextureCacheColorSamples = 512

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SO3EE9.ini
View file
Expand Up @@ -26,5 +26,4 @@ PH_ZNear =
PH_ZFar =

[Video_Hacks]
DlistCachingEnable = False

2 changes: 0 additions & 2 deletions Data/Sys/GameSettings/SO3J99.ini
View file
Expand Up @@ -26,5 +26,3 @@ PH_ZNear =
PH_ZFar =

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SOUE01.ini
View file
Expand Up @@ -18,4 +18,3 @@ PH_ZNear =
PH_ZFar =
[Video_Hacks]
EFBAccessEnable = True
DlistCachingEnable = False
1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SOUJ01.ini
View file
Expand Up @@ -18,4 +18,3 @@ PH_ZNear =
PH_ZFar =
[Video_Hacks]
EFBAccessEnable = True
DlistCachingEnable = False
1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SOUK01.ini
View file
Expand Up @@ -18,4 +18,3 @@ PH_ZNear =
PH_ZFar =
[Video_Hacks]
EFBAccessEnable = True
DlistCachingEnable = False
1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SOUP01.ini
View file
Expand Up @@ -18,4 +18,3 @@ PH_ZNear =
PH_ZFar =
[Video_Hacks]
EFBAccessEnable = True
DlistCachingEnable = False
1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SRQE41.ini
View file
Expand Up @@ -26,5 +26,4 @@ PH_ZNear =
PH_ZFar =

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SRQP41.ini
View file
Expand Up @@ -26,5 +26,4 @@ PH_ZNear =
PH_ZFar =

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/STHP8P.ini
View file
Expand Up @@ -27,5 +27,4 @@ PH_ZNear =
PH_ZFar =

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SX4E01.ini
View file
Expand Up @@ -27,4 +27,3 @@ PH_ZNear =
PH_ZFar =

[Video_Hacks]
DlistCachingEnable = False
1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SX4J01.ini
View file
Expand Up @@ -27,5 +27,4 @@ PH_ZNear =
PH_ZFar =

[Video_Hacks]
DlistCachingEnable = False

1 change: 0 additions & 1 deletion Data/Sys/GameSettings/SX4P01.ini
View file
Expand Up @@ -27,5 +27,4 @@ PH_ZNear =
PH_ZFar =

[Video_Hacks]
DlistCachingEnable = False

2 changes: 0 additions & 2 deletions Source/Android/src/org/dolphinemu/dolphinemu/settings/UserPreferences.java
View file
Expand Up @@ -91,7 +91,6 @@ else if (usingXFB.equals("True") && usingRealXFB.equals("True"))
editor.putString("externalFrameBuffer", "Real");
}

editor.putBoolean("cacheDisplayLists", getConfig("gfx_opengl.ini", "Hacks", "DlistCachingEnable", "False").equals("True"));
editor.putBoolean("disableDestinationAlpha", getConfig("gfx_opengl.ini", "Settings", "DstAlphaPass", "False").equals("True"));
editor.putBoolean("fastDepthCalculation", getConfig("gfx_opengl.ini", "Settings", "FastDepthCalc", "True").equals("True"));

Expand Down Expand Up @@ -234,7 +233,6 @@ else if (externalFrameBuffer.equals("Real"))
NativeLibrary.SetConfig("gfx_opengl.ini", "Settings", "UseRealXFB", "True");
}

NativeLibrary.SetConfig("gfx_opengl.ini", "Hacks", "DlistCachingEnable", dlistCachingEnabled ? "True" : "False");
NativeLibrary.SetConfig("gfx_opengl.ini", "Settings", "DstAlphaPass", disableDstAlphaPass ? "True" : "False");
NativeLibrary.SetConfig("gfx_opengl.ini", "Settings", "FastDepthCalc", useFastDepthCalc ? "True" : "False");

Expand Down
2 changes: 0 additions & 2 deletions Source/Core/DolphinWX/VideoConfigDiag.cpp
View file
Expand Up @@ -117,7 +117,6 @@ wxString use_ffv1_desc = wxTRANSLATE("Encode frame dumps using the FFV1 codec.\n
#endif
wxString free_look_desc = wxTRANSLATE("This feature allows you to change the game's camera.\nMove the mouse while holding the right mouse button to pan and while holding the middle button to move.\nHold SHIFT and press one of the WASD keys to move the camera by a certain step distance (SHIFT+0 to move faster and SHIFT+9 to move slower). Press SHIFT+R to reset the camera.\n\nIf unsure, leave this unchecked.");
wxString crop_desc = wxTRANSLATE("Crop the picture from 4:3 to 5:4 or from 16:9 to 16:10.\n\nIf unsure, leave this unchecked.");
wxString dlc_desc = wxTRANSLATE("[EXPERIMENTAL]\nSpeeds up emulation a bit by caching display lists.\nPossibly causes issues though.\n\nIf unsure, leave this unchecked.");
wxString omp_desc = wxTRANSLATE("Use multiple threads to decode textures.\nMight result in a speedup (especially on CPUs with more than two cores).\n\nIf unsure, leave this unchecked.");
wxString ppshader_desc = wxTRANSLATE("Apply a post-processing effect after finishing a frame.\n\nIf unsure, select (off).");
wxString cache_efb_copies_desc = wxTRANSLATE("Slightly speeds up EFB to RAM copies by sacrificing emulation accuracy.\nSometimes also increases visual quality.\nIf you're experiencing any issues, try raising texture cache accuracy or disable this option.\n\nIf unsure, leave this unchecked.");
Expand Down Expand Up @@ -495,7 +494,6 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con
// - other hacks
{
wxGridSizer* const szr_other = new wxGridSizer(2, 5, 5);
szr_other->Add(CreateCheckBox(page_hacks, _("Cache Display Lists"), wxGetTranslation(dlc_desc), vconfig.bDlistCachingEnable));
szr_other->Add(CreateCheckBox(page_hacks, _("Disable Destination Alpha"), wxGetTranslation(disable_dstalpha_desc), vconfig.bDstAlphaPass));
szr_other->Add(CreateCheckBox(page_hacks, _("OpenMP Texture Decoder"), wxGetTranslation(omp_desc), vconfig.bOMPDecoder));
szr_other->Add(CreateCheckBox(page_hacks, _("Fast Depth Calculation"), wxGetTranslation(fast_depth_calc_desc), vconfig.bFastDepthCalc));
Expand Down
2 changes: 0 additions & 2 deletions Source/Core/VideoBackends/D3D/Render.cpp
View file
Expand Up @@ -8,7 +8,6 @@
#include "Timer.h"

#include "Debugger.h"
#include "DLCache.h"
#include "EmuWindow.h"
#include "Fifo.h"
#include "OnScreenDisplay.h"
Expand Down Expand Up @@ -950,7 +949,6 @@ void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangle& r

GFX_DEBUGGER_PAUSE_AT(NEXT_FRAME, true);

DLCache::ProgressiveCleanup();
TextureCache::Cleanup();

// Enable configuration changes
Expand Down
3 changes: 0 additions & 3 deletions Source/Core/VideoBackends/D3D/main.cpp
View file
Expand Up @@ -20,7 +20,6 @@
#include "Host.h"

#include "Debugger/DebuggerPanel.h"
#include "DLCache.h"
#include "EmuWindow.h"
#include "IndexGenerator.h"
#include "FileUtil.h"
Expand Down Expand Up @@ -201,7 +200,6 @@ void VideoBackend::Video_Prepare()
PixelShaderManager::Init();
CommandProcessor::Init();
PixelEngine::Init();
DLCache::Init();

// Tell the host that the window is ready
Host_Message(WM_USER_CREATE);
Expand All @@ -219,7 +217,6 @@ void VideoBackend::Shutdown()
s_swapRequested = FALSE;

// VideoCommon
DLCache::Shutdown();
Fifo_Shutdown();
CommandProcessor::Shutdown();
PixelShaderManager::Shutdown();
Expand Down
2 changes: 0 additions & 2 deletions Source/Core/VideoBackends/OGL/Render.cpp
View file
Expand Up @@ -33,7 +33,6 @@
#include "TextureCache.h"
#include "RasterFont.h"
#include "VertexShaderGen.h"
#include "DLCache.h"
#include "ProgramShaderCache.h"
#include "VertexShaderManager.h"
#include "VertexLoaderManager.h"
Expand Down Expand Up @@ -1588,7 +1587,6 @@ void Renderer::Swap(u32 xfbAddr, u32 fbWidth, u32 fbHeight,const EFBRectangle& r
}

// Clean out old stuff from caches. It's not worth it to clean out the shader caches.
DLCache::ProgressiveCleanup();
TextureCache::Cleanup();

frameCount++;
Expand Down
7 changes: 0 additions & 7 deletions Source/Core/VideoBackends/OGL/main.cpp
View file
Expand Up @@ -76,7 +76,6 @@ Make AA apply instantly during gameplay if possible
#include "TextureConverter.h"
#include "PostProcessing.h"
#include "OnScreenDisplay.h"
#include "DLCache.h"
#include "FramebufferManager.h"
#include "Core.h"
#include "Host.h"
Expand Down Expand Up @@ -225,9 +224,6 @@ void VideoBackend::Video_Prepare()
GL_REPORT_ERRORD();
VertexLoaderManager::Init();
TextureConverter::Init();
#ifndef _M_GENERIC
DLCache::Init();
#endif

// Notify the core that the video backend is ready
Host_Message(WM_USER_CREATE);
Expand All @@ -250,9 +246,6 @@ void VideoBackend::Video_Cleanup() {
s_efbAccessRequested = false;
s_FifoShuttingDown = false;
s_swapRequested = false;
#ifndef _M_GENERIC
DLCache::Shutdown();
#endif
Fifo_Shutdown();

// The following calls are NOT Thread Safe
Expand Down
6 changes: 2 additions & 4 deletions Source/Core/VideoCommon/CMakeLists.txt
View file
Expand Up @@ -40,11 +40,9 @@ set(SRCS BPFunctions.cpp
set(LIBS core png)

if(NOT _M_GENERIC)
set(SRCS ${SRCS} TextureDecoder_x64.cpp
DLCache_x64.cpp)
set(SRCS ${SRCS} TextureDecoder_x64.cpp)
else()
set(SRCS ${SRCS} TextureDecoder_Generic.cpp
DLCache_Generic.cpp)
set(SRCS ${SRCS} TextureDecoder_Generic.cpp)
endif()
if(NOT ${CL} STREQUAL CL-NOTFOUND)
list(APPEND LIBS ${CL})
Expand Down
3 changes: 0 additions & 3 deletions Source/Core/VideoCommon/CommandProcessor.cpp
View file
Expand Up @@ -17,7 +17,6 @@
#include "HW/ProcessorInterface.h"
#include "HW/GPFifo.h"
#include "HW/Memmap.h"
#include "DLCache.h"
#include "HW/SystemTimers.h"
#include "Core.h"

Expand Down Expand Up @@ -409,7 +408,6 @@ void Write16(const u16 _Value, const u32 _Address)
{
ResetVideoBuffer();
}
IncrementCheckContextId();
DEBUG_LOG(COMMANDPROCESSOR,"Try to write to FIFO_RW_DISTANCE_HI : %04x", _Value);
break;
case FIFO_RW_DISTANCE_LO:
Expand Down Expand Up @@ -527,7 +525,6 @@ void SetCpStatus(bool isCPUThread)
{
INFO_LOG(COMMANDPROCESSOR, "Hit breakpoint at %i", fifo.CPReadPointer);
fifo.bFF_Breakpoint = true;
IncrementCheckContextId();
}
}
else
Expand Down
20 changes: 0 additions & 20 deletions Source/Core/VideoCommon/DLCache.h
View file

This file was deleted.

52 changes: 0 additions & 52 deletions Source/Core/VideoCommon/DLCache_Generic.cpp
View file

This file was deleted.

775 changes: 0 additions & 775 deletions Source/Core/VideoCommon/DLCache_x64.cpp
View file

This file was deleted.

11 changes: 1 addition & 10 deletions Source/Core/VideoCommon/OpcodeDecoding.cpp
View file
Expand Up @@ -112,15 +112,6 @@ void InterpretDisplayList(u32 address, u32 size)
g_pVideoData = old_pVideoData;
}

// Defer to backend-specific DL cache.
extern bool HandleDisplayList(u32 address, u32 size);

void ExecuteDisplayList(u32 address, u32 size)
{
if (!HandleDisplayList(address, size))
InterpretDisplayList(address, size);
}

u32 FifoCommandRunnable(u32 &command_size)
{
u32 cycleTime = 0;
Expand Down Expand Up @@ -337,7 +328,7 @@ static void Decode()
{
u32 address = DataReadU32();
u32 count = DataReadU32();
ExecuteDisplayList(address, count);
InterpretDisplayList(address, count);
}
break;

Expand Down
2 changes: 1 addition & 1 deletion Source/Core/VideoCommon/OpcodeDecoding.h
View file
Expand Up @@ -38,5 +38,5 @@ extern bool g_bRecordFifoData;
void OpcodeDecoder_Init();
void OpcodeDecoder_Shutdown();
u32 OpcodeDecoder_Run(bool skipped_frame);
void ExecuteDisplayList(u32 address, u32 size);
void InterpretDisplayList(u32 address, u32 size);
#endif // _OPCODE_DECODING_H
4 changes: 0 additions & 4 deletions Source/Core/VideoCommon/PixelEngine.cpp
View file
Expand Up @@ -17,7 +17,6 @@
#include "RenderBase.h"
#include "CommandProcessor.h"
#include "HW/ProcessorInterface.h"
#include "DLCache.h"
#include "State.h"

namespace PixelEngine
Expand Down Expand Up @@ -380,7 +379,6 @@ void SetToken_OnMainThread(u64 userdata, int cyclesLate)
UpdateInterrupts();
}
CommandProcessor::interruptTokenWaiting = false;
IncrementCheckContextId();
}

void SetFinish_OnMainThread(u64 userdata, int cyclesLate)
Expand All @@ -402,7 +400,6 @@ void SetToken(const u16 _token, const int _bSetTokenAcknowledge)

CommandProcessor::interruptTokenWaiting = true;
CoreTiming::ScheduleEvent_Threadsafe(0, et_SetTokenOnMainThread, _token | (_bSetTokenAcknowledge << 16));
IncrementCheckContextId();
}

// SetFinish
Expand All @@ -412,7 +409,6 @@ void SetFinish()
CommandProcessor::interruptFinishWaiting = true;
CoreTiming::ScheduleEvent_Threadsafe(0, et_SetFinishOnMainThread, 0);
INFO_LOG(PIXELENGINE, "VIDEO Set Finish");
IncrementCheckContextId();
}

//This function is used in CommandProcessor when write CTRL_REGISTER and the new fifo is attached.
Expand Down
9 changes: 0 additions & 9 deletions Source/Core/VideoCommon/RenderBase.cpp
View file
Expand Up @@ -59,7 +59,6 @@ int Renderer::s_LastEFBScale;

bool Renderer::s_skipSwap;
bool Renderer::XFBWrited;
bool Renderer::s_EnableDLCachingAfterRecording;

unsigned int Renderer::prev_efb_format = (unsigned int)-1;
unsigned int Renderer::efb_scale_numeratorX = 1;
Expand Down Expand Up @@ -490,19 +489,11 @@ void Renderer::CheckFifoRecording()
{
if (!wasRecording)
{
// Disable display list caching because the recorder does not handle it
s_EnableDLCachingAfterRecording = g_ActiveConfig.bDlistCachingEnable;
g_ActiveConfig.bDlistCachingEnable = false;

RecordVideoMemory();
}

FifoRecorder::GetInstance().EndFrame(CommandProcessor::fifo.CPBase, CommandProcessor::fifo.CPEnd);
}
else if (wasRecording)
{
g_ActiveConfig.bDlistCachingEnable = s_EnableDLCachingAfterRecording;
}
}

void Renderer::RecordVideoMemory()
Expand Down
2 changes: 0 additions & 2 deletions Source/Core/VideoCommon/RenderBase.h
View file
Expand Up @@ -151,8 +151,6 @@ class Renderer
static bool s_skipSwap;
static bool XFBWrited;

static bool s_EnableDLCachingAfterRecording;

private:
static unsigned int prev_efb_format;
static unsigned int efb_scale_numeratorX;
Expand Down
41 changes: 15 additions & 26 deletions Source/Core/VideoCommon/VertexLoader.cpp
View file
Expand Up @@ -19,6 +19,7 @@
#include "BPMemory.h"
#include "DataReader.h"
#include "VertexManagerBase.h"
#include "IndexGenerator.h"

#include "VertexLoader_Position.h"
#include "VertexLoader_Normal.h"
Expand Down Expand Up @@ -836,7 +837,7 @@ void VertexLoader::WriteSetVariable(int bits, void *address, OpArg value)
}
#endif

int VertexLoader::SetupRunVertices(int vtx_attr_group, int primitive, int const count)
void VertexLoader::SetupRunVertices(int vtx_attr_group, int primitive, int const count)
{
m_numLoadedVertices += count;

Expand All @@ -851,13 +852,6 @@ int VertexLoader::SetupRunVertices(int vtx_attr_group, int primitive, int const
}
g_nativeVertexFmt = m_NativeFmt;

if (bpmem.genMode.cullmode == 3 && primitive < 5)
{
// if cull mode is none, ignore triangles and quads
DataSkip(count * m_VertexSize);
return 0;
}

// Load position and texcoord scale factors.
m_VtxAttr.PosFrac = g_VtxAttr[vtx_attr_group].g0.PosFrac;
m_VtxAttr.texCoord[0].Frac = g_VtxAttr[vtx_attr_group].g0.Tex0Frac;
Expand All @@ -881,17 +875,6 @@ int VertexLoader::SetupRunVertices(int vtx_attr_group, int primitive, int const
s_bbox_primitive = primitive;
s_bbox_currPoint = 0;
s_bbox_loadedPoints = 0;

VertexManager::PrepareForAdditionalData(primitive, count, native_stride);

return count;
}

void VertexLoader::RunVertices(int vtx_attr_group, int primitive, int const count)
{
auto const new_count = SetupRunVertices(vtx_attr_group, primitive, count);
ConvertVertices(new_count);
VertexManager::AddVertices(primitive, new_count);
}

void VertexLoader::ConvertVertices ( int count )
Expand All @@ -915,15 +898,21 @@ void VertexLoader::ConvertVertices ( int count )
#endif
}

void VertexLoader::RunCompiledVertices(int vtx_attr_group, int primitive, int const count, u8* Data)
void VertexLoader::RunVertices(int vtx_attr_group, int primitive, int const count)
{
auto const new_count = SetupRunVertices(vtx_attr_group, primitive, count);

memcpy_gc(VertexManager::s_pCurBufferPointer, Data, native_stride * new_count);
VertexManager::s_pCurBufferPointer += native_stride * new_count;
DataSkip(new_count * m_VertexSize);
if (bpmem.genMode.cullmode == 3 && primitive < 5)
{
// if cull mode is none, ignore triangles and quads
DataSkip(count * m_VertexSize);
return;
}
SetupRunVertices(vtx_attr_group, primitive, count);
VertexManager::PrepareForAdditionalData(primitive, count, native_stride);
ConvertVertices(count);
IndexGenerator::AddIndices(primitive, count);

VertexManager::AddVertices(primitive, new_count);
ADDSTAT(stats.thisFrame.numPrims, count);
INCSTAT(stats.thisFrame.numPrimitiveJoins);
}

void VertexLoader::SetVAT(u32 _group0, u32 _group1, u32 _group2)
Expand Down
3 changes: 1 addition & 2 deletions Source/Core/VideoCommon/VertexLoader.h
View file
Expand Up @@ -95,9 +95,8 @@ class VertexLoader

int GetVertexSize() const {return m_VertexSize;}

int SetupRunVertices(int vtx_attr_group, int primitive, int const count);
void SetupRunVertices(int vtx_attr_group, int primitive, int const count);
void RunVertices(int vtx_attr_group, int primitive, int count);
void RunCompiledVertices(int vtx_attr_group, int primitive, int count, u8* Data);

// For debugging / profiling
void AppendToString(std::string *dest) const;
Expand Down
18 changes: 8 additions & 10 deletions Source/Core/VideoCommon/VertexLoaderManager.cpp
View file
Expand Up @@ -96,7 +96,7 @@ void MarkAllDirty()
s_attr_dirty = 0xff;
}

static void RefreshLoader(int vtx_attr_group)
static VertexLoader* RefreshLoader(int vtx_attr_group)
{
if ((s_attr_dirty >> vtx_attr_group) & 1)
{
Expand All @@ -116,29 +116,27 @@ static void RefreshLoader(int vtx_attr_group)
}
}
s_attr_dirty &= ~(1 << vtx_attr_group);
return g_VertexLoaders[vtx_attr_group];
}

void RunVertices(int vtx_attr_group, int primitive, int count)
{
if (!count)
return;

RefreshLoader(vtx_attr_group);
g_VertexLoaders[vtx_attr_group]->RunVertices(vtx_attr_group, primitive, count);
RefreshLoader(vtx_attr_group)->RunVertices(vtx_attr_group, primitive, count);
}

void RunCompiledVertices(int vtx_attr_group, int primitive, int count, u8* Data)
void SkipVertices(int vtx_attr_group, int count)
{
if (!count || !Data)
if (!count)
return;
RefreshLoader(vtx_attr_group);
g_VertexLoaders[vtx_attr_group]->RunCompiledVertices(vtx_attr_group, primitive, count,Data);
u32 stride = RefreshLoader(vtx_attr_group)->GetVertexSize();
DataSkip(count * stride);
}

int GetVertexSize(int vtx_attr_group)
{
RefreshLoader(vtx_attr_group);
return g_VertexLoaders[vtx_attr_group]->GetVertexSize();
return RefreshLoader(vtx_attr_group)->GetVertexSize();
}

} // namespace
Expand Down
1 change: 0 additions & 1 deletion Source/Core/VideoCommon/VertexLoaderManager.h
View file
Expand Up @@ -17,7 +17,6 @@ namespace VertexLoaderManager

int GetVertexSize(int vtx_attr_group);
void RunVertices(int vtx_attr_group, int primitive, int count);
void RunCompiledVertices(int vtx_attr_group, int primitive, int count, u8* Data);

// For debugging
void AppendListToString(std::string *dest);
Expand Down
11 changes: 0 additions & 11 deletions Source/Core/VideoCommon/VertexManagerBase.cpp
View file
Expand Up @@ -140,17 +140,6 @@ u32 VertexManager::GetRemainingIndices(int primitive)
}
}

void VertexManager::AddVertices(int primitive, u32 numVertices)
{
if (numVertices <= 0)
return;

ADDSTAT(stats.thisFrame.numPrims, numVertices);
INCSTAT(stats.thisFrame.numPrimitiveJoins);

IndexGenerator::AddIndices(primitive, numVertices);
}

void VertexManager::Flush()
{
if (IsFlushed) return;
Expand Down
2 changes: 0 additions & 2 deletions Source/Core/VideoCommon/VertexManagerBase.h
View file
Expand Up @@ -32,8 +32,6 @@ class VertexManager
// needs to be virtual for DX11's dtor
virtual ~VertexManager();

static void AddVertices(int _primitive, u32 _numVertices);

static u8 *s_pCurBufferPointer;
static u8 *s_pBaseBufferPointer;
static u8 *s_pEndBufferPointer;
Expand Down
2 changes: 0 additions & 2 deletions Source/Core/VideoCommon/VideoCommon.vcxproj
View file
Expand Up @@ -85,7 +85,6 @@
<ClCompile Include="VideoBackendBase.cpp" />
<ClCompile Include="VideoConfig.cpp" />
<ClCompile Include="VideoState.cpp" />
<ClCompile Include="DLCache_x64.cpp" />
<ClCompile Include="TextureDecoder_x64.cpp" />
<ClCompile Include="XFMemory.cpp" />
<ClCompile Include="XFStructs.cpp" />
Expand All @@ -99,7 +98,6 @@
<ClInclude Include="CPMemory.h" />
<ClInclude Include="DataReader.h" />
<ClInclude Include="Debugger.h" />
<ClInclude Include="DLCache.h" />
<ClInclude Include="DriverDetails.h" />
<ClInclude Include="EmuWindow.h" />
<ClInclude Include="Fifo.h" />
Expand Down
6 changes: 0 additions & 6 deletions Source/Core/VideoCommon/VideoCommon.vcxproj.filters
View file
Expand Up @@ -120,9 +120,6 @@
<ClCompile Include="VideoState.cpp">
<Filter>Util</Filter>
</ClCompile>
<ClCompile Include="DLCache_x64.cpp">
<Filter>Vertex Loading</Filter>
</ClCompile>
<ClCompile Include="VertexLoader.cpp">
<Filter>Vertex Loading</Filter>
</ClCompile>
Expand Down Expand Up @@ -253,9 +250,6 @@
<ClInclude Include="DataReader.h">
<Filter>Vertex Loading</Filter>
</ClInclude>
<ClInclude Include="DLCache.h">
<Filter>Vertex Loading</Filter>
</ClInclude>
<ClInclude Include="VertexLoader.h">
<Filter>Vertex Loading</Filter>
</ClInclude>
Expand Down
3 changes: 0 additions & 3 deletions Source/Core/VideoCommon/VideoConfig.cpp
View file
Expand Up @@ -90,7 +90,6 @@ void VideoConfig::Load(const char *ini_file)
iniFile.Get("Enhancements", "Enable3dVision", &b3DVision, false);

iniFile.Get("Hacks", "EFBAccessEnable", &bEFBAccessEnable, true);
iniFile.Get("Hacks", "DlistCachingEnable", &bDlistCachingEnable,false);
iniFile.Get("Hacks", "EFBCopyEnable", &bEFBCopyEnable, true);
iniFile.Get("Hacks", "EFBToTextureEnable", &bCopyEFBToTexture, true);
iniFile.Get("Hacks", "EFBScaledCopy", &bCopyEFBScaled, true);
Expand Down Expand Up @@ -189,7 +188,6 @@ void VideoConfig::GameIniLoad()
CHECK_SETTING("Video_Enhancements", "Enable3dVision", b3DVision);

CHECK_SETTING("Video_Hacks", "EFBAccessEnable", bEFBAccessEnable);
CHECK_SETTING("Video_Hacks", "DlistCachingEnable", bDlistCachingEnable);
CHECK_SETTING("Video_Hacks", "EFBCopyEnable", bEFBCopyEnable);
CHECK_SETTING("Video_Hacks", "EFBToTextureEnable", bCopyEFBToTexture);
CHECK_SETTING("Video_Hacks", "EFBScaledCopy", bCopyEFBScaled);
Expand Down Expand Up @@ -269,7 +267,6 @@ void VideoConfig::Save(const char *ini_file)
iniFile.Set("Enhancements", "Enable3dVision", b3DVision);

iniFile.Set("Hacks", "EFBAccessEnable", bEFBAccessEnable);
iniFile.Set("Hacks", "DlistCachingEnable", bDlistCachingEnable);
iniFile.Set("Hacks", "EFBCopyEnable", bEFBCopyEnable);
iniFile.Set("Hacks", "EFBToTextureEnable", bCopyEFBToTexture);
iniFile.Set("Hacks", "EFBScaledCopy", bCopyEFBScaled);
Expand Down
1 change: 0 additions & 1 deletion Source/Core/VideoCommon/VideoConfig.h
View file
Expand Up @@ -105,7 +105,6 @@ struct VideoConfig

// Hacks
bool bEFBAccessEnable;
bool bDlistCachingEnable;
bool bPerfQueriesEnable;

bool bEFBCopyEnable;
Expand Down