Mesa (staging/18.2): r600: use build-id when available for disk cache

[GitLab Mirror]

Module: Mesa
Branch: staging/18.2
Commit: 2cf5abd80b8210a64532122270716b4cdefbd9f5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2cf5abd80b8210a64532122270716b4cdefbd9f5

Author: Timothy Arceri <tarceri at itsqueeze.com>
Date:   Wed Sep 19 11:59:09 2018 +1000

r600: use build-id when available for disk cache

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
(cherry picked from commit 2b5f42068d18a222e70f396c6ffc2564c4c36666)

---

 src/gallium/drivers/r600/r600_pipe_common.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_pipe_common.c b/src/gallium/drivers/r600/r600_pipe_common.c
index f7cfd0d46a..6b581242a1 100644
--- a/src/gallium/drivers/r600/r600_pipe_common.c
+++ b/src/gallium/drivers/r600/r600_pipe_common.c
@@ -854,13 +854,13 @@ static void r600_disk_cache_create(struct r600_common_screen *rscreen)
 	if (rscreen->debug_flags & DBG_ALL_SHADERS)
 		return;
 
-	uint32_t mesa_timestamp;
-	if (disk_cache_get_function_timestamp(r600_disk_cache_create,
-					      &mesa_timestamp)) {
-		char *timestamp_str;
+	uint32_t mesa_id;
+	if (disk_cache_get_function_identifier(r600_disk_cache_create,
+					       &mesa_id)) {
+		char *mesa_id_str;
 		int res = -1;
 
-		res = asprintf(&timestamp_str, "%u",mesa_timestamp);
+		res = asprintf(&mesa_id_str, "%u", mesa_id);
 		if (res != -1) {
 			/* These flags affect shader compilation. */
 			uint64_t shader_debug_flags =
@@ -870,9 +870,9 @@ static void r600_disk_cache_create(struct r600_common_screen *rscreen)
 
 			rscreen->disk_shader_cache =
 				disk_cache_create(r600_get_family_name(rscreen),
-						  timestamp_str,
+						  mesa_id_str,
 						  shader_debug_flags);
-			free(timestamp_str);
+			free(mesa_id_str);
 		}
 	}
 }