diff --git a/src/textures/hires/hqresize.cpp b/src/textures/hires/hqresize.cpp index a898b9fb6..22f9f8f2f 100644 --- a/src/textures/hires/hqresize.cpp +++ b/src/textures/hires/hqresize.cpp @@ -47,7 +47,7 @@ CUSTOM_CVAR(Int, gl_texture_hqresize, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) { - if (self < 0 || self > 16) + if (self < 0 || self > 19) { self = 0; } @@ -389,8 +389,13 @@ unsigned char *FTexture::CreateUpsampledTextureBuffer (unsigned char *inputBuffe case 13: case 14: case 15: + case 16: + case 17: return xbrzHelper(xbrzOldScale, type - 11, inputBuffer, inWidth, inHeight, outWidth, outHeight ); - + + case 18: + case 19: + return xbrzHelper(xbrz::scale, type - 13, inputBuffer, inWidth, inHeight, outWidth, outHeight); } } return inputBuffer; diff --git a/wadsrc/static/language.enu b/wadsrc/static/language.enu index 7ec1b5489..a700c6db1 100644 --- a/wadsrc/static/language.enu +++ b/wadsrc/static/language.enu @@ -2880,9 +2880,13 @@ OPTVAL_HQ4XMMX = "hq4x MMX"; OPTVAL_2XBRZ = "2xBRZ"; OPTVAL_3XBRZ = "3xBRZ"; OPTVAL_4XBRZ = "4xBRZ"; +OPTVAL_5XBRZ = "5xBRZ"; +OPTVAL_6XBRZ = "6xBRZ"; OPTVAL_OLD_2XBRZ = "Old 2xBRZ"; OPTVAL_OLD_3XBRZ = "Old 3xBRZ"; OPTVAL_OLD_4XBRZ = "Old 4xBRZ"; +OPTVAL_OLD_5XBRZ = "Old 5xBRZ"; +OPTVAL_OLD_6XBRZ = "Old 6xBRZ"; OPTVAL_RADIAL = "Radial"; OPTVAL_PIXELFUZZ = "Pixel fuzz"; OPTVAL_SMOOTHFUZZ = "Smooth fuzz"; diff --git a/wadsrc/static/menudef.txt b/wadsrc/static/menudef.txt index 5fc1b0f66..6c3571adc 100644 --- a/wadsrc/static/menudef.txt +++ b/wadsrc/static/menudef.txt @@ -2158,9 +2158,13 @@ OptionValue "HqResizeModes" 10, "$OPTVAL_2XBRZ" 11, "$OPTVAL_3XBRZ" 12, "$OPTVAL_4XBRZ" + 18, "$OPTVAL_5XBRZ" + 19, "$OPTVAL_6XBRZ" 13, "$OPTVAL_OLD_2XBRZ" 14, "$OPTVAL_OLD_3XBRZ" 15, "$OPTVAL_OLD_4XBRZ" + 16, "$OPTVAL_OLD_5XBRZ" + 17, "$OPTVAL_OLD_6XBRZ" } OptionValue "HqResizeModesNoMMX" @@ -2175,9 +2179,13 @@ OptionValue "HqResizeModesNoMMX" 10, "$OPTVAL_2XBRZ" 11, "$OPTVAL_3XBRZ" 12, "$OPTVAL_4XBRZ" + 18, "$OPTVAL_5XBRZ" + 19, "$OPTVAL_6XBRZ" 13, "$OPTVAL_OLD_2XBRZ" 14, "$OPTVAL_OLD_3XBRZ" 15, "$OPTVAL_OLD_4XBRZ" + 16, "$OPTVAL_OLD_5XBRZ" + 17, "$OPTVAL_OLD_6XBRZ" } OptionValue "FogMode"