Skip to content

Commit c14c8d2

Browse files
committed
More buildfixes
1 parent 9d9ae3e commit c14c8d2

File tree

5 files changed

+2
-27
lines changed

5 files changed

+2
-27
lines changed

Common/GPU/thin3d_create.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ namespace Draw {
2727
DrawContext *T3DCreateGLContext(bool canChangeSwapInterval);
2828

2929
#ifdef _WIN32
30-
DrawContext *T3DCreateDX9Context(IDirect3D9 *d3d, IDirect3D9Ex *d3dEx, int adapterId, IDirect3DDevice9 *device, IDirect3DDevice9Ex *deviceEx);
3130
DrawContext *T3DCreateD3D11Context(ID3D11Device *device, ID3D11DeviceContext *context, ID3D11Device1 *device1, ID3D11DeviceContext1 *context1, IDXGISwapChain *swapChain, D3D_FEATURE_LEVEL featureLevel, HWND hWnd, const std::vector<std::string> &adapterNames, int maxInflightFrames);
3231
#endif
3332

GPU/Common/SoftwareTransformCommon.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838

3939
// There's code here that simply expands transformed RECTANGLES into plain triangles.
4040

41-
// 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.
41+
// We're gonna have to keep software transforming RECTANGLES, unless we use a geom shader which we can't on OpenGL ES 2.0.
4242
// 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
4343
// this code.
4444

GPU/Common/TextureCacheCommon.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3010,7 +3010,7 @@ void TextureCacheCommon::LoadTextureLevel(TexCacheEntry &entry, uint8_t *data, s
30103010
if (decPitch != stride) {
30113011
// Rearrange in place to match the requested pitch.
30123012
// (it can only be larger than w * bpp, and a match is likely.)
3013-
// Note! This is bad because it reads the mapped memory! TODO: Look into if DX9 does this right.
3013+
// Note! This is bad because it reads the mapped memory!
30143014
for (int y = scaledH - 1; y >= 0; --y) {
30153015
memcpy((u8 *)data + stride * y, (u8 *)data + decPitch * y, scaledW *4);
30163016
}

libretro/LibretroGraphicsContext.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -68,22 +68,6 @@ class LibretroHWRenderContext : public LibretroGraphicsContext {
6868
retro_hw_render_callback hw_render_ = {};
6969
};
7070

71-
#ifdef _WIN32
72-
class LibretroD3D9Context : public LibretroHWRenderContext {
73-
public:
74-
LibretroD3D9Context() : LibretroHWRenderContext(RETRO_HW_CONTEXT_DIRECT3D, 9) {}
75-
bool Init() override { return false; }
76-
77-
void CreateDrawContext() override {
78-
draw_ = Draw::T3DCreateDX9Context(nullptr, nullptr, 0, nullptr, nullptr);
79-
draw_->CreatePresets();
80-
}
81-
82-
GPUCore GetGPUCore() override { return GPUCORE_DIRECTX9; }
83-
const char *Ident() override { return "DirectX 9"; }
84-
};
85-
#endif
86-
8771
class LibretroSoftwareContext : public LibretroGraphicsContext {
8872
public:
8973
LibretroSoftwareContext() {}

libretro/Makefile.common

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -983,14 +983,6 @@ SOURCES_CXX += \
983983

984984

985985
ifeq ($(PLATFORM_EXT), win32)
986-
SOURCES_CXX += \
987-
$(GPUDIR)/Directx9/DrawEngineDX9.cpp \
988-
$(GPUDIR)/Directx9/FramebufferManagerDX9.cpp \
989-
$(GPUDIR)/Directx9/GPU_DX9.cpp \
990-
$(GPUDIR)/Directx9/ShaderManagerDX9.cpp \
991-
$(GPUDIR)/Directx9/StateMappingDX9.cpp \
992-
$(GPUDIR)/Directx9/TextureCacheDX9.cpp
993-
994986
SOURCES_CXX += \
995987
$(GPUDIR)/D3D11/DrawEngineD3D11.cpp \
996988
$(GPUDIR)/D3D11/FramebufferManagerD3D11.cpp \

0 commit comments

Comments
 (0)