DX11 code maintenance, part 7:

Header cleanups. If anything, this will decrease compile time.. :P

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6916 8ced0084-cf51-0410-be5f-012b33b47a6e

Source/Core/VideoCommon/Src/TextureCacheBase.h

@@ -4,7 +4,7 @@
 
 #include <map>
 
-//#include "VideoCommon.h"
+#include "VideoCommon.h"
 #include "TextureDecoder.h"
 #include "BPMemory.h"
 

Source/Plugins/Plugin_VideoDX11/Src/D3DBase.cpp

@@ -15,14 +15,12 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
+#include "StringUtil.h"
+#include "VideoConfig.h"
+
 #include "D3DBase.h"
 #include "D3DTexture.h"
-#include "D3DShader.h"
-#include "D3Dcompiler.h"
-#include "VideoConfig.h"
-#include "Render.h"
-#include "XFStructs.h"
-#include "StringUtil.h"
+#include "GfxState.h"
 
 HINSTANCE hD3DXDll = NULL;
 D3DX11COMPILEFROMMEMORYTYPE PD3DX11CompileFromMemory = NULL;

Source/Plugins/Plugin_VideoDX11/Src/D3DBase.h

@@ -19,8 +19,6 @@
 
 #include <d3dx11.h>
 #include "Common.h"
-#include "D3DBlob.h"
-#include "GfxState.h"
 #include <vector>
 
 #define SAFE_RELEASE(x) { if (x) (x)->Release(); (x) = NULL; }

Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.cpp

@@ -15,6 +15,7 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
+#include <d3d11.h>
 #include "D3DBlob.h"
 
 D3DBlob::D3DBlob(unsigned int blob_size, const u8* init_data) : ref(1), size(blob_size), blob(NULL)

Source/Plugins/Plugin_VideoDX11/Src/D3DBlob.h

@@ -17,8 +17,9 @@
 
 #pragma once
 
-#include <d3d11.h>
-#include "Common.h"
+#include "CommonTypes.h"
+
+struct ID3D10Blob;
 
 // use this class instead ID3D10Blob or ID3D11Blob whenever possible
 class D3DBlob

Source/Plugins/Plugin_VideoDX11/Src/D3DShader.cpp

@@ -15,11 +15,11 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include <d3dx11.h>
-#include <d3dcompiler.h>
 #include <string>
 
 #include "VideoConfig.h"
+
+#include "D3DBase.h"
 #include "D3DShader.h"
 
 namespace D3D
@@ -53,11 +53,14 @@ bool CompileVertexShader(const char* code, unsigned int len, D3DBlob** blob)
 							flags, 0, NULL, &shaderBuffer, &errorBuffer, NULL);
 
 	if (FAILED(hr) || errorBuffer)
+	{
+		if (g_ActiveConfig.bShowShaderErrors)
 		{
 			std::string msg = (char*)errorBuffer->GetBufferPointer();
 			msg += "\n\n";
 			msg += code;
 			MessageBoxA(0, msg.c_str(), "Error compiling pixel shader", MB_ICONERROR);
+		}
 
 		*blob = NULL;
 		errorBuffer->Release();
@@ -98,11 +101,14 @@ bool CompilePixelShader(const char* code, unsigned int len, D3DBlob** blob)
 							flags, 0, NULL, &shaderBuffer, &errorBuffer, NULL);
 
 	if (FAILED(hr) || errorBuffer)
