From 8905410aa4e91c5fa9e9598c363ad7b97b4be9ff Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Mon, 30 Nov 2020 21:59:13 +0100 Subject: [PATCH] clean up --- core/hw/pvr/drkPvr.cpp | 6 ------ core/rend/TexCache.cpp | 5 +++-- core/rend/TexCache.h | 2 -- core/rend/norend/norend.cpp | 1 - core/types.h | 2 -- 5 files changed, 3 insertions(+), 13 deletions(-) diff --git a/core/hw/pvr/drkPvr.cpp b/core/hw/pvr/drkPvr.cpp index 46a51dba2..1a957746b 100644 --- a/core/hw/pvr/drkPvr.cpp +++ b/core/hw/pvr/drkPvr.cpp @@ -13,12 +13,6 @@ #include "pvr_regs.h" #include "rend/TexCache.h" -void libPvr_LockedBlockWrite (vram_block* block,u32 addr) -{ - rend_text_invl(block); -} - - void libPvr_Reset(bool hard) { KillTex = true; diff --git a/core/rend/TexCache.cpp b/core/rend/TexCache.cpp index 25221ad01..11aed9005 100644 --- a/core/rend/TexCache.cpp +++ b/core/rend/TexCache.cpp @@ -27,6 +27,7 @@ bool palette_updated; const std::array D_Adjust_LoD_Bias = { 0.f, -4.f, -2.f, -1.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f, 0.f }; +static void rend_text_invl(vram_block* bl); u32 detwiddle[2][11][1024]; //input : address in the yyyyyxxxxx format @@ -221,7 +222,7 @@ bool VramLockedWriteOffset(size_t offset) { if (lock != nullptr) { - libPvr_LockedBlockWrite(lock, (u32)offset); + rend_text_invl(lock); if (lock != nullptr) { @@ -907,7 +908,7 @@ void WriteTextureToVRam(u32 width, u32 height, u8 *data, u16 *dst) } } -void rend_text_invl(vram_block* bl) +static void rend_text_invl(vram_block* bl) { BaseTextureCacheData* tcd = (BaseTextureCacheData*)bl->userdata; tcd->dirty = FrameCount; diff --git a/core/rend/TexCache.h b/core/rend/TexCache.h index 6f0073267..9f9debfdf 100644 --- a/core/rend/TexCache.h +++ b/core/rend/TexCache.h @@ -820,8 +820,6 @@ private: const TCW TCWTextureCacheMask = { { 0x1FFFFF, 0, 0, 1, 7, 1, 1 } }; }; -void rend_text_invl(vram_block* bl); - void ReadFramebuffer(PixelBuffer& pb, int& width, int& height); void WriteTextureToVRam(u32 width, u32 height, u8 *data, u16 *dst); diff --git a/core/rend/norend/norend.cpp b/core/rend/norend/norend.cpp index 642224ff4..e953ca657 100644 --- a/core/rend/norend/norend.cpp +++ b/core/rend/norend/norend.cpp @@ -3,7 +3,6 @@ #include "hw/pvr/Renderer_if.h" void rend_set_fb_scale(float x,float y) { } -void rend_text_invl(vram_block* bl) { } struct norend : Renderer { diff --git a/core/types.h b/core/types.h index 58990ba38..126d5aebf 100644 --- a/core/types.h +++ b/core/types.h @@ -518,8 +518,6 @@ s32 libPvr_Init(); void libPvr_Reset(bool Manual); void libPvr_Term(); -void libPvr_LockedBlockWrite(vram_block* block,u32 addr); //set to 0 if not used - void* libPvr_GetRenderTarget(); //GDR