Switch bloom cvars to new-style

Author: VReaperV

src/engine/renderer/tr_backend.cpp

@@ -3104,15 +3104,15 @@ void RB_RenderBloom()
 
 		gl_blurXShader->BindProgram( 0 );
 
-		gl_blurXShader->SetUniform_DeformMagnitude( r_bloomBlur->value );
+		gl_blurXShader->SetUniform_DeformMagnitude( r_bloomBlur.Get() );
 		gl_blurXShader->SetUniform_TexScale( texScale );
 
 		gl_blurXShader->SetUniform_ColorMapBindless(
 			GL_BindToTMU( 0, tr.contrastRenderFBOImage )
 		);
 
 		int flip = 0;
-		for ( int i = 0; i < r_bloomPasses->integer; i++ ) {
+		for ( int i = 0; i < r_bloomPasses.Get(); i++ ) {
 			R_BindFBO( tr.bloomRenderFBO[flip] );
 			glClear( GL_COLOR_BUFFER_BIT );
 			Tess_InstantQuad( *gl_blurXShader,
@@ -3127,14 +3127,14 @@ void RB_RenderBloom()
 
 		gl_blurYShader->BindProgram( 0 );
 
-		gl_blurYShader->SetUniform_DeformMagnitude( r_bloomBlur->value );
+		gl_blurYShader->SetUniform_DeformMagnitude( r_bloomBlur.Get() );
 		gl_blurYShader->SetUniform_TexScale( texScale );
 
 		gl_blurYShader->SetUniform_ColorMapBindless(
 			GL_BindToTMU( 0, tr.bloomRenderFBOImage[flip ^ 1] )
 		);
 
-		for ( int i = 0; i < r_bloomPasses->integer; i++ ) {
+		for ( int i = 0; i < r_bloomPasses.Get(); i++ ) {
 			R_BindFBO( tr.bloomRenderFBO[flip] );
 			glClear( GL_COLOR_BUFFER_BIT );
 			Tess_InstantQuad( *gl_blurYShader,

src/engine/renderer/tr_init.cpp

@@ -276,10 +276,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 	cvar_t      *r_vboVertexSkinning;
 
 	cvar_t      *r_mergeLeafSurfaces;
-
-	cvar_t      *r_bloom;
-	cvar_t      *r_bloomBlur;
-	cvar_t      *r_bloomPasses;
+	
+	Cvar::Cvar<bool> r_bloom( "r_bloom", "Use bloom", Cvar::ARCHIVE, false );
+	Cvar::Cvar<float> r_bloomBlur( "r_bloomBlur", "Bloom strength", Cvar::NONE, 1.0 );
+	Cvar::Cvar<int> r_bloomPasses( "r_bloomPasses", "Amount of bloom passes in each direction", Cvar::NONE, 2 );
 	cvar_t      *r_FXAA;
 	cvar_t      *r_ssao;
 
@@ -1198,9 +1198,7 @@ ScreenshotCmd screenshotPNGRegistration("screenshotPNG", ssFormat_t::SSF_PNG, "p
 
 		r_printShaders = Cvar_Get( "r_printShaders", "0", 0 );
 
-		r_bloom = Cvar_Get( "r_bloom", "0", CVAR_LATCH | CVAR_ARCHIVE );
-		r_bloomBlur = Cvar_Get( "r_bloomBlur", "1.0", CVAR_CHEAT );
-		r_bloomPasses = Cvar_Get( "r_bloomPasses", "2", CVAR_CHEAT );
+		Cvar::Latch( r_bloom );
 		r_FXAA = Cvar_Get( "r_FXAA", "0", CVAR_LATCH | CVAR_ARCHIVE );
 		r_ssao = Cvar_Get( "r_ssao", "0", CVAR_LATCH | CVAR_ARCHIVE );
 

src/engine/renderer/tr_local.h

@@ -3065,9 +3065,9 @@ enum class shaderProfilerRenderSubGroupsMode {
 
 	extern cvar_t *r_mergeLeafSurfaces;
 
-	extern cvar_t *r_bloom;
-	extern cvar_t *r_bloomBlur;
-	extern cvar_t *r_bloomPasses;
+	extern Cvar::Cvar<bool> r_bloom;
+	extern Cvar::Cvar<float> r_bloomBlur;
+	extern Cvar::Cvar<int> r_bloomPasses;
 	extern cvar_t *r_FXAA;
 	extern cvar_t *r_ssao;
 

src/engine/renderer/tr_shade.cpp

@@ -142,7 +142,7 @@ static void EnableAvailableFeatures()
 	glConfig2.specularMapping = glConfig2.deluxeMapping && glConfig2.specularMapping;
 	glConfig2.physicalMapping = glConfig2.deluxeMapping && glConfig2.physicalMapping;
 
-	glConfig2.bloom = r_bloom->integer;
+	glConfig2.bloom = r_bloom.Get();
 
 	/* Motion blur is enabled by cg_motionblur which is a client cvar so we have to build it in all cases,
 	unless unsupported by the hardware which is the only condition when the engine knows it is not used. */