diff --git a/Common/GPU/thin3d_create.h b/Common/GPU/thin3d_create.h index 81aba58a1e62..5d0d1d1de27f 100644 --- a/Common/GPU/thin3d_create.h +++ b/Common/GPU/thin3d_create.h @@ -27,7 +27,6 @@ namespace Draw { DrawContext *T3DCreateGLContext(bool canChangeSwapInterval); #ifdef _WIN32 -DrawContext *T3DCreateDX9Context(IDirect3D9 *d3d, IDirect3D9Ex *d3dEx, int adapterId, IDirect3DDevice9 *device, IDirect3DDevice9Ex *deviceEx); DrawContext *T3DCreateD3D11Context(ID3D11Device *device, ID3D11DeviceContext *context, ID3D11Device1 *device1, ID3D11DeviceContext1 *context1, IDXGISwapChain *swapChain, D3D_FEATURE_LEVEL featureLevel, HWND hWnd, const std::vector &adapterNames, int maxInflightFrames); #endif diff --git a/GPU/Common/SoftwareTransformCommon.cpp b/GPU/Common/SoftwareTransformCommon.cpp index dc6e8139436f..35e3b2e9408c 100644 --- a/GPU/Common/SoftwareTransformCommon.cpp +++ b/GPU/Common/SoftwareTransformCommon.cpp @@ -38,7 +38,7 @@ // There's code here that simply expands transformed RECTANGLES into plain triangles. -// We're gonna have to keep software transforming RECTANGLES, unless we use a geom shader which we can't on OpenGL ES 2.0 or DX9. +// We're gonna have to keep software transforming RECTANGLES, unless we use a geom shader which we can't on OpenGL ES 2.0. // Usually, though, these primitives don't use lighting etc so it's no biggie performance wise, but it would be nice to get rid of // this code. diff --git a/GPU/Common/TextureCacheCommon.cpp b/GPU/Common/TextureCacheCommon.cpp index 5040762b9d14..e6347135ad98 100644 --- a/GPU/Common/TextureCacheCommon.cpp +++ b/GPU/Common/TextureCacheCommon.cpp @@ -3010,7 +3010,7 @@ void TextureCacheCommon::LoadTextureLevel(TexCacheEntry &entry, uint8_t *data, s if (decPitch != stride) { // Rearrange in place to match the requested pitch. // (it can only be larger than w * bpp, and a match is likely.) - // Note! This is bad because it reads the mapped memory! TODO: Look into if DX9 does this right. + // Note! This is bad because it reads the mapped memory! for (int y = scaledH - 1; y >= 0; --y) { memcpy((u8 *)data + stride * y, (u8 *)data + decPitch * y, scaledW *4); } diff --git a/libretro/LibretroGraphicsContext.h b/libretro/LibretroGraphicsContext.h index 96e7bbd69a1d..26c6c199d0a8 100644 --- a/libretro/LibretroGraphicsContext.h +++ b/libretro/LibretroGraphicsContext.h @@ -68,22 +68,6 @@ class LibretroHWRenderContext : public LibretroGraphicsContext { retro_hw_render_callback hw_render_ = {}; }; -#ifdef _WIN32 -class LibretroD3D9Context : public LibretroHWRenderContext { -public: - LibretroD3D9Context() : LibretroHWRenderContext(RETRO_HW_CONTEXT_DIRECT3D, 9) {} - bool Init() override { return false; } - - void CreateDrawContext() override { - draw_ = Draw::T3DCreateDX9Context(nullptr, nullptr, 0, nullptr, nullptr); - draw_->CreatePresets(); - } - - GPUCore GetGPUCore() override { return GPUCORE_DIRECTX9; } - const char *Ident() override { return "DirectX 9"; } -}; -#endif - class LibretroSoftwareContext : public LibretroGraphicsContext { public: LibretroSoftwareContext() {} diff --git a/libretro/Makefile.common b/libretro/Makefile.common index 2ccc5eeeeafb..652fc5ef53ff 100644 --- a/libretro/Makefile.common +++ b/libretro/Makefile.common @@ -983,14 +983,6 @@ SOURCES_CXX += \ ifeq ($(PLATFORM_EXT), win32) -SOURCES_CXX += \ - $(GPUDIR)/Directx9/DrawEngineDX9.cpp \ - $(GPUDIR)/Directx9/FramebufferManagerDX9.cpp \ - $(GPUDIR)/Directx9/GPU_DX9.cpp \ - $(GPUDIR)/Directx9/ShaderManagerDX9.cpp \ - $(GPUDIR)/Directx9/StateMappingDX9.cpp \ - $(GPUDIR)/Directx9/TextureCacheDX9.cpp - SOURCES_CXX += \ $(GPUDIR)/D3D11/DrawEngineD3D11.cpp \ $(GPUDIR)/D3D11/FramebufferManagerD3D11.cpp \