OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium: Add pipe_shader_state_from_nir

Browse Source 
and use it in nouveau

Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22537>
This commit is contained in:
M Henning
2023-04-22 00:47:28 -04:00
committed by Marge Bot
parent 5889c13fcd
commit b82004d960
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1067,9 +1067,8 @@ nv50_blitter_make_fp(struct pipe_context *pipe,
/* return shader */
NIR_PASS_V(b.shader, nir_lower_samplers);
struct pipe_shader_state state = {};
state.type = PIPE_SHADER_IR_NIR;
state.ir.nir = b.shader;
struct pipe_shader_state state;
pipe_shader_state_from_nir(&state, b.shader);
return pipe->create_fs_state(pipe, &state);
}

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

@@ -1025,8 +1025,7 @@ 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 = {0};
state.type = PIPE_SHADER_IR_NIR;
state.ir.nir = b.shader;
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);
}

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

@@ -888,9 +888,8 @@ nvc0_blitter_make_vp(struct pipe_context *pipe)
NIR_PASS_V(b.shader, nir_lower_var_copies);
struct pipe_shader_state state = {};
state.type = PIPE_SHADER_IR_NIR;
state.ir.nir = b.shader;
struct pipe_shader_state state;
pipe_shader_state_from_nir(&state, b.shader);
return pipe->create_vs_state(pipe, &state);
}

10
src/gallium/include/pipe/p_state.h
View File

@@ -318,6 +318,16 @@ pipe_shader_state_from_tgsi(struct pipe_shader_state *state,
memset(&state->stream_output, 0, sizeof(state->stream_output));
}
static inline void
pipe_shader_state_from_nir(struct pipe_shader_state *state,
void *nir)
{
state->type = PIPE_SHADER_IR_NIR;
state->ir.nir = nir;
state->tokens = NULL;
memset(&state->stream_output, 0, sizeof(state->stream_output));
}
struct pipe_stencil_state
{