diff --git a/miniwin/src/d3drm/backends/citro3d/renderer.cpp b/miniwin/src/d3drm/backends/citro3d/renderer.cpp index 18609dee..f9167401 100644 --- a/miniwin/src/d3drm/backends/citro3d/renderer.cpp +++ b/miniwin/src/d3drm/backends/citro3d/renderer.cpp @@ -1,3 +1,4 @@ +#include "d3drmrenderer.h" #include "d3drmrenderer_citro3d.h" #include "d3drmtexture_impl.h" #include "ddraw_impl.h" @@ -362,15 +363,6 @@ Uint32 Citro3DRenderer::GetMeshId(IDirect3DRMMesh* mesh, const MeshGroup* meshGr return (Uint32) (m_meshs.size() - 1); } -void Citro3DRenderer::GetDesc(D3DDEVICEDESC* halDesc, D3DDEVICEDESC* helDesc) -{ -} - -const char* Citro3DRenderer::GetName() -{ - return "Citro3D"; -} - void Citro3DRenderer::StartFrame() { if (g_rendering) { diff --git a/miniwin/src/internal/d3drmrenderer_citro3d.h b/miniwin/src/internal/d3drmrenderer_citro3d.h index c18f3ed1..426f75c8 100644 --- a/miniwin/src/internal/d3drmrenderer_citro3d.h +++ b/miniwin/src/internal/d3drmrenderer_citro3d.h @@ -1,6 +1,7 @@ #pragma once #include "d3drmrenderer.h" +#include "ddraw_impl.h" #include #include @@ -33,8 +34,6 @@ class Citro3DRenderer : public Direct3DRMRenderer { void SetFrustumPlanes(const Plane* frustumPlanes) override; Uint32 GetTextureId(IDirect3DRMTexture* texture, bool isUi) override; Uint32 GetMeshId(IDirect3DRMMesh* mesh, const MeshGroup* meshGroup) override; - void GetDesc(D3DDEVICEDESC* halDesc, D3DDEVICEDESC* helDesc) override; - const char* GetName() override; HRESULT BeginFrame() override; void EnableTransparency() override; void SubmitDraw( @@ -68,9 +67,6 @@ class Citro3DRenderer : public Direct3DRMRenderer { inline static void Citro3DRenderer_EnumDevice(LPD3DENUMDEVICESCALLBACK cb, void* ctx) { - GUID guid = Citro3D_GUID; - char* deviceNameDup = SDL_strdup("Citro3D"); - char* deviceDescDup = SDL_strdup("Miniwin driver"); D3DDEVICEDESC halDesc = {}; halDesc.dcmColorModel = D3DCOLOR_RGB; halDesc.dwFlags = D3DDD_DEVICEZBUFFERBITDEPTH; @@ -79,10 +75,8 @@ inline static void Citro3DRenderer_EnumDevice(LPD3DENUMDEVICESCALLBACK cb, void* halDesc.dpcTriCaps.dwTextureCaps = D3DPTEXTURECAPS_PERSPECTIVE; halDesc.dpcTriCaps.dwShadeCaps = D3DPSHADECAPS_ALPHAFLATBLEND; halDesc.dpcTriCaps.dwTextureFilterCaps = D3DPTFILTERCAPS_LINEAR; + D3DDEVICEDESC helDesc = {}; - cb(&guid, deviceNameDup, deviceDescDup, &halDesc, &helDesc, ctx); - - SDL_free(deviceDescDup); - SDL_free(deviceNameDup); + EnumDevice(cb, ctx, "Citro3D", &halDesc, &helDesc, Citro3D_GUID); }