Merge pull request #1027 from rohit-n/change-include

Include CommonTypes.h instead of Common.h.
This commit is contained in:
Ryan Houdek
2014-09-10 00:35:16 -05:00
285 changed files with 286 additions and 286 deletions

View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Core/ConfigManager.h"
#include "Core/HW/Memmap.h"

View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "VideoCommon/BPMemory.h"
// BP state

View File

@ -7,7 +7,7 @@
#include <string>
#include "Common/BitField.h"
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#pragma pack(4)

View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "VideoCommon/CPMemory.h"
// CP state

View File

@ -4,7 +4,7 @@
#pragma once
#include "Common/Common.h"
#include "Common/CommonTypes.h"
// Vertex array numbers
enum

View File

@ -4,7 +4,7 @@
#include "Common/Atomic.h"
#include "Common/ChunkFile.h"
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/MathUtil.h"
#include "Common/Thread.h"
#include "Core/ConfigManager.h"

View File

@ -4,7 +4,7 @@
#pragma once
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "VideoCommon/VideoBackendBase.h"
class PointerWrap;

View File

@ -4,7 +4,7 @@
#pragma once
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "VideoCommon/VideoBackendBase.h"
class PointerWrap;

View File

@ -5,7 +5,7 @@
#pragma once
#include <string>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
bool SaveData(const std::string& filename, const char* pdata);
bool TextureToPng(u8* data, int row_stride, const std::string& filename, int width, int height, bool saveAlpha = true);

View File

@ -4,7 +4,7 @@
#include <cstddef>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "VideoCommon/IndexGenerator.h"
#include "VideoCommon/OpcodeDecoding.h"
#include "VideoCommon/VideoConfig.h"

View File

@ -4,7 +4,7 @@
#pragma once
#include "Common/Common.h"
#include "Common/CommonTypes.h"
inline u8 Convert3To8(u8 v)
{

View File

@ -4,7 +4,7 @@
#pragma once
#include "Common/Common.h"
#include "Common/CommonTypes.h"
// m_components
enum

View File

@ -6,7 +6,7 @@
#include <map>
#include <string>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/Timer.h"
#include "Core/ConfigManager.h"

View File

@ -12,7 +12,7 @@
// while interpreting them, and hope that the vertex format doesn't change, though, if you do it right
// when they are called. The reason is that the vertex format affects the sizes of the vertices.
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/CPUDetect.h"
#include "Core/Core.h"
#include "Core/Host.h"

View File

@ -8,7 +8,7 @@
#include "Common/Atomic.h"
#include "Common/ChunkFile.h"
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Core/ConfigManager.h"
#include "Core/CoreTiming.h"
#include "Core/State.h"

View File

@ -4,7 +4,7 @@
#include <cmath>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "VideoCommon/PixelShaderManager.h"
#include "VideoCommon/RenderBase.h"

View File

@ -4,7 +4,7 @@
#pragma once
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "VideoCommon/TextureDecoder.h"
#include "VideoCommon/VideoCommon.h"

View File

@ -5,7 +5,7 @@
#include <algorithm>
#include <cmath>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/CPUDetect.h"
#include "VideoCommon/LookUpTables.h"
#include "VideoCommon/TextureDecoder.h"

View File

@ -5,7 +5,7 @@
#include <algorithm>
#include <cmath>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
//#include "VideoCommon.h" // to get debug logs
#include "Common/CPUDetect.h"

View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/MemoryUtil.h"
#include "Common/StringUtil.h"
#include "Common/x64ABI.h"

View File

@ -10,7 +10,7 @@
#include <algorithm>
#include <string>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/x64Emitter.h"
#include "VideoCommon/CPMemory.h"

View File

@ -6,7 +6,7 @@
#include <string>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "VideoCommon/NativeVertexFormat.h"
namespace VertexLoaderManager

View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "VideoCommon/LookUpTables.h"
#include "VideoCommon/VertexLoader.h"

View File

@ -5,7 +5,7 @@
#include <cmath>
#include <limits>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/CPUDetect.h"
#include "VideoCommon/VertexLoader.h"

View File

@ -4,7 +4,7 @@
#pragma once
#include "Common/Common.h"
#include "Common/CommonTypes.h"
class VertexLoader_Normal
{

View File

@ -4,7 +4,7 @@
#include <limits>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/CPUDetect.h"
#include "VideoCommon/VertexLoader.h"

View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/CPUDetect.h"
#include "VideoCommon/VertexLoader.h"

View File

@ -1,4 +1,4 @@
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "VideoCommon/BPStructs.h"
#include "VideoCommon/Debugger.h"
@ -144,7 +144,8 @@ u32 VertexManager::GetRemainingIndices(int primitive)
void VertexManager::Flush()
{
if (IsFlushed) return;
if (IsFlushed)
return;
// loading a state will invalidate BP, so check for it
g_video_backend->CheckInvalidState();

View File

@ -1,7 +1,7 @@
#pragma once
#include <vector>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
class NativeVertexFormat;
class PointerWrap;

View File

@ -5,7 +5,7 @@
#include <cmath>
#include <sstream>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/MathUtil.h"
#include "VideoCommon/BPMemory.h"
#include "VideoCommon/CPMemory.h"

View File

@ -8,7 +8,7 @@
#include <windows.h>
#endif
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/MathUtil.h"
#include "VideoCommon/VideoBackendBase.h"

View File

@ -4,7 +4,7 @@
#include <cmath>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Common/FileUtil.h"
#include "Common/IniFile.h"
#include "Common/StringUtil.h"

View File

@ -14,7 +14,7 @@
#include <string>
#include <vector>
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "VideoCommon/VideoCommon.h"
// Log in two categories, and save three other options in the same byte

View File

@ -4,7 +4,7 @@
#pragma once
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "VideoCommon/CPMemory.h"

View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Common/Common.h"
#include "Common/CommonTypes.h"
#include "Core/HW/Memmap.h"
#include "VideoCommon/CPMemory.h"
#include "VideoCommon/DataReader.h"