- added 5x and 6x upscaling with xBRZ

This commit is contained in:
alexey.lysiuk 2018-08-03 18:14:53 +03:00 committed by Rachael Alexanderson
parent 36adbcd9ed
commit 778a7c370d
3 changed files with 19 additions and 2 deletions

View file

@ -47,7 +47,7 @@
CUSTOM_CVAR(Int, gl_texture_hqresize, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG | CVAR_NOINITCALL) 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; self = 0;
} }
@ -389,8 +389,13 @@ unsigned char *FTexture::CreateUpsampledTextureBuffer (unsigned char *inputBuffe
case 13: case 13:
case 14: case 14:
case 15: case 15:
case 16:
case 17:
return xbrzHelper(xbrzOldScale, type - 11, inputBuffer, inWidth, inHeight, outWidth, outHeight ); 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; return inputBuffer;

View file

@ -2880,9 +2880,13 @@ OPTVAL_HQ4XMMX = "hq4x MMX";
OPTVAL_2XBRZ = "2xBRZ"; OPTVAL_2XBRZ = "2xBRZ";
OPTVAL_3XBRZ = "3xBRZ"; OPTVAL_3XBRZ = "3xBRZ";
OPTVAL_4XBRZ = "4xBRZ"; OPTVAL_4XBRZ = "4xBRZ";
OPTVAL_5XBRZ = "5xBRZ";
OPTVAL_6XBRZ = "6xBRZ";
OPTVAL_OLD_2XBRZ = "Old 2xBRZ"; OPTVAL_OLD_2XBRZ = "Old 2xBRZ";
OPTVAL_OLD_3XBRZ = "Old 3xBRZ"; OPTVAL_OLD_3XBRZ = "Old 3xBRZ";
OPTVAL_OLD_4XBRZ = "Old 4xBRZ"; OPTVAL_OLD_4XBRZ = "Old 4xBRZ";
OPTVAL_OLD_5XBRZ = "Old 5xBRZ";
OPTVAL_OLD_6XBRZ = "Old 6xBRZ";
OPTVAL_RADIAL = "Radial"; OPTVAL_RADIAL = "Radial";
OPTVAL_PIXELFUZZ = "Pixel fuzz"; OPTVAL_PIXELFUZZ = "Pixel fuzz";
OPTVAL_SMOOTHFUZZ = "Smooth fuzz"; OPTVAL_SMOOTHFUZZ = "Smooth fuzz";

View file

@ -2158,9 +2158,13 @@ OptionValue "HqResizeModes"
10, "$OPTVAL_2XBRZ" 10, "$OPTVAL_2XBRZ"
11, "$OPTVAL_3XBRZ" 11, "$OPTVAL_3XBRZ"
12, "$OPTVAL_4XBRZ" 12, "$OPTVAL_4XBRZ"
18, "$OPTVAL_5XBRZ"
19, "$OPTVAL_6XBRZ"
13, "$OPTVAL_OLD_2XBRZ" 13, "$OPTVAL_OLD_2XBRZ"
14, "$OPTVAL_OLD_3XBRZ" 14, "$OPTVAL_OLD_3XBRZ"
15, "$OPTVAL_OLD_4XBRZ" 15, "$OPTVAL_OLD_4XBRZ"
16, "$OPTVAL_OLD_5XBRZ"
17, "$OPTVAL_OLD_6XBRZ"
} }
OptionValue "HqResizeModesNoMMX" OptionValue "HqResizeModesNoMMX"
@ -2175,9 +2179,13 @@ OptionValue "HqResizeModesNoMMX"
10, "$OPTVAL_2XBRZ" 10, "$OPTVAL_2XBRZ"
11, "$OPTVAL_3XBRZ" 11, "$OPTVAL_3XBRZ"
12, "$OPTVAL_4XBRZ" 12, "$OPTVAL_4XBRZ"
18, "$OPTVAL_5XBRZ"
19, "$OPTVAL_6XBRZ"
13, "$OPTVAL_OLD_2XBRZ" 13, "$OPTVAL_OLD_2XBRZ"
14, "$OPTVAL_OLD_3XBRZ" 14, "$OPTVAL_OLD_3XBRZ"
15, "$OPTVAL_OLD_4XBRZ" 15, "$OPTVAL_OLD_4XBRZ"
16, "$OPTVAL_OLD_5XBRZ"
17, "$OPTVAL_OLD_6XBRZ"
} }
OptionValue "FogMode" OptionValue "FogMode"