From 79be48783324bc6e1732959dbd9d6d24c2faaccc Mon Sep 17 00:00:00 2001 From: Alug Date: Thu, 25 Jan 2024 15:14:03 +0100 Subject: [PATCH] fix merge conflict --- src/hardware/hw_cache.c | 6 ++---- src/hardware/hw_glob.h | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c index 884910363..27af1d3f8 100644 --- a/src/hardware/hw_cache.c +++ b/src/hardware/hw_cache.c @@ -215,8 +215,7 @@ bpp = format2bpp(grMipmap->format); // Create a composite texture from patches, adapt the texture size to a power of 2 // height and width for the hardware texture cache. // -static void HWR_GenerateTexture(INT32 texnum, GLTexture_t *grtex) -static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *grtex, boolean noencore) +static void HWR_GenerateTexture(INT32 texnum, GLMapTexture_t *grtex) { UINT8 *block; texture_t *texture; @@ -450,8 +449,7 @@ void HWR_PrepLevelCache(size_t pnumtextures) // -------------------------------------------------------------------------- // Make sure texture is downloaded and set it as the source // -------------------------------------------------------------------------- -GLTexture_t *HWR_GetTexture(INT32 tex) -GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore) +GLMapTexture_t *HWR_GetTexture(INT32 tex) { GLMapTexture_t *grtex; #ifdef PARANOIA diff --git a/src/hardware/hw_glob.h b/src/hardware/hw_glob.h index 448ce3d88..b3f2227db 100644 --- a/src/hardware/hw_glob.h +++ b/src/hardware/hw_glob.h @@ -62,8 +62,7 @@ void HWR_FreeExtraSubsectors(void); void HWR_GetFlat(lumpnum_t flatlumpnum, boolean noencoremap); // ^ some flats must NOT be remapped to encore, since we remap them as we cache them for ease, adding a toggle here seems wise. -GLTexture_t *HWR_GetTexture(INT32 tex); -GLMapTexture_t *HWR_GetTexture(INT32 tex, boolean noencore); +GLMapTexture_t *HWR_GetTexture(INT32 tex); void HWR_GetPatch(GLPatch_t *gpatch); void HWR_GetMappedPatch(GLPatch_t *gpatch, const UINT8 *colormap); void HWR_MakePatch(patch_t *patch, GLPatch_t *grPatch, GLMipmap_t *grMipmap, boolean makebitmap);