Merge pull request #502 from magumagu/video-common-small-cleanup

VideoCommon: small cleanups.
dolphin-emu · Jun 17, 2014 · afc4a37 · afc4a37
2 parents ee690fe + 9d87818
commit afc4a37
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 14 deletions.
diff --git 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 @@ class VideoBackend
 	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
@@ -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
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Base">
@@ -80,9 +80,6 @@
     <ClCompile Include="TextureConversionShader.cpp">
       <Filter>Shader Generators</Filter>
     </ClCompile>
-    <ClCompile Include="TextureDecoder_x64.cpp">
-      <Filter>Shader Generators</Filter>
-    </ClCompile>
     <ClCompile Include="VertexShaderGen.cpp">
       <Filter>Shader Generators</Filter>
     </ClCompile>
@@ -135,6 +132,9 @@
       <Filter>Vertex Loading</Filter>
     </ClCompile>
     <ClCompile Include="stdafx.cpp" />
+    <ClCompile Include="TextureDecoder_x64.cpp">
+      <Filter>Decoding</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CommandProcessor.h" />
@@ -266,4 +266,4 @@
   <ItemGroup>
     <Text Include="CMakeLists.txt" />
   </ItemGroup>
-</Project>
+</Project>
diff --git 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
 {