Clean-up buffer binds

Author: VReaperV

src.cmake

@@ -78,6 +78,7 @@ set(COMMONTESTLIST
 )
 
 set(RENDERERLIST
+    ${ENGINE_DIR}/renderer/BufferBind.h
     ${ENGINE_DIR}/renderer/DetectGLVendors.cpp
     ${ENGINE_DIR}/renderer/DetectGLVendors.h
     ${ENGINE_DIR}/renderer/gl_shader.cpp

src/engine/renderer/BufferBind.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.
+
+===========================================================================
+*/
+// BufferBind.h
+
+#ifndef BUFFERBIND_H
+#define BUFFERBIND_H
+
+namespace BufferBind {
+	enum : uint32_t {
+		// UBO
+		MATERIALS = 0,
+		TEX_DATA = 1,
+		LIGHTMAP_DATA = 2,
+		LIGHTS = 3,
+
+		SURFACE_BATCHES = 4,
+
+		// SSBO
+		SURFACE_DESCRIPTORS = 0,
+		SURFACE_COMMANDS = 1,
+		CULLED_COMMANDS = 2,
+		PORTAL_SURFACES = 4,
+
+		GEOMETRY_CACHE_INPUT_VBO = 5,
+		GEOMETRY_CACHE_VBO = 6,
+
+		COMMAND_COUNTERS_STORAGE = 9,
+		TEX_DATA_STORAGE = 11,
+
+		DEBUG = 10,
+		
+		// Atomic
+		COMMAND_COUNTERS_ATOMIC = 0,
+		
+		UNUSED = INT32_MAX
+	};
+};
+
+#endif // BUFFERBIND_H

src/engine/renderer/Material.cpp

@@ -35,6 +35,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include "tr_local.h"
 #include "Material.h"
+#include "BufferBind.h"
 #include "ShadeCommon.h"
 #include "GeometryCache.h"
 
@@ -541,7 +542,13 @@ void MaterialSystem::GenerateWorldCommandBuffer( std::vector<MaterialSurface>& s
 	surfaceDescriptorsSSBO.BufferData( surfaceDescriptorsCount * descriptorSize, nullptr, GL_STATIC_DRAW );
 	uint32_t* surfaceDescriptors = surfaceDescriptorsSSBO.MapBufferRange( surfaceDescriptorsCount * descriptorSize );
 
-	texDataBufferType = glConfig2.maxUniformBlockSize >= MIN_MATERIAL_UBO_SIZE ? GL_UNIFORM_BUFFER : GL_SHADER_STORAGE_BUFFER;
+	if ( glConfig2.maxUniformBlockSize >= MIN_MATERIAL_UBO_SIZE ) {
+		texDataBufferType = GL_UNIFORM_BUFFER;
+		texDataBindingPoint = BufferBind::TEX_DATA;
+	} else {
+		texDataBufferType = GL_SHADER_STORAGE_BUFFER;
+		texDataBindingPoint = BufferBind::TEX_DATA_STORAGE;
+	}
 
 	texDataBuffer.BufferStorage( ( texData.size() + dynamicTexData.size() ) * TEX_BUNDLE_SIZE, 1, nullptr );
 	texDataBuffer.MapAll();
@@ -2023,7 +2030,7 @@ void MaterialSystem::RenderMaterial( Material& material, const uint32_t viewID )
 
 	atomicCommandCountersBuffer.BindBuffer( GL_PARAMETER_BUFFER_ARB );
 
-	texDataBuffer.BindBufferBase( texDataBufferType );
+	texDataBuffer.BindBufferBase( texDataBufferType, texDataBindingPoint );
 	lightMapDataUBO.BindBufferBase();
 
 	if ( r_showGlobalMaterials.Get() && material.sort != 0
@@ -2140,7 +2147,7 @@ void MaterialSystem::RenderMaterial( Material& material, const uint32_t viewID )
 
 	atomicCommandCountersBuffer.UnBindBuffer( GL_PARAMETER_BUFFER_ARB );
 
-	texDataBuffer.UnBindBufferBase( texDataBufferType );
+	texDataBuffer.UnBindBufferBase( texDataBufferType, texDataBindingPoint );
 	lightMapDataUBO.UnBindBufferBase();
 
 	if ( material.usePolygonOffset ) {

src/engine/renderer/Material.h

@@ -306,26 +306,6 @@ struct SurfaceCommandBatch {
 	uint32_t materialIDs[2] { 0, 0 };
 };
 
-namespace BufferBind {
-	enum : uint32_t {
-		MATERIALS = 1,
-		TEX_DATA = 6,
-		LIGHTMAP_DATA = 2,
-		LIGHTS = 0,
-		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 {
 	public:
 	vec3_t worldViewBounds[2];
@@ -431,6 +411,7 @@ class MaterialSystem {
 	std::vector<shaderStage_t*> dynamicStages;
 
 	GLenum texDataBufferType;
+	GLuint texDataBindingPoint;
 	std::vector<TextureData> texData;
 	std::vector<TextureData> dynamicTexData;
 

src/engine/renderer/gl_shader.cpp

@@ -584,6 +584,7 @@ static std::string GenVertexHeader() {
 	if ( glConfig2.usingMaterialSystem ) {
 		AddDefine( str, "BIND_MATERIALS", BufferBind::MATERIALS );
 		AddDefine( str, "BIND_TEX_DATA", BufferBind::TEX_DATA );
+		AddDefine( str, "BIND_TEX_DATA_STORAGE", BufferBind::TEX_DATA_STORAGE );
 		AddDefine( str, "BIND_LIGHTMAP_DATA", BufferBind::LIGHTMAP_DATA );
 	}
 
@@ -628,6 +629,7 @@ static std::string GenFragmentHeader() {
 	if ( glConfig2.usingMaterialSystem ) {
 		AddDefine( str, "BIND_MATERIALS", BufferBind::MATERIALS );
 		AddDefine( str, "BIND_TEX_DATA", BufferBind::TEX_DATA );
+		AddDefine( str, "BIND_TEX_DATA_STORAGE", BufferBind::TEX_DATA_STORAGE );
 		AddDefine( str, "BIND_LIGHTMAP_DATA", BufferBind::LIGHTMAP_DATA );
 	}
 

src/engine/renderer/gl_shader.h

@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #define GL_SHADER_H
 
 #include "tr_local.h"
+#include "BufferBind.h"
 #include <stdexcept>
 
 #define USE_UNIFORM_FIREWALL 1