diff --git a/targets/platform/renderer/IPlatformRenderer.h b/targets/platform/renderer/IPlatformRenderer.h index 32ab3793f..b5f8c78cc 100644 --- a/targets/platform/renderer/IPlatformRenderer.h +++ b/targets/platform/renderer/IPlatformRenderer.h @@ -9,7 +9,6 @@ public: enum eVertexType { VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1, VERTEX_TYPE_COMPRESSED, - VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1_LIT, VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1_TEXGEN, VERTEX_TYPE_COUNT }; @@ -17,7 +16,6 @@ public: enum ePixelShaderType { PIXEL_SHADER_TYPE_STANDARD, PIXEL_SHADER_TYPE_PROJECTION, - PIXEL_SHADER_TYPE_FORCELOD, PIXEL_SHADER_COUNT }; @@ -118,8 +116,6 @@ public: virtual void TextureDataUpdate(int xoffset, int yoffset, int width, int height, void* data, int level) = 0; virtual void TextureSetParam(int param, int value) = 0; - virtual void TextureDynamicUpdateStart() = 0; - virtual void TextureDynamicUpdateEnd() = 0; [[nodiscard]] virtual int LoadTextureData(const char* szFilename, D3DXIMAGE_INFO* pSrcInfo, int** ppDataOut) = 0; @@ -127,17 +123,7 @@ public: std::uint32_t byteCount, D3DXIMAGE_INFO* pSrcInfo, int** ppDataOut) = 0; - [[nodiscard]] virtual int SaveTextureData(const char* szFilename, - D3DXIMAGE_INFO* pSrcInfo, - int* ppDataOut) = 0; - [[nodiscard]] virtual int SaveTextureDataToMemory(void* pOutput, - int outputCapacity, - int* outputLength, - int width, int height, - int* ppDataIn) = 0; virtual void ReadPixels(int x, int y, int w, int h, void* buf) = 0; - virtual void TextureGetStats() = 0; - [[nodiscard]] virtual void* TextureGetTexture(int idx) = 0; // Render state virtual void StateSetColour(float r, float g, float b, float a) = 0; @@ -197,7 +183,6 @@ public: virtual void EndConditionalRendering() = 0; // Screenshots - virtual void DoScreenGrabOnNextPresent() = 0; virtual void CaptureThumbnail(ImageFileBuffer* pngOut) = 0; virtual void CaptureScreen(ImageFileBuffer* jpgOut, XSOCIAL_PREVIEWIMAGE* previewOut) = 0; diff --git a/targets/platform/renderer/IRenderPath.h b/targets/platform/renderer/IRenderPath.h index 6d585ee33..7e1af25ce 100644 --- a/targets/platform/renderer/IRenderPath.h +++ b/targets/platform/renderer/IRenderPath.h @@ -514,8 +514,6 @@ public: // Texture queries [[deprecated]] [[nodiscard]] virtual int TextureGetTextureLevels() = 0; - [[deprecated]] virtual void TextureDynamicUpdateStart() = 0; - [[deprecated]] virtual void TextureDynamicUpdateEnd() = 0; [[deprecated]] virtual void ReadPixels(int x, int y, int w, int h, void* buf) = 0; [[deprecated]] [[nodiscard]] virtual int LoadTextureData(const char* filename, void* srcInfo, int** dataOut) = 0; [[deprecated]] [[nodiscard]] virtual int LoadTextureData(uint8_t* data, uint32_t bytes, void* srcInfo, int** dataOut) = 0; diff --git a/targets/platform/renderer/gl/GLRenderer.h b/targets/platform/renderer/gl/GLRenderer.h index d5084c24b..f946da111 100644 --- a/targets/platform/renderer/gl/GLRenderer.h +++ b/targets/platform/renderer/gl/GLRenderer.h @@ -35,7 +35,6 @@ public: void SetWindowSize(int w, int h); void SetFullscreen(bool fs); void StartFrame(); - void DoScreenGrabOnNextPresent(); void Present(); void Clear(int flags); void SetClearColour(const float colourRGBA[4]); @@ -80,22 +79,13 @@ public: void TextureDataUpdate(int xoffset, int yoffset, int width, int height, void* data, int level); void TextureSetParam(int param, int value); - void TextureDynamicUpdateStart(); - void TextureDynamicUpdateEnd(); int LoadTextureData(const char* szFilename, D3DXIMAGE_INFO* pSrcInfo, int** ppDataOut); int LoadTextureData(std::uint8_t* pbData, std::uint32_t byteCount, D3DXIMAGE_INFO* pSrcInfo, int** ppDataOut); - int SaveTextureData(const char* szFilename, D3DXIMAGE_INFO* pSrcInfo, - int* ppDataOut); - int SaveTextureDataToMemory(void* pOutput, int outputCapacity, - int* outputLength, int width, int height, - int* ppDataIn); void ReadPixels(int x, int y, int w, int h, void* buf); - void TextureGetStats(); - void* TextureGetTexture(int idx); // State control void StateSetColour(float r, float g, float b, float a); diff --git a/targets/platform/renderer/gl/LegacyGLRenderPath.cpp b/targets/platform/renderer/gl/LegacyGLRenderPath.cpp index 68473324e..65b0f8e0b 100644 --- a/targets/platform/renderer/gl/LegacyGLRenderPath.cpp +++ b/targets/platform/renderer/gl/LegacyGLRenderPath.cpp @@ -422,8 +422,6 @@ bool LegacyGLRenderPath::IsWidescreen() { return Platfo bool LegacyGLRenderPath::IsHiDef() { return PlatformRenderer.IsHiDef(); } int LegacyGLRenderPath::TextureGetTextureLevels() { return PlatformRenderer.TextureGetTextureLevels(); } -void LegacyGLRenderPath::TextureDynamicUpdateStart() { PlatformRenderer.TextureDynamicUpdateStart(); } -void LegacyGLRenderPath::TextureDynamicUpdateEnd() { PlatformRenderer.TextureDynamicUpdateEnd(); } void LegacyGLRenderPath::ReadPixels(int x, int y, int w, int h, void* b) { PlatformRenderer.ReadPixels(x, y, w, h, b); } int LegacyGLRenderPath::LoadTextureData(const char* f, void* si, int** d) { return PlatformRenderer.LoadTextureData(f, static_cast(si), d); } int LegacyGLRenderPath::LoadTextureData(uint8_t* data, uint32_t bytes, void* si, int** d) { return PlatformRenderer.LoadTextureData(data, bytes, static_cast(si), d); } diff --git a/targets/platform/renderer/gl/LegacyGLRenderPath.h b/targets/platform/renderer/gl/LegacyGLRenderPath.h index 1d9bcec82..dab76d801 100644 --- a/targets/platform/renderer/gl/LegacyGLRenderPath.h +++ b/targets/platform/renderer/gl/LegacyGLRenderPath.h @@ -113,8 +113,6 @@ public: [[nodiscard]] bool IsHiDef() override; [[nodiscard]] int TextureGetTextureLevels() override; - void TextureDynamicUpdateStart() override; - void TextureDynamicUpdateEnd() override; void ReadPixels(int x, int y, int w, int h, void* buf) override; [[nodiscard]] int LoadTextureData(const char* filename, void* srcInfo, int** dataOut) override; [[nodiscard]] int LoadTextureData(uint8_t* data, uint32_t bytes, void* srcInfo, int** dataOut) override; diff --git a/targets/platform/renderer/gl/render_stubs.cpp b/targets/platform/renderer/gl/render_stubs.cpp index 531ee9f05..c178b3165 100644 --- a/targets/platform/renderer/gl/render_stubs.cpp +++ b/targets/platform/renderer/gl/render_stubs.cpp @@ -13,21 +13,7 @@ void GLRenderer::StateSetEnableViewportClipPlanes(bool) {} void GLRenderer::StateSetForceLOD(int) {} void GLRenderer::StateSetTexGenCol(int, float, float, float, float, bool) {} -// Textures -void GLRenderer::TextureDynamicUpdateStart() {} -void GLRenderer::TextureDynamicUpdateEnd() {} -void GLRenderer::TextureGetStats() {} -void* GLRenderer::TextureGetTexture(int) { return nullptr; } - -int GLRenderer::SaveTextureData(const char*, D3DXIMAGE_INFO*, int*) { - return 0; -} -int GLRenderer::SaveTextureDataToMemory(void*, int, int*, int, int, int*) { - return 0; -} - // Screen/Image Capturing -void GLRenderer::DoScreenGrabOnNextPresent() {} void GLRenderer::CaptureThumbnail(ImageFileBuffer*) {} void GLRenderer::CaptureScreen(ImageFileBuffer*, XSOCIAL_PREVIEWIMAGE*) {} @@ -43,4 +29,4 @@ void GLRenderer::Tick() {} // Lifecycle void GLRenderer::Suspend() {} bool GLRenderer::Suspended() { return false; } -void GLRenderer::Resume() {} \ No newline at end of file +void GLRenderer::Resume() {}