Module: Mesa Branch: main Commit: e84302f7634bf0ca32dde0ed695f4f07e4f799b2 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=e84302f7634bf0ca32dde0ed695f4f07e4f799b2
Author: Alyssa Rosenzweig <aly...@rosenzweig.io> Date: Sat Nov 18 22:13:05 2023 -0400 nouveau: use pipe_shader_from_nir Signed-off-by: Alyssa Rosenzweig <aly...@rosenzweig.io> Reviewed-by: Eric Engestrom <e...@igalia.com> Reviewed-by: M Henning <dra...@darkrefraction.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26272> --- src/gallium/drivers/nouveau/nv50/nv50_surface.c | 5 ++--- src/gallium/drivers/nouveau/nvc0/nvc0_program.c | 5 ++--- src/gallium/drivers/nouveau/nvc0/nvc0_surface.c | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/gallium/drivers/nouveau/nv50/nv50_surface.c b/src/gallium/drivers/nouveau/nv50/nv50_surface.c index faadab176f2..7499d67d738 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_surface.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_surface.c @@ -25,6 +25,7 @@ #include "compiler/nir/nir.h" #include "compiler/nir/nir_builder.h" +#include "nir/pipe_nir.h" #include "pipe/p_defines.h" #include "util/u_inlines.h" @@ -992,9 +993,7 @@ nv50_blitter_make_fp(struct pipe_context *pipe, /* return shader */ NIR_PASS_V(b.shader, nir_lower_samplers); - struct pipe_shader_state state; - pipe_shader_state_from_nir(&state, b.shader); - return pipe->create_fs_state(pipe, &state); + return pipe_shader_from_nir(pipe, b.shader); } static void diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_program.c b/src/gallium/drivers/nouveau/nvc0/nvc0_program.c index e806977af73..a2c1ca76b91 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_program.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_program.c @@ -20,6 +20,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "nir/pipe_nir.h" #include "pipe/p_defines.h" #include "compiler/nir/nir.h" @@ -1012,7 +1013,5 @@ nvc0_program_init_tcp_empty(struct nvc0_context *nvc0) nir_validate_shader(b.shader, "in nvc0_program_init_tcp_empty"); - struct pipe_shader_state state; - pipe_shader_state_from_nir(&state, b.shader); - nvc0->tcp_empty = nvc0->base.pipe.create_tcs_state(&nvc0->base.pipe, &state); + nvc0->tcp_empty = pipe_shader_from_nir(&nvc0->base.pipe, b.shader); } diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c b/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c index da5f20b444f..c168b418345 100644 --- a/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_surface.c @@ -25,6 +25,7 @@ #include "compiler/nir/nir.h" #include "compiler/nir/nir_builder.h" +#include "nir/pipe_nir.h" #include "pipe/p_defines.h" #include "util/u_inlines.h" @@ -888,9 +889,7 @@ nvc0_blitter_make_vp(struct pipe_context *pipe) NIR_PASS_V(b.shader, nir_lower_var_copies); - struct pipe_shader_state state; - pipe_shader_state_from_nir(&state, b.shader); - return pipe->create_vs_state(pipe, &state); + return pipe_shader_from_nir(pipe, b.shader); } static void
