Some work on merging the video plugins: Added a new plugin to the solution(shouldn...
commit34b4b8767e7a37cb93cf979cb04f6ee508a09c47
authorBilliard26 <Billiard26@8ced0084-cf51-0410-be5f-012b33b47a6e>
Mon, 20 Sep 2010 21:45:47 +0000 (20 21:45 +0000)
committerBilliard26 <Billiard26@8ced0084-cf51-0410-be5f-012b33b47a6e>
Mon, 20 Sep 2010 21:45:47 +0000 (20 21:45 +0000)
treed47c3f18b9ff118419c171cd7854f94cc535e5ae
parent1b839046f43c277d45d2b01c52998e578c18ff84
Some work on merging the video plugins: Added a new plugin to the solution(shouldn't build by default) which combines the DX9, DX11, and OGL plugins with their common code merged (and some things temporarily removed). In it's current state the plugin is hardly usable. Perhaps someone with knowledge of the video plugins will be able to fix the things I have broken more easily than me(or point me in the right direction). I will continue to work on it as well.

Main Issues:
DX11 is functional with a ~2MB/s mem leak.
OpenGL/DirectX9 have a black display while game runs. (DirectX 9 flashes good display on emulation stop)
Too many virtual function calls. (once everything is working, I will work on removing them)
Won't build on non-Windows in its current state. (mainly EmuWindow will need changes for Linux/OS X)
Probably other stuff.

git-svn-id: http://dolphin-emu.googlecode.com/svn/trunk@6219 8ced0084-cf51-0410-be5f-012b33b47a6e
94 files changed:
Source/Core/VideoCommon/Src/VideoCommon.h
Source/Dolphin.sln
Source/Plugins/Plugin_VideoMerge/Plugin_VideoMerge.vcproj [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/BPFunctions.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_D3DBase.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_D3DBase.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_D3DBlob.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_D3DBlob.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_D3DShader.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_D3DShader.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_D3DTexture.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_D3DTexture.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_D3DUtil.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_D3DUtil.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_FramebufferManager.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_FramebufferManager.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_GfxState.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_GfxState.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_NativeVertexFormat.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_PixelShaderCache.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_PixelShaderCache.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_Render.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_Render.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_TextureCache.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_TextureCache.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_VertexManager.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_VertexManager.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_VertexShaderCache.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX11/DX11_VertexShaderCache.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_D3DBase.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_D3DBase.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_D3DShader.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_D3DShader.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_D3DTexture.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_D3DTexture.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_D3DUtil.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_D3DUtil.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_FramebufferManager.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_FramebufferManager.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_NativeVertexFormat.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_PixelShaderCache.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_PixelShaderCache.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_Render.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_Render.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_TextureCache.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_TextureCache.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_TextureConverter.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_TextureConverter.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_VertexManager.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_VertexManager.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_VertexShaderCache.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/DX9/DX9_VertexShaderCache.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/EmuWindow.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/EmuWindow.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/FramebufferManager.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/FramebufferManager.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/Main.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/Main.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_FramebufferManager.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_FramebufferManager.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_GLUtil.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_GLUtil.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_GLWindow.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_NativeVertexFormat.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_PixelShaderCache.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_PixelShaderCache.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_PostProcessing.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_PostProcessing.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_RasterFont.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_RasterFont.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_Render.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_Render.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_TextureCache.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_TextureCache.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_TextureConverter.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_TextureConverter.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_VertexManager.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_VertexManager.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_VertexShaderCache.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_VertexShaderCache.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_XFB.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/OGL/OGL_XFB.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/PixelShaderCache.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/PixelShaderCache.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/Renderer.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/Renderer.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/TextureCache.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/TextureCache.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/VertexManager.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/VertexManager.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/VertexShaderCache.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/VertexShaderCache.h [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/VideoConfigDiag.cpp [new file with mode: 0644]
Source/Plugins/Plugin_VideoMerge/Src/VideoConfigDiag.h [new file with mode: 0644]