Make BufferBind less noisy

Author: VReaperV

src/engine/renderer/Material.h

@@ -306,21 +306,23 @@ struct SurfaceCommandBatch {
 	uint32_t materialIDs[2] { 0, 0 };
 };
 
-enum class BufferBind {
-	MATERIALS = 1, // LightTile UBO uses binding point 0, so avoid it here
-	TEX_DATA = 6,
-	LIGHTMAP_DATA = 2,
-	SURFACE_DESCRIPTORS = 0,
-	SURFACE_COMMANDS = 1,
-	CULLED_COMMANDS = 2,
-	SURFACE_BATCHES = 3,
-	COMMAND_COUNTERS_ATOMIC = 0,
-	COMMAND_COUNTERS_STORAGE = 4, // Avoid needlessly rebinding buffers
-	PORTAL_SURFACES = 5,
-	GEOMETRY_CACHE_INPUT_VBO = 6,
-	GEOMETRY_CACHE_VBO = 7,
-	DEBUG = 10,
-	UNUSED = INT32_MAX
+namespace BufferBind {
+	enum : uint32_t {
+		MATERIALS = 1, // LightTile UBO uses binding point 0, so avoid it here
+		TEX_DATA = 6,
+		LIGHTMAP_DATA = 2,
+		SURFACE_DESCRIPTORS = 0,
+		SURFACE_COMMANDS = 1,
+		CULLED_COMMANDS = 2,
+		SURFACE_BATCHES = 3,
+		COMMAND_COUNTERS_ATOMIC = 0,
+		COMMAND_COUNTERS_STORAGE = 4, // Avoid needlessly rebinding buffers
+		PORTAL_SURFACES = 5,
+		GEOMETRY_CACHE_INPUT_VBO = 6,
+		GEOMETRY_CACHE_VBO = 7,
+		DEBUG = 10,
+		UNUSED = INT32_MAX
+	};
 };
 
 class MaterialSystem {

src/engine/renderer/gl_shader.cpp

@@ -303,6 +303,10 @@ static inline void AddDefine( std::string& defines, const std::string& define, i
 	defines += Str::Format("#ifndef %s\n#define %s %d\n#endif\n", define, define, value);
 }
 
+static inline void AddDefine( std::string& defines, const std::string& define, uint32_t value ) {
+	defines += Str::Format( "#ifndef %s\n#define %s %d\n#endif\n", define, define, value );
+}
+
 // Epsilon for float is 5.96e-08, so exponential notation with 8 decimal places should give exact values.
 
 static inline void AddDefine( std::string& defines, const std::string& define, float value )
@@ -577,9 +581,9 @@ static std::string GenVertexHeader() {
 	}
 
 	if ( glConfig2.usingMaterialSystem ) {
-		AddDefine( str, "BIND_MATERIALS", Util::ordinal( BufferBind::MATERIALS ) );
-		AddDefine( str, "BIND_TEX_DATA", Util::ordinal( BufferBind::TEX_DATA ) );
-		AddDefine( str, "BIND_LIGHTMAP_DATA", Util::ordinal( BufferBind::LIGHTMAP_DATA ) );
+		AddDefine( str, "BIND_MATERIALS", BufferBind::MATERIALS );
+		AddDefine( str, "BIND_TEX_DATA", BufferBind::TEX_DATA );
+		AddDefine( str, "BIND_LIGHTMAP_DATA", BufferBind::LIGHTMAP_DATA );
 	}
 
 	return str;
@@ -617,9 +621,9 @@ static std::string GenFragmentHeader() {
 	}
 
 	if ( glConfig2.usingMaterialSystem ) {
-		AddDefine( str, "BIND_MATERIALS", Util::ordinal( BufferBind::MATERIALS ) );
-		AddDefine( str, "BIND_TEX_DATA", Util::ordinal( BufferBind::TEX_DATA ) );
-		AddDefine( str, "BIND_LIGHTMAP_DATA", Util::ordinal( BufferBind::LIGHTMAP_DATA ) );
+		AddDefine( str, "BIND_MATERIALS", BufferBind::MATERIALS );
+		AddDefine( str, "BIND_TEX_DATA", BufferBind::TEX_DATA );
+		AddDefine( str, "BIND_LIGHTMAP_DATA", BufferBind::LIGHTMAP_DATA );
 	}
 
 	return str;
@@ -636,15 +640,15 @@ static std::string GenComputeHeader() {
 		AddDefine( str, "MAX_SURFACE_COMMAND_BATCHES", MAX_SURFACE_COMMAND_BATCHES );
 		AddDefine( str, "MAX_COMMAND_COUNTERS", MAX_COMMAND_COUNTERS );
 
-		AddDefine( str, "BIND_SURFACE_DESCRIPTORS", Util::ordinal( BufferBind::SURFACE_DESCRIPTORS ) );
-		AddDefine( str, "BIND_SURFACE_COMMANDS", Util::ordinal( BufferBind::SURFACE_COMMANDS ) );
-		AddDefine( str, "BIND_CULLED_COMMANDS", Util::ordinal( BufferBind::CULLED_COMMANDS ) );
-		AddDefine( str, "BIND_SURFACE_BATCHES", Util::ordinal( BufferBind::SURFACE_BATCHES ) );
-		AddDefine( str, "BIND_COMMAND_COUNTERS_ATOMIC", Util::ordinal( BufferBind::COMMAND_COUNTERS_ATOMIC ) );
-		AddDefine( str, "BIND_COMMAND_COUNTERS_STORAGE", Util::ordinal( BufferBind::COMMAND_COUNTERS_STORAGE ) );
-		AddDefine( str, "BIND_PORTAL_SURFACES", Util::ordinal( BufferBind::PORTAL_SURFACES ) );
+		AddDefine( str, "BIND_SURFACE_DESCRIPTORS", BufferBind::SURFACE_DESCRIPTORS );
+		AddDefine( str, "BIND_SURFACE_COMMANDS", BufferBind::SURFACE_COMMANDS );
+		AddDefine( str, "BIND_CULLED_COMMANDS", BufferBind::CULLED_COMMANDS );
+		AddDefine( str, "BIND_SURFACE_BATCHES", BufferBind::SURFACE_BATCHES );
+		AddDefine( str, "BIND_COMMAND_COUNTERS_ATOMIC", BufferBind::COMMAND_COUNTERS_ATOMIC );
+		AddDefine( str, "BIND_COMMAND_COUNTERS_STORAGE", BufferBind::COMMAND_COUNTERS_STORAGE );
+		AddDefine( str, "BIND_PORTAL_SURFACES", BufferBind::PORTAL_SURFACES );
 
-		AddDefine( str, "BIND_DEBUG", Util::ordinal( BufferBind::DEBUG ) );
+		AddDefine( str, "BIND_DEBUG", BufferBind::DEBUG );
 	}
 
 	if ( glConfig2.usingBindlessTextures ) {
@@ -1510,19 +1514,19 @@ std::string GLShaderManager::ShaderPostProcess( GLShader *shader, const std::str
 	// 6 kb for materials
 	const uint32_t count = ( 4096 + 2048 ) / shader->GetPaddedSize();
 	std::string materialBlock = "layout(std140, binding = "
-		                        + std::to_string( Util::ordinal( BufferBind::MATERIALS ) )
+		                        + std::to_string( BufferBind::MATERIALS )
 		                        + ") uniform materialsUBO {\n"
 	                            "	Material materials[" + std::to_string( count ) + "]; \n"
 	                            "};\n\n";
 
 	std::string texBuf = glConfig2.maxUniformBlockSize >= MIN_MATERIAL_UBO_SIZE ?
 		"layout(std140, binding = "
-		+ std::to_string( Util::ordinal( BufferBind::TEX_DATA ) )
+		+ std::to_string( BufferBind::TEX_DATA )
 		+ ") uniform texDataUBO {\n"
 		"	TexData texData[" + std::to_string( MAX_TEX_BUNDLES ) + "]; \n"
 		"};\n\n"
 		: "layout(std430, binding = "
-		+ std::to_string( Util::ordinal( BufferBind::TEX_DATA ) )
+		+ std::to_string( BufferBind::TEX_DATA )
 		+ ") restrict readonly buffer texDataSSBO {\n"
 		"	TexData texData[];\n"
 		"};\n\n";