From ff4f67492bff68d8b34aebc9ea6c85ca34e02b71 Mon Sep 17 00:00:00 2001
From: Shawn Hoffman <godisgovernment@gmail.com>
Date: Tue, 15 Sep 2020 05:00:24 -0700
Subject: [PATCH] normalize common filenames in VideoBackends/OGL

---
 Source/Core/VideoBackends/OGL/CMakeLists.txt  | 24 ++++++++---------
 Source/Core/VideoBackends/OGL/OGL.vcxproj     | 26 +++++++++----------
 .../VideoBackends/OGL/OGL.vcxproj.filters     | 24 ++++++++---------
 .../{BoundingBox.cpp => OGLBoundingBox.cpp}   |  4 +--
 .../OGL/{BoundingBox.h => OGLBoundingBox.h}   |  0
 .../OGL/{main.cpp => OGLMain.cpp}             |  8 +++---
 ...exFormat.cpp => OGLNativeVertexFormat.cpp} |  4 +--
 .../OGL/{PerfQuery.cpp => OGLPerfQuery.cpp}   |  4 +--
 .../OGL/{PerfQuery.h => OGLPerfQuery.h}       |  0
 Source/Core/VideoBackends/OGL/OGLPipeline.cpp |  4 +--
 .../OGL/{Render.cpp => OGLRender.cpp}         |  6 ++---
 .../OGL/{Render.h => OGLRender.h}             |  0
 .../{StreamBuffer.cpp => OGLStreamBuffer.cpp} |  4 +--
 .../OGL/{StreamBuffer.h => OGLStreamBuffer.h} |  0
 ...VertexManager.cpp => OGLVertexManager.cpp} |  6 ++---
 .../{VertexManager.h => OGLVertexManager.h}   |  0
 .../VideoBackends/OGL/ProgramShaderCache.cpp  |  6 ++---
 .../Core/VideoBackends/OGL/SamplerCache.cpp   |  2 +-
 Source/Core/VideoBackends/OGL/SamplerCache.h  |  2 +-
 19 files changed, 62 insertions(+), 62 deletions(-)
 rename Source/Core/VideoBackends/OGL/{BoundingBox.cpp => OGLBoundingBox.cpp} (96%)
 rename Source/Core/VideoBackends/OGL/{BoundingBox.h => OGLBoundingBox.h} (100%)
 rename Source/Core/VideoBackends/OGL/{main.cpp => OGLMain.cpp} (97%)
 rename Source/Core/VideoBackends/OGL/{NativeVertexFormat.cpp => OGLNativeVertexFormat.cpp} (96%)
 rename Source/Core/VideoBackends/OGL/{PerfQuery.cpp => OGLPerfQuery.cpp} (98%)
 rename Source/Core/VideoBackends/OGL/{PerfQuery.h => OGLPerfQuery.h} (100%)
 rename Source/Core/VideoBackends/OGL/{Render.cpp => OGLRender.cpp} (99%)
 rename Source/Core/VideoBackends/OGL/{Render.h => OGLRender.h} (100%)
 rename Source/Core/VideoBackends/OGL/{StreamBuffer.cpp => OGLStreamBuffer.cpp} (99%)
 rename Source/Core/VideoBackends/OGL/{StreamBuffer.h => OGLStreamBuffer.h} (100%)
 rename Source/Core/VideoBackends/OGL/{VertexManager.cpp => OGLVertexManager.cpp} (98%)
 rename Source/Core/VideoBackends/OGL/{VertexManager.h => OGLVertexManager.h} (100%)

diff --git a/Source/Core/VideoBackends/OGL/CMakeLists.txt b/Source/Core/VideoBackends/OGL/CMakeLists.txt
index 2d80039fa5e0..8b4b27a57127 100644
--- a/Source/Core/VideoBackends/OGL/CMakeLists.txt
+++ b/Source/Core/VideoBackends/OGL/CMakeLists.txt
@@ -1,27 +1,27 @@
 add_library(videoogl
-  BoundingBox.cpp
-  BoundingBox.h
   GPUTimer.h
-  main.cpp
-  NativeVertexFormat.cpp
+  OGLBoundingBox.cpp
+  OGLBoundingBox.h
+  OGLMain.cpp
+  OGLNativeVertexFormat.cpp
+  OGLPerfQuery.cpp
+  OGLPerfQuery.h
   OGLPipeline.cpp
   OGLPipeline.h
+  OGLRender.cpp
+  OGLRender.h
   OGLShader.cpp
   OGLShader.h
+  OGLStreamBuffer.cpp
+  OGLStreamBuffer.h
   OGLTexture.cpp
   OGLTexture.h
-  PerfQuery.cpp
-  PerfQuery.h
+  OGLVertexManager.cpp
+  OGLVertexManager.h
   ProgramShaderCache.cpp
   ProgramShaderCache.h
-  Render.cpp
-  Render.h
   SamplerCache.cpp
   SamplerCache.h
-  StreamBuffer.cpp
-  StreamBuffer.h
-  VertexManager.cpp
-  VertexManager.h
   VideoBackend.h
 )
 
diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj b/Source/Core/VideoBackends/OGL/OGL.vcxproj
index 28f7152a06d4..991d3b7bccf9 100644
--- a/Source/Core/VideoBackends/OGL/OGL.vcxproj
+++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj
@@ -16,31 +16,31 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <ItemGroup>
+    <ClCompile Include="OGLBoundingBox.cpp" />
+    <ClCompile Include="OGLMain.cpp" />
+    <ClCompile Include="OGLNativeVertexFormat.cpp" />
+    <ClCompile Include="OGLPerfQuery.cpp" />
     <ClCompile Include="OGLPipeline.cpp" />
+    <ClCompile Include="OGLRender.cpp" />
     <ClCompile Include="OGLShader.cpp" />
+    <ClCompile Include="OGLStreamBuffer.cpp" />
     <ClCompile Include="OGLTexture.cpp" />
-    <ClCompile Include="BoundingBox.cpp" />
-    <ClCompile Include="main.cpp" />
-    <ClCompile Include="NativeVertexFormat.cpp" />
-    <ClCompile Include="PerfQuery.cpp" />
+    <ClCompile Include="OGLVertexManager.cpp" />
     <ClCompile Include="ProgramShaderCache.cpp" />
-    <ClCompile Include="Render.cpp" />
     <ClCompile Include="SamplerCache.cpp" />
-    <ClCompile Include="StreamBuffer.cpp" />
-    <ClCompile Include="VertexManager.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="GPUTimer.h" />
+    <ClInclude Include="OGLBoundingBox.h" />
+    <ClInclude Include="OGLPerfQuery.h" />
     <ClInclude Include="OGLPipeline.h" />
+    <ClInclude Include="OGLRender.h" />
     <ClInclude Include="OGLShader.h" />
+    <ClInclude Include="OGLStreamBuffer.h" />
     <ClInclude Include="OGLTexture.h" />
-    <ClInclude Include="BoundingBox.h" />
-    <ClInclude Include="GPUTimer.h" />
-    <ClInclude Include="PerfQuery.h" />
+    <ClInclude Include="OGLVertexManager.h" />
     <ClInclude Include="ProgramShaderCache.h" />
-    <ClInclude Include="Render.h" />
     <ClInclude Include="SamplerCache.h" />
-    <ClInclude Include="StreamBuffer.h" />
-    <ClInclude Include="VertexManager.h" />
     <ClInclude Include="VideoBackend.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters b/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters
index 4077f05a37bc..5e0e52e16dce 100644
--- a/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters
+++ b/Source/Core/VideoBackends/OGL/OGL.vcxproj.filters
@@ -12,28 +12,28 @@
     </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="NativeVertexFormat.cpp">
+    <ClCompile Include="OGLNativeVertexFormat.cpp">
       <Filter>Decoder</Filter>
     </ClCompile>
-    <ClCompile Include="VertexManager.cpp">
+    <ClCompile Include="OGLVertexManager.cpp">
       <Filter>Decoder</Filter>
     </ClCompile>
-    <ClCompile Include="BoundingBox.cpp">
+    <ClCompile Include="OGLBoundingBox.cpp">
       <Filter>Render</Filter>
     </ClCompile>
-    <ClCompile Include="PerfQuery.cpp">
+    <ClCompile Include="OGLPerfQuery.cpp">
       <Filter>Render</Filter>
     </ClCompile>
     <ClCompile Include="ProgramShaderCache.cpp">
       <Filter>Render</Filter>
     </ClCompile>
-    <ClCompile Include="Render.cpp">
+    <ClCompile Include="OGLRender.cpp">
       <Filter>Render</Filter>
     </ClCompile>
-    <ClCompile Include="StreamBuffer.cpp">
+    <ClCompile Include="OGLStreamBuffer.cpp">
       <Filter>Render</Filter>
     </ClCompile>
