Improve undersampling settings

Calinou · SmallJoker · commit 05a7da627959 · 2019-09-17T19:06:51.000+02:00
The setting now accepts values between 1 and 8 in the Advanced Settings menu. Values 0 and 1 now behave the same way (setting it to 1 won't disable MSAA anymore), so there's no need to expose 0 as a value. This closes #8939.
diff --git a/builtin/settingtypes.txt b/builtin/settingtypes.txt
@@ -508,10 +508,11 @@ texture_min_size (Minimum texture size) int 64
 #    when set to higher number than 0.
 fsaa (FSAA) enum 0 0,1,2,4,8,16
 
-#    Undersampling is similar to using lower screen resolution, but it applies
+#    Undersampling is similar to using a lower screen resolution, but it applies
 #    to the game world only, keeping the GUI intact.
-#    It should give significant performance boost at the cost of less detailed image.
-undersampling (Undersampling) enum 0 0,2,3,4
+#    It should give a significant performance boost at the cost of less detailed image.
+#    Higher values result in a less detailed image.
+undersampling (Undersampling) int 1 1 8
 
 [**Shaders]
 
diff --git a/src/client/render/plain.cpp b/src/client/render/plain.cpp
@@ -35,7 +35,7 @@ RenderingCorePlain::RenderingCorePlain(
 
 void RenderingCorePlain::initTextures()
 {
-	if (!scale)
+	if (scale <= 1)
 		return;
 	v2u32 size{scaledown(scale, screensize.X), scaledown(scale, screensize.Y)};
 	lowres = driver->addRenderTargetTexture(
@@ -44,21 +44,21 @@ void RenderingCorePlain::initTextures()
 
 void RenderingCorePlain::clearTextures()
 {
-	if (!scale)
+	if (scale <= 1)
 		return;
 	driver->removeTexture(lowres);
 }
 
 void RenderingCorePlain::beforeDraw()
 {
-	if (!scale)
+	if (scale <= 1)
 		return;
 	driver->setRenderTarget(lowres, true, true, skycolor);
 }
 
 void RenderingCorePlain::upscale()
 {
-	if (!scale)
+	if (scale <= 1)
 		return;
 	driver->setRenderTarget(0, true, true);
 	v2u32 size{scaledown(scale, screensize.X), scaledown(scale, screensize.Y)};

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ RenderingCorePlain::RenderingCorePlain(`
`35`	`35`
`36`	`36`	`void RenderingCorePlain::initTextures()`
`37`	`37`	`{`
`38`		`- if (!scale)`
	`38`	`+ if (scale <= 1)`
`39`	`39`	`return;`
`40`	`40`	`v2u32 size{scaledown(scale, screensize.X), scaledown(scale, screensize.Y)};`
`41`	`41`	`lowres = driver->addRenderTargetTexture(`
`@@ -44,21 +44,21 @@ void RenderingCorePlain::initTextures()`
`44`	`44`
`45`	`45`	`void RenderingCorePlain::clearTextures()`
`46`	`46`	`{`
`47`		`- if (!scale)`
	`47`	`+ if (scale <= 1)`
`48`	`48`	`return;`
`49`	`49`	`driver->removeTexture(lowres);`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`void RenderingCorePlain::beforeDraw()`
`53`	`53`	`{`
`54`		`- if (!scale)`
	`54`	`+ if (scale <= 1)`
`55`	`55`	`return;`
`56`	`56`	`driver->setRenderTarget(lowres, true, true, skycolor);`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`void RenderingCorePlain::upscale()`
`60`	`60`	`{`
`61`		`- if (!scale)`
	`61`	`+ if (scale <= 1)`
`62`	`62`	`return;`
`63`	`63`	`driver->setRenderTarget(0, true, true);`
`64`	`64`	`v2u32 size{scaledown(scale, screensize.X), scaledown(scale, screensize.Y)};`