lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Use po2 patches to fix mipmaps

Browse source
This commit is contained in:
fickleheart 2020-03-14 15:52:25 -05:00
parent b9d7b3e5c5
commit e3b17cd82b
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/hardware/hw_cache.c
View file

@ -298,13 +298,13 @@ static void HWR_DrawPatchInCache(GLMipmap_t *mipmap,
if (pwidth <= 0 || pheight <= 0) if (pwidth <= 0 || pheight <= 0)
return; return;
ncols = (pwidth * pblockwidth) / pwidth; ncols = pwidth;
// source advance // source advance
xfrac = 0; xfrac = 0;
xfracstep = (pwidth << FRACBITS) / pblockwidth; xfracstep = FRACUNIT;
yfracstep = (pheight << FRACBITS) / pblockheight; yfracstep = FRACUNIT;
scale_y = (pblockheight << FRACBITS) / pheight; scale_y = FRACUNIT;
bpp = format2bpp[mipmap->grInfo.format]; bpp = format2bpp[mipmap->grInfo.format];
@ -573,13 +573,18 @@ void HWR_MakePatch (const patch_t *patch, GLPatch_t *grPatch, GLMipmap_t *grMipm
grPatch->leftoffset = SHORT(patch->leftoffset); grPatch->leftoffset = SHORT(patch->leftoffset);
grPatch->topoffset = SHORT(patch->topoffset); grPatch->topoffset = SHORT(patch->topoffset);
grMipmap->width = (UINT16)SHORT(patch->width); grMipmap->width = grMipmap->height = 1;
grMipmap->height = (UINT16)SHORT(patch->height); while (grMipmap->width < grPatch->width) grMipmap->width <<= 1;
while (grMipmap->height < grPatch->height) grMipmap->height <<= 1;
// no wrap around, no chroma key // no wrap around, no chroma key
grMipmap->flags = 0; grMipmap->flags = 0;
// setup the texture info // setup the texture info
grMipmap->grInfo.format = patchformat; grMipmap->grInfo.format = patchformat;
//grPatch->max_s = grPatch->max_t = 1.0f;
grPatch->max_s = (float)grPatch->width / (float)grMipmap->width;
grPatch->max_t = (float)grPatch->height / (float)grMipmap->height;
} }
Z_Free(grMipmap->grInfo.data); Z_Free(grMipmap->grInfo.data);
@ -590,12 +595,10 @@ void HWR_MakePatch (const patch_t *patch, GLPatch_t *grPatch, GLMipmap_t *grMipm
MakeBlock(grMipmap); MakeBlock(grMipmap);
HWR_DrawPatchInCache(grMipmap, HWR_DrawPatchInCache(grMipmap,
grPatch->width, grPatch->height, grMipmap->width, grMipmap->height,
grPatch->width, grPatch->height, grPatch->width, grPatch->height,
patch); patch);
} }
grPatch->max_s = grPatch->max_t = 1.0f;
} }