zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-12-02 08:53:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/coelckers/gzdoom

Browse source
This commit is contained in:
Christoph Oelckers 2019-12-20 18:56:38 +01:00
commit fd15af0b50
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gamedata/textures/hires/hqresize.cpp
View file

@ -411,8 +411,9 @@ void FTexture::CreateUpsampledTextureBuffer(FTextureBuffer &texbuffer, bool hasA
int inWidth = texbuffer.mWidth; int inWidth = texbuffer.mWidth;
int inHeight = texbuffer.mHeight; int inHeight = texbuffer.mHeight;
// [BB] Don't resample if the width or height of the input texture is bigger than gl_texture_hqresize_maxinputsize. // [BB] Don't resample if width * height of the input texture is bigger than gl_texture_hqresize_maxinputsize squared.
if ((inWidth > gl_texture_hqresize_maxinputsize) || (inHeight > gl_texture_hqresize_maxinputsize)) const int maxInputSize = gl_texture_hqresize_maxinputsize;
if (inWidth * inHeight > maxInputSize * maxInputSize)
return; return;
// [BB] Don't try to upsample textures based off FCanvasTexture. (This should never get here in the first place!) // [BB] Don't try to upsample textures based off FCanvasTexture. (This should never get here in the first place!)