From 9d87818853956f5ce78cc20aa026019de6d683fd Mon Sep 17 00:00:00 2001 From: magumagu Date: Mon, 16 Jun 2014 14:03:29 -0700 Subject: [PATCH] VideoCommon: small cleanups. No functional change. --- Source/Core/VideoCommon/VideoBackendBase.h | 3 +-- Source/Core/VideoCommon/VideoCommon.h | 5 ----- Source/Core/VideoCommon/VideoCommon.vcxproj.filters | 10 +++++----- Source/Core/VideoCommon/VideoConfig.h | 2 -- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/Source/Core/VideoCommon/VideoBackendBase.h b/Source/Core/VideoCommon/VideoBackendBase.h index ddd71b033c..8ab6a4380f 100644 --- a/Source/Core/VideoCommon/VideoBackendBase.h +++ b/Source/Core/VideoCommon/VideoBackendBase.h @@ -58,7 +58,6 @@ struct SCPFifoStruct volatile u32 bFF_HiWatermark; // for GP watchdog hack - volatile u32 Fake_GPWDToken; // cicular incrementer volatile u32 isGpuReadingData; }; @@ -80,7 +79,7 @@ public: virtual std::string GetName() const = 0; virtual std::string GetDisplayName() const { return GetName(); } - virtual void ShowConfig(void*) {} + virtual void ShowConfig(void*) = 0; virtual void Video_Prepare() = 0; virtual void Video_EnterLoop() = 0; diff --git a/Source/Core/VideoCommon/VideoCommon.h b/Source/Core/VideoCommon/VideoCommon.h index 6bb41da814..8786bfb245 100644 --- a/Source/Core/VideoCommon/VideoCommon.h +++ b/Source/Core/VideoCommon/VideoCommon.h @@ -29,11 +29,6 @@ const u32 MAX_XFB_WIDTH = EFB_WIDTH; // that are next to each other in memory (TODO: handle that situation). const u32 MAX_XFB_HEIGHT = 574; -// Logging -// ---------- -void HandleGLError(); - - // This structure should only be used to represent a rectangle in EFB // coordinates, where the origin is at the upper left and the frame dimensions // are 640 x 528. diff --git a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters index a573cdb16d..cf8611b719 100644 --- a/Source/Core/VideoCommon/VideoCommon.vcxproj.filters +++ b/Source/Core/VideoCommon/VideoCommon.vcxproj.filters @@ -1,4 +1,4 @@ - + @@ -80,9 +80,6 @@ Shader Generators - - Shader Generators - Shader Generators @@ -135,6 +132,9 @@ Vertex Loading + + Decoding + @@ -266,4 +266,4 @@ - + \ No newline at end of file diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h index b7a41fac99..1747fef374 100644 --- a/Source/Core/VideoCommon/VideoConfig.h +++ b/Source/Core/VideoCommon/VideoConfig.h @@ -44,8 +44,6 @@ enum EFBScale SCALE_4X, }; -class IniFile; - // NEVER inherit from this class. struct VideoConfig final {