Merge pull request #5647 from lioncash/abstract

AbstractTexture: Minor changes

Source/Core/VideoBackends/D3D/DXTexture.h

@@ -7,7 +7,6 @@
 #include "Common/CommonTypes.h"
 
 #include "VideoCommon/AbstractTexture.h"
-#include "VideoCommon/VideoCommon.h"
 
 class D3DTexture2D;
 

Source/Core/VideoBackends/Null/NullTexture.h

@@ -7,7 +7,6 @@
 #include "Common/CommonTypes.h"
 
 #include "VideoCommon/AbstractTexture.h"
-#include "VideoCommon/VideoCommon.h"
 
 namespace Null
 {

Source/Core/VideoBackends/OGL/OGLTexture.h

@@ -7,7 +7,6 @@
 #include "Common/GL/GLUtil.h"
 
 #include "VideoCommon/AbstractTexture.h"
-#include "VideoCommon/VideoCommon.h"
 
 namespace OGL
 {

Source/Core/VideoBackends/Software/SWTexture.h

@@ -7,7 +7,6 @@
 #include "Common/CommonTypes.h"
 
 #include "VideoCommon/AbstractTexture.h"
-#include "VideoCommon/VideoCommon.h"
 
 namespace SW
 {

Source/Core/VideoBackends/Vulkan/VKTexture.h

@@ -8,7 +8,6 @@
 #include <vulkan/vulkan.h>
 
 #include "VideoCommon/AbstractTexture.h"
-#include "VideoCommon/VideoCommon.h"
 
 namespace Vulkan
 {

Source/Core/VideoCommon/AbstractTexture.cpp

@@ -38,7 +38,7 @@ size_t AbstractTexture::CalculateHostTextureLevelPitch(AbstractTextureFormat for
   }
 }
 
-const TextureConfig AbstractTexture::GetConfig() const
+const TextureConfig& AbstractTexture::GetConfig() const
 {
   return m_config;
 }

Source/Core/VideoCommon/AbstractTexture.h

@@ -4,10 +4,12 @@
 
 #pragma once
 
+#include <cstddef>
+#include <string>
+
 #include "Common/CommonTypes.h"
 #include "Common/MathUtil.h"
 #include "VideoCommon/TextureConfig.h"
-#include "VideoCommon/VideoCommon.h"
 
 class AbstractTexture
 {
@@ -26,7 +28,7 @@ public:
   static bool IsCompressedHostTextureFormat(AbstractTextureFormat format);
   static size_t CalculateHostTextureLevelPitch(AbstractTextureFormat format, u32 row_length);
 
-  const TextureConfig GetConfig() const;
+  const TextureConfig& GetConfig() const;
 
 protected:
   const TextureConfig m_config;