fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 03:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/mesa: fix incorrect types of shader CSOs

Browse source 
CSOs are always void *.

Reviewed-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31968>
This commit is contained in:
Marek Olšák 2024-10-27 12:42:06 -04:00 • committed by Marge Bot
parent e329d39aa9
commit 09355290d3
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/state_tracker/st_nir.h
View file

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

6
src/mesa/state_tracker/st_nir_builtins.c
View file

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

2
src/mesa/state_tracker/st_pbo_compute.c
View file

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

4
src/mesa/state_tracker/st_program.c
View file

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

2
src/mesa/state_tracker/st_program.h
View file

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