-    <ClCompile Include="main.cpp" />
+    <ClCompile Include="OGLMain.cpp" />
     <ClCompile Include="SamplerCache.cpp" />
     <ClCompile Include="OGLTexture.cpp">
       <Filter>Render</Filter>
@@ -46,22 +46,22 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="VertexManager.h">
+    <ClInclude Include="OGLVertexManager.h">
       <Filter>Decoder</Filter>
     </ClInclude>
-    <ClInclude Include="BoundingBox.h">
+    <ClInclude Include="OGLBoundingBox.h">
       <Filter>Render</Filter>
     </ClInclude>
-    <ClInclude Include="PerfQuery.h">
+    <ClInclude Include="OGLPerfQuery.h">
       <Filter>Render</Filter>
     </ClInclude>
     <ClInclude Include="ProgramShaderCache.h">
       <Filter>Render</Filter>
     </ClInclude>
-    <ClInclude Include="Render.h">
+    <ClInclude Include="OGLRender.h">
       <Filter>Render</Filter>
     </ClInclude>
-    <ClInclude Include="StreamBuffer.h">
+    <ClInclude Include="OGLStreamBuffer.h">
       <Filter>Render</Filter>
     </ClInclude>
     <ClInclude Include="SamplerCache.h" />
diff --git a/Source/Core/VideoBackends/OGL/BoundingBox.cpp b/Source/Core/VideoBackends/OGL/OGLBoundingBox.cpp
similarity index 96%
rename from Source/Core/VideoBackends/OGL/BoundingBox.cpp
rename to Source/Core/VideoBackends/OGL/OGLBoundingBox.cpp
index 18ef7802cc12..9e88767afc1c 100644
--- a/Source/Core/VideoBackends/OGL/BoundingBox.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLBoundingBox.cpp
@@ -6,8 +6,8 @@
 
 #include "Common/GL/GLUtil.h"
 
-#include "VideoBackends/OGL/BoundingBox.h"
-#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/OGLBoundingBox.h"
+#include "VideoBackends/OGL/OGLRender.h"
 
 #include "VideoCommon/DriverDetails.h"
 #include "VideoCommon/VideoConfig.h"
diff --git a/Source/Core/VideoBackends/OGL/BoundingBox.h b/Source/Core/VideoBackends/OGL/OGLBoundingBox.h
similarity index 100%
rename from Source/Core/VideoBackends/OGL/BoundingBox.h
rename to Source/Core/VideoBackends/OGL/OGLBoundingBox.h
diff --git a/Source/Core/VideoBackends/OGL/main.cpp b/Source/Core/VideoBackends/OGL/OGLMain.cpp
similarity index 97%
rename from Source/Core/VideoBackends/OGL/main.cpp
rename to Source/Core/VideoBackends/OGL/OGLMain.cpp
index 864de5762415..894af140bea3 100644
--- a/Source/Core/VideoBackends/OGL/main.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLMain.cpp
@@ -45,12 +45,12 @@ Make AA apply instantly during gameplay if possible
 
 #include "Core/Config/GraphicsSettings.h"
 
-#include "VideoBackends/OGL/BoundingBox.h"
-#include "VideoBackends/OGL/PerfQuery.h"
+#include "VideoBackends/OGL/OGLBoundingBox.h"
+#include "VideoBackends/OGL/OGLPerfQuery.h"
+#include "VideoBackends/OGL/OGLRender.h"
+#include "VideoBackends/OGL/OGLVertexManager.h"
 #include "VideoBackends/OGL/ProgramShaderCache.h"
-#include "VideoBackends/OGL/Render.h"
 #include "VideoBackends/OGL/SamplerCache.h"
-#include "VideoBackends/OGL/VertexManager.h"
 #include "VideoBackends/OGL/VideoBackend.h"
 
 #include "VideoCommon/FramebufferManager.h"
diff --git a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp b/Source/Core/VideoBackends/OGL/OGLNativeVertexFormat.cpp
similarity index 96%
rename from Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp
rename to Source/Core/VideoBackends/OGL/OGLNativeVertexFormat.cpp
index 6057c8878c18..09114fb9744e 100644
--- a/Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLNativeVertexFormat.cpp
@@ -6,9 +6,9 @@
 #include "Common/GL/GLUtil.h"
 #include "Common/MsgHandler.h"
 
