piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-30 01:29:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #88 from lioncash/relative-includes

Browse Source 
Relative includes
This commit is contained in:
Pierre Bourdon
2014-02-20 02:08:44 +01:00
parent afba0d736d 24ba058404
commit 6d8df311a3
908 changed files with 4955 additions and 5275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Core/VideoBackends/D3D/D3DBase.cpp
View File

@ -2,12 +2,11 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "StringUtil.h"
#include "VideoConfig.h"
#include "D3DBase.h"
#include "D3DTexture.h"
#include "GfxState.h"
#include "Common/StringUtil.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DTexture.h"
#include "VideoBackends/D3D/GfxState.h"
#include "VideoCommon/VideoConfig.h"
namespace DX11
{

5
Source/Core/VideoBackends/D3D/D3DBase.h
View File

@ -4,12 +4,13 @@
#pragma once
#include <dxgi.h>
#include <d3d11.h>
#include <d3dcompiler.h>
#include "Common.h"
#include <dxgi.h>
#include <vector>
#include "Common/Common.h"
namespace DX11
{

3
Source/Core/VideoBackends/D3D/D3DBlob.cpp
View File

@ -3,7 +3,8 @@
// Refer to the license.txt file included.
#include <d3d11.h>
#include "D3DBlob.h"
#include "VideoBackends/D3D/D3DBlob.h"
namespace DX11
{

2
Source/Core/VideoBackends/D3D/D3DBlob.h
View File

@ -4,7 +4,7 @@
#pragma once
#include "CommonTypes.h"
#include "Common/CommonTypes.h"
struct ID3D10Blob;

7
Source/Core/VideoBackends/D3D/D3DShader.cpp
View File

@ -4,10 +4,9 @@
#include <string>
#include "VideoConfig.h"
#include "D3DBase.h"
#include "D3DShader.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DShader.h"
#include "VideoCommon/VideoConfig.h"
namespace DX11
{

4
Source/Core/VideoBackends/D3D/D3DShader.h
View File

@ -4,8 +4,8 @@
#pragma once
#include "D3DBase.h"
#include "D3DBlob.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DBlob.h"
struct ID3D11PixelShader;
struct ID3D11VertexShader;

4
Source/Core/VideoBackends/D3D/D3DTexture.cpp
View File

@ -2,8 +2,8 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "D3DBase.h"
#include "D3DTexture.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DTexture.h"
namespace DX11
{

12
Source/Core/VideoBackends/D3D/D3DUtil.cpp
View File

@ -4,12 +4,12 @@
#include <list>
#include "D3DBase.h"
#include "D3DUtil.h"
#include "PixelShaderCache.h"
#include "VertexShaderCache.h"
#include "D3DShader.h"
#include "GfxState.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DShader.h"
#include "VideoBackends/D3D/D3DUtil.h"
#include "VideoBackends/D3D/GfxState.h"
#include "VideoBackends/D3D/PixelShaderCache.h"
#include "VideoBackends/D3D/VertexShaderCache.h"
namespace DX11
{

3
Source/Core/VideoBackends/D3D/D3DUtil.h
View File

@ -5,7 +5,8 @@
#pragma once
#include <d3d11.h>
#include <MathUtil.h>
#include "Common/MathUtil.h"
namespace DX11
{

19
Source/Core/VideoBackends/D3D/FramebufferManager.cpp
View File

@ -2,16 +2,15 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "VideoConfig.h"
#include "D3DBase.h"
#include "D3DUtil.h"
#include "FramebufferManager.h"
#include "PixelShaderCache.h"
#include "Render.h"
#include "VertexShaderCache.h"
#include "XFBEncoder.h"
#include "HW/Memmap.h"
#include "Core/HW/Memmap.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DUtil.h"
#include "VideoBackends/D3D/FramebufferManager.h"
#include "VideoBackends/D3D/PixelShaderCache.h"
#include "VideoBackends/D3D/Render.h"
#include "VideoBackends/D3D/VertexShaderCache.h"
#include "VideoBackends/D3D/XFBEncoder.h"
#include "VideoCommon/VideoConfig.h"
namespace DX11 {

5
Source/Core/VideoBackends/D3D/FramebufferManager.h
View File

@ -6,9 +6,8 @@
#include "d3d11.h"
#include "FramebufferManagerBase.h"
#include "D3DTexture.h"
#include "VideoBackends/D3D/D3DTexture.h"
#include "VideoCommon/FramebufferManagerBase.h"
namespace DX11 {

6
Source/Core/VideoBackends/D3D/GfxState.cpp
View File

@ -2,10 +2,10 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Log.h"
#include "Common/Log.h"
#include "D3DBase.h"
#include "GfxState.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/GfxState.h"
namespace DX11
{

9
Source/Core/VideoBackends/D3D/Globals.h
View File

@ -4,8 +4,9 @@
#pragma once
#include "Common.h"
#include "VideoConfig.h"
#include "main.h"
#include "Common/Common.h"
#include "VideoCommon.h"
#include "VideoBackends/D3D/main.h"
#include "VideoCommon/VideoCommon.h"
#include "VideoCommon/VideoConfig.h"

10
Source/Core/VideoBackends/D3D/LineGeometryShader.cpp
View File

@ -2,12 +2,12 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "LineGeometryShader.h"
#include <sstream>
#include "D3DBase.h"
#include "D3DShader.h"
#include "VertexShaderGen.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DShader.h"
#include "VideoBackends/D3D/LineGeometryShader.h"
#include "VideoCommon/VertexShaderGen.h"
namespace DX11
{

2
Source/Core/VideoBackends/D3D/LineGeometryShader.h
View File

@ -4,7 +4,7 @@
#pragma once
#include "VideoCommon.h"
#include "VideoCommon/VideoCommon.h"
struct ID3D11Buffer;
struct ID3D11GeometryShader;

10
Source/Core/VideoBackends/D3D/NativeVertexFormat.cpp
View File

@ -2,11 +2,11 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "D3DBase.h"
#include "D3DBlob.h"
#include "NativeVertexFormat.h"
#include "VertexManager.h"
#include "VertexShaderCache.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DBlob.h"
#include "VideoBackends/D3D/VertexManager.h"
#include "VideoBackends/D3D/VertexShaderCache.h"
#include "VideoCommon/NativeVertexFormat.h"
namespace DX11
{

19
Source/Core/VideoBackends/D3D/PSTextureEncoder.cpp
View File

@ -2,16 +2,15 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "PSTextureEncoder.h"
#include "D3DBase.h"
#include "D3DShader.h"
#include "GfxState.h"
#include "BPMemory.h"
#include "FramebufferManager.h"
#include "Render.h"
#include "HW/Memmap.h"
#include "TextureCache.h"
#include "Core/HW/Memmap.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DShader.h"
#include "VideoBackends/D3D/FramebufferManager.h"
#include "VideoBackends/D3D/GfxState.h"
#include "VideoBackends/D3D/PSTextureEncoder.h"
#include "VideoBackends/D3D/Render.h"
#include "VideoBackends/D3D/TextureCache.h"
#include "VideoCommon/BPMemory.h"
// "Static mode" will compile a new EFB encoder shader for every combination of
// encoding configurations. It's compatible with Shader Model 4.

2
Source/Core/VideoBackends/D3D/PSTextureEncoder.h
View File

@ -4,7 +4,7 @@
#pragma once
#include "TextureEncoder.h"
#include "VideoBackends/D3D/TextureEncoder.h"
struct ID3D11Texture2D;
struct ID3D11RenderTargetView;

7
Source/Core/VideoBackends/D3D/PerfQuery.cpp
View File

@ -1,7 +1,6 @@
#include "RenderBase.h"
#include "D3DBase.h"
#include "PerfQuery.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/PerfQuery.h"
#include "VideoCommon/RenderBase.h"
namespace DX11 {

3
Source/Core/VideoBackends/D3D/PerfQuery.h
View File

@ -1,7 +1,8 @@
#pragma once
#include <array>
#include "PerfQueryBase.h"
#include "VideoCommon/PerfQueryBase.h"
namespace DX11 {

25
Source/Core/VideoBackends/D3D/PixelShaderCache.cpp
View File

@ -2,21 +2,22 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "FileUtil.h"
#include "LinearDiskCache.h"
#include "Common/FileUtil.h"
#include "Common/LinearDiskCache.h"
#include "Debugger.h"
#include "Statistics.h"
#include "VideoConfig.h"
#include "Core/ConfigManager.h"
#include "D3DBase.h"
#include "D3DShader.h"
#include "Globals.h"
#include "PixelShaderGen.h"
#include "PixelShaderCache.h"
#include "PixelShaderManager.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DShader.h"
#include "VideoBackends/D3D/Globals.h"
#include "VideoBackends/D3D/PixelShaderCache.h"
#include "VideoCommon/Debugger.h"
#include "VideoCommon/PixelShaderGen.h"
#include "VideoCommon/PixelShaderManager.h"
#include "VideoCommon/Statistics.h"
#include "VideoCommon/VideoConfig.h"
#include "ConfigManager.h"
extern int frameCount;

5
Source/Core/VideoBackends/D3D/PixelShaderCache.h
View File

@ -4,12 +4,11 @@
#pragma once
#include "PixelShaderGen.h"
#include <d3d11.h>
#include <map>
#include "VideoCommon/PixelShaderGen.h"
enum DSTALPHA_MODE;
namespace DX11

10
Source/Core/VideoBackends/D3D/PointGeometryShader.cpp
View File

@ -2,12 +2,12 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "PointGeometryShader.h"
#include <sstream>
#include "D3DBase.h"
#include "D3DShader.h"
#include "VertexShaderGen.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DShader.h"
#include "VideoBackends/D3D/PointGeometryShader.h"
#include "VideoCommon/VertexShaderGen.h"
namespace DX11
{

2
Source/Core/VideoBackends/D3D/PointGeometryShader.h
View File

@ -4,7 +4,7 @@
#pragma once
#include "VideoCommon.h"
#include "VideoCommon/VideoCommon.h"
struct ID3D11Buffer;
struct ID3D11GeometryShader;

57
Source/Core/VideoBackends/D3D/Render.cpp
View File

@ -4,35 +4,36 @@
#include <cinttypes>
#include <cmath>
#include "Timer.h"
#include "EmuWindow.h"
#include "Fifo.h"
#include "OnScreenDisplay.h"
#include "PixelEngine.h"
#include "Statistics.h"
#include "VertexShaderManager.h"
#include "VideoConfig.h"
#include "D3DBase.h"
#include "D3DUtil.h"
#include "FramebufferManager.h"
#include "GfxState.h"
#include "PixelShaderCache.h"
#include "Render.h"
#include "TextureCache.h"
#include "VertexShaderCache.h"
#include "Core.h"
#include "Movie.h"
#include "Television.h"
#include "Host.h"
#include "BPFunctions.h"
#include "AVIDump.h"
#include "FPSCounter.h"
#include "ConfigManager.h"
#include <strsafe.h>
#include "ImageWrite.h"
#include "Common/Timer.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Host.h"
#include "Core/Movie.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DUtil.h"
#include "VideoBackends/D3D/FramebufferManager.h"
#include "VideoBackends/D3D/GfxState.h"
#include "VideoBackends/D3D/PixelShaderCache.h"
#include "VideoBackends/D3D/Render.h"
#include "VideoBackends/D3D/Television.h"
#include "VideoBackends/D3D/TextureCache.h"
#include "VideoBackends/D3D/VertexShaderCache.h"
#include "VideoCommon/AVIDump.h"
#include "VideoCommon/BPFunctions.h"
#include "VideoCommon/EmuWindow.h"
#include "VideoCommon/Fifo.h"
#include "VideoCommon/FPSCounter.h"
#include "VideoCommon/ImageWrite.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/PixelEngine.h"
#include "VideoCommon/Statistics.h"
#include "VideoCommon/VertexShaderManager.h"
#include "VideoCommon/VideoConfig.h"
namespace DX11
{

2
Source/Core/VideoBackends/D3D/Render.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "RenderBase.h"
#include "VideoCommon/RenderBase.h"
namespace DX11
{

16
Source/Core/VideoBackends/D3D/Television.cpp
View File

@ -2,16 +2,16 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Television.h"
#include "VideoConfig.h"
#include "D3DBase.h"
#include "D3DShader.h"
#include "D3DUtil.h"
#include "VertexShaderCache.h"
#include "HW/Memmap.h"
#include <vector>
#include "Core/HW/Memmap.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DShader.h"
#include "VideoBackends/D3D/D3DUtil.h"
#include "VideoBackends/D3D/Television.h"
#include "VideoBackends/D3D/VertexShaderCache.h"
#include "VideoCommon/VideoConfig.h"
namespace DX11
{

2
Source/Core/VideoBackends/D3D/Television.h
View File

@ -4,7 +4,7 @@
#pragma once
#include "VideoCommon.h"
#include "VideoCommon/VideoCommon.h"
struct ID3D11Texture2D;
struct ID3D11ShaderResourceView;

25
Source/Core/VideoBackends/D3D/TextureCache.cpp
View File

@ -2,19 +2,18 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "RenderBase.h"
#include "D3DBase.h"
#include "D3DUtil.h"
#include "FramebufferManager.h"
#include "PixelShaderCache.h"
#include "TextureCache.h"
#include "VertexShaderCache.h"
#include "TextureEncoder.h"
#include "PSTextureEncoder.h"
#include "HW/Memmap.h"
#include "VideoConfig.h"
#include "ImageWrite.h"
#include "Core/HW/Memmap.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DUtil.h"
#include "VideoBackends/D3D/FramebufferManager.h"
#include "VideoBackends/D3D/PixelShaderCache.h"
#include "VideoBackends/D3D/PSTextureEncoder.h"
#include "VideoBackends/D3D/TextureCache.h"
#include "VideoBackends/D3D/TextureEncoder.h"
#include "VideoBackends/D3D/VertexShaderCache.h"
#include "VideoCommon/ImageWrite.h"
#include "VideoCommon/RenderBase.h"
#include "VideoCommon/VideoConfig.h"
namespace DX11
{

5
Source/Core/VideoBackends/D3D/TextureCache.h
View File

@ -4,9 +4,8 @@
#pragma once
#include "TextureCacheBase.h"
#include "D3DTexture.h"
#include "VideoBackends/D3D/D3DTexture.h"
#include "VideoCommon/TextureCacheBase.h"
namespace DX11
{

2
Source/Core/VideoBackends/D3D/TextureEncoder.h
View File

@ -4,7 +4,7 @@
#pragma once
#include "VideoCommon.h"
#include "VideoCommon/VideoCommon.h"
namespace DX11
{

30
Source/Core/VideoBackends/D3D/VertexManager.cpp
View File

@ -2,22 +2,22 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "D3DBase.h"
#include "PixelShaderCache.h"
#include "VertexManager.h"
#include "VertexShaderCache.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/PixelShaderCache.h"
#include "VideoBackends/D3D/Render.h"
#include "VideoBackends/D3D/VertexManager.h"
#include "VideoBackends/D3D/VertexShaderCache.h"
#include "BPMemory.h"
#include "Debugger.h"
#include "IndexGenerator.h"
#include "MainBase.h"
#include "PixelShaderManager.h"
#include "RenderBase.h"
#include "Render.h"
#include "Statistics.h"
#include "TextureCacheBase.h"
#include "VertexShaderManager.h"
#include "VideoConfig.h"
#include "VideoCommon/BPMemory.h"
#include "VideoCommon/Debugger.h"
#include "VideoCommon/IndexGenerator.h"
#include "VideoCommon/MainBase.h"
#include "VideoCommon/PixelShaderManager.h"
#include "VideoCommon/RenderBase.h"
#include "VideoCommon/Statistics.h"
#include "VideoCommon/TextureCacheBase.h"
#include "VideoCommon/VertexShaderManager.h"
#include "VideoCommon/VideoConfig.h"
// internal state for loading vertices
extern NativeVertexFormat *g_nativeVertexFmt;

6
Source/Core/VideoBackends/D3D/VertexManager.h
View File

@ -4,9 +4,9 @@
#pragma once
#include "VertexManagerBase.h"
#include "LineGeometryShader.h"
#include "PointGeometryShader.h"
#include "VideoBackends/D3D/LineGeometryShader.h"
#include "VideoBackends/D3D/PointGeometryShader.h"
#include "VideoCommon/VertexManagerBase.h"
namespace DX11
{

20
Source/Core/VideoBackends/D3D/VertexShaderCache.cpp
View File

@ -2,19 +2,19 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "FileUtil.h"
#include "LinearDiskCache.h"
#include "Common/FileUtil.h"
#include "Common/LinearDiskCache.h"
#include "Debugger.h"
#include "Statistics.h"
#include "VertexShaderGen.h"
#include "Core/ConfigManager.h"
#include "D3DShader.h"
#include "Globals.h"
#include "VertexShaderCache.h"
#include "VertexShaderManager.h"
#include "VideoBackends/D3D/D3DShader.h"
#include "VideoBackends/D3D/Globals.h"
#include "VideoBackends/D3D/VertexShaderCache.h"
#include "ConfigManager.h"
#include "VideoCommon/Debugger.h"
#include "VideoCommon/Statistics.h"
#include "VideoCommon/VertexShaderGen.h"
#include "VideoCommon/VertexShaderManager.h"
namespace DX11 {

10
Source/Core/VideoBackends/D3D/VertexShaderCache.h
View File

@ -4,13 +4,13 @@
#pragma once
#include "VertexShaderGen.h"
#include "D3DBase.h"
#include "D3DBlob.h"
#include <map>
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DBlob.h"
#include "VideoCommon/VertexShaderGen.h"
namespace DX11 {
class VertexShaderCache

2
Source/Core/VideoBackends/D3D/VideoBackend.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "VideoBackendBase.h"
#include "VideoCommon/VideoBackendBase.h"
namespace DX11
{

15
Source/Core/VideoBackends/D3D/XFBEncoder.cpp
View File

@ -2,14 +2,13 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "XFBEncoder.h"
#include "D3DBase.h"
#include "D3DBlob.h"
#include "D3DShader.h"
#include "Render.h"
#include "GfxState.h"
#include "FramebufferManager.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DBlob.h"
#include "VideoBackends/D3D/D3DShader.h"
#include "VideoBackends/D3D/FramebufferManager.h"
#include "VideoBackends/D3D/GfxState.h"
#include "VideoBackends/D3D/Render.h"
#include "VideoBackends/D3D/XFBEncoder.h"
namespace DX11
{

2
Source/Core/VideoBackends/D3D/XFBEncoder.h
View File

@ -4,7 +4,7 @@
#pragma once
#include "VideoCommon.h"
#include "VideoCommon/VideoCommon.h"
struct ID3D11Texture2D;
struct ID3D11RenderTargetView;

58
Source/Core/VideoBackends/D3D/main.cpp
View File

@ -4,39 +4,39 @@
#include <wx/wx.h>
#include "LogManager.h"
#include "Common/FileUtil.h"
#include "Common/IniFile.h"
#include "Common/LogManager.h"
#include "BPStructs.h"
#include "CommandProcessor.h"
#include "Fifo.h"
#include "OnScreenDisplay.h"
#include "OpcodeDecoding.h"
#include "PixelEngine.h"
#include "PixelShaderManager.h"
#include "VideoConfig.h"
#include "VertexLoaderManager.h"
#include "VertexShaderManager.h"
#include "Core.h"
#include "Host.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Host.h"
#include "Debugger/DebuggerPanel.h"
#include "EmuWindow.h"
#include "IndexGenerator.h"
#include "FileUtil.h"
#include "Globals.h"
#include "IniFile.h"
#include "VideoConfigDiag.h"
#include "DolphinWX/VideoConfigDiag.h"
#include "DolphinWX/Debugger/DebuggerPanel.h"
#include "D3DUtil.h"
#include "D3DBase.h"
#include "PerfQuery.h"
#include "PixelShaderCache.h"
#include "TextureCache.h"
#include "VertexManager.h"
#include "VertexShaderCache.h"
#include "VideoBackends/D3D/D3DBase.h"
#include "VideoBackends/D3D/D3DUtil.h"
#include "VideoBackends/D3D/Globals.h"
#include "VideoBackends/D3D/PerfQuery.h"
#include "VideoBackends/D3D/PixelShaderCache.h"
#include "VideoBackends/D3D/TextureCache.h"
#include "VideoBackends/D3D/VertexManager.h"
#include "VideoBackends/D3D/VertexShaderCache.h"
#include "VideoBackends/D3D/VideoBackend.h"
#include "VideoBackend.h"
#include "ConfigManager.h"
#include "VideoCommon/BPStructs.h"
#include "VideoCommon/CommandProcessor.h"
#include "VideoCommon/EmuWindow.h"
#include "VideoCommon/Fifo.h"
#include "VideoCommon/IndexGenerator.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/OpcodeDecoding.h"
#include "VideoCommon/PixelEngine.h"
#include "VideoCommon/PixelShaderManager.h"
#include "VideoCommon/VertexLoaderManager.h"
#include "VideoCommon/VertexShaderManager.h"
#include "VideoCommon/VideoConfig.h"
namespace DX11
{

4
Source/Core/VideoBackends/D3D/main.h
View File

@ -4,5 +4,5 @@
#pragma once
#include "Render.h"
#include "MainBase.h"
#include "VideoBackends/D3D/Render.h"
#include "VideoCommon/MainBase.h"

2
Source/Core/VideoBackends/D3D/stdafx.cpp
View File

@ -2,4 +2,4 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "stdafx.h"
#include "VideoBackends/D3D/stdafx.h"

17
Source/Core/VideoBackends/OGL/FramebufferManager.cpp
View File

@ -2,15 +2,16 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Globals.h"
#include "FramebufferManager.h"
#include "VertexShaderGen.h"
#include "OnScreenDisplay.h"
#include "DriverDetails.h"
#include "Core/HW/Memmap.h"
#include "TextureConverter.h"
#include "Render.h"
#include "HW/Memmap.h"
#include "VideoBackends/OGL/FramebufferManager.h"
#include "VideoBackends/OGL/Globals.h"
#include "VideoBackends/OGL/Render.h"
#include "VideoBackends/OGL/TextureConverter.h"
#include "VideoCommon/DriverDetails.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/VertexShaderGen.h"
namespace OGL
{

9
Source/Core/VideoBackends/OGL/FramebufferManager.h
View File

@ -4,10 +4,11 @@
#pragma once
#include "GLUtil.h"
#include "FramebufferManagerBase.h"
#include "ProgramShaderCache.h"
#include "Render.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/Render.h"
#include "VideoCommon/FramebufferManagerBase.h"
// On the GameCube, the game sends a request for the graphics processor to
// transfer its internal EFB (Embedded Framebuffer) to an area in GameCube RAM

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_ES2_compatibility.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLCLEARDEPTHFPROC glClearDepthf;
extern PFNGLDEPTHRANGEFPROC glDepthRangef;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_blend_func_extended.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLBINDFRAGDATALOCATIONINDEXEDPROC glBindFragDataLocationIndexed;
extern PFNGLGETFRAGDATAINDEXPROC glGetFragDataIndex;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_buffer_storage.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLBUFFERSTORAGEPROC glBufferStorage;
extern PFNGLNAMEDBUFFERSTORAGEEXTPROC glNamedBufferStorageEXT;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_debug_output.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLDEBUGMESSAGECALLBACKARBPROC glDebugMessageCallbackARB;
extern PFNGLDEBUGMESSAGECONTROLARBPROC glDebugMessageControlARB;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_draw_elements_base_vertex.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLDRAWELEMENTSBASEVERTEXPROC glDrawElementsBaseVertex;
extern PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC glDrawElementsInstancedBaseVertex;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_framebuffer_object.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLBINDFRAMEBUFFERPROC glBindFramebuffer;
extern PFNGLBINDRENDERBUFFERPROC glBindRenderbuffer;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_get_program_binary.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLGETPROGRAMBINARYPROC glGetProgramBinary;
extern PFNGLPROGRAMBINARYPROC glProgramBinary;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_map_buffer_range.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLFLUSHMAPPEDBUFFERRANGEPROC glFlushMappedBufferRange;
extern PFNGLMAPBUFFERRANGEPROC glMapBufferRange;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_sample_shading.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLMINSAMPLESHADINGARBPROC glMinSampleShadingARB;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_sampler_objects.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLBINDSAMPLERPROC glBindSampler;
extern PFNGLDELETESAMPLERSPROC glDeleteSamplers;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_sync.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLCLIENTWAITSYNCPROC glClientWaitSync;
extern PFNGLDELETESYNCPROC glDeleteSync;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_uniform_buffer_object.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLBINDBUFFERBASEPROC glBindBufferBase;
extern PFNGLBINDBUFFERRANGEPROC glBindBufferRange;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_vertex_array_object.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLBINDVERTEXARRAYPROC glBindVertexArray;
extern PFNGLDELETEVERTEXARRAYSPROC glDeleteVertexArrays;

2
Source/Core/VideoBackends/OGL/GLExtensions/ARB_viewport_array.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLDEPTHRANGEARRAYVPROC glDepthRangeArrayv;
extern PFNGLDEPTHRANGEINDEXEDPROC glDepthRangeIndexed;

9
Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
View File

@ -2,14 +2,15 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "GLExtensions.h"
#include "Log.h"
#include <sstream>
#include <unordered_map>
#include "Common/Log.h"
#include "VideoBackends/OGL/GLExtensions/GLExtensions.h"
#if defined(__linux__) || defined(__APPLE__)
#include <dlfcn.h>
#endif
#include <unordered_map>
#include <sstream>
// gl_1_1
PFNGLCLEARINDEXPROC glClearIndex;

54
Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.h
View File

@ -4,34 +4,34 @@
#include <string>
#include "GLInterface/GLInterface.h"
#include "DolphinWX/GLInterface/GLInterface.h"
#include "gl_1_1.h"
#include "gl_1_2.h"
#include "gl_1_3.h"
#include "gl_1_4.h"
#include "gl_1_5.h"
#include "gl_2_0.h"
#include "gl_3_0.h"
#include "gl_3_1.h"
#include "gl_3_2.h"
#include "ARB_uniform_buffer_object.h"
#include "ARB_sampler_objects.h"
#include "ARB_map_buffer_range.h"
#include "ARB_vertex_array_object.h"
#include "ARB_framebuffer_object.h"
#include "ARB_get_program_binary.h"
#include "ARB_sync.h"
#include "ARB_ES2_compatibility.h"
#include "NV_primitive_restart.h"
#include "ARB_blend_func_extended.h"
#include "ARB_viewport_array.h"
#include "ARB_draw_elements_base_vertex.h"
#include "NV_framebuffer_multisample_coverage.h"
#include "ARB_sample_shading.h"
#include "ARB_debug_output.h"
#include "KHR_debug.h"
#include "ARB_buffer_storage.h"
#include "VideoBackends/OGL/GLExtensions/ARB_blend_func_extended.h"
#include "VideoBackends/OGL/GLExtensions/ARB_buffer_storage.h"
#include "VideoBackends/OGL/GLExtensions/ARB_debug_output.h"
#include "VideoBackends/OGL/GLExtensions/ARB_draw_elements_base_vertex.h"
#include "VideoBackends/OGL/GLExtensions/ARB_ES2_compatibility.h"
#include "VideoBackends/OGL/GLExtensions/ARB_framebuffer_object.h"
#include "VideoBackends/OGL/GLExtensions/ARB_get_program_binary.h"
#include "VideoBackends/OGL/GLExtensions/ARB_map_buffer_range.h"
#include "VideoBackends/OGL/GLExtensions/ARB_sample_shading.h"
#include "VideoBackends/OGL/GLExtensions/ARB_sampler_objects.h"
#include "VideoBackends/OGL/GLExtensions/ARB_sync.h"
#include "VideoBackends/OGL/GLExtensions/ARB_uniform_buffer_object.h"
#include "VideoBackends/OGL/GLExtensions/ARB_vertex_array_object.h"
#include "VideoBackends/OGL/GLExtensions/ARB_viewport_array.h"
#include "VideoBackends/OGL/GLExtensions/gl_1_1.h"
#include "VideoBackends/OGL/GLExtensions/gl_1_2.h"
#include "VideoBackends/OGL/GLExtensions/gl_1_3.h"
#include "VideoBackends/OGL/GLExtensions/gl_1_4.h"
#include "VideoBackends/OGL/GLExtensions/gl_1_5.h"
#include "VideoBackends/OGL/GLExtensions/gl_2_0.h"
#include "VideoBackends/OGL/GLExtensions/gl_3_0.h"
#include "VideoBackends/OGL/GLExtensions/gl_3_1.h"
#include "VideoBackends/OGL/GLExtensions/gl_3_2.h"
#include "VideoBackends/OGL/GLExtensions/KHR_debug.h"
#include "VideoBackends/OGL/GLExtensions/NV_framebuffer_multisample_coverage.h"
#include "VideoBackends/OGL/GLExtensions/NV_primitive_restart.h"
namespace GLExtensions
{

2
Source/Core/VideoBackends/OGL/GLExtensions/KHR_debug.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#ifndef GL_VERSION_4_3

2
Source/Core/VideoBackends/OGL/GLExtensions/NV_framebuffer_multisample_coverage.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB
#define GL_RENDERBUFFER_COLOR_SAMPLES_NV 0x8E10

2
Source/Core/VideoBackends/OGL/GLExtensions/NV_primitive_restart.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
#define GL_PRIMITIVE_RESTART_NV 0x8558
#define GL_PRIMITIVE_RESTART_INDEX_NV 0x8559

2
Source/Core/VideoBackends/OGL/GLExtensions/gl_1_1.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
typedef void (GLAPIENTRY * PFNGLCLEARINDEXPROC) ( GLfloat c );
typedef void (GLAPIENTRY * PFNGLCLEARCOLORPROC) ( GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha );

2
Source/Core/VideoBackends/OGL/GLExtensions/gl_1_2.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLCOPYTEXSUBIMAGE3DPROC glCopyTexSubImage3D;
extern PFNGLDRAWRANGEELEMENTSPROC glDrawRangeElements;

2
Source/Core/VideoBackends/OGL/GLExtensions/gl_1_3.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLACTIVETEXTUREARBPROC glActiveTexture;
extern PFNGLCLIENTACTIVETEXTUREARBPROC glClientActiveTexture;

2
Source/Core/VideoBackends/OGL/GLExtensions/gl_1_4.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
// These two are provided by ARB_imaging as well
extern PFNGLBLENDCOLORPROC glBlendColor;

2
Source/Core/VideoBackends/OGL/GLExtensions/gl_1_5.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLBEGINQUERYPROC glBeginQuery;
extern PFNGLBINDBUFFERPROC glBindBuffer;

2
Source/Core/VideoBackends/OGL/GLExtensions/gl_2_0.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLATTACHSHADERPROC glAttachShader;
extern PFNGLBINDATTRIBLOCATIONPROC glBindAttribLocation;

2
Source/Core/VideoBackends/OGL/GLExtensions/gl_3_0.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLBEGINCONDITIONALRENDERPROC glBeginConditionalRender;
extern PFNGLBEGINTRANSFORMFEEDBACKPROC glBeginTransformFeedback;

2
Source/Core/VideoBackends/OGL/GLExtensions/gl_3_1.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLDRAWARRAYSINSTANCEDPROC glDrawArraysInstanced;
extern PFNGLDRAWELEMENTSINSTANCEDPROC glDrawElementsInstanced;

2
Source/Core/VideoBackends/OGL/GLExtensions/gl_3_2.h
View File

@ -2,7 +2,7 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "gl_common.h"
#include "VideoBackends/OGL/GLExtensions/gl_common.h"
extern PFNGLFRAMEBUFFERTEXTUREPROC glFramebufferTexture;
extern PFNGLGETBUFFERPARAMETERI64VPROC glGetBufferParameteri64v;

17
Source/Core/VideoBackends/OGL/GLUtil.cpp
View File

@ -2,16 +2,17 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Globals.h"
#include "VideoConfig.h"
#include "IniFile.h"
#include "Core.h"
#include "VideoBackend.h"
#include "ConfigManager.h"
#include "Common/IniFile.h"
#include "Render.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "GLUtil.h"
#include "VideoBackends/OGL/Globals.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/OGL/Render.h"
#include "VideoBackends/OGL/VideoBackend.h"
#include "VideoCommon/VideoConfig.h"
GLWindow GLWin;
cInterfaceBase *GLInterface;

8
Source/Core/VideoBackends/OGL/GLUtil.h
View File

@ -4,10 +4,10 @@
#pragma once
#include "VideoConfig.h"
#include "MathUtil.h"
#include "GLInterface/GLInterface.h"
#include "GLExtensions/GLExtensions.h"
#include "Common/MathUtil.h"
#include "DolphinWX/GLInterface/GLInterface.h"
#include "VideoBackends/OGL/GLExtensions/GLExtensions.h"
#include "VideoCommon/VideoConfig.h"
#ifndef _WIN32

6
Source/Core/VideoBackends/OGL/Globals.h
View File

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

19
Source/Core/VideoBackends/OGL/NativeVertexFormat.cpp
View File

@ -2,16 +2,17 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "GLUtil.h"
#include "x64Emitter.h"
#include "x64ABI.h"
#include "MemoryUtil.h"
#include "ProgramShaderCache.h"
#include "VertexShaderGen.h"
#include "Common/MemoryUtil.h"
#include "Common/x64ABI.h"
#include "Common/x64Emitter.h"
#include "CPMemory.h"
#include "NativeVertexFormat.h"
#include "VertexManager.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/VertexManager.h"
#include "VideoCommon/CPMemory.h"
#include "VideoCommon/NativeVertexFormat.h"
#include "VideoCommon/VertexShaderGen.h"
// Here's some global state. We only use this to keep track of what we've sent to the OpenGL state
// machine.

8
Source/Core/VideoBackends/OGL/PerfQuery.cpp
View File

@ -2,10 +2,10 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "GLInterface/GLInterface.h"
#include "RenderBase.h"
#include "GLUtil.h"
#include "PerfQuery.h"
#include "DolphinWX/GLInterface/GLInterface.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/OGL/PerfQuery.h"
#include "VideoCommon/RenderBase.h"
namespace OGL
{

2
Source/Core/VideoBackends/OGL/PerfQuery.h
View File

@ -1,7 +1,7 @@
#pragma once
#include <array>
#include "PerfQueryBase.h"
#include "VideoCommon/PerfQueryBase.h"
namespace OGL {

18
Source/Core/VideoBackends/OGL/PostProcessing.cpp
View File

@ -2,14 +2,16 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "CommonPaths.h"
#include "FileUtil.h"
#include "VideoCommon.h"
#include "VideoConfig.h"
#include "GLUtil.h"
#include "PostProcessing.h"
#include "ProgramShaderCache.h"
#include "FramebufferManager.h"
#include "Common/CommonPaths.h"
#include "Common/FileUtil.h"
#include "VideoBackends/OGL/FramebufferManager.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/OGL/PostProcessing.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoCommon/VideoCommon.h"
#include "VideoCommon/VideoConfig.h"
namespace OGL
{

4
Source/Core/VideoBackends/OGL/PostProcessing.h
View File

@ -4,8 +4,8 @@
#pragma once
#include "VideoCommon.h"
#include "GLUtil.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoCommon/VideoCommon.h"
namespace OGL
{

22
Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
View File

@ -2,16 +2,18 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "ProgramShaderCache.h"
#include "DriverDetails.h"
#include "MathUtil.h"
#include "StreamBuffer.h"
#include "Debugger.h"
#include "Statistics.h"
#include "ImageWrite.h"
#include "Render.h"
#include "PixelShaderManager.h"
#include "VertexShaderManager.h"
#include "Common/MathUtil.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/Render.h"
#include "VideoBackends/OGL/StreamBuffer.h"
#include "VideoCommon/Debugger.h"
#include "VideoCommon/DriverDetails.h"
#include "VideoCommon/ImageWrite.h"
#include "VideoCommon/PixelShaderManager.h"
#include "VideoCommon/Statistics.h"
#include "VideoCommon/VertexShaderManager.h"
namespace OGL
{

12
Source/Core/VideoBackends/OGL/ProgramShaderCache.h
View File

@ -4,13 +4,11 @@
#pragma once
#include "GLUtil.h"
#include "PixelShaderGen.h"
#include "VertexShaderGen.h"
#include "LinearDiskCache.h"
#include "ConfigManager.h"
#include "Common/LinearDiskCache.h"
#include "Core/ConfigManager.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoCommon/PixelShaderGen.h"
#include "VideoCommon/VertexShaderGen.h"
namespace OGL
{

6
Source/Core/VideoBackends/OGL/RasterFont.cpp
View File

@ -2,10 +2,10 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "GLUtil.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/RasterFont.h"
#include "RasterFont.h"
#include "ProgramShaderCache.h"
// globals
namespace OGL {

89
Source/Core/VideoBackends/OGL/Render.cpp
View File

@ -2,63 +2,64 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Globals.h"
#include "Thread.h"
#include "Atomic.h"
#include <vector>
#include <cinttypes>
#include <cmath>
#include <cstdio>
#include <cinttypes>
#include <vector>
#include "Common/Atomic.h"
#include "Common/CommonPaths.h"
#include "Common/FileUtil.h"
#include "Common/StringUtil.h"
#include "Common/Thread.h"
#include "Common/Timer.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Movie.h"
#include "VideoBackends/OGL/FramebufferManager.h"
#include "VideoBackends/OGL/Globals.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/OGL/main.h"
#include "VideoBackends/OGL/PostProcessing.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/RasterFont.h"
#include "VideoBackends/OGL/Render.h"
#include "VideoBackends/OGL/SamplerCache.h"
#include "VideoBackends/OGL/StreamBuffer.h"
#include "VideoBackends/OGL/TextureCache.h"
#include "VideoBackends/OGL/TextureConverter.h"
#include "VideoBackends/OGL/VertexManager.h"
#include "VideoCommon/BPFunctions.h"
#include "VideoCommon/BPStructs.h"
#include "VideoCommon/DriverDetails.h"
#include "VideoCommon/Fifo.h"
#include "VideoCommon/FPSCounter.h"
#include "VideoCommon/ImageWrite.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/PixelEngine.h"
#include "VideoCommon/Statistics.h"
#include "VideoCommon/VertexLoader.h"
#include "VideoCommon/VertexLoaderManager.h"
#include "VideoCommon/VertexShaderGen.h"
#include "VideoCommon/VertexShaderManager.h"
#include "VideoCommon/VideoConfig.h"
#include "GLUtil.h"
#if defined(HAVE_WX) && HAVE_WX
#include "WxUtils.h"
#include "DolphinWX/WxUtils.h"
#endif
#include "FileUtil.h"
#ifdef _WIN32
#include <mmsystem.h>
#endif
#include "CommonPaths.h"
#include "DriverDetails.h"
#include "VideoConfig.h"
#include "Statistics.h"
#include "ImageWrite.h"
#include "PixelEngine.h"
#include "Render.h"
#include "BPStructs.h"
#include "TextureCache.h"
#include "RasterFont.h"
#include "VertexShaderGen.h"
#include "ProgramShaderCache.h"
#include "VertexShaderManager.h"
#include "VertexLoaderManager.h"
#include "VertexLoader.h"
#include "PostProcessing.h"
#include "TextureConverter.h"
#include "OnScreenDisplay.h"
#include "Timer.h"
#include "StringUtil.h"
#include "FramebufferManager.h"
#include "Fifo.h"
#include "Core.h"
#include "Movie.h"
#include "BPFunctions.h"
#include "FPSCounter.h"
#include "ConfigManager.h"
#include "VertexManager.h"
#include "SamplerCache.h"
#include "StreamBuffer.h"
#include "main.h" // Local
#ifdef _WIN32
#include "EmuWindow.h"
#include "VideoCommon/EmuWindow.h"
#endif
#if defined _WIN32 || defined HAVE_LIBAV
#include "AVIDump.h"
#include "VideoCommon/AVIDump.h"
#endif

2
Source/Core/VideoBackends/OGL/Render.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "RenderBase.h"
#include "VideoCommon/RenderBase.h"
namespace OGL
{

4
Source/Core/VideoBackends/OGL/SamplerCache.cpp
View File

@ -2,8 +2,8 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "DriverDetails.h"
#include "SamplerCache.h"
#include "VideoBackends/OGL/SamplerCache.h"
#include "VideoCommon/DriverDetails.h"
namespace OGL
{

4
Source/Core/VideoBackends/OGL/SamplerCache.h
View File

@ -2,8 +2,8 @@
#include <map>
#include "Render.h"
#include "GLUtil.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/OGL/Render.h"
namespace OGL
{

16
Source/Core/VideoBackends/OGL/StreamBuffer.cpp
View File

@ -2,13 +2,15 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Globals.h"
#include "GLUtil.h"
#include "StreamBuffer.h"
#include "MemoryUtil.h"
#include "Render.h"
#include "DriverDetails.h"
#include "OnScreenDisplay.h"
#include "Common/MemoryUtil.h"
#include "VideoBackends/OGL/Globals.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/OGL/Render.h"
#include "VideoBackends/OGL/StreamBuffer.h"
#include "VideoCommon/DriverDetails.h"
#include "VideoCommon/OnScreenDisplay.h"
namespace OGL
{

6
Source/Core/VideoBackends/OGL/StreamBuffer.h
View File

@ -5,9 +5,9 @@
#pragma once
#include <utility>
#include "VideoCommon.h"
#include "FramebufferManager.h"
#include "GLUtil.h"
#include "VideoBackends/OGL/FramebufferManager.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoCommon/VideoCommon.h"
namespace OGL
{

44
Source/Core/VideoBackends/OGL/TextureCache.cpp
View File

@ -2,11 +2,10 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include <vector>
#include <cmath>
#include <fstream>
#include <vector>
#ifdef _WIN32
#define _interlockedbittestandset workaround_ms_header_bug_platform_sdk6_set
#define _interlockedbittestandreset workaround_ms_header_bug_platform_sdk6_reset
@ -19,24 +18,27 @@
#undef _interlockedbittestandreset64
#endif
#include "BPStructs.h"
#include "CommonPaths.h"
#include "FileUtil.h"
#include "FramebufferManager.h"
#include "Globals.h"
#include "Hash.h"
#include "HiresTextures.h"
#include "HW/Memmap.h"
#include "ImageWrite.h"
#include "MemoryUtil.h"
#include "ProgramShaderCache.h"
#include "Render.h"
#include "Statistics.h"
#include "StringUtil.h"
#include "TextureCache.h"
#include "TextureConverter.h"
#include "TextureDecoder.h"
#include "VideoConfig.h"
#include "Common/CommonPaths.h"
#include "Common/FileUtil.h"
#include "Common/Hash.h"
#include "Common/MemoryUtil.h"
#include "Common/StringUtil.h"
#include "Core/HW/Memmap.h"
#include "VideoBackends/OGL/FramebufferManager.h"
#include "VideoBackends/OGL/Globals.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/Render.h"
#include "VideoBackends/OGL/TextureCache.h"
#include "VideoBackends/OGL/TextureConverter.h"
#include "VideoCommon/BPStructs.h"
#include "VideoCommon/HiresTextures.h"
#include "VideoCommon/ImageWrite.h"
#include "VideoCommon/Statistics.h"
#include "VideoCommon/TextureDecoder.h"
#include "VideoCommon/VideoConfig.h"
namespace OGL
{

9
Source/Core/VideoBackends/OGL/TextureCache.h
View File

@ -6,11 +6,10 @@
#include <map>
#include "VideoCommon.h"
#include "GLUtil.h"
#include "BPStructs.h"
#include "TextureCacheBase.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoCommon/BPStructs.h"
#include "VideoCommon/TextureCacheBase.h"
#include "VideoCommon/VideoCommon.h"
namespace OGL
{

28
Source/Core/VideoBackends/OGL/TextureConverter.cpp
View File

@ -4,18 +4,22 @@
// Fast image conversion using OpenGL shaders.
#include "TextureConverter.h"
#include "TextureConversionShader.h"
#include "TextureCache.h"
#include "ProgramShaderCache.h"
#include "FramebufferManager.h"
#include "Globals.h"
#include "VideoConfig.h"
#include "ImageWrite.h"
#include "Render.h"
#include "FileUtil.h"
#include "HW/Memmap.h"
#include "DriverDetails.h"
#include "Common/FileUtil.h"
#include "Core/HW/Memmap.h"
#include "VideoBackends/OGL/FramebufferManager.h"
#include "VideoBackends/OGL/Globals.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/Render.h"
#include "VideoBackends/OGL/TextureCache.h"
#include "VideoBackends/OGL/TextureConverter.h"
#include "VideoCommon/DriverDetails.h"
#include "VideoCommon/ImageWrite.h"
#include "VideoCommon/TextureConversionShader.h"
#include "VideoCommon/VideoConfig.h"
namespace OGL
{

4
Source/Core/VideoBackends/OGL/TextureConverter.h
View File

@ -4,8 +4,8 @@
#pragma once
#include "VideoCommon.h"
#include "GLUtil.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoCommon/VideoCommon.h"
namespace OGL
{

42
Source/Core/VideoBackends/OGL/VertexManager.cpp
View File

@ -2,33 +2,31 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "Globals.h"
#include <fstream>
#include <vector>
#include "Fifo.h"
#include "Common/FileUtil.h"
#include "Common/MemoryUtil.h"
#include "DriverDetails.h"
#include "VideoConfig.h"
#include "Statistics.h"
#include "MemoryUtil.h"
#include "Render.h"
#include "ImageWrite.h"
#include "BPMemory.h"
#include "TextureCache.h"
#include "PixelShaderManager.h"
#include "VertexShaderManager.h"
#include "ProgramShaderCache.h"
#include "VertexShaderGen.h"
#include "VertexLoader.h"
#include "VertexManager.h"
#include "IndexGenerator.h"
#include "FileUtil.h"
#include "StreamBuffer.h"
#include "Render.h"
#include "VideoBackends/OGL/Globals.h"
#include "VideoBackends/OGL/main.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/Render.h"
#include "VideoBackends/OGL/StreamBuffer.h"
#include "VideoBackends/OGL/TextureCache.h"
#include "VideoBackends/OGL/VertexManager.h"
#include "main.h"
#include "VideoCommon/BPMemory.h"
#include "VideoCommon/DriverDetails.h"
#include "VideoCommon/Fifo.h"
#include "VideoCommon/ImageWrite.h"
#include "VideoCommon/IndexGenerator.h"
#include "VideoCommon/PixelShaderManager.h"
#include "VideoCommon/Statistics.h"
#include "VideoCommon/VertexLoader.h"
#include "VideoCommon/VertexShaderGen.h"
#include "VideoCommon/VertexShaderManager.h"
#include "VideoCommon/VideoConfig.h"
// internal state for loading vertices
extern NativeVertexFormat *g_nativeVertexFmt;

5
Source/Core/VideoBackends/OGL/VertexManager.h
View File

@ -4,9 +4,8 @@
#pragma once
#include "CPMemory.h"
#include "VertexManagerBase.h"
#include "VideoCommon/CPMemory.h"
#include "VideoCommon/VertexManagerBase.h"
namespace OGL
{

2
Source/Core/VideoBackends/OGL/VideoBackend.h
View File

@ -1,6 +1,6 @@
#pragma once
#include "VideoBackendBase.h"
#include "VideoCommon/VideoBackendBase.h"
namespace OGL
{

88
Source/Core/VideoBackends/OGL/main.cpp
View File

@ -36,57 +36,59 @@ Make AA apply instantly during gameplay if possible
*/
#include "Globals.h"
#include "Atomic.h"
#include "CommonPaths.h"
#include "Thread.h"
#include "LogManager.h"
#include <cstdarg>
#include <algorithm>
#include <cstdarg>
#include "Common/Atomic.h"
#include "Common/CommonPaths.h"
#include "Common/LogManager.h"
#include "Common/Thread.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/Host.h"
#include "VideoBackends/OGL/FramebufferManager.h"
#include "VideoBackends/OGL/Globals.h"
#include "VideoBackends/OGL/GLUtil.h"
#include "VideoBackends/OGL/PerfQuery.h"
#include "VideoBackends/OGL/PostProcessing.h"
#include "VideoBackends/OGL/ProgramShaderCache.h"
#include "VideoBackends/OGL/Render.h"
#include "VideoBackends/OGL/SamplerCache.h"
#include "VideoBackends/OGL/TextureCache.h"
#include "VideoBackends/OGL/TextureConverter.h"
#include "VideoBackends/OGL/VertexManager.h"
#include "VideoBackends/OGL/VideoBackend.h"
#include "VideoCommon/BPStructs.h"
#include "VideoCommon/CommandProcessor.h"
#include "VideoCommon/Fifo.h"
#include "VideoCommon/ImageWrite.h"
#include "VideoCommon/IndexGenerator.h"
#include "VideoCommon/LookUpTables.h"
#include "VideoCommon/MainBase.h"
#include "VideoCommon/OnScreenDisplay.h"
#include "VideoCommon/OpcodeDecoding.h"
#include "VideoCommon/PixelEngine.h"
#include "VideoCommon/PixelShaderManager.h"
#include "VideoCommon/VertexLoader.h"
#include "VideoCommon/VertexLoaderManager.h"
#include "VideoCommon/VertexShaderManager.h"
#include "VideoCommon/VideoConfig.h"
#include "VideoCommon/VideoState.h"
#ifdef _WIN32
#include "EmuWindow.h"
#include "IniFile.h"
#include "Common/IniFile.h"
#include "VideoCommon/EmuWindow.h"
#endif
#if defined(HAVE_WX) && HAVE_WX
#include "VideoConfigDiag.h"
#include "Debugger/DebuggerPanel.h"
#include "DolphinWX/VideoConfigDiag.h"
#include "DolphinWX/Debugger/DebuggerPanel.h"
#endif // HAVE_WX
#include "MainBase.h"
#include "VideoConfig.h"
#include "LookUpTables.h"
#include "ImageWrite.h"
#include "Render.h"
#include "GLUtil.h"
#include "Fifo.h"
#include "OpcodeDecoding.h"
#include "TextureCache.h"
#include "BPStructs.h"
#include "VertexLoader.h"
#include "VertexLoaderManager.h"
#include "VertexManager.h"
#include "PixelShaderManager.h"
#include "VertexShaderManager.h"
#include "ProgramShaderCache.h"
#include "CommandProcessor.h"
#include "PixelEngine.h"
#include "TextureConverter.h"
#include "PostProcessing.h"
#include "OnScreenDisplay.h"
#include "FramebufferManager.h"
#include "Core.h"
#include "Host.h"
#include "SamplerCache.h"
#include "PerfQuery.h"
#include "VideoState.h"
#include "IndexGenerator.h"
#include "VideoBackend.h"
#include "ConfigManager.h"
namespace OGL
{

2
Source/Core/VideoBackends/OGL/main.h
View File

@ -4,4 +4,4 @@
#pragma once
#include "MainBase.h"
#include "VideoCommon/MainBase.h"

2
Source/Core/VideoBackends/OGL/stdafx.cpp
View File

@ -2,4 +2,4 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "stdafx.h"
#include "VideoBackends/OGL/stdafx.h"

19
Source/Core/VideoBackends/Software/BPMemLoader.cpp
View File

@ -2,16 +2,17 @@
// Licensed under GPLv2
// Refer to the license.txt file included.
#include "VideoCommon.h"
#include "TextureDecoder.h"
#include "Core/Core.h"
#include "Core/HW/Memmap.h"
#include "BPMemLoader.h"
#include "EfbCopy.h"
#include "Rasterizer.h"
#include "SWPixelEngine.h"
#include "Tev.h"
#include "HW/Memmap.h"
#include "Core.h"
#include "VideoBackends/Software/BPMemLoader.h"
#include "VideoBackends/Software/EfbCopy.h"
#include "VideoBackends/Software/Rasterizer.h"
#include "VideoBackends/Software/SWPixelEngine.h"
#include "VideoBackends/Software/Tev.h"
#include "VideoCommon/TextureDecoder.h"
#include "VideoCommon/VideoCommon.h"
void InitBPMemory()

4
Source/Core/VideoBackends/Software/BPMemLoader.h
View File

@ -5,8 +5,8 @@
#pragma once
#include "Common.h"
#include "BPMemory.h"
#include "Common/Common.h"
#include "VideoCommon/BPMemory.h"
void InitBPMemory();
void SWBPWritten(int address, int newvalue);

Some files were not shown because too many files have changed in this diff Show More