From 46c08b73dea5c12f8fd7e3f2a404daf110d5df43 Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Tue, 10 Nov 2020 09:38:45 +0100 Subject: [PATCH] softpipe: correct signature of get_compiler_options This gets rid of a harmless but annoying compiler warning on MSVC. Fixes: 73bafb5ee38 ("gallium: s/unsigned/enum pipe_shader_type/ for get_compiler_options()") Reviewed-By: Mike Blumenkrantz Part-of: (cherry picked from commit 7a1346b26a70a9d6000f4889ab4d594a6a445d6d) --- .pick_status.json | 2 +- src/gallium/drivers/softpipe/sp_screen.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d336e969660..5b35ac1d24d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1453,7 +1453,7 @@ "description": "softpipe: correct signature of get_compiler_options", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "73bafb5ee38964019c3da2000095608a7fb4b554" }, diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c index 4219e9bd36f..43f57bbf081 100644 --- a/src/gallium/drivers/softpipe/sp_screen.c +++ b/src/gallium/drivers/softpipe/sp_screen.c @@ -89,7 +89,8 @@ static const nir_shader_compiler_options sp_compiler_options = { static const void * softpipe_get_compiler_options(struct pipe_screen *pscreen, - enum pipe_shader_ir ir, unsigned shader) + enum pipe_shader_ir ir, + enum pipe_shader_type shader) { assert(ir == PIPE_SHADER_IR_NIR); return &sp_compiler_options;