From: Grazvydas Ignotas Date: Thu, 2 Mar 2017 22:46:53 +0000 (+0200) Subject: tgsi/ureg: return correct token count in ureg_get_tokens X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4dc42ae792352c808e79de299d89a85ea87ecc7e;p=mesa.git tgsi/ureg: return correct token count in ureg_get_tokens Valgrind reports that the shader cache writes uninitialized data to disk. Turns out ureg_get_tokens() is returning the count of allocated tokens instead of how many are actually used, so the cache writes out unused space at the end. Use the real count instead. This change should not cause regressions elsewhere because the only ureg_get_tokens() user that cares about token count is the shader cache. Signed-off-by: Grazvydas Ignotas Reviewed-by: Timothy Arceri --- diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.c b/src/gallium/auxiliary/tgsi/tgsi_ureg.c index 8d1b6cc7da4..ab0a3ebe1a5 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_ureg.c +++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.c @@ -2141,7 +2141,7 @@ const struct tgsi_token *ureg_get_tokens( struct ureg_program *ureg, tokens = &ureg->domain[DOMAIN_DECL].tokens[0].token; if (nr_tokens) - *nr_tokens = ureg->domain[DOMAIN_DECL].size; + *nr_tokens = ureg->domain[DOMAIN_DECL].count; ureg->domain[DOMAIN_DECL].tokens = 0; ureg->domain[DOMAIN_DECL].size = 0;