diff --git a/lib/ati3dcif/DllMain.cpp b/lib/ati3dcif/DllMain.cpp index a7fe3b4b5..b973d80e9 100644 --- a/lib/ati3dcif/DllMain.cpp +++ b/lib/ati3dcif/DllMain.cpp @@ -179,21 +179,6 @@ C3D_EC WINAPI ATI3DCIF_TexturePaletteDestroy(C3D_HTXPAL htxpalToDestroy) return C3D_EC_OK; } -C3D_EC WINAPI ATI3DCIF_TexturePaletteAnimate(C3D_HTXPAL htxpalToAnimate, C3D_UINT32 u32StartIndex, C3D_UINT32 u32NumEntries, C3D_PPALETTENTRY pclrPalette) -{ - LOG_TRACE("0x%p, %d, %d, 0x%p", htxpalToAnimate, u32StartIndex, - u32NumEntries, *pclrPalette); - - try { - renderer->texturePaletteAnimate( - htxpalToAnimate, u32StartIndex, u32NumEntries, pclrPalette); - } catch (...) { - return HandleException(); - } - - return C3D_EC_OK; -} - C3D_HRC WINAPI ATI3DCIF_ContextCreate(void) { LOG_TRACE(""); @@ -270,13 +255,6 @@ C3D_EC WINAPI ATI3DCIF_RenderEnd(void) return C3D_EC_OK; } -C3D_EC WINAPI ATI3DCIF_RenderSwitch(C3D_HRC hRC) -{ - LOG_TRACE("0x%p", hRC); - // function has officially never been implemented - return C3D_EC_NOTIMPYET; -} - C3D_EC WINAPI ATI3DCIF_RenderPrimStrip(C3D_VSTRIP vStrip, C3D_UINT32 u32NumVert) { LOG_TRACE("0x%p, %d", vStrip, u32NumVert); @@ -303,14 +281,6 @@ C3D_EC WINAPI ATI3DCIF_RenderPrimList(C3D_VLIST vList, C3D_UINT32 u32NumVert) return C3D_EC_OK; } -C3D_EC WINAPI ATI3DCIF_RenderPrimMesh(C3D_PVARRAY vMesh, C3D_PUINT32 pu32Indicies, C3D_UINT32 u32NumIndicies) -{ - LOG_TRACE("0x%p, %d", vMesh, u32NumIndicies); - - // TODO - return C3D_EC_NOTIMPYET; -} - C3D_EC __declspec(dllexport) (*WINAPI ATI3DCIF_Term_lib)(void) = ATI3DCIF_Term; C3D_EC __declspec(dllexport) (*WINAPI ATI3DCIF_Init_lib)(void) = ATI3DCIF_Init; C3D_EC __declspec(dllexport) (*WINAPI ATI3DCIF_GetInfo_lib)(PC3D_3DCIFINFO p3DCIFInfo) = ATI3DCIF_GetInfo; @@ -318,16 +288,13 @@ C3D_EC __declspec(dllexport) (*WINAPI ATI3DCIF_TextureReg_lib)(C3D_PTMAP ptmapTo C3D_EC __declspec(dllexport) (*WINAPI ATI3DCIF_TextureUnreg_lib)(C3D_HTX htxToUnreg) = ATI3DCIF_TextureUnreg; C3D_EC __declspec(dllexport) (*WINAPI ATI3DCIF_TexturePaletteCreate_lib)(C3D_ECI_TMAP_TYPE epalette, void* pPalette, C3D_PHTXPAL phtpalCreated) = ATI3DCIF_TexturePaletteCreate; C3D_EC __declspec(dllexport) (*WINAPI ATI3DCIF_TexturePaletteDestroy_lib)(C3D_HTXPAL htxpalToDestroy) = ATI3DCIF_TexturePaletteDestroy; -C3D_EC __declspec(dllexport) (*WINAPI ATI3DCIF_TexturePaletteAnimate_lib)(C3D_HTXPAL htxpalToAnimate, C3D_UINT32 u32StartIndex, C3D_UINT32 u32NumEntries, C3D_PPALETTENTRY pclrPalette) = ATI3DCIF_TexturePaletteAnimate; C3D_HRC __declspec(dllexport) (*WINAPI ATI3DCIF_ContextCreate_lib)(void) = ATI3DCIF_ContextCreate; C3D_EC __declspec(dllexport) (*WINAPI ATI3DCIF_ContextDestroy_lib)(C3D_HRC hRC) = ATI3DCIF_ContextDestroy; C3D_EC __declspec(dllexport) (*WINAPI ATI3DCIF_ContextSetState_lib)(C3D_HRC hRC, C3D_ERSID eRStateID, C3D_PRSDATA pRStateData) = ATI3DCIF_ContextSetState; C3D_EC __declspec(dllexport) (*WINAPI ATI3DCIF_RenderBegin_lib)(C3D_HRC hRC) = ATI3DCIF_RenderBegin; C3D_EC __declspec(dllexport) (*WINAPI ATI3DCIF_RenderEnd_lib)(void) = ATI3DCIF_RenderEnd; -C3D_EC __declspec(dllexport) (*WINAPI ATI3DCIF_RenderSwitch_lib)(C3D_HRC hRC) = ATI3DCIF_RenderSwitch; C3D_EC __declspec(dllexport) (*WINAPI ATI3DCIF_RenderPrimStrip_lib)(C3D_VSTRIP vStrip, C3D_UINT32 u32NumVert) = ATI3DCIF_RenderPrimStrip; C3D_EC __declspec(dllexport) (*WINAPI ATI3DCIF_RenderPrimList_lib)(C3D_VLIST vList, C3D_UINT32 u32NumVert) = ATI3DCIF_RenderPrimList; -C3D_EC __declspec(dllexport) (*WINAPI ATI3DCIF_RenderPrimMesh_lib)(C3D_PVARRAY vMesh, C3D_PUINT32 pu32Indicies, C3D_UINT32 u32NumIndicies) = ATI3DCIF_RenderPrimMesh; } // extern "C" diff --git a/lib/ati3dcif/Renderer.cpp b/lib/ati3dcif/Renderer.cpp index 6547c398e..8b6467022 100644 --- a/lib/ati3dcif/Renderer.cpp +++ b/lib/ati3dcif/Renderer.cpp @@ -197,13 +197,6 @@ void Renderer::texturePaletteDestroy(C3D_HTXPAL htxpalToDestroy) m_palettes.erase(htxpalToDestroy); } -void Renderer::texturePaletteAnimate(C3D_HTXPAL htxpalToAnimate, - C3D_UINT32 u32StartIndex, C3D_UINT32 u32NumEntries, - C3D_PPALETTENTRY pclrPalette) -{ - throw Error(std::string(__FUNCTION__) + ": Not implemented", C3D_EC_NOTIMPYET); -} - void Renderer::renderPrimStrip(C3D_VSTRIP vStrip, C3D_UINT32 u32NumVert) { m_context.setRendered(); diff --git a/lib/ati3dcif/Renderer.hpp b/lib/ati3dcif/Renderer.hpp index 172add0f0..d4df22f6f 100644 --- a/lib/ati3dcif/Renderer.hpp +++ b/lib/ati3dcif/Renderer.hpp @@ -81,8 +81,6 @@ public: void textureUnreg(C3D_HTX); void texturePaletteCreate(C3D_ECI_TMAP_TYPE, void*, C3D_PHTXPAL); void texturePaletteDestroy(C3D_HTXPAL); - void texturePaletteAnimate( - C3D_HTXPAL, C3D_UINT32, C3D_UINT32, C3D_PPALETTENTRY); void renderPrimStrip(C3D_VSTRIP, C3D_UINT32); void renderPrimList(C3D_VLIST, C3D_UINT32); void setState(C3D_ERSID eRStateID, C3D_PRSDATA pRStateData);