+	{
+		if (g_ActiveConfig.bShowShaderErrors)
 		{
 			std::string msg = (char*)errorBuffer->GetBufferPointer();
 			msg += "\n\n";
 			msg += code;
 			MessageBoxA(0, msg.c_str(), "Error compiling pixel shader", MB_ICONERROR);
+		}
 
 		*blob = NULL;
 		errorBuffer->Release();

Source/Plugins/Plugin_VideoDX11/Src/D3DShader.h

@@ -17,7 +17,10 @@
 
 #pragma once
 
-#include "D3DBase.h"
+#include "D3DBlob.h"
+
+struct ID3D11PixelShader;
+struct ID3D11VertexShader;
 
 namespace D3D
 {

Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.cpp

@@ -15,7 +15,6 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include <d3dx11.h>
 #include "D3DBase.h"
 #include "D3DTexture.h"
 

Source/Plugins/Plugin_VideoDX11/Src/D3DTexture.h

@@ -17,7 +17,7 @@
 
 #pragma once
 
-#include "D3DBase.h"
+#include "d3d11.h"
 
 namespace D3D
 {

Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.cpp

@@ -16,15 +16,13 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include <list>
-#include "Common.h"
 
 #include "D3DBase.h"
 #include "D3DUtil.h"
-#include "D3DTexture.h"
-#include "Render.h"
 #include "PixelShaderCache.h"
 #include "VertexShaderCache.h"
 #include "D3DShader.h"
+#include "GfxState.h"
 
 namespace D3D
 {

Source/Plugins/Plugin_VideoDX11/Src/D3DUtil.h

@@ -17,8 +17,7 @@
 
 #pragma	once
 
-#include "D3DBase.h"
-#include <math.h>
+#include "d3d11.h"
 #include <MathUtil.h>
 
 namespace D3D

Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.cpp

@@ -15,13 +15,13 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "D3DBase.h"
-#include "D3DTexture.h"
-#include "D3DUtil.h"
-#include "Render.h"
-#include "FramebufferManager.h"
 #include "VideoConfig.h"
+
+#include "D3DBase.h"
+#include "D3DUtil.h"
+#include "FramebufferManager.h"
 #include "PixelShaderCache.h"
+#include "Render.h"
 #include "VertexShaderCache.h"
 
 FramebufferManager::Efb FramebufferManager::m_efb;

Source/Plugins/Plugin_VideoDX11/Src/FramebufferManager.h

@@ -18,10 +18,12 @@
 #ifndef _FBMANAGER_D3D_H_
 #define _FBMANAGER_D3D_H_
 
-#include "D3DBase.h"
-#include "D3DTexture.h"
+#include "d3d11.h"
+
 #include "FramebufferManagerBase.h"
 
+#include "D3DTexture.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
 // called the XFB (External Framebuffer). The size and location of the XFB is

Source/Plugins/Plugin_VideoDX11/Src/GfxState.cpp

@@ -15,9 +15,10 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "VideoConfig.h"
+#include "Log.h"
+
+#include "D3DBase.h"
 #include "GfxState.h"
-#include "VertexShaderCache.h"
 
 namespace D3D
 {

Source/Plugins/Plugin_VideoDX11/Src/NativeVertexFormat.cpp

@@ -17,14 +17,7 @@
 // http://code.google.com/p/dolphin-emu/
 
 #include "D3DBase.h"
-
-#include "Profiler.h"
-#include "x64Emitter.h"
-#include "ABI.h"
-#include "MemoryUtil.h"
-#include "VertexShaderGen.h"
-
-#include "CPMemory.h"
+#include "D3DBlob.h"
 #include "NativeVertexFormat.h"
 #include "VertexManager.h"
 #include "VertexShaderCache.h"

Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp

@@ -15,24 +15,18 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "Common.h"
 #include "FileUtil.h"
 #include "LinearDiskCache.h"
 
-#include "Globals.h"
-#include "D3DBase.h"
-#include "D3Dcompiler.h"
-#include "D3DShader.h"
+#include "Debugger.h"
 #include "Statistics.h"
 #include "VideoConfig.h"
+
+#include "D3DBase.h"
+#include "D3DShader.h"
+#include "Globals.h"
 #include "PixelShaderGen.h"
-#include "PixelShaderManager.h"
 #include "PixelShaderCache.h"
-#include "VertexLoader.h"
-#include "BPMemory.h"
-#include "XFMemory.h"
-#include "ImageWrite.h"
-#include "Debugger.h"
 
 extern int frameCount;
 

Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h

@@ -17,14 +17,12 @@
 
 #pragma once
 
-#include "Common.h"
-#include "LinearDiskCache.h"
-#include "D3DBase.h"
-
 #include <map>
 
-#include "PixelShaderGen.h"
-#include "VertexShaderGen.h"
+#include <d3d11.h>
+
+class PIXELSHADERUID;
+enum DSTALPHA_MODE;
 
 class PixelShaderCache
 {

Source/Plugins/Plugin_VideoDX11/Src/Render.cpp

@@ -15,41 +15,30 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include <list>
+#include <math.h>
+#include <strsafe.h>
 
-#include "StringUtil.h"
-#include "Common.h"
-#include "Atomic.h"
-#include "FileUtil.h"
-#include "Thread.h"
 #include "Timer.h"
-#include "Statistics.h"
-
-#include "VideoConfig.h"
-#include "main.h"
-#include "VertexManager.h"
-#include "PixelEngine.h"
-#include "Render.h"
-#include "OpcodeDecoding.h"
-#include "BPStructs.h"
-#include "XFStructs.h"
-#include "D3DUtil.h"
-#include "VertexShaderManager.h"
-#include "PixelShaderManager.h"
-#include "VertexShaderCache.h"
-#include "PixelShaderCache.h"
-#include "VertexLoaderManager.h"
-#include "TextureCache.h"
-#include "EmuWindow.h"
-#include "AVIDump.h"
-#include "OnScreenDisplay.h"
-#include "FramebufferManager.h"
-#include "Fifo.h"
-#include "DLCache.h"
 
 #include "Debugger.h"
+#include "DLCache.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 <strsafe.h>
 
 static int s_fps = 0;
 

Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp

@@ -15,30 +15,14 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include <d3dx11.h>
-
-#include "Globals.h"
-#include "Statistics.h"
-#include "MemoryUtil.h"
-#include "Hash.h"
-
-#include "CommonPaths.h"
-#include "FileUtil.h"
+#include "RenderBase.h"
 
 #include "D3DBase.h"
-#include "D3DTexture.h"
 #include "D3DUtil.h"
 #include "FramebufferManager.h"
 #include "PixelShaderCache.h"
-#include "PixelShaderManager.h"
-#include "VertexShaderManager.h"
-#include "VertexShaderCache.h"
-
-#include "Render.h"
-
-#include "TextureDecoder.h"
 #include "TextureCache.h"
-#include "HiresTextures.h"
+#include "VertexShaderCache.h"
 
 namespace DX11
 {

Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h

@@ -17,15 +17,10 @@
 
 #pragma once
 
-#include <map>
-
-#include "D3DBase.h"
-#include "D3DTexture.h"
-#include "VideoCommon.h"
-#include "BPMemory.h"
-
 #include "TextureCacheBase.h"
 
+#include "D3DTexture.h"
+
 namespace DX11
 {
 

Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp

@@ -15,32 +15,22 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include "Common.h"
-#include "FileUtil.h"
-
 #include "D3DBase.h"
-#include "D3DShader.h"
-#include "D3DUtil.h"
-#include "Fifo.h"
-#include "Statistics.h"
-#include "Profiler.h"
-#include "FramebufferManager.h"
-#include "VertexManager.h"
-#include "OpcodeDecoding.h"
-#include "IndexGenerator.h"
-#include "VertexShaderManager.h"
-#include "VertexShaderCache.h"
-#include "PixelShaderManager.h"
 #include "PixelShaderCache.h"
-#include "NativeVertexFormat.h"
-#include "TextureCache.h"
-#include "main.h"
+#include "VertexManager.h"
+#include "VertexShaderCache.h"
 
-#include "BPStructs.h"
-#include "XFStructs.h"
-
-#include "Globals.h"
+#include "BPMemory.h"
 #include "Debugger.h"
+#include "IndexGenerator.h"
+#include "MainBase.h"
+#include "PixelShaderManager.h"
+#include "Profiler.h"
+#include "RenderBase.h"
+#include "Statistics.h"
+#include "TextureCacheBase.h"
+#include "VertexShaderManager.h"
+#include "VideoConfig.h"
 
 // internal state for loading vertices
 extern NativeVertexFormat *g_nativeVertexFmt;

Source/Plugins/Plugin_VideoDX11/Src/VertexManager.h

@@ -18,11 +18,8 @@
 #ifndef _VERTEXMANAGER_H
 #define _VERTEXMANAGER_H
 
-#include "CPMemory.h"
-#include "VertexLoader.h"
-
 #include "VertexManagerBase.h"
-#include "D3DBase.h"
+
 
 namespace DX11
 {

Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp

@@ -15,23 +15,17 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include <map>
-
-#include "Common.h"
 #include "FileUtil.h"
 #include "LinearDiskCache.h"
 
-#include "Globals.h"
-#include "D3DBase.h"
-#include "D3DShader.h"
-#include "Statistics.h"
-#include "Profiler.h"
-#include "VideoConfig.h"
-#include "VertexShaderCache.h"
-#include "VertexLoader.h"
-#include "BPMemory.h"
-#include "XFMemory.h"
 #include "Debugger.h"
+#include "Profiler.h"
+#include "Statistics.h"
+#include "VertexShaderGen.h"
+
+#include "D3DShader.h"
+#include "Globals.h"
+#include "VertexShaderCache.h"
 
 VertexShaderCache::VSCache VertexShaderCache::vshaders;
 const VertexShaderCache::VSCacheEntry *VertexShaderCache::last_entry;

Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.h

@@ -18,10 +18,13 @@
 #ifndef _VERTEXSHADERCACHE_H
 #define _VERTEXSHADERCACHE_H
 
-#include "D3DBase.h"
-#include "VertexShaderGen.h"
 #include <map>
 
+#include "D3DBase.h"
+#include "D3DBlob.h"
+
+class VERTEXSHADERUID;
+
 class VertexShaderCache
 {
 public:

Source/Plugins/Plugin_VideoDX11/Src/main.cpp

@@ -15,46 +15,37 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#include <tchar.h>
-#include <windows.h>
-#include <d3dx11.h>
-
 #include <wx/wx.h>
-#include <wx/notebook.h>
 
-#include "Common.h"
-#include "Atomic.h"
-#include "Thread.h"
 #include "LogManager.h"
 
-#include "VideoConfig.h"
-#include "Fifo.h"
-#include "OpcodeDecoding.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 "PixelShaderManager.h"
-#include "CommandProcessor.h"
-#include "PixelEngine.h"
-#include "OnScreenDisplay.h"
-#include "VideoState.h"
 #include "XFBConvert.h"
-#include "Render.h"
 
-#include "MainBase.h"
-#include "main.h"
+#include "DebuggerPanel.h"
+#include "DLCache.h"
+#include "EmuWindow.h"
+#include "FileUtil.h"
+#include "Globals.h"
+#include "IniFile.h"
 #include "VideoConfigDiag.h"
+
+#include "D3DUtil.h"
+#include "D3DBase.h"
+#include "PixelShaderCache.h"
 #include "TextureCache.h"
 #include "VertexManager.h"
 #include "VertexShaderCache.h"
-#include "PixelShaderCache.h"
-#include "D3DTexture.h"
-#include "D3DUtil.h"
-#include "EmuWindow.h"
-#include "FramebufferManager.h"
-#include "DLCache.h"
-#include "DebuggerPanel.h"
-#include "IniFile.h"
+
 
 HINSTANCE g_hInstance = NULL;