From f0602dc92044ea6d738d0e539e52f938a41f6093 Mon Sep 17 00:00:00 2001 From: Tim Rowley Date: Tue, 22 Aug 2017 10:39:57 -0500 Subject: [PATCH] swr: limit pipe_draw_info->restart_index usage Only copy this value when in restart drawing mode. Eliminates valgrind errors when running trivial programs. Reviewed-by: Bruce Cherniak --- src/gallium/drivers/swr/swr_draw.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/gallium/drivers/swr/swr_draw.cpp b/src/gallium/drivers/swr/swr_draw.cpp index df1c11abeb7..2363800f805 100644 --- a/src/gallium/drivers/swr/swr_draw.cpp +++ b/src/gallium/drivers/swr/swr_draw.cpp @@ -107,7 +107,10 @@ swr_draw_vbo(struct pipe_context *pipe, const struct pipe_draw_info *info) } struct swr_vertex_element_state *velems = ctx->velems; - velems->fsState.cutIndex = info->restart_index; + if (info->primitive_restart) + velems->fsState.cutIndex = info->restart_index; + else + velems->fsState.cutIndex = 0; velems->fsState.bEnableCutIndex = info->primitive_restart; velems->fsState.bPartialVertexBuffer = (info->min_index > 0); -- 2.30.2