fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 20:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nouveau: remove old bind_*_sampler_states() functions

Browse source
This commit is contained in:
Brian Paul 2013-09-12 18:14:02 -06:00
parent 1446600d1a
commit 7478236da9
4 changed files with 0 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/drivers/nouveau/nv30/nv30_fragtex.c
View file

@ -197,6 +197,5 @@ nv30_fragtex_set_sampler_views(struct pipe_context *pipe, unsigned nr,
void void
nv30_fragtex_init(struct pipe_context *pipe) nv30_fragtex_init(struct pipe_context *pipe)
{ {
pipe->bind_fragment_sampler_states = nv30_fragtex_sampler_states_bind;
pipe->set_fragment_sampler_views = nv30_fragtex_set_sampler_views; pipe->set_fragment_sampler_views = nv30_fragtex_set_sampler_views;
} }

1
src/gallium/drivers/nouveau/nv30/nv40_verttex.c
View file

@ -95,6 +95,5 @@ nv40_verttex_set_sampler_views(struct pipe_context *pipe, unsigned nr,
void void
nv40_verttex_init(struct pipe_context *pipe) nv40_verttex_init(struct pipe_context *pipe)
{ {
pipe->bind_vertex_sampler_states = nv40_verttex_sampler_states_bind;
pipe->set_vertex_sampler_views = nv40_verttex_set_sampler_views; pipe->set_vertex_sampler_views = nv40_verttex_set_sampler_views;
} }

3
src/gallium/drivers/nouveau/nv50/nv50_state.c
View file

@ -1089,9 +1089,6 @@ nv50_init_state_functions(struct nv50_context *nv50)
pipe->create_sampler_state = nv50_sampler_state_create; pipe->create_sampler_state = nv50_sampler_state_create;
pipe->delete_sampler_state = nv50_sampler_state_delete; pipe->delete_sampler_state = nv50_sampler_state_delete;
pipe->bind_sampler_states = nv50_bind_sampler_states; pipe->bind_sampler_states = nv50_bind_sampler_states;
pipe->bind_vertex_sampler_states = nv50_vp_sampler_states_bind;
pipe->bind_fragment_sampler_states = nv50_fp_sampler_states_bind;
pipe->bind_geometry_sampler_states = nv50_gp_sampler_states_bind;
pipe->create_sampler_view = nv50_create_sampler_view; pipe->create_sampler_view = nv50_create_sampler_view;
pipe->sampler_view_destroy = nv50_sampler_view_destroy; pipe->sampler_view_destroy = nv50_sampler_view_destroy;

31
src/gallium/drivers/nouveau/nvc0/nvc0_state.c
View file

@ -471,24 +471,6 @@ nvc0_stage_sampler_states_bind(struct nvc0_context *nvc0, int s,
nvc0->dirty |= NVC0_NEW_SAMPLERS; nvc0->dirty |= NVC0_NEW_SAMPLERS;
} }
static void
nvc0_vp_sampler_states_bind(struct pipe_context *pipe, unsigned nr, void **s)
{
nvc0_stage_sampler_states_bind(nvc0_context(pipe), 0, nr, s);
}
static void
nvc0_fp_sampler_states_bind(struct pipe_context *pipe, unsigned nr, void **s)
{
nvc0_stage_sampler_states_bind(nvc0_context(pipe), 4, nr, s);
}
static void
nvc0_gp_sampler_states_bind(struct pipe_context *pipe, unsigned nr, void **s)
{
nvc0_stage_sampler_states_bind(nvc0_context(pipe), 3, nr, s);
}
static void static void
nvc0_stage_sampler_states_bind_range(struct nvc0_context *nvc0, nvc0_stage_sampler_states_bind_range(struct nvc0_context *nvc0,
const unsigned s, const unsigned s,
@ -531,15 +513,6 @@ nvc0_stage_sampler_states_bind_range(struct nvc0_context *nvc0,
} }
} }
static void
nvc0_cp_sampler_states_bind(struct pipe_context *pipe,
unsigned start, unsigned nr, void **cso)
{
nvc0_stage_sampler_states_bind_range(nvc0_context(pipe), 5, start, nr, cso);
nvc0_context(pipe)->dirty_cp |= NVC0_NEW_CP_SAMPLERS;
}
static void static void
nvc0_bind_sampler_states(struct pipe_context *pipe, unsigned shader, nvc0_bind_sampler_states(struct pipe_context *pipe, unsigned shader,
unsigned start, unsigned nr, void **s) unsigned start, unsigned nr, void **s)
@ -1221,10 +1194,6 @@ nvc0_init_state_functions(struct nvc0_context *nvc0)
pipe->create_sampler_state = nv50_sampler_state_create; pipe->create_sampler_state = nv50_sampler_state_create;
pipe->delete_sampler_state = nvc0_sampler_state_delete; pipe->delete_sampler_state = nvc0_sampler_state_delete;
pipe->bind_sampler_states = nvc0_bind_sampler_states; pipe->bind_sampler_states = nvc0_bind_sampler_states;
pipe->bind_vertex_sampler_states = nvc0_vp_sampler_states_bind;
pipe->bind_fragment_sampler_states = nvc0_fp_sampler_states_bind;
pipe->bind_geometry_sampler_states = nvc0_gp_sampler_states_bind;
pipe->bind_compute_sampler_states = nvc0_cp_sampler_states_bind;
pipe->create_sampler_view = nvc0_create_sampler_view; pipe->create_sampler_view = nvc0_create_sampler_view;
pipe->sampler_view_destroy = nvc0_sampler_view_destroy; pipe->sampler_view_destroy = nvc0_sampler_view_destroy;