diff --git a/miniwin/miniwin/include/miniwin_d3drm.h b/miniwin/miniwin/include/miniwin_d3drm.h index c2835e89..dfd8b66f 100644 --- a/miniwin/miniwin/include/miniwin_d3drm.h +++ b/miniwin/miniwin/include/miniwin_d3drm.h @@ -145,7 +145,6 @@ struct D3DRMVERTEX { }; struct IDirect3DRMObject : public IUnknown { - virtual HRESULT Clone(void** ppObject) = 0; virtual HRESULT AddDestroyCallback(D3DRMOBJECTCALLBACK callback, void* arg) = 0; virtual HRESULT DeleteDestroyCallback(D3DRMOBJECTCALLBACK callback, void* arg) = 0; virtual HRESULT SetAppData(LPD3DRM_APPDATA appData) = 0; diff --git a/miniwin/miniwin/src/miniwin_d3drm.cpp b/miniwin/miniwin/src/miniwin_d3drm.cpp index b4ed7f87..6bd62a08 100644 --- a/miniwin/miniwin/src/miniwin_d3drm.cpp +++ b/miniwin/miniwin/src/miniwin_d3drm.cpp @@ -188,11 +188,6 @@ struct Direct3DRMObjectBase : public T { }; struct Direct3DRMMeshImpl : public Direct3DRMObjectBase { - HRESULT Clone(void** ppObject) override - { - *ppObject = static_cast(new Direct3DRMMeshImpl); - return DD_OK; - } HRESULT Clone(int flags, GUID iid, void** object) override { if (SDL_memcmp(&iid, &IID_IDirect3DRMMesh, sizeof(GUID)) == 0) { @@ -259,11 +254,6 @@ struct Direct3DRMTextureImpl : public Direct3DRMObjectBase SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Direct3DRMTextureImpl does not implement guid"); return E_NOINTERFACE; } - HRESULT Clone(void** ppObject) override - { - *ppObject = static_cast(new Direct3DRMTextureImpl); - return DD_OK; - } HRESULT Changed(BOOL pixels, BOOL palette) override { return DD_OK; } }; @@ -274,11 +264,6 @@ struct Direct3DRMDevice2Impl : public Direct3DRMObjectBase { m_viewports->AddRef(); } ~Direct3DRMDevice2Impl() override { m_viewports->Release(); } - HRESULT Clone(void** ppObject) override - { - *ppObject = static_cast(new Direct3DRMDevice2Impl); - return DD_OK; - } unsigned int GetWidth() override { return 640; } unsigned int GetHeight() override { return 480; } HRESULT SetBufferCount(int count) override { return DD_OK; } @@ -324,11 +309,6 @@ struct Direct3DRMFrameImpl : public Direct3DRMObjectBase { m_texture->Release(); } } - HRESULT Clone(void** ppObject) override - { - *ppObject = static_cast(new Direct3DRMFrameImpl); - return DD_OK; - } HRESULT AddChild(IDirect3DRMFrame* child) override { return m_children->AddElement(child); } HRESULT DeleteChild(IDirect3DRMFrame* child) override { return m_children->DeleteElement(child); } HRESULT SetSceneBackgroundRGB(float r, float g, float b) override { return DD_OK; } @@ -390,11 +370,6 @@ struct Direct3DRMFrameImpl : public Direct3DRMObjectBase { }; struct Direct3DRMViewportImpl : public Direct3DRMObjectBase { - HRESULT Clone(void** ppObject) override - { - *ppObject = static_cast(new Direct3DRMViewportImpl); - return DD_OK; - } HRESULT Render(IDirect3DRMFrame* group) override { return DD_OK; } HRESULT ForceUpdate(int x, int y, int w, int h) override { return DD_OK; } HRESULT Clear() override { return DD_OK; } @@ -427,21 +402,10 @@ struct Direct3DRMViewportImpl : public Direct3DRMObjectBase }; struct Direct3DRMLightImpl : public Direct3DRMObjectBase { - HRESULT Clone(void** ppObject) override - { - *ppObject = static_cast(new Direct3DRMLightImpl); - return DD_OK; - } HRESULT SetColorRGB(float r, float g, float b) override { return DD_OK; } }; -struct Direct3DRMMaterialImpl : public Direct3DRMObjectBase { - HRESULT Clone(void** ppObject) override - { - *ppObject = static_cast(new Direct3DRMMaterialImpl); - return DD_OK; - } -}; +struct Direct3DRMMaterialImpl : public Direct3DRMObjectBase {}; struct Direct3DRMImpl : virtual public IDirect3DRM2 { // IUnknown interface