Module: Mesa Branch: staging/22.2 Commit: ec9691dbf12f1a04c2bbbf13b4ecf2760dc46121 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ec9691dbf12f1a04c2bbbf13b4ecf2760dc46121
Author: Charmaine Lee <[email protected]> Date: Wed Aug 3 11:40:32 2022 -0700 svga: fix mksstats build Trivial. Fixes: ed77ac1eef7 ("svga: add a helper function for common shader creation") Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17971> (cherry picked from commit aa5d4062e8b359fb11f35816d87fd2f4fd4b778a) --- .pick_status.json | 2 +- src/gallium/drivers/svga/svga_pipe_ts.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index 276a22a6e3f..2034dcd8522 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -85,7 +85,7 @@ "description": "svga: fix mksstats build", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "ed77ac1eef7c6f4126149ea2e492a243ba8449e5" }, diff --git a/src/gallium/drivers/svga/svga_pipe_ts.c b/src/gallium/drivers/svga/svga_pipe_ts.c index e576294e78c..06e58159991 100644 --- a/src/gallium/drivers/svga/svga_pipe_ts.c +++ b/src/gallium/drivers/svga/svga_pipe_ts.c @@ -61,6 +61,7 @@ static void * svga_create_tcs_state(struct pipe_context *pipe, const struct pipe_shader_state *templ) { + struct svga_context *svga = svga_context(pipe); struct svga_tcs_shader *tcs; SVGA_STATS_TIME_PUSH(svga_sws(svga), SVGA_STATS_TIME_CREATETCS); @@ -73,6 +74,8 @@ svga_create_tcs_state(struct pipe_context *pipe, done: SVGA_STATS_TIME_POP(svga_sws(svga)); + (void) svga; /* silence unused var warning */ + return tcs; } @@ -137,6 +140,7 @@ static void * svga_create_tes_state(struct pipe_context *pipe, const struct pipe_shader_state *templ) { + struct svga_context *svga = svga_context(pipe); struct svga_tes_shader *tes; SVGA_STATS_TIME_PUSH(svga_sws(svga), SVGA_STATS_TIME_CREATETES); @@ -150,6 +154,8 @@ svga_create_tes_state(struct pipe_context *pipe, done: SVGA_STATS_TIME_POP(svga_sws(svga)); + (void) svga; /* silence unused var warning */ + return tes; }
