fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-21 18:40:42 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

nouveau: use pipe_shader_from_nir

Browse source 
Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: M Henning <drawoc@darkrefraction.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26272>
This commit is contained in:
Alyssa Rosenzweig 2023-11-18 22:13:05 -04:00 • committed by Marge Bot
parent de1245417a
commit e84302f763
3 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/nouveau/nv50/nv50_surface.c
View file

@ -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

5
src/gallium/drivers/nouveau/nvc0/nvc0_program.c
View file

@ -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);
}

5
src/gallium/drivers/nouveau/nvc0/nvc0_surface.c
View file

@ -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