[Mesa-dev] [PATCH 02/15] radv: fewer than 8 RBs are possible

[Nicolai Hähnle]

From: Nicolai Hähnle <nicolai.haehnle at amd.com>

This fixes the subsequent assertion on Bonaire.
---
 src/amd/vulkan/radv_query.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index f79b3e6..2ee3e24 100644
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -39,22 +39,20 @@
 static const int pipelinestat_block_size = 11 * 8;
 static const unsigned pipeline_statistics_indices[] = {7, 6, 3, 4, 5, 2, 1, 0, 8, 9, 10};
 
 static unsigned get_max_db(struct radv_device *device)
 {
 	unsigned num_db = device->physical_device->rad_info.num_render_backends;
 	MAYBE_UNUSED unsigned rb_mask = device->physical_device->rad_info.enabled_rb_mask;
 
 	if (device->physical_device->rad_info.chip_class == SI)
 		num_db = 8;
-	else
-		num_db = MAX2(8, num_db);
 
 	/* Otherwise we need to change the query reset procedure */
 	assert(rb_mask == ((1ull << num_db) - 1));
 
 	return num_db;
 }
 
 static void radv_break_on_count(nir_builder *b, nir_variable *var, nir_ssa_def *count)
 {
 	nir_ssa_def *counter = nir_load_var(b, var);
-- 
2.9.3