Mesa (master): radv: use pool->stride when calling radv_query_shader()

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: a9a56f47f883018922a404f908325996718854b8
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=a9a56f47f883018922a404f908325996718854b8

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Oct 30 15:18:57 2018 +0100

radv: use pool->stride when calling radv_query_shader()

Not needed to recompute the stride.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Dave Airlie <airlied at redhat.com>

---

 src/amd/vulkan/radv_query.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/amd/vulkan/radv_query.c b/src/amd/vulkan/radv_query.c
index 5a326c9df5..318d6c7afe 100644
--- a/src/amd/vulkan/radv_query.c
+++ b/src/amd/vulkan/radv_query.c
@@ -1050,7 +1050,7 @@ void radv_CmdCopyQueryPoolResults(
 		radv_query_shader(cmd_buffer, &cmd_buffer->device->meta_state.query.occlusion_query_pipeline,
 		                  pool->bo, dst_buffer->bo, firstQuery * pool->stride,
 		                  dst_buffer->offset + dstOffset,
-		                  get_max_db(cmd_buffer->device) * 16, stride,
+		                  pool->stride, stride,
 		                  queryCount, flags, 0, 0);
 		break;
 	case VK_QUERY_TYPE_PIPELINE_STATISTICS:
@@ -1069,7 +1069,7 @@ void radv_CmdCopyQueryPoolResults(
 		radv_query_shader(cmd_buffer, &cmd_buffer->device->meta_state.query.pipeline_statistics_query_pipeline,
 		                  pool->bo, dst_buffer->bo, firstQuery * pool->stride,
 		                  dst_buffer->offset + dstOffset,
-		                  pipelinestat_block_size * 2, stride, queryCount, flags,
+		                  pool->stride, stride, queryCount, flags,
 		                  pool->pipeline_stats_mask,
 		                  pool->availability_offset + 4 * firstQuery);
 		break;