Change most of the remaining renderer cvars to new-style

src.cmake

@@ -115,6 +115,8 @@ set(RENDERERLIST
     ${ENGINE_DIR}/renderer/tr_fbo.cpp
     ${ENGINE_DIR}/renderer/tr_flares.cpp
     ${ENGINE_DIR}/renderer/tr_font.cpp
+    ${ENGINE_DIR}/renderer/GeometryCache.cpp
+    ${ENGINE_DIR}/renderer/GeometryCache.h
     ${ENGINE_DIR}/renderer/InternalImage.cpp
     ${ENGINE_DIR}/renderer/InternalImage.h
     ${ENGINE_DIR}/renderer/Material.cpp

src/engine/renderer/GeometryCache.cpp

@@ -0,0 +1,100 @@
+/*
+===========================================================================
+
+Daemon BSD Source Code
+Copyright (c) 2025 Daemon Developers
+All rights reserved.
+
+This file is part of the Daemon BSD Source Code (Daemon Source Code).
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Daemon developers nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL DAEMON DEVELOPERS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+===========================================================================
+*/
+// GeometryCache.cpp
+
+#include "GeometryCache.h"
+
+#include "tr_local.h"
+
+GeometryCache geometryCache;
+
+void GeometryCache::Bind() {
+	VAO.Bind();
+}
+
+void GeometryCache::InitGLBuffers() {
+	inputVBO.GenBuffer();
+	VBO.GenBuffer();
+	IBO.GenBuffer();
+
+	VAO.GenVAO();
+}
+
+void GeometryCache::FreeGLBuffers() {
+	inputVBO.DelBuffer();
+	VBO.DelBuffer();
+	IBO.DelBuffer();
+
+	VAO.DelVAO();
+}
+
+void GeometryCache::Free() {
+}
+
+void GeometryCache::AllocBuffers() {
+	VBO.BufferData( mapVerticesNumber * 8, nullptr, GL_STATIC_DRAW );
+
+	IBO.BufferData( mapIndicesNumber, nullptr, GL_STATIC_DRAW );
+}
+
+void GeometryCache::AddMapGeometry( const uint32_t verticesNumber, const uint32_t indicesNumber,
+	const vertexAttributeSpec_t* attrBegin, const vertexAttributeSpec_t* attrEnd,
+	const glIndex_t* indices ) {
+	mapVerticesNumber = verticesNumber;
+	mapIndicesNumber = indicesNumber;
+
+	VAO.Bind();
+
+	AllocBuffers();
+
+	VAO.SetAttrs( attrBegin, attrEnd );
+
+	VAO.SetVertexBuffer( VBO, 0 );
+	VAO.SetIndexBuffer( IBO );
+
+	uint32_t* VBOVerts = VBO.MapBufferRange( mapVerticesNumber * 8 );
+	memset( VBOVerts, 0, mapVerticesNumber * 8 * sizeof( uint32_t ) );
+	for ( const vertexAttributeSpec_t* spec = attrBegin; spec < attrEnd; spec++ ) {
+		vboAttributeLayout_t& attr = VAO.attrs[spec->attrIndex];
+
+		CopyVertexAttribute( attr, *spec, mapVerticesNumber, ( byte* ) VBOVerts );
+	}
+	VBO.UnmapBuffer();
+
+	uint32_t* VBOIndices = IBO.MapBufferRange( mapIndicesNumber );
+	memcpy( VBOIndices, indices, mapIndicesNumber * sizeof( uint32_t ) );
+	IBO.UnmapBuffer();
+
+	glBindVertexArray( backEnd.currentVAO );
+}

src/engine/renderer/GeometryCache.h

@@ -0,0 +1,70 @@
+/*
+===========================================================================
+
+Daemon BSD Source Code
+Copyright (c) 2025 Daemon Developers
+All rights reserved.
+
+This file is part of the Daemon BSD Source Code (Daemon Source Code).
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+	* Redistributions of source code must retain the above copyright
+	  notice, this list of conditions and the following disclaimer.
+	* Redistributions in binary form must reproduce the above copyright
+	  notice, this list of conditions and the following disclaimer in the
+	  documentation and/or other materials provided with the distribution.
+	* Neither the name of the Daemon developers nor the
+	  names of its contributors may be used to endorse or promote products
+	  derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL DAEMON DEVELOPERS BE LIABLE FOR ANY
+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+===========================================================================
+*/
+// GeometryCache.h
+
+#ifndef GEOMETRY_CACHE_H
+#define GEOMETRY_CACHE_H
+
+#include "gl_shader.h"
+#include "Material.h"
+
+class GeometryCache {
+	public:
+	void Bind();
+
+	void InitGLBuffers();
+	void FreeGLBuffers();
+
+	void Free();
+
+	void AllocBuffers();
+	void AddMapGeometry( const uint32_t verticesNumber, const uint32_t indicesNumber,
+		const vertexAttributeSpec_t* attrBegin,
+		const vertexAttributeSpec_t* attrEnd,
+		const glIndex_t* indices );
+
+	private:
+	uint32_t mapVerticesNumber;
+	uint32_t mapIndicesNumber;
+
+	GLVAO VAO = GLVAO( 0 );
+
+	GLBuffer inputVBO = GLBuffer( "geometryCacheInputVBO", Util::ordinal( BufferBind::GEOMETRY_CACHE_INPUT_VBO ), GL_MAP_WRITE_BIT, GL_MAP_INVALIDATE_RANGE_BIT );
+	GLBuffer VBO = GLBuffer( "geometryCacheVBO", Util::ordinal( BufferBind::GEOMETRY_CACHE_VBO ), GL_MAP_WRITE_BIT, GL_MAP_FLUSH_EXPLICIT_BIT );
+	GLBuffer IBO = GLBuffer( "geometryCacheIBO", Util::ordinal( BufferBind::UNUSED ), GL_MAP_WRITE_BIT, GL_MAP_INVALIDATE_RANGE_BIT );
+};
+
+extern GeometryCache geometryCache;
+
+#endif // GEOMETRY_CACHE_H

src/engine/renderer/InternalImage.cpp

@@ -139,16 +139,16 @@ int R_GetImageCustomScalingStep( const image_t *image, const imageParams_t &imag
 		return scalingStep;
 	}
 
-	int materialMinDimension = r_ignoreMaterialMinDimension->integer ? 0 : imageParams.minDimension;
-	int materialMaxDimension = r_ignoreMaterialMaxDimension->integer ? 0 : imageParams.maxDimension;
+	int materialMinDimension = r_ignoreMaterialMinDimension.Get() ? 0 : imageParams.minDimension;
+	int materialMaxDimension = r_ignoreMaterialMaxDimension.Get() ? 0 : imageParams.maxDimension;
 
 	int minDimension;
 
 	if ( materialMinDimension <= 0 )
 	{
 		minDimension = 1;
 	}
-	else if ( r_replaceMaterialMinDimensionIfPresentWithMaxDimension->integer )
+	else if ( r_replaceMaterialMinDimensionIfPresentWithMaxDimension.Get() )
 	{
 		minDimension = materialMaxDimension > 0 ? materialMaxDimension : std::numeric_limits<int>::max();
 	}
@@ -159,16 +159,16 @@ int R_GetImageCustomScalingStep( const image_t *image, const imageParams_t &imag
 
 	int maxDimension = materialMaxDimension > 0 ? materialMaxDimension : std::numeric_limits<int>::max();
 
-	if ( r_imageMaxDimension->integer > 0 )
+	if ( r_imageMaxDimension.Get() > 0 )
 	{
-		maxDimension = std::min( maxDimension, r_imageMaxDimension->integer );
+		maxDimension = std::min( maxDimension, r_imageMaxDimension.Get() );
 	}
 
 	// 1st priority: scaledDimension >= minDimension
 	// 2nd priority: scaledDimension <= maxDimension
-	// 3rd priority: scalingStep >= r_picMip->integer
+	// 3rd priority: scalingStep >= r_picMip.Get()
 	// 4th priority: scalingStep as low as possible
-	while ( scaledDimension > maxDimension || scalingStep < r_picMip->integer )
+	while ( scaledDimension > maxDimension || scalingStep < r_picMip.Get() )
 	{
 		scaledDimension >>= 1;