Merge pull request #19951 from hrydgard/remove-dx9

Remove D3D9 support, to make future changes easier

Author: hrydgard

CMakeLists.txt

@@ -604,12 +604,6 @@ source_group(LOONGARCH64 FILES ${CommonLOONGARCH64})
 
 if(WIN32)
 	set(CommonD3D
-		Common/GPU/D3D9/D3D9ShaderCompiler.cpp
-		Common/GPU/D3D9/D3D9ShaderCompiler.h
-		Common/GPU/D3D9/D3D9StateCache.cpp
-		Common/GPU/D3D9/D3D9StateCache.h
-		Common/GPU/D3D9/thin3d_d3d9.cpp
-		Common/GPU/D3D9/D3DCompilerLoader.cpp
 		Common/GPU/D3D11/thin3d_d3d11.cpp
 		Common/GPU/D3D11/D3D11Loader.cpp
 		Common/GPU/D3D11/D3D11Loader.h
@@ -1516,7 +1510,7 @@ else()
 endif()
 
 if(WIN32)
-	target_link_libraries(Common winmm d3d9 dsound dxguid Version)
+	target_link_libraries(Common winmm dsound dxguid Version)
 endif()
 
 if(NOT LIBRETRO)
@@ -1875,21 +1869,6 @@ set(GPU_VULKAN
 	GPU/Vulkan/VulkanUtil.h
 )
 
-set(GPU_D3D9
-	GPU/Directx9/DrawEngineDX9.cpp
-	GPU/Directx9/DrawEngineDX9.h
-	GPU/Directx9/FramebufferManagerDX9.cpp
-	GPU/Directx9/FramebufferManagerDX9.h
-	GPU/Directx9/GPU_DX9.cpp
-	GPU/Directx9/GPU_DX9.h
-	GPU/Directx9/ShaderManagerDX9.cpp
-	GPU/Directx9/ShaderManagerDX9.h
-	GPU/Directx9/StateMappingDX9.cpp
-	GPU/Directx9/StateMappingDX9.h
-	GPU/Directx9/TextureCacheDX9.cpp
-	GPU/Directx9/TextureCacheDX9.h
-)
-
 set(GPU_D3D11
 	GPU/D3D11/DrawEngineD3D11.cpp
 	GPU/D3D11/DrawEngineD3D11.h
@@ -1910,7 +1889,7 @@ set(GPU_D3D11
 # We build Vulkan even on Apple to avoid annoying build differences.
 set(GPU_IMPLS ${GPU_GLES} ${GPU_VULKAN})
 if(WIN32)
-	list(APPEND GPU_IMPLS ${GPU_D3D9} ${GPU_D3D11})
+	list(APPEND GPU_IMPLS ${GPU_D3D11})
 endif()
 
 set(GPU_SOURCES
@@ -2693,8 +2672,7 @@ set(WindowsFiles
 	Windows/DSoundStream.h
 	Windows/EmuThread.cpp
 	Windows/EmuThread.h
-	Windows/GPU/D3D9Context.cpp
-	Windows/GPU/D3D9Context.h
+	Windows/GeDebugger/GeDebugger.cpp
 	Windows/GPU/D3D11Context.cpp
 	Windows/GPU/D3D11Context.h
 	Windows/GPU/WindowsGLContext.cpp
@@ -2743,7 +2721,7 @@ set(WindowsFiles
 list(APPEND LinkCommon ${CoreLibName} ${CMAKE_THREAD_LIBS_INIT})
 
 if(WIN32)
-	list(APPEND LinkCommon kernel32 user32 gdi32 shell32 comctl32 dsound xinput d3d9 winmm dinput8 ole32 winspool ksuser dwmapi mf uxtheme mfplat mfreadwrite mfuuid shlwapi)
+	list(APPEND LinkCommon kernel32 user32 gdi32 shell32 comctl32 dsound xinput winmm dinput8 ole32 winspool ksuser dwmapi mf uxtheme mfplat mfreadwrite mfuuid shlwapi)
 	#setup_target_project(${TargetBin} Windows)
 	list(APPEND NativeAppSource ${WindowsFiles})
 endif()
@@ -2800,8 +2778,6 @@ if(HEADLESS)
 		list(APPEND HeadlessSource
 			headless/WindowsHeadlessHost.cpp
 			headless/WindowsHeadlessHost.h
-			Windows/GPU/D3D9Context.cpp
-			Windows/GPU/D3D9Context.h
 			Windows/GPU/D3D11Context.cpp
 			Windows/GPU/D3D11Context.h
 			Windows/GPU/WindowsGLContext.cpp

Common/Common.vcxproj

@@ -500,9 +500,6 @@
     <ClInclude Include="File\VFS\VFS.h" />
     <ClInclude Include="File\VFS\ZipFileReader.h" />
     <ClInclude Include="GPU\D3D11\D3D11Loader.h" />
-    <ClInclude Include="GPU\D3D9\D3DCompilerLoader.h" />
-    <ClInclude Include="GPU\D3D9\D3D9ShaderCompiler.h" />
-    <ClInclude Include="GPU\D3D9\D3D9StateCache.h" />
     <ClInclude Include="GPU\DataFormat.h" />
     <ClInclude Include="GPU\GPUBackendCommon.h" />
     <ClInclude Include="GPU\MiscTypes.h" />
@@ -996,10 +993,6 @@
     <ClCompile Include="File\VFS\ZipFileReader.cpp" />
     <ClCompile Include="GPU\D3D11\D3D11Loader.cpp" />
     <ClCompile Include="GPU\D3D11\thin3d_d3d11.cpp" />
-    <ClCompile Include="GPU\D3D9\D3DCompilerLoader.cpp" />
-    <ClCompile Include="GPU\D3D9\D3D9ShaderCompiler.cpp" />
-    <ClCompile Include="GPU\D3D9\D3D9StateCache.cpp" />
-    <ClCompile Include="GPU\D3D9\thin3d_d3d9.cpp" />
     <ClCompile Include="GPU\GPUBackendCommon.cpp" />
     <ClCompile Include="GPU\OpenGL\DataFormatGL.cpp" />
     <ClCompile Include="GPU\OpenGL\gl3stub.c" />

Common/Common.vcxproj.filters

@@ -250,15 +250,6 @@
     <ClInclude Include="UI\ViewGroup.h">
       <Filter>UI</Filter>
     </ClInclude>
-    <ClInclude Include="GPU\D3D9\D3DCompilerLoader.h">
-      <Filter>GPU\D3D9</Filter>
-    </ClInclude>
-    <ClInclude Include="GPU\D3D9\D3D9ShaderCompiler.h">
-      <Filter>GPU\D3D9</Filter>
-    </ClInclude>
-    <ClInclude Include="GPU\D3D9\D3D9StateCache.h">
-      <Filter>GPU\D3D9</Filter>
-    </ClInclude>
     <ClInclude Include="GPU\D3D11\D3D11Loader.h">
       <Filter>GPU\D3D11</Filter>
     </ClInclude>
@@ -923,21 +914,9 @@
     <ClCompile Include="UI\ViewGroup.cpp">
       <Filter>UI</Filter>
     </ClCompile>
-    <ClCompile Include="GPU\D3D9\thin3d_d3d9.cpp">
-      <Filter>GPU\D3D9</Filter>
-    </ClCompile>
     <ClCompile Include="GPU\D3D11\thin3d_d3d11.cpp">
       <Filter>GPU\D3D11</Filter>
     </ClCompile>
-    <ClCompile Include="GPU\D3D9\D3DCompilerLoader.cpp">
-      <Filter>GPU\D3D9</Filter>
-    </ClCompile>
-    <ClCompile Include="GPU\D3D9\D3D9ShaderCompiler.cpp">
-      <Filter>GPU\D3D9</Filter>
-    </ClCompile>
-    <ClCompile Include="GPU\D3D9\D3D9StateCache.cpp">
-      <Filter>GPU\D3D9</Filter>
-    </ClCompile>
     <ClCompile Include="GPU\D3D11\D3D11Loader.cpp">
       <Filter>GPU\D3D11</Filter>
     </ClCompile>
@@ -1383,9 +1362,6 @@
     <Filter Include="GPU">
       <UniqueIdentifier>{3b448d70-d5c6-4732-96f0-29f3e101bfe8}</UniqueIdentifier>
     </Filter>
-    <Filter Include="GPU\D3D9">
-      <UniqueIdentifier>{a1745de8-f61a-4f11-b715-705a8812862e}</UniqueIdentifier>
-    </Filter>
     <Filter Include="GPU\D3D11">
       <UniqueIdentifier>{8241d0c2-78c8-4fc6-9543-69042ec5eb54}</UniqueIdentifier>
     </Filter>

Common/GPU/D3D11/thin3d_d3d11.cpp

@@ -357,12 +357,6 @@ D3D11DrawContext::D3D11DrawContext(ComPtr<ID3D11Device> device, ComPtr<ID3D11Dev
 
 	caps_.isTilingGPU = false;
 
-	// Hide D3D9 when we know it likely won't work well.
-	caps_.supportsD3D9 = true;
-	if (!strcmp(adapterDesc_.c_str(), "Intel(R) Iris(R) Xe Graphics")) {
-		caps_.supportsD3D9 = false;
-	}
-
 #ifndef __LIBRETRO__  // their build server uses an old SDK
 	if (swapChain_) {
 		DXGI_SWAP_CHAIN_DESC swapChainDesc;
@@ -373,6 +367,7 @@ D3D11DrawContext::D3D11DrawContext(ComPtr<ID3D11Device> device, ComPtr<ID3D11Dev
 		}
 	}
 #endif
+
 	// Temp texture for read-back of small images. Custom textures are created on demand for larger ones.
 	// TODO: Should really benchmark if this extra complexity has any benefit.
 	D3D11_TEXTURE2D_DESC packDesc{};
@@ -1650,7 +1645,6 @@ void D3D11DrawContext::CopyFramebufferImage(Framebuffer *srcfb, int level, int x
 		break;
 	case Aspect::NO_BIT:
 	case Aspect::STENCIL_BIT:
-	case Aspect::SURFACE_BIT:
 	case Aspect::VIEW_BIT:
 	case Aspect::FORMAT_BIT:
 		break;
@@ -1833,7 +1827,6 @@ bool D3D11DrawContext::CopyFramebufferToMemory(Framebuffer *src, Aspect channelB
 		}
 		break;
 	case Aspect::NO_BIT:
-	case Aspect::SURFACE_BIT:
 	case Aspect::VIEW_BIT:
 	case Aspect::FORMAT_BIT:
 		break;