From 09355290d3f4886d310b62ba15d11aca3b72d395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sun, 27 Oct 2024 12:42:06 -0400 Subject: [PATCH] st/mesa: fix incorrect types of shader CSOs CSOs are always void *. Reviewed-by: Alyssa Rosenzweig Part-of: --- src/mesa/state_tracker/st_nir.h | 6 +++--- src/mesa/state_tracker/st_nir_builtins.c | 6 +++--- src/mesa/state_tracker/st_pbo_compute.c | 2 +- src/mesa/state_tracker/st_program.c | 4 ++-- src/mesa/state_tracker/st_program.h | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/mesa/state_tracker/st_nir.h b/src/mesa/state_tracker/st_nir.h index b59471edb06..a327ac29e1a 100644 --- a/src/mesa/state_tracker/st_nir.h +++ b/src/mesa/state_tracker/st_nir.h @@ -60,11 +60,11 @@ void st_nir_lower_uniforms(struct st_context *st, struct nir_shader *nir); void st_nir_finish_builtin_nir(struct st_context *st, struct nir_shader *nir); -struct pipe_shader_state * +void * st_nir_finish_builtin_shader(struct st_context *st, struct nir_shader *nir); -struct pipe_shader_state * +void * st_nir_make_passthrough_shader(struct st_context *st, const char *shader_name, gl_shader_stage stage, @@ -74,7 +74,7 @@ st_nir_make_passthrough_shader(struct st_context *st, unsigned *interpolation_modes, unsigned sysval_mask); -struct pipe_shader_state * +void * st_nir_make_clearcolor_shader(struct st_context *st); struct nir_variable * diff --git a/src/mesa/state_tracker/st_nir_builtins.c b/src/mesa/state_tracker/st_nir_builtins.c index be4dfdb2b63..1a44ae20965 100644 --- a/src/mesa/state_tracker/st_nir_builtins.c +++ b/src/mesa/state_tracker/st_nir_builtins.c @@ -81,7 +81,7 @@ st_nir_finish_builtin_nir(struct st_context *st, nir_shader *nir) } } -struct pipe_shader_state * +void * st_nir_finish_builtin_shader(struct st_context *st, nir_shader *nir) { @@ -98,7 +98,7 @@ st_nir_finish_builtin_shader(struct st_context *st, /** * Make a simple shader that copies inputs to corresponding outputs. */ -struct pipe_shader_state * +void * st_nir_make_passthrough_shader(struct st_context *st, const char *shader_name, gl_shader_stage stage, @@ -143,7 +143,7 @@ st_nir_make_passthrough_shader(struct st_context *st, * Make a simple shader that reads color value from a constant buffer * and uses it to clear all color buffers. */ -struct pipe_shader_state * +void * st_nir_make_clearcolor_shader(struct st_context *st) { const nir_shader_compiler_options *options = diff --git a/src/mesa/state_tracker/st_pbo_compute.c b/src/mesa/state_tracker/st_pbo_compute.c index f06de85c238..02871e9bf7c 100644 --- a/src/mesa/state_tracker/st_pbo_compute.c +++ b/src/mesa/state_tracker/st_pbo_compute.c @@ -49,7 +49,7 @@ struct pbo_spec_async_data { unsigned uses; struct util_queue_fence fence; nir_shader *nir; - struct pipe_shader_state *cs; + void *cs; }; struct pbo_async_data { diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index f0119d36cbe..4ffdf3b47e3 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -497,7 +497,7 @@ st_translate_stream_output_info(struct gl_program *prog) * Creates a driver shader from a NIR shader. Takes ownership of the * passed nir_shader. */ -struct pipe_shader_state * +void * st_create_nir_shader(struct st_context *st, struct pipe_shader_state *state) { struct pipe_context *pipe = st->pipe; @@ -511,7 +511,7 @@ st_create_nir_shader(struct st_context *st, struct pipe_shader_state *state) nir_print_shader(nir, stderr); } - struct pipe_shader_state *shader; + void *shader; switch (stage) { case MESA_SHADER_VERTEX: shader = pipe->create_vs_state(pipe, state); diff --git a/src/mesa/state_tracker/st_program.h b/src/mesa/state_tracker/st_program.h index 1a0699b0fbb..cceb0676fd6 100644 --- a/src/mesa/state_tracker/st_program.h +++ b/src/mesa/state_tracker/st_program.h @@ -358,7 +358,7 @@ st_serialize_base_nir(struct gl_program *prog, struct nir_shader *nir); extern void st_finalize_program(struct st_context *st, struct gl_program *prog); -struct pipe_shader_state * +void * st_create_nir_shader(struct st_context *st, struct pipe_shader_state *state); GLboolean st_program_string_notify(struct gl_context *ctx,