Add a workaround for AMD/Mesa driver bug with bindless on depth target

VReaperV · VReaperV · commit 49064fc40073 · 2025-09-10T18:00:17.000+03:00
diff --git a/src/engine/renderer/gl_shader.cpp b/src/engine/renderer/gl_shader.cpp
@@ -575,6 +575,10 @@ static std::string GenVertexHeader() {
 			"#define OUT(mode) varying\n";
 	}
 
+	if ( glConfig.driverVendor == glDriverVendor_t::ATI || glConfig.driverVendor == glDriverVendor_t::MESA ) {
+		AddDefine( str, "DRIVER_AMD_MESA", 1 );
+	}
+
 	if ( glConfig.shaderDrawParametersAvailable ) {
 		str += "OUT(flat) int in_drawID;\n";
 		str += "OUT(flat) int in_baseInstance;\n";
@@ -612,6 +616,10 @@ static std::string GenFragmentHeader() {
 			"#define DECLARE_OUTPUT(type) /* empty*/\n";
 	}
 
+	if ( glConfig.driverVendor == glDriverVendor_t::ATI || glConfig.driverVendor == glDriverVendor_t::MESA ) {
+		AddDefine( str, "DRIVER_AMD_MESA", 1 );
+	}
+
 	if ( glConfig.usingBindlessTextures ) {
 		str += "layout(bindless_sampler) uniform;\n";
 	}
@@ -640,6 +648,10 @@ static std::string GenFragmentHeader() {
 static std::string GenComputeHeader() {
 	std::string str;
 
+	if ( glConfig.driverVendor == glDriverVendor_t::ATI || glConfig.driverVendor == glDriverVendor_t::MESA ) {
+		AddDefine( str, "DRIVER_AMD_MESA", 1 );
+	}
+
 	// Compute shader compatibility defines
 	if ( glConfig.usingMaterialSystem ) {
 		AddDefine( str, "MAX_VIEWS", MAX_VIEWS );
@@ -2214,6 +2226,13 @@ std::vector<GLUniform*> GLShaderManager::ProcessUniforms( const GLUniform::Updat
 	for ( GLUniform* uniform : uniforms ) {
 		if ( uniform->_updateType >= minType && uniform->_updateType <= maxType
 			&& ( !uniform->_isTexture || !skipTextures ) ) {
+
+			if ( uniform->_isTexture && uniform->_AMDSkipBindless
+				&& ( glConfig.driverVendor == glDriverVendor_t::ATI || glConfig.driverVendor == glDriverVendor_t::MESA )
+				&& workaround_glDriver_amd_mesa_skipBindlessDepthTarget.Get() ){
+				continue;
+			}
+
 			tmp.emplace_back( uniform );
 		}
 	}
diff --git a/src/engine/renderer/gl_shader.h b/src/engine/renderer/gl_shader.h
@@ -347,6 +347,7 @@ class GLUniform {
 	const UpdateType _updateType;
 	const int _components;
 	const bool _isTexture;
+	const bool _AMDSkipBindless;
 
 	protected:
 	GLShader* _shader;
@@ -355,7 +356,7 @@ class GLUniform {
 
 	GLUniform( GLShader* shader, const char* name, const char* type, const GLuint std430Size, const GLuint std430Alignment,
 		const UpdateType updateType, const int components = 0,
-		const bool isTexture = false ) :
+		const bool isTexture = false, const bool AMDSkipBindless = false ) :
 		_name( name ),
 		_type( type ),
 		_std430BaseSize( std430Size ),
@@ -364,6 +365,7 @@ class GLUniform {
 		_updateType( updateType ),
 		_components( components ),
 		_isTexture( isTexture ),
+		_AMDSkipBindless( AMDSkipBindless ),
 		_shader( shader ) {
 		_shader->RegisterUniform( this );
 	}
@@ -522,9 +524,9 @@ class GLShaderManager {
 
 class GLUniformSampler : protected GLUniform {
 	protected:
-	GLUniformSampler( GLShader* shader, const char* name, const char* type, const UpdateType updateType ) :
+	GLUniformSampler( GLShader* shader, const char* name, const char* type, const UpdateType updateType, const bool AMDSkipBindless = false ) :
 		GLUniform( shader, name, type, glConfig.bindlessTexturesAvailable ? 2 : 1,
-		                               glConfig.bindlessTexturesAvailable ? 2 : 1, updateType, 0, true ) {
+		                               glConfig.bindlessTexturesAvailable ? 2 : 1, updateType, 0, true, AMDSkipBindless ) {
 	}
 
 	inline GLint GetLocation() {
@@ -550,6 +552,12 @@ class GLUniformSampler : protected GLUniform {
 		currentValueBindless = value;
 
 		if ( glConfig.usingBindlessTextures ) {
+			if ( _AMDSkipBindless
+				&& ( glConfig.driverVendor == glDriverVendor_t::ATI || glConfig.driverVendor == glDriverVendor_t::MESA )
+				&& workaround_glDriver_amd_mesa_skipBindlessDepthTarget.Get() ) {
+				return;
+			}
+
 			if ( _shader->UseMaterialSystem() && _updateType == TEXDATA_OR_PUSH ) {
 				return;
 			}
@@ -579,8 +587,8 @@ class GLUniformSampler : protected GLUniform {
 
 class GLUniformSampler2D : protected GLUniformSampler {
 	protected:
-	GLUniformSampler2D( GLShader* shader, const char* name, const UpdateType updateType ) :
-		GLUniformSampler( shader, name, "sampler2D", updateType ) {
+	GLUniformSampler2D( GLShader* shader, const char* name, const UpdateType updateType, const bool AMDSkipBindless = false ) :
+		GLUniformSampler( shader, name, "sampler2D", updateType, AMDSkipBindless ) {
 	}
 };
 
@@ -1743,7 +1751,7 @@ class u_DepthMap :
 	GLUniformSampler2D {
 	public:
 	u_DepthMap( GLShader* shader ) :
-		GLUniformSampler2D( shader, "u_DepthMap", CONST ) {
+		GLUniformSampler2D( shader, "u_DepthMap", CONST, true ) {
 	}
 
 	void SetUniform_DepthMapBindless( GLuint64 bindlessHandle ) {
diff --git a/src/engine/renderer/glsl_source/depthReduction_cp.glsl b/src/engine/renderer/glsl_source/depthReduction_cp.glsl
@@ -41,7 +41,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // Keep this to 8x8 because we don't want extra shared mem etc. to be allocated, and to minimize wasted lanes
 layout (local_size_x = 8, local_size_y = 8, local_size_z = 1) in;
 
-layout(binding = 0) uniform sampler2D u_DepthMap;
+uniform sampler2D u_DepthMap;
 layout(r32f, binding = 1) uniform readonly image2D depthImageIn;
 layout(r32f, binding = 2) uniform writeonly image2D depthImageOut;
 
diff --git a/src/engine/renderer/glsl_source/material_fp.glsl b/src/engine/renderer/glsl_source/material_fp.glsl
@@ -60,7 +60,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 		sampler2D u_PortalMap = sampler2D( u_PortalMap_initial );
 	#endif // !LIQUID_GLSL
 
-	#if defined(DEPTHMAP_GLSL)
+	#if defined(DEPTHMAP_GLSL) && !defined(DRIVER_AMD_MESA)
 		sampler2D u_DepthMap = sampler2D( u_DepthMap_initial );
 	#endif // !DEPTHMAP_GLSL
 
diff --git a/src/engine/renderer/tr_backend.cpp b/src/engine/renderer/tr_backend.cpp
@@ -178,7 +178,7 @@ GLuint64 GL_BindToTMU( int unit, image_t *image )
 		image = tr.defaultImage;
 	}
 
-	if ( glConfig.usingBindlessTextures ) {
+	if ( glConfig.usingBindlessTextures && !( image->bits & IF_AMD_SKIP_BINDLESS ) ) {
 		return tr.textureManager.BindTexture( 0, image->texture );
 	}
 
diff --git a/src/engine/renderer/tr_image.cpp b/src/engine/renderer/tr_image.cpp
@@ -1471,6 +1471,15 @@ image_t *R_CreateImage( const char *name, const byte **pic, int width, int heigh
 	image->height = height;
 
 	image->bits = imageParams.bits;
+
+	const bool skipAMDBindless =
+		( glConfig.driverVendor == glDriverVendor_t::ATI || glConfig.driverVendor == glDriverVendor_t::MESA )
+		&& workaround_glDriver_amd_mesa_skipBindlessDepthTarget.Get();
+
+	if ( !skipAMDBindless ) {
+		image->bits &= ~IF_AMD_SKIP_BINDLESS;
+	}
+
 	image->filterType = imageParams.filterType;
 	image->wrapType = imageParams.wrapType;
 
@@ -2556,7 +2565,7 @@ static void R_CreateCurrentRenderImage()
 	tr.currentRenderImage[1] = R_CreateImage( "_currentRender[1]", nullptr, width, height, 1, imageParams );
 
 	imageParams = {};
-	imageParams.bits = IF_NOPICMIP | IF_PACKED_DEPTH24_STENCIL8;
+	imageParams.bits = IF_NOPICMIP | IF_PACKED_DEPTH24_STENCIL8 | IF_AMD_SKIP_BINDLESS;
 	imageParams.filterType = filterType_t::FT_NEAREST;
 	imageParams.wrapType = wrapTypeEnum_t::WT_CLAMP;
 
diff --git a/src/engine/renderer/tr_local.h b/src/engine/renderer/tr_local.h
@@ -483,7 +483,8 @@ enum class ssaoMode {
 	  IF_BC4 = BIT( 22 ),
 	  IF_BC5 = BIT( 23 ),
 	  IF_RGBA32UI = BIT( 24 ),
-	  IF_HOMEPATH = BIT( 25 )
+	  IF_HOMEPATH = BIT( 25 ),
+	  IF_AMD_SKIP_BINDLESS = BIT( 26 )
 	};
 
 	enum class filterType_t
@@ -2773,6 +2774,8 @@ enum
 
 	extern cvar_t *r_evsmPostProcess;
 
+	extern Cvar::Cvar<bool> workaround_glDriver_amd_mesa_skipBindlessDepthTarget;
+
 //====================================================================
 
 /* r_checkGLErrors values:
diff --git a/src/engine/sys/sdl_glimp.cpp b/src/engine/sys/sdl_glimp.cpp
@@ -135,6 +135,10 @@ static Cvar::Cvar<bool> workaround_glDriver_amd_oglp_disableBindlessTexture(
 	"workaround.glDriver.amd.oglp.disableBindlessTexture",
 	"Disable ARB_bindless_texture on AMD OGLP driver",
 	Cvar::NONE, true );
+Cvar::Cvar<bool> workaround_glDriver_amd_mesa_skipBindlessDepthTarget(
+	"workaround.glDriver.amd.mesa.skipBindlessDepthTarget",
+	"Disable bindless depth target on AMD and Mesa drivers",
+	Cvar::NONE, true );
 static Cvar::Cvar<bool> workaround_glDriver_mesa_ati_rv300_useFloatVertex(
 	"workaround.glDriver.mesa.ati.rv300.useFloatVertex",
 	"Use float vertex instead of supported-but-slower half-float vertex on Mesa driver on ATI RV300 hardware",

Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ GLuint64 GL_BindToTMU( int unit, image_t *image )`
`178`	`178`	`image = tr.defaultImage;`
`179`	`179`	`}`
`180`	`180`
`181`		`- if ( glConfig.usingBindlessTextures ) {`
	`181`	`+ if ( glConfig.usingBindlessTextures && !( image->bits & IF_AMD_SKIP_BINDLESS ) ) {`
`182`	`182`	`return tr.textureManager.BindTexture( 0, image->texture );`
`183`	`183`	`}`
`184`	`184`