Skip to content
Permalink
Browse files

Merge pull request #8249 from lioncash/rect

VideoCommon: Remove unused MathUtil.h include from VideoCommon.h
  • Loading branch information...
stenzek committed Jul 19, 2019
2 parents a9abf28 + 2b93892 commit fc8859a4148ba73100c4e3cfd6729c187543ddde
@@ -8,6 +8,7 @@
#include "Common/Logging/Log.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoCommon/RenderBase.h"
#include "VideoCommon/VideoCommon.h"

namespace DX11
{
@@ -2,14 +2,16 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.

#include "VideoBackends/D3D12/PerfQuery.h"

#include <algorithm>

#include "Common/Assert.h"
#include "Common/Logging/Log.h"
#include "VideoBackends/D3D12/Common.h"
#include "VideoBackends/D3D12/DXContext.h"
#include "VideoBackends/D3D12/PerfQuery.h"
#include "VideoBackends/D3D12/Renderer.h"
#include "VideoCommon/VideoCommon.h"

namespace DX12
{
@@ -10,7 +10,6 @@
#include <vector>

#include "Common/CommonTypes.h"
#include "VideoCommon/VideoCommon.h"

struct IDXGIFactory;

@@ -2,13 +2,15 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.

#include "VideoBackends/OGL/PerfQuery.h"

#include <memory>

#include "Common/CommonTypes.h"
#include "Common/GL/GLExtensions/GLExtensions.h"

#include "VideoBackends/OGL/PerfQuery.h"
#include "VideoBackends/OGL/Render.h"
#include "VideoCommon/VideoCommon.h"
#include "VideoCommon/VideoConfig.h"

namespace OGL
@@ -18,6 +18,7 @@
#include "VideoCommon/BPMemory.h"
#include "VideoCommon/ImageWrite.h"
#include "VideoCommon/Statistics.h"
#include "VideoCommon/VideoCommon.h"
#include "VideoCommon/VideoConfig.h"

namespace DebugUtil
@@ -12,12 +12,12 @@

#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"
#include "Common/Swap.h"

#include "VideoBackends/Software/CopyRegion.h"
#include "VideoCommon/BPMemory.h"
#include "VideoCommon/LookUpTables.h"
#include "VideoCommon/PerfQueryBase.h"
#include "VideoCommon/VideoCommon.h"

namespace EfbInterface
{
@@ -5,8 +5,8 @@
#pragma once

#include "Common/CommonTypes.h"
#include "Common/MathUtil.h"
#include "VideoCommon/PerfQueryBase.h"
#include "VideoCommon/VideoCommon.h"

namespace EfbInterface
{
@@ -2,16 +2,18 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.

#include "VideoBackends/Software/Rasterizer.h"

#include <algorithm>
#include <cstring>

#include "Common/CommonTypes.h"
#include "VideoBackends/Software/EfbInterface.h"
#include "VideoBackends/Software/NativeVertexFormat.h"
#include "VideoBackends/Software/Rasterizer.h"
#include "VideoBackends/Software/Tev.h"
#include "VideoCommon/PerfQueryBase.h"
#include "VideoCommon/Statistics.h"
#include "VideoCommon/VideoCommon.h"
#include "VideoCommon/VideoConfig.h"
#include "VideoCommon/XFMemory.h"

@@ -5,15 +5,12 @@
#pragma once

#include <memory>
#include <string>
#include <vector>

#include "Common/CommonTypes.h"
#include "VideoCommon/VideoCommon.h"

class GLContext;
#include "Common/MathUtil.h"

class AbstractTexture;
class GLContext;
struct WindowSystemInfo;

class SWOGLWindow
@@ -9,7 +9,6 @@
#include "Common/CommonTypes.h"
#include "Common/GL/GLContext.h"

#include "Core/Config/GraphicsSettings.h"
#include "Core/HW/Memmap.h"

#include "VideoBackends/Software/EfbCopy.h"
@@ -22,9 +21,8 @@
#include "VideoCommon/AbstractTexture.h"
#include "VideoCommon/BoundingBox.h"
#include "VideoCommon/NativeVertexFormat.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/VideoBackendBase.h"
#include "VideoCommon/VideoConfig.h"
#include "VideoCommon/VideoCommon.h"

namespace SW
{
@@ -2,20 +2,22 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.

#include "VideoBackends/Software/Tev.h"

#include <algorithm>
#include <cmath>

#include "Common/ChunkFile.h"
#include "Common/CommonTypes.h"
#include "VideoBackends/Software/DebugUtil.h"
#include "VideoBackends/Software/EfbInterface.h"
#include "VideoBackends/Software/Tev.h"
#include "VideoBackends/Software/TextureSampler.h"

#include "VideoCommon/BoundingBox.h"
#include "VideoCommon/PerfQueryBase.h"
#include "VideoCommon/PixelShaderManager.h"
#include "VideoCommon/Statistics.h"
#include "VideoCommon/VideoCommon.h"
#include "VideoCommon/VideoConfig.h"
#include "VideoCommon/XFMemory.h"

@@ -5,8 +5,8 @@
#pragma once

#include "Common/CommonTypes.h"
#include "Common/MathUtil.h"
#include "VideoCommon/TextureCacheBase.h"
#include "VideoCommon/VideoCommon.h"

namespace TextureEncoder
{
@@ -19,8 +19,6 @@
#include "Common/Flag.h"
#include "Common/Semaphore.h"

#include "VideoCommon/VideoCommon.h"

#include "VideoBackends/Vulkan/Constants.h"

namespace Vulkan
@@ -16,6 +16,7 @@
#include "VideoBackends/Vulkan/Renderer.h"
#include "VideoBackends/Vulkan/StateTracker.h"
#include "VideoBackends/Vulkan/VulkanContext.h"
#include "VideoCommon/VideoCommon.h"

namespace Vulkan
{
@@ -14,6 +14,7 @@

#include "VideoBackends/Vulkan/VulkanContext.h"
#include "VideoCommon/DriverDetails.h"
#include "VideoCommon/VideoCommon.h"

namespace Vulkan
{
@@ -2,13 +2,14 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.

#include "VideoCommon/BPFunctions.h"

#include <algorithm>

#include "Common/CommonTypes.h"
#include "Common/Logging/Log.h"

#include "VideoCommon/AbstractFramebuffer.h"
#include "VideoCommon/BPFunctions.h"
#include "VideoCommon/BPMemory.h"
#include "VideoCommon/FramebufferManager.h"
#include "VideoCommon/RenderBase.h"
@@ -8,7 +8,7 @@

#pragma once

#include "VideoCommon/VideoCommon.h"
#include "Common/MathUtil.h"

struct BPCmd;

@@ -2,6 +2,8 @@
// Licensed under GPLv2+
// Refer to the license.txt file included.

#include "VideoCommon/PostProcessing.h"

#include <sstream>
#include <string>

@@ -20,7 +22,6 @@
#include "VideoCommon/AbstractShader.h"
#include "VideoCommon/AbstractTexture.h"
#include "VideoCommon/FramebufferManager.h"
#include "VideoCommon/PostProcessing.h"
#include "VideoCommon/RenderBase.h"
#include "VideoCommon/ShaderCache.h"
#include "VideoCommon/VertexManagerBase.h"
@@ -5,17 +5,18 @@
#pragma once

#include <map>
#include <memory>
#include <string>
#include <vector>

#include "Common/CommonTypes.h"
#include "Common/MathUtil.h"
#include "Common/Timer.h"
#include "VideoCommon/TextureConfig.h"
#include "VideoCommon/VideoCommon.h"

class AbstractTexture;
class AbstractPipeline;
class AbstractShader;
class AbstractTexture;

namespace VideoCommon
{
@@ -22,7 +22,7 @@
#include <string>
#include <tuple>

#include "imgui.h"
#include <imgui.h>

#include "Common/Assert.h"
#include "Common/CommonTypes.h"
@@ -74,6 +74,7 @@
#include "VideoCommon/VertexManagerBase.h"
#include "VideoCommon/VertexShaderManager.h"
#include "VideoCommon/VideoBackendBase.h"
#include "VideoCommon/VideoCommon.h"
#include "VideoCommon/VideoConfig.h"
#include "VideoCommon/XFMemory.h"

@@ -87,7 +88,9 @@ static float AspectToWidescreen(float aspect)
Renderer::Renderer(int backbuffer_width, int backbuffer_height, float backbuffer_scale,
AbstractTextureFormat backbuffer_format)
: m_backbuffer_width(backbuffer_width), m_backbuffer_height(backbuffer_height),
m_backbuffer_scale(backbuffer_scale), m_backbuffer_format(backbuffer_format)
m_backbuffer_scale(backbuffer_scale),
m_backbuffer_format(backbuffer_format), m_last_xfb_width{MAX_XFB_WIDTH}, m_last_xfb_height{
MAX_XFB_HEIGHT}
{
UpdateActiveConfig();
UpdateDrawRectangle();
@@ -33,7 +33,6 @@
#include "VideoCommon/FrameDump.h"
#include "VideoCommon/RenderState.h"
#include "VideoCommon/TextureConfig.h"
#include "VideoCommon/VideoCommon.h"

class AbstractFramebuffer;
class AbstractPipeline;
@@ -359,8 +358,8 @@ class Renderer
u64 m_last_xfb_id = std::numeric_limits<u64>::max();

// Note: Only used for auto-ir
u32 m_last_xfb_width = MAX_XFB_WIDTH;
u32 m_last_xfb_height = MAX_XFB_HEIGHT;
u32 m_last_xfb_width = 0;
u32 m_last_xfb_height = 0;

// NOTE: The methods below are called on the framedumping thread.
bool StartFrameDumpToFFMPEG(const FrameDumpConfig& config);
@@ -8,6 +8,7 @@

#include <imgui.h>

#include "VideoCommon/VideoCommon.h"
#include "VideoCommon/VideoConfig.h"

Statistics g_stats;
@@ -16,15 +16,15 @@
#include <vector>

#include "Common/CommonTypes.h"
#include "Common/MathUtil.h"
#include "VideoCommon/AbstractTexture.h"
#include "VideoCommon/BPMemory.h"
#include "VideoCommon/TextureConfig.h"
#include "VideoCommon/TextureDecoder.h"
#include "VideoCommon/VideoCommon.h"

struct VideoConfig;
class AbstractFramebuffer;
class AbstractStagingTexture;
struct VideoConfig;

struct TextureAndTLUTFormat
{
@@ -16,7 +16,6 @@
#include "Common/Logging/Log.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Host.h"

// TODO: ugly
#ifdef _WIN32
@@ -35,14 +34,14 @@
#include "VideoCommon/Fifo.h"
#include "VideoCommon/GeometryShaderManager.h"
#include "VideoCommon/IndexGenerator.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/OpcodeDecoding.h"
#include "VideoCommon/PixelEngine.h"
#include "VideoCommon/PixelShaderManager.h"
#include "VideoCommon/RenderBase.h"
#include "VideoCommon/TextureCacheBase.h"
#include "VideoCommon/VertexLoaderManager.h"
#include "VideoCommon/VertexShaderManager.h"
#include "VideoCommon/VideoCommon.h"
#include "VideoCommon/VideoConfig.h"
#include "VideoCommon/VideoState.h"

@@ -3,8 +3,8 @@
// Refer to the license.txt file included.

#pragma once

#include "Common/CommonTypes.h"
#include "Common/MathUtil.h"

// Global flag to signal if FifoRecorder is active.
extern bool g_bRecordFifoData;
@@ -14,7 +14,8 @@
#include <vector>

#include "Common/CommonTypes.h"
#include "VideoCommon/VideoCommon.h"

enum class APIType;

// Log in two categories, and save three other options in the same byte
#define CONF_LOG 1

0 comments on commit fc8859a

Please sign in to comment.
You can’t perform that action at this time.