Re: [Mesa-dev] [PATCH v2 29/32] disk_cache: Fix issue reading GLSL metadata

2017-10-19 Thread Timothy Arceri

Reviewed-by: Timothy Arceri 
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH v2 29/32] disk_cache: Fix issue reading GLSL metadata

2017-10-18 Thread Jordan Justen
This would cause the read of the metadata content to fail, which would
prevent the linking from being skipped.

Seen on Rocket League with i965 shader cache.

Cc: Timothy Arceri 
Signed-off-by: Jordan Justen 
---
 src/util/disk_cache.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c
index e38cacb259..fde6e2e097 100644
--- a/src/util/disk_cache.c
+++ b/src/util/disk_cache.c
@@ -1110,7 +1110,7 @@ disk_cache_get(struct disk_cache *cache, const cache_key 
key, size_t *size)
* TODO: pass the metadata back to the caller and do some basic
* validation.
*/
-  cache_item_md_size += sizeof(cache_key);
+  cache_item_md_size += num_keys * sizeof(cache_key);
   ret = lseek(fd, num_keys * sizeof(cache_key), SEEK_CUR);
   if (ret == -1)
  goto fail;
-- 
2.15.0.rc0

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev