From: Nicolai Hähnle <nicolai.haehnle@amd.com>
Date: Thu, 15 Sep 2016 10:18:24 +0000 (+0200)
Subject: gallium/radeon: cleanup getting PIPE_QUERY_TIMESTAMP result
X-Git-Tag: android-x86-6.0-r2~863
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=daeab0171dda1ce477ba34eb52576bda638f98df;p=android-x86%2Fexternal-mesa.git

gallium/radeon: cleanup getting PIPE_QUERY_TIMESTAMP result

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

diff --git a/src/gallium/drivers/radeon/r600_query.c b/src/gallium/drivers/radeon/r600_query.c
index b9041eb2c95..c1c359990bd 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:
 		 * {