Mesa (master): gallium/radeon: cleanup getting PIPE_QUERY_TIMESTAMP result

[Nicolai Hähnle]

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

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Thu Sep 15 12:18:24 2016 +0200

gallium/radeon: cleanup getting PIPE_QUERY_TIMESTAMP result

Reviewed-by: Edward O'Callaghan <funfunctor at folklore1984.net>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/gallium/drivers/radeon/r600_query.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c
index b9041eb..c1c3599 100644
--- a/src/gallium/drivers/radeon/r600_query.c
+++ b/src/gallium/drivers/radeon/r600_query.c
@@ -953,12 +953,8 @@ static void r600_query_hw_add_result(struct r600_common_context *ctx,
 		result->u64 += r600_query_read_result(buffer, 0, 2, false);
 		break;
 	case PIPE_QUERY_TIMESTAMP:
-	{
-		uint32_t *current_result = (uint32_t*)buffer;
-		result->u64 = (uint64_t)current_result[0] |
-			      (uint64_t)current_result[1] << 32;
+		result->u64 = *(uint64_t*)buffer;
 		break;
-	}
 	case PIPE_QUERY_PRIMITIVES_EMITTED:
 		/* SAMPLE_STREAMOUTSTATS stores this structure:
 		 * {