Skip to content
Permalink
Browse files

Eliminated the plugin interface. Merged DX9/DX11/OGL video plugins in…

…to Dolphin. It could still use a lot of cleanup. Lots of things are still named "plugin". Software renderer is temporarily disabled until it gets some namespaces. I only updated vs08/10, Linux/OSX builds are broken.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6996 8ced0084-cf51-0410-be5f-012b33b47a6e
  • Loading branch information...
jordan-woyak committed Jan 31, 2011
1 parent ae7c64e commit fbaf9659958cd6d8c0df6b0c217f6e60f57f9d77
Showing with 1,536 additions and 3,411 deletions.
  1. +13 −49 Source/Core/Common/Common.vcproj
  2. +2 −8 Source/Core/Common/Common.vcxproj
  3. +0 −166 Source/Core/Common/Src/DynamicLibrary.cpp
  4. +0 −59 Source/Core/Common/Src/DynamicLibrary.h
  5. +0 −135 Source/Core/Common/Src/Plugin.cpp
  6. +0 −75 Source/Core/Common/Src/Plugin.h
  7. +0 −104 Source/Core/Common/Src/PluginVideo.cpp
  8. +0 −79 Source/Core/Common/Src/PluginVideo.h
  9. +58 −0 Source/Core/Common/Src/VideoBackendBase.cpp
  10. +156 −0 Source/Core/Common/Src/VideoBackendBase.h
  11. +7 −15 Source/Core/Core/Core.vcproj
  12. +59 −9 Source/Core/Core/Core.vcxproj
  13. +2 −1 Source/Core/Core/Src/ConfigManager.cpp
  14. +26 −73 Source/Core/Core/Src/Core.cpp
  15. +7 −0 Source/Core/Core/Src/Core.h
  16. +2 −2 Source/Core/Core/Src/CoreTiming.cpp
  17. +4 −7 Source/Core/Core/Src/HW/CPU.cpp
  18. +0 −1 Source/Core/Core/Src/HW/DSP.cpp
  19. +1 −0 Source/Core/Core/Src/HW/DSPLLE/DSPLLE.h
  20. +4 −7 Source/Core/Core/Src/HW/GPFifo.cpp
  21. +0 −1 Source/Core/Core/Src/HW/HW.cpp
  22. +12 −12 Source/Core/Core/Src/HW/Memmap.cpp
  23. +5 −5 Source/Core/Core/Src/HW/MemmapFunctions.cpp
  24. +3 −2 Source/Core/Core/Src/HW/ProcessorInterface.cpp
  25. +0 −2 Source/Core/Core/Src/HW/SI_DeviceAMBaseboard.cpp
  26. +0 −1 Source/Core/Core/Src/HW/SI_DeviceGCController.h
  27. +2 −3 Source/Core/Core/Src/HW/SystemTimers.cpp
  28. +6 −10 Source/Core/Core/Src/HW/VideoInterface.cpp
  29. +0 −1 Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_WiiMote.cpp
  30. +3 −3 Source/Core/Core/Src/LuaInterface.cpp
  31. +3 −3 Source/Core/Core/Src/OnFrame.cpp
  32. +1 −0 Source/Core/Core/Src/PluginDSP.h
  33. +0 −295 Source/Core/Core/Src/PluginManager.cpp
  34. +0 −79 Source/Core/Core/Src/PluginManager.h
  35. +2 −3 Source/Core/Core/Src/State.cpp
  36. +0 −1 Source/Core/DebuggerWX/Src/CodeWindow.cpp
  37. +18 −23 Source/Core/DebuggerWX/Src/CodeWindowFunctions.cpp
  38. +28 −7 Source/Core/DolphinWX/Dolphin.vcxproj
  39. +202 −327 Source/Core/DolphinWX/Src/ConfigMain.cpp
  40. +0 −6 Source/Core/DolphinWX/Src/ConfigMain.h
  41. +2 −4 Source/Core/DolphinWX/Src/Frame.cpp
  42. +0 −1 Source/Core/DolphinWX/Src/FrameAui.cpp
  43. +4 −14 Source/Core/DolphinWX/Src/FrameTools.cpp
  44. +6 −5 Source/Core/DolphinWX/Src/Main.cpp
  45. +4 −2 Source/Core/VideoCommon/Src/BPFunctions.cpp
  46. +38 −30 Source/Core/VideoCommon/Src/CommandProcessor.cpp
  47. +1 −1 Source/Core/VideoCommon/Src/CommandProcessor.h
  48. +8 −7 Source/Core/VideoCommon/Src/DLCache.cpp
  49. +2 −2 Source/Core/VideoCommon/Src/Debugger.cpp
  50. +4 −3 Source/Core/VideoCommon/Src/EmuWindow.cpp
  51. +5 −5 Source/Core/VideoCommon/Src/Fifo.cpp
  52. +2 −2 Source/Core/VideoCommon/Src/Fifo.h
  53. +23 −46 Source/Core/VideoCommon/Src/MainBase.cpp
  54. +11 −8 Source/Core/VideoCommon/Src/OpcodeDecoding.cpp
  55. +16 −13 Source/Core/VideoCommon/Src/PixelEngine.cpp
  56. +24 −7 Source/Core/VideoCommon/Src/PixelShaderManager.cpp
  57. +0 −4 Source/Core/VideoCommon/Src/PixelShaderManager.h
  58. +0 −3 Source/Core/VideoCommon/Src/RenderBase.cpp
  59. +11 −3 Source/Core/VideoCommon/Src/RenderBase.h
  60. +8 −9 Source/Core/VideoCommon/Src/TextureCacheBase.cpp
  61. +3 −2 Source/Core/VideoCommon/Src/TextureConversionShader.cpp
  62. +2 −1 Source/Core/VideoCommon/Src/VertexLoader.cpp
  63. +3 −2 Source/Core/VideoCommon/Src/VertexLoaderManager.cpp
  64. +22 −0 Source/Core/VideoCommon/Src/VertexShaderManager.cpp
  65. +0 −6 Source/Core/VideoCommon/Src/VertexShaderManager.h
  66. +1 −39 Source/Core/VideoCommon/Src/VideoCommon.h
  67. +4 −1 Source/Core/VideoCommon/Src/VideoConfig.cpp
  68. +2 −1 Source/Core/VideoCommon/Src/XFStructs.cpp
  69. +7 −7 Source/Core/VideoCommon/VideoCommon.vcxproj
  70. +2 −3 Source/Core/VideoUICommon/Src/DebuggerPanel.cpp
  71. +9 −6 Source/Dolphin.sln
  72. +1 −41 Source/Dolphin_2010.sln
  73. +0 −6 Source/PluginSpecs/ExportEpilog.h
  74. +0 −15 Source/PluginSpecs/ExportProlog.h
  75. +14 −120 Source/PluginSpecs/PluginSpecs.h
  76. +0 −208 Source/PluginSpecs/pluginspecs_video.h
  77. +19 −130 Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcproj
  78. +12 −10 Source/Plugins/Plugin_VideoDX11/Plugin_VideoDX11.vcxproj
  79. +0 −4 Source/Plugins/Plugin_VideoDX11/Src/Globals.h
  80. +5 −5 Source/Plugins/Plugin_VideoDX11/Src/NativeVertexFormat.cpp
  81. +8 −8 Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.cpp
  82. +3 −2 Source/Plugins/Plugin_VideoDX11/Src/PixelShaderCache.h
  83. +6 −6 Source/Plugins/Plugin_VideoDX11/Src/Render.cpp
  84. +9 −0 Source/Plugins/Plugin_VideoDX11/Src/Render.h
  85. +10 −8 Source/Plugins/Plugin_VideoDX11/Src/VertexShaderCache.cpp
  86. +27 −0 Source/Plugins/Plugin_VideoDX11/Src/VideoBackend.h
  87. +42 −118 Source/Plugins/Plugin_VideoDX11/Src/main.cpp
  88. +0 −3 Source/Plugins/Plugin_VideoDX11/Src/main.h
  89. +19 −130 Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj
  90. +14 −12 Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcxproj
  91. +2 −1 Source/Plugins/Plugin_VideoDX9/Src/FramebufferManager.cpp
  92. +0 −4 Source/Plugins/Plugin_VideoDX9/Src/Globals.h
  93. +5 −5 Source/Plugins/Plugin_VideoDX9/Src/NativeVertexFormat.cpp
  94. +7 −7 Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp
  95. +6 −5 Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
  96. +9 −0 Source/Plugins/Plugin_VideoDX9/Src/Render.h
  97. +4 −3 Source/Plugins/Plugin_VideoDX9/Src/TextureConverter.cpp
  98. +8 −8 Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp
  99. +27 −0 Source/Plugins/Plugin_VideoDX9/Src/VideoBackend.h
  100. +40 −121 Source/Plugins/Plugin_VideoDX9/Src/main.cpp
  101. +3 −3 Source/Plugins/Plugin_VideoDX9/Src/main.h
  102. +31 −129 Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcproj
  103. +36 −10 Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj
  104. +2 −3 Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
  105. +29 −19 Source/Plugins/Plugin_VideoOGL/Src/GLUtil.cpp
  106. +1 −2 Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
  107. +0 −4 Source/Plugins/Plugin_VideoOGL/Src/Globals.h
  108. +5 −7 Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
  109. +9 −5 Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
  110. +9 −0 Source/Plugins/Plugin_VideoOGL/Src/Render.h
  111. +6 −4 Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
  112. +6 −6 Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
  113. +27 −0 Source/Plugins/Plugin_VideoOGL/Src/VideoBackend.h
  114. +24 −118 Source/Plugins/Plugin_VideoOGL/Src/main.cpp
  115. +0 −3 Source/Plugins/Plugin_VideoOGL/Src/main.h
  116. +21 −100 Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcproj
  117. +17 −17 Source/Plugins/Plugin_VideoSoftware/Plugin_VideoSoftware.vcxproj
  118. +6 −6 Source/Plugins/Plugin_VideoSoftware/Src/BPMemLoader.cpp
  119. +2 −2 Source/Plugins/Plugin_VideoSoftware/Src/CPMemLoader.cpp
  120. +15 −11 Source/Plugins/Plugin_VideoSoftware/Src/CommandProcessor.cpp
  121. +2 −2 Source/Plugins/Plugin_VideoSoftware/Src/CommandProcessor.h
  122. +5 −4 Source/Plugins/Plugin_VideoSoftware/Src/EfbCopy.cpp
  123. +15 −10 Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.cpp
  124. +1 −2 Source/Plugins/Plugin_VideoSoftware/Src/GLUtil.h
  125. +2 −1 Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.cpp
  126. +1 −1 Source/Plugins/Plugin_VideoSoftware/Src/OpcodeDecoder.h
  127. +13 −11 Source/Plugins/Plugin_VideoSoftware/Src/PixelEngine.cpp
  128. +1 −1 Source/Plugins/Plugin_VideoSoftware/Src/PixelEngine.h
  129. +4 −7 Source/Plugins/Plugin_VideoSoftware/Src/Renderer.cpp
  130. +2 −2 Source/Plugins/Plugin_VideoSoftware/Src/Renderer.h
  131. +2 −1 Source/Plugins/Plugin_VideoSoftware/Src/TextureSampler.cpp
  132. +46 −0 Source/Plugins/Plugin_VideoSoftware/Src/VideoBackend.h
  133. +11 −48 Source/Plugins/Plugin_VideoSoftware/Src/Win32.cpp
  134. +2 −2 Source/Plugins/Plugin_VideoSoftware/Src/XFMemLoader.cpp
  135. +32 −76 Source/Plugins/Plugin_VideoSoftware/Src/main.cpp
  136. +1 −3 Source/Plugins/Plugin_VideoSoftware/Src/main.h
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="9,00"
Version="9.00"
Name="Common"
ProjectGUID="{C573CAF7-EE6A-458E-8049-16C0BF34C2E9}"
RootNamespace="Common"
@@ -453,46 +453,6 @@
<References>
</References>
<Files>
<Filter
Name="Plugins"
>
<File
RelativePath=".\Src\Plugin.cpp"
>
</File>
<File
RelativePath=".\Src\Plugin.h"
>
</File>
<File
RelativePath=".\Src\PluginVideo.cpp"
>
</File>
<File
RelativePath=".\Src\PluginVideo.h"
>
</File>
<Filter
Name="Specs"
>
<File
RelativePath="..\..\PluginSpecs\ExportEpilog.h"
>
</File>
<File
RelativePath="..\..\PluginSpecs\ExportProlog.h"
>
</File>
<File
RelativePath="..\..\PluginSpecs\PluginSpecs.h"
>
</File>
<File
RelativePath="..\..\PluginSpecs\pluginspecs_video.h"
>
</File>
</Filter>
</Filter>
<Filter
Name="Logging"
>
@@ -641,14 +601,6 @@
RelativePath=".\Src\DebugInterface.h"
>
</File>
<File
RelativePath=".\Src\DynamicLibrary.cpp"
>
</File>
<File
RelativePath=".\Src\DynamicLibrary.h"
>
</File>
<File
RelativePath=".\Src\ExtendedTrace.cpp"
>
@@ -761,6 +713,10 @@
RelativePath=".\Src\OpenCL.h"
>
</File>
<File
RelativePath="..\..\PluginSpecs\PluginSpecs.h"
>
</File>
<File
RelativePath=".\Src\SConscript"
>
@@ -897,6 +853,14 @@
RelativePath=".\Src\Version.cpp"
>
</File>
<File
RelativePath=".\Src\VideoBackendBase.cpp"
>
</File>
<File
RelativePath=".\Src\VideoBackendBase.h"
>
</File>
<File
RelativePath=".\Src\x64Analyzer.cpp"
>
@@ -242,7 +242,6 @@
<ClCompile Include="Src\Crypto\ec.cpp" />
<ClCompile Include="Src\Crypto\md5.cpp" />
<ClCompile Include="Src\Crypto\sha1.cpp" />
<ClCompile Include="Src\DynamicLibrary.cpp" />
<ClCompile Include="Src\ExtendedTrace.cpp" />
<ClCompile Include="Src\FileSearch.cpp" />
<ClCompile Include="Src\FileUtil.cpp" />
@@ -256,9 +255,6 @@
<ClCompile Include="Src\MsgHandler.cpp" />
<ClCompile Include="Src\NandPaths.cpp" />
<ClCompile Include="Src\OpenCL.cpp" />
<ClCompile Include="Src\Plugin.cpp" />
<ClCompile Include="Src\PluginDSP.cpp" />
<ClCompile Include="Src\PluginVideo.cpp" />
<ClCompile Include="Src\SDCardUtil.cpp" />
<ClCompile Include="Src\stdafx.cpp">
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
@@ -275,6 +271,7 @@
<ClCompile Include="Src\Thunk.cpp" />
<ClCompile Include="Src\Timer.cpp" />
<ClCompile Include="Src\Version.cpp" />
<ClCompile Include="Src\VideoBackendBase.cpp" />
<ClCompile Include="Src\x64Analyzer.cpp" />
<ClCompile Include="Src\x64Emitter.cpp" />
</ItemGroup>
@@ -299,7 +296,6 @@
<ClInclude Include="Src\Crypto\sha1.h" />
<ClInclude Include="Src\Crypto\tools.h" />
<ClInclude Include="Src\DebugInterface.h" />
<ClInclude Include="Src\DynamicLibrary.h" />
<ClInclude Include="Src\ExtendedTrace.h" />
<ClInclude Include="Src\FifoQueue.h" />
<ClInclude Include="Src\FileSearch.h" />
@@ -316,9 +312,7 @@
<ClInclude Include="Src\MsgHandler.h" />
<ClInclude Include="Src\NandPaths.h" />
<ClInclude Include="Src\OpenCL.h" />
<ClInclude Include="Src\Plugin.h" />
<ClInclude Include="Src\PluginDSP.h" />
<ClInclude Include="Src\PluginVideo.h" />
<ClInclude Include="Src\VideoBackendBase.h" />
<ClInclude Include="Src\SDCardUtil.h" />
<ClInclude Include="Src\Setup.h" />
<ClInclude Include="Src\stdafx.h" />

This file was deleted.

This file was deleted.

0 comments on commit fbaf965

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