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

draw: remove use of old bind_fragment_sampler_states()

Browse source
This commit is contained in:
Brian Paul 2013-09-12 15:25:08 -06:00
parent 7478236da9
commit 9fa6722a68
2 changed files with 13 additions and 82 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
src/gallium/auxiliary/draw/draw_pipe_aaline.c
View file

@ -120,8 +120,6 @@ struct aaline_stage
void (*driver_bind_sampler_states)(struct pipe_context *, unsigned, unsigned,
unsigned, void **);
void (*driver_bind_fragment_sampler_states)(struct pipe_context *, unsigned,
void **);
void (*driver_set_sampler_views)(struct pipe_context *,
unsigned,
@ -706,12 +704,9 @@ aaline_first_line(struct draw_stage *stage, struct prim_header *header)
aaline->sampler_view);
draw->suspend_flushing = TRUE;
if (aaline->driver_bind_sampler_states)
aaline->driver_bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, 0,
num_samplers, aaline->state.sampler);
else
aaline->driver_bind_fragment_sampler_states(pipe, num_samplers,
aaline->state.sampler);
aaline->driver_bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, 0,
num_samplers, aaline->state.sampler);
aaline->driver_set_sampler_views(pipe, num_samplers, aaline->state.sampler_views);
@ -741,13 +736,9 @@ aaline_flush(struct draw_stage *stage, unsigned flags)
draw->suspend_flushing = TRUE;
aaline->driver_bind_fs_state(pipe, aaline->fs ? aaline->fs->driver_fs : NULL);
if (aaline->driver_bind_sampler_states)
aaline->driver_bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, 0,
aaline->num_samplers,
aaline->state.sampler);
else
aaline->driver_bind_fragment_sampler_states(pipe, aaline->num_samplers,
aaline->state.sampler);
aaline->driver_bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, 0,
aaline->num_samplers,
aaline->state.sampler);
aaline->driver_set_sampler_views(pipe,
aaline->num_sampler_views,
@ -800,7 +791,6 @@ aaline_destroy(struct draw_stage *stage)
pipe->delete_fs_state = aaline->driver_delete_fs_state;
pipe->bind_sampler_states = aaline->driver_bind_sampler_states;
pipe->bind_fragment_sampler_states = aaline->driver_bind_fragment_sampler_states;
pipe->set_fragment_sampler_views = aaline->driver_set_sampler_views;
FREE( stage );
@ -941,26 +931,6 @@ aaline_bind_sampler_states(struct pipe_context *pipe, unsigned shader,
}
/* XXX deprecated / remove */
static void
aaline_bind_fragment_sampler_states(struct pipe_context *pipe,
unsigned num, void **sampler)
{
struct aaline_stage *aaline = aaline_stage_from_pipe(pipe);
if (aaline == NULL) {
return;
}
/* save current */
memcpy(aaline->state.sampler, sampler, num * sizeof(void *));
aaline->num_samplers = num;
/* pass-through */
aaline->driver_bind_fragment_sampler_states(pipe, num, sampler);
}
static void
aaline_set_sampler_views(struct pipe_context *pipe,
unsigned num,
@ -1038,7 +1008,6 @@ draw_install_aaline_stage(struct draw_context *draw, struct pipe_context *pipe)
aaline->driver_delete_fs_state = pipe->delete_fs_state;
aaline->driver_bind_sampler_states = pipe->bind_sampler_states;
aaline->driver_bind_fragment_sampler_states = pipe->bind_fragment_sampler_states;
aaline->driver_set_sampler_views = pipe->set_fragment_sampler_views;
/* override the driver's functions */
@ -1046,11 +1015,7 @@ draw_install_aaline_stage(struct draw_context *draw, struct pipe_context *pipe)
pipe->bind_fs_state = aaline_bind_fs_state;
pipe->delete_fs_state = aaline_delete_fs_state;
if (pipe->bind_sampler_states)
pipe->bind_sampler_states = aaline_bind_sampler_states;
else
pipe->bind_fragment_sampler_states = aaline_bind_fragment_sampler_states;
pipe->bind_sampler_states = aaline_bind_sampler_states;
pipe->set_fragment_sampler_views = aaline_set_sampler_views;
/* Install once everything is known to be OK:

46
src/gallium/auxiliary/draw/draw_pipe_pstipple.c
View file

@ -99,8 +99,6 @@ struct pstip_stage
void (*driver_bind_fs_state)(struct pipe_context *, void *);
void (*driver_delete_fs_state)(struct pipe_context *, void *);
void (*driver_bind_fragment_sampler_states)(struct pipe_context *, unsigned, void **);
void (*driver_bind_sampler_states)(struct pipe_context *, unsigned,
unsigned, unsigned, void **);
@ -551,12 +549,8 @@ pstip_first_tri(struct draw_stage *stage, struct prim_header *header)
draw->suspend_flushing = TRUE;
if (pstip->driver_bind_sampler_states)
pstip->driver_bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, 0,
num_samplers, pstip->state.samplers);
else
pstip->driver_bind_fragment_sampler_states(pipe, num_samplers,
pstip->state.samplers);
pstip->driver_bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, 0,
num_samplers, pstip->state.samplers);
pstip->driver_set_sampler_views(pipe, num_samplers, pstip->state.sampler_views);
draw->suspend_flushing = FALSE;
@ -581,13 +575,9 @@ pstip_flush(struct draw_stage *stage, unsigned flags)
draw->suspend_flushing = TRUE;
pstip->driver_bind_fs_state(pipe, pstip->fs ? pstip->fs->driver_fs : NULL);
if (pstip->driver_bind_sampler_states)
pstip->driver_bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, 0,
pstip->num_samplers,
pstip->state.samplers);
else
pstip->driver_bind_fragment_sampler_states(pipe, pstip->num_samplers,
pstip->state.samplers);
pstip->driver_bind_sampler_states(pipe, PIPE_SHADER_FRAGMENT, 0,
pstip->num_samplers,
pstip->state.samplers);
pstip->driver_set_sampler_views(pipe,
pstip->num_sampler_views,
@ -740,27 +730,6 @@ pstip_bind_sampler_states(struct pipe_context *pipe, unsigned shader,
}
/* XXX deprecated / remove */
static void
pstip_bind_fragment_sampler_states(struct pipe_context *pipe,
unsigned num, void **sampler)
{
struct pstip_stage *pstip = pstip_stage_from_pipe(pipe);
uint i;
/* save current */
memcpy(pstip->state.samplers, sampler, num * sizeof(void *));
for (i = num; i < PIPE_MAX_SAMPLERS; i++) {
pstip->state.samplers[i] = NULL;
}
pstip->num_samplers = num;
/* pass-through */
pstip->driver_bind_fragment_sampler_states(pstip->pipe, num, sampler);
}
static void
pstip_set_sampler_views(struct pipe_context *pipe,
unsigned num,
@ -835,7 +804,6 @@ draw_install_pstipple_stage(struct draw_context *draw,
pstip->driver_delete_fs_state = pipe->delete_fs_state;
pstip->driver_bind_sampler_states = pipe->bind_sampler_states;
pstip->driver_bind_fragment_sampler_states = pipe->bind_fragment_sampler_states;
pstip->driver_set_sampler_views = pipe->set_fragment_sampler_views;
pstip->driver_set_polygon_stipple = pipe->set_polygon_stipple;
@ -844,9 +812,7 @@ draw_install_pstipple_stage(struct draw_context *draw,
pipe->bind_fs_state = pstip_bind_fs_state;
pipe->delete_fs_state = pstip_delete_fs_state;
if (pipe->bind_sampler_states)
pipe->bind_sampler_states = pstip_bind_sampler_states;
pipe->bind_fragment_sampler_states = pstip_bind_fragment_sampler_states;
pipe->bind_sampler_states = pstip_bind_sampler_states;
pipe->set_fragment_sampler_views = pstip_set_sampler_views;
pipe->set_polygon_stipple = pstip_set_polygon_stipple;