+#include "VideoBackends/OGL/OGLRender.h"
+#include "VideoBackends/OGL/OGLVertexManager.h"
 #include "VideoBackends/OGL/ProgramShaderCache.h"
-#include "VideoBackends/OGL/Render.h"
-#include "VideoBackends/OGL/VertexManager.h"
 
 #include "VideoCommon/NativeVertexFormat.h"
 #include "VideoCommon/VertexShaderGen.h"
diff --git a/Source/Core/VideoBackends/OGL/PerfQuery.cpp b/Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp
similarity index 98%
rename from Source/Core/VideoBackends/OGL/PerfQuery.cpp
rename to Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp
index 83abe0d9b4b8..e708f93e10be 100644
--- a/Source/Core/VideoBackends/OGL/PerfQuery.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLPerfQuery.cpp
@@ -2,14 +2,14 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/OGL/PerfQuery.h"
+#include "VideoBackends/OGL/OGLPerfQuery.h"
 
 #include <memory>
 
 #include "Common/CommonTypes.h"
 #include "Common/GL/GLExtensions/GLExtensions.h"
 
-#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/OGLRender.h"
 #include "VideoCommon/VideoCommon.h"
 #include "VideoCommon/VideoConfig.h"
 
diff --git a/Source/Core/VideoBackends/OGL/PerfQuery.h b/Source/Core/VideoBackends/OGL/OGLPerfQuery.h
similarity index 100%
rename from Source/Core/VideoBackends/OGL/PerfQuery.h
rename to Source/Core/VideoBackends/OGL/OGLPerfQuery.h
diff --git a/Source/Core/VideoBackends/OGL/OGLPipeline.cpp b/Source/Core/VideoBackends/OGL/OGLPipeline.cpp
index 00ae8aa8732d..0d3ae7bf0a20 100644
--- a/Source/Core/VideoBackends/OGL/OGLPipeline.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLPipeline.cpp
@@ -5,10 +5,10 @@
 #include "Common/Assert.h"
 
 #include "VideoBackends/OGL/OGLPipeline.h"
+#include "VideoBackends/OGL/OGLRender.h"
 #include "VideoBackends/OGL/OGLShader.h"
+#include "VideoBackends/OGL/OGLVertexManager.h"
 #include "VideoBackends/OGL/ProgramShaderCache.h"
-#include "VideoBackends/OGL/Render.h"
-#include "VideoBackends/OGL/VertexManager.h"
 #include "VideoCommon/VideoConfig.h"
 
 namespace OGL
diff --git a/Source/Core/VideoBackends/OGL/Render.cpp b/Source/Core/VideoBackends/OGL/OGLRender.cpp
similarity index 99%
rename from Source/Core/VideoBackends/OGL/Render.cpp
rename to Source/Core/VideoBackends/OGL/OGLRender.cpp
index 042aaeaaa0f1..6b99327fee25 100644
--- a/Source/Core/VideoBackends/OGL/Render.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLRender.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/OGLRender.h"
 
 #include <algorithm>
 #include <cinttypes>
@@ -22,13 +22,13 @@
 
 #include "Core/Config/GraphicsSettings.h"
 
-#include "VideoBackends/OGL/BoundingBox.h"
+#include "VideoBackends/OGL/OGLBoundingBox.h"
 #include "VideoBackends/OGL/OGLPipeline.h"
 #include "VideoBackends/OGL/OGLShader.h"
 #include "VideoBackends/OGL/OGLTexture.h"
+#include "VideoBackends/OGL/OGLVertexManager.h"
 #include "VideoBackends/OGL/ProgramShaderCache.h"
 #include "VideoBackends/OGL/SamplerCache.h"
-#include "VideoBackends/OGL/VertexManager.h"
 
 #include "VideoCommon/BPFunctions.h"
 #include "VideoCommon/DriverDetails.h"
diff --git a/Source/Core/VideoBackends/OGL/Render.h b/Source/Core/VideoBackends/OGL/OGLRender.h
similarity index 100%
rename from Source/Core/VideoBackends/OGL/Render.h
rename to Source/Core/VideoBackends/OGL/OGLRender.h
diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp b/Source/Core/VideoBackends/OGL/OGLStreamBuffer.cpp
similarity index 99%
rename from Source/Core/VideoBackends/OGL/StreamBuffer.cpp
rename to Source/Core/VideoBackends/OGL/OGLStreamBuffer.cpp
index b59d08b4f1dc..b389b2951fa8 100644
--- a/Source/Core/VideoBackends/OGL/StreamBuffer.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLStreamBuffer.cpp
@@ -2,14 +2,14 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/OGL/StreamBuffer.h"
+#include "VideoBackends/OGL/OGLStreamBuffer.h"
 
 #include "Common/Align.h"
 #include "Common/GL/GLUtil.h"
 #include "Common/MathUtil.h"
 #include "Common/MemoryUtil.h"
 
