summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary/draw
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2013-09-12 13:43:14 -0600
committerBrian Paul <brianp@vmware.com>2013-10-03 14:05:25 -0600
commitc368479e38783100f1e525ac6398bf8eb2233b4c (patch)
tree93c6da4bf96abbd8af229644ab5735165c30b4d1 /src/gallium/auxiliary/draw
parentc7d91a6f13d9dafe47cfa948619083258bc47cb0 (diff)
draw: rename bind_sampler_states variables
Put 'fragment' in the names. In preparation for upcoming function renaming.
Diffstat (limited to 'src/gallium/auxiliary/draw')
-rw-r--r--src/gallium/auxiliary/draw/draw_pipe_aaline.c22
-rw-r--r--src/gallium/auxiliary/draw/draw_pipe_pstipple.c16
2 files changed, 19 insertions, 19 deletions
diff --git a/src/gallium/auxiliary/draw/draw_pipe_aaline.c b/src/gallium/auxiliary/draw/draw_pipe_aaline.c
index 8483bd7dd32..816dd4b5623 100644
--- a/src/gallium/auxiliary/draw/draw_pipe_aaline.c
+++ b/src/gallium/auxiliary/draw/draw_pipe_aaline.c
@@ -118,8 +118,8 @@ struct aaline_stage
void (*driver_bind_fs_state)(struct pipe_context *, void *);
void (*driver_delete_fs_state)(struct pipe_context *, void *);
- void (*driver_bind_sampler_states)(struct pipe_context *, unsigned,
- void **);
+ void (*driver_bind_fragment_sampler_states)(struct pipe_context *, unsigned,
+ void **);
void (*driver_set_sampler_views)(struct pipe_context *,
unsigned,
@@ -704,7 +704,7 @@ aaline_first_line(struct draw_stage *stage, struct prim_header *header)
aaline->sampler_view);
draw->suspend_flushing = TRUE;
- aaline->driver_bind_sampler_states(pipe, num_samplers, aaline->state.sampler);
+ aaline->driver_bind_fragment_sampler_states(pipe, num_samplers, aaline->state.sampler);
aaline->driver_set_sampler_views(pipe, num_samplers, aaline->state.sampler_views);
/* Disable triangle culling, stippling, unfilled mode etc. */
@@ -732,8 +732,8 @@ aaline_flush(struct draw_stage *stage, unsigned flags)
/* restore original frag shader, texture, sampler state */
draw->suspend_flushing = TRUE;
aaline->driver_bind_fs_state(pipe, aaline->fs ? aaline->fs->driver_fs : NULL);
- aaline->driver_bind_sampler_states(pipe, aaline->num_samplers,
- aaline->state.sampler);
+ aaline->driver_bind_fragment_sampler_states(pipe, aaline->num_samplers,
+ aaline->state.sampler);
aaline->driver_set_sampler_views(pipe,
aaline->num_sampler_views,
aaline->state.sampler_views);
@@ -784,7 +784,7 @@ aaline_destroy(struct draw_stage *stage)
pipe->bind_fs_state = aaline->driver_bind_fs_state;
pipe->delete_fs_state = aaline->driver_delete_fs_state;
- pipe->bind_fragment_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 );
@@ -903,8 +903,8 @@ aaline_delete_fs_state(struct pipe_context *pipe, void *fs)
static void
-aaline_bind_sampler_states(struct pipe_context *pipe,
- unsigned num, void **sampler)
+aaline_bind_fragment_sampler_states(struct pipe_context *pipe,
+ unsigned num, void **sampler)
{
struct aaline_stage *aaline = aaline_stage_from_pipe(pipe);
@@ -917,7 +917,7 @@ aaline_bind_sampler_states(struct pipe_context *pipe,
aaline->num_samplers = num;
/* pass-through */
- aaline->driver_bind_sampler_states(pipe, num, sampler);
+ aaline->driver_bind_fragment_sampler_states(pipe, num, sampler);
}
@@ -997,7 +997,7 @@ draw_install_aaline_stage(struct draw_context *draw, struct pipe_context *pipe)
aaline->driver_bind_fs_state = pipe->bind_fs_state;
aaline->driver_delete_fs_state = pipe->delete_fs_state;
- aaline->driver_bind_sampler_states = pipe->bind_fragment_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 */
@@ -1005,7 +1005,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;
- pipe->bind_fragment_sampler_states = aaline_bind_sampler_states;
+ pipe->bind_fragment_sampler_states = aaline_bind_fragment_sampler_states;
pipe->set_fragment_sampler_views = aaline_set_sampler_views;
/* Install once everything is known to be OK:
diff --git a/src/gallium/auxiliary/draw/draw_pipe_pstipple.c b/src/gallium/auxiliary/draw/draw_pipe_pstipple.c
index f38addd6410..65f3125af31 100644
--- a/src/gallium/auxiliary/draw/draw_pipe_pstipple.c
+++ b/src/gallium/auxiliary/draw/draw_pipe_pstipple.c
@@ -99,7 +99,7 @@ struct pstip_stage
void (*driver_bind_fs_state)(struct pipe_context *, void *);
void (*driver_delete_fs_state)(struct pipe_context *, void *);
- void (*driver_bind_sampler_states)(struct pipe_context *, unsigned, void **);
+ void (*driver_bind_fragment_sampler_states)(struct pipe_context *, unsigned, void **);
void (*driver_set_sampler_views)(struct pipe_context *,
unsigned,
@@ -547,7 +547,7 @@ pstip_first_tri(struct draw_stage *stage, struct prim_header *header)
assert(num_samplers <= PIPE_MAX_SAMPLERS);
draw->suspend_flushing = TRUE;
- pstip->driver_bind_sampler_states(pipe, num_samplers, pstip->state.samplers);
+ pstip->driver_bind_fragment_sampler_states(pipe, num_samplers, pstip->state.samplers);
pstip->driver_set_sampler_views(pipe, num_samplers, pstip->state.sampler_views);
draw->suspend_flushing = FALSE;
@@ -570,7 +570,7 @@ pstip_flush(struct draw_stage *stage, unsigned flags)
/* restore original frag shader, texture, sampler state */
draw->suspend_flushing = TRUE;
pstip->driver_bind_fs_state(pipe, pstip->fs ? pstip->fs->driver_fs : NULL);
- pstip->driver_bind_sampler_states(pipe, pstip->num_samplers,
+ pstip->driver_bind_fragment_sampler_states(pipe, pstip->num_samplers,
pstip->state.samplers);
pstip->driver_set_sampler_views(pipe,
pstip->num_sampler_views,
@@ -701,8 +701,8 @@ pstip_delete_fs_state(struct pipe_context *pipe, void *fs)
static void
-pstip_bind_sampler_states(struct pipe_context *pipe,
- unsigned num, void **sampler)
+pstip_bind_fragment_sampler_states(struct pipe_context *pipe,
+ unsigned num, void **sampler)
{
struct pstip_stage *pstip = pstip_stage_from_pipe(pipe);
uint i;
@@ -715,7 +715,7 @@ pstip_bind_sampler_states(struct pipe_context *pipe,
pstip->num_samplers = num;
/* pass-through */
- pstip->driver_bind_sampler_states(pstip->pipe, num, sampler);
+ pstip->driver_bind_fragment_sampler_states(pstip->pipe, num, sampler);
}
@@ -792,7 +792,7 @@ draw_install_pstipple_stage(struct draw_context *draw,
pstip->driver_bind_fs_state = pipe->bind_fs_state;
pstip->driver_delete_fs_state = pipe->delete_fs_state;
- pstip->driver_bind_sampler_states = pipe->bind_fragment_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;
@@ -801,7 +801,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;
- pipe->bind_fragment_sampler_states = pstip_bind_sampler_states;
+ pipe->bind_fragment_sampler_states = pstip_bind_fragment_sampler_states;
pipe->set_fragment_sampler_views = pstip_set_sampler_views;
pipe->set_polygon_stipple = pstip_set_polygon_stipple;