From 646fd15b02e498b1701440176399e1e6f68764ae Mon Sep 17 00:00:00 2001 From: Sally Coolatta Date: Wed, 28 Oct 2020 15:16:05 -0400 Subject: [PATCH] Remove these 2 calls to HWR_UnlockCachedPatch From what I can tell, this is not in SRB2 master or next. I'm uncertain about this, but Jeck has had zero crashes with this. --- src/hardware/hw_md2.c | 2 -- src/z_zone.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/hardware/hw_md2.c b/src/hardware/hw_md2.c index fe0d1fc99..3d00252e7 100644 --- a/src/hardware/hw_md2.c +++ b/src/hardware/hw_md2.c @@ -419,7 +419,6 @@ static void md2_loadTexture(md2_t *model) } HWD.pfnSetTexture(grpatch->mipmap); - HWR_UnlockCachedPatch(grpatch); } // -----------------+ @@ -470,7 +469,6 @@ static void md2_loadBlendTexture(md2_t *model) } HWD.pfnSetTexture(grpatch->mipmap); // We do need to do this so that it can be cleared and knows to recreate it when necessary - HWR_UnlockCachedPatch(grpatch); Z_Free(filename); } diff --git a/src/z_zone.h b/src/z_zone.h index 5cbcc6655..dfb2f6c71 100644 --- a/src/z_zone.h +++ b/src/z_zone.h @@ -62,7 +62,7 @@ enum PU_CACHE_UNLOCKED = 101, // Note: unused PU_HWRCACHE_UNLOCKED = 102, // 'unlocked' PU_HWRCACHE memory: // 'second-level' cache for graphics - // stored in hardware format and downloaded as needed + // stored in hardware format and downloaded as needed PU_HWRPATCHINFO_UNLOCKED = 103, // 'unlocked' PU_HWRPATCHINFO memory PU_HWRMODELTEXTURE_UNLOCKED = 104, // 'unlocked' PU_HWRMODELTEXTURE memory };