-#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/OGLRender.h"
 
 #include "VideoCommon/DriverDetails.h"
 #include "VideoCommon/OnScreenDisplay.h"
diff --git a/Source/Core/VideoBackends/OGL/StreamBuffer.h b/Source/Core/VideoBackends/OGL/OGLStreamBuffer.h
similarity index 100%
rename from Source/Core/VideoBackends/OGL/StreamBuffer.h
rename to Source/Core/VideoBackends/OGL/OGLStreamBuffer.h
diff --git a/Source/Core/VideoBackends/OGL/VertexManager.cpp b/Source/Core/VideoBackends/OGL/OGLVertexManager.cpp
similarity index 98%
rename from Source/Core/VideoBackends/OGL/VertexManager.cpp
rename to Source/Core/VideoBackends/OGL/OGLVertexManager.cpp
index 7d14e76dd980..54369385242d 100644
--- a/Source/Core/VideoBackends/OGL/VertexManager.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLVertexManager.cpp
@@ -2,7 +2,7 @@
 // Licensed under GPLv2+
 // Refer to the license.txt file included.
 
-#include "VideoBackends/OGL/VertexManager.h"
+#include "VideoBackends/OGL/OGLVertexManager.h"
 
 #include <fstream>
 #include <memory>
@@ -14,9 +14,9 @@
 #include "Common/GL/GLExtensions/GLExtensions.h"
 
 #include "VideoBackends/OGL/OGLPipeline.h"
+#include "VideoBackends/OGL/OGLRender.h"
+#include "VideoBackends/OGL/OGLStreamBuffer.h"
 #include "VideoBackends/OGL/ProgramShaderCache.h"
-#include "VideoBackends/OGL/Render.h"
-#include "VideoBackends/OGL/StreamBuffer.h"
 
 #include "VideoCommon/IndexGenerator.h"
 #include "VideoCommon/Statistics.h"
diff --git a/Source/Core/VideoBackends/OGL/VertexManager.h b/Source/Core/VideoBackends/OGL/OGLVertexManager.h
similarity index 100%
rename from Source/Core/VideoBackends/OGL/VertexManager.h
rename to Source/Core/VideoBackends/OGL/OGLVertexManager.h
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
index e4afbf0ccdbc..23a2b9fb44ba 100644
--- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
@@ -21,10 +21,10 @@
 
 #include "Core/ConfigManager.h"
 
+#include "VideoBackends/OGL/OGLRender.h"
 #include "VideoBackends/OGL/OGLShader.h"
-#include "VideoBackends/OGL/Render.h"
-#include "VideoBackends/OGL/StreamBuffer.h"
-#include "VideoBackends/OGL/VertexManager.h"
+#include "VideoBackends/OGL/OGLStreamBuffer.h"
+#include "VideoBackends/OGL/OGLVertexManager.h"
 
 #include "VideoCommon/AsyncShaderCompiler.h"
 #include "VideoCommon/GeometryShaderManager.h"
diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.cpp b/Source/Core/VideoBackends/OGL/SamplerCache.cpp
index 364ec51c993c..bec6316b0477 100644
--- a/Source/Core/VideoBackends/OGL/SamplerCache.cpp
+++ b/Source/Core/VideoBackends/OGL/SamplerCache.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "VideoBackends/OGL/SamplerCache.h"
-#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/OGLRender.h"
 
 #include <memory>
 
diff --git a/Source/Core/VideoBackends/OGL/SamplerCache.h b/Source/Core/VideoBackends/OGL/SamplerCache.h
index 8c7ee5ca7b52..af4d50041b59 100644
--- a/Source/Core/VideoBackends/OGL/SamplerCache.h
+++ b/Source/Core/VideoBackends/OGL/SamplerCache.h
@@ -10,7 +10,7 @@
 
 #include "Common/CommonTypes.h"
 #include "Common/GL/GLUtil.h"
-#include "VideoBackends/OGL/Render.h"
+#include "VideoBackends/OGL/OGLRender.h"
 
 namespace OGL
 {