ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5647 from lioncash/abstract 

AbstractTexture: Minor changes
This commit is contained in:
Markus Wick 2017-06-19 10:19:39 +02:00 committed by GitHub
parent 4c2b078017 59a947d41d
commit c6417e0e78
7 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Source/Core/VideoBackends/D3D/DXTexture.h
View File

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

1
Source/Core/VideoBackends/Null/NullTexture.h
View File

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

1
Source/Core/VideoBackends/OGL/OGLTexture.h
View File

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

1
Source/Core/VideoBackends/Software/SWTexture.h
View File

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

1
Source/Core/VideoBackends/Vulkan/VKTexture.h
View File

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

2
Source/Core/VideoCommon/AbstractTexture.cpp
View File

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

6
Source/Core/VideoCommon/AbstractTexture.h
View File

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