summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers
diff options
context:
space:
mode:
authorStéphane Marchesin <[email protected]>2012-10-04 17:57:31 -0700
committerStéphane Marchesin <[email protected]>2012-10-05 12:45:02 -0700
commit74b6ea49dfc1b8921de1768da937557150ee7893 (patch)
treeaf1a55207f6f857cc4c325f5b514c0f2d5ec8016 /src/gallium/drivers
parentdca9e3c4779936970dac796872a2399cd0437f63 (diff)
i915g: Get rid of the fixup state functions.
Now that the saved_* state is gone, we don't need those any longer.
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r--src/gallium/drivers/i915/i915_context.c3
-rw-r--r--src/gallium/drivers/i915/i915_context.h8
-rw-r--r--src/gallium/drivers/i915/i915_state.c37
3 files changed, 0 insertions, 48 deletions
diff --git a/src/gallium/drivers/i915/i915_context.c b/src/gallium/drivers/i915/i915_context.c
index 1f2ca848100..42d90ffc0c6 100644
--- a/src/gallium/drivers/i915/i915_context.c
+++ b/src/gallium/drivers/i915/i915_context.c
@@ -198,9 +198,6 @@ i915_create_context(struct pipe_screen *screen, void *priv)
draw_install_aapoint_stage(i915->draw, &i915->base);
draw_enable_point_sprites(i915->draw, TRUE);
- /* augmented draw pipeline clobbers state functions */
- i915_init_fixup_state_functions(i915);
-
i915->dirty = ~0;
i915->hardware_dirty = ~0;
i915->immediate_dirty = ~0;
diff --git a/src/gallium/drivers/i915/i915_context.h b/src/gallium/drivers/i915/i915_context.h
index 719a0e87308..0c0555c7172 100644
--- a/src/gallium/drivers/i915/i915_context.h
+++ b/src/gallium/drivers/i915/i915_context.h
@@ -289,13 +289,6 @@ struct i915_context {
/** blitter/hw-clear */
struct blitter_context* blitter;
-
- /** State tracking needed by u_blitter for save/restore. */
- void (*saved_bind_fs_state)(struct pipe_context *pipe, void *shader);
- void (*saved_bind_sampler_states)(struct pipe_context *pipe,
- unsigned num, void **sampler);
- void (*saved_set_sampler_views)(struct pipe_context *pipe,
- unsigned num, struct pipe_sampler_view **views);
};
/* A flag for each state_tracker state object:
@@ -400,7 +393,6 @@ void i915_clear_emit(struct pipe_context *pipe, unsigned buffers,
*
*/
void i915_init_state_functions( struct i915_context *i915 );
-void i915_init_fixup_state_functions( struct i915_context *i915 );
void i915_init_flush_functions( struct i915_context *i915 );
void i915_init_string_functions( struct i915_context *i915 );
diff --git a/src/gallium/drivers/i915/i915_state.c b/src/gallium/drivers/i915/i915_state.c
index d3e62c941a5..74a5df484b4 100644
--- a/src/gallium/drivers/i915/i915_state.c
+++ b/src/gallium/drivers/i915/i915_state.c
@@ -291,14 +291,6 @@ i915_create_sampler_state(struct pipe_context *pipe,
return cso;
}
-static void i915_fixup_bind_sampler_states(struct pipe_context *pipe,
- unsigned num, void **sampler)
-{
- struct i915_context *i915 = i915_context(pipe);
-
- i915->saved_bind_sampler_states(pipe, num, sampler);
-}
-
static void
i915_bind_vertex_sampler_states(struct pipe_context *pipe,
unsigned num_samplers,
@@ -579,14 +571,6 @@ i915_create_fs_state(struct pipe_context *pipe,
}
static void
-i915_fixup_bind_fs_state(struct pipe_context *pipe, void *shader)
-{
- struct i915_context *i915 = i915_context(pipe);
-
- i915->saved_bind_fs_state(pipe, shader);
-}
-
-static void
i915_bind_fs_state(struct pipe_context *pipe, void *shader)
{
struct i915_context *i915 = i915_context(pipe);
@@ -712,16 +696,6 @@ static void i915_set_constant_buffer(struct pipe_context *pipe,
}
-static void
-i915_fixup_set_fragment_sampler_views(struct pipe_context *pipe,
- unsigned num,
- struct pipe_sampler_view **views)
-{
- struct i915_context *i915 = i915_context(pipe);
-
- i915->saved_set_sampler_views(pipe, num, views);
-}
-
static void i915_set_fragment_sampler_views(struct pipe_context *pipe,
unsigned num,
struct pipe_sampler_view **views)
@@ -1085,14 +1059,3 @@ i915_init_state_functions( struct i915_context *i915 )
i915->base.set_vertex_buffers = i915_set_vertex_buffers;
i915->base.set_index_buffer = i915_set_index_buffer;
}
-
-void
-i915_init_fixup_state_functions( struct i915_context *i915 )
-{
- i915->saved_bind_fs_state = i915->base.bind_fs_state;
- i915->base.bind_fs_state = i915_fixup_bind_fs_state;
- i915->saved_bind_sampler_states = i915->base.bind_fragment_sampler_states;
- i915->base.bind_fragment_sampler_states = i915_fixup_bind_sampler_states;
- i915->saved_set_sampler_views = i915->base.set_fragment_sampler_views;
- i915->base.set_fragment_sampler_views = i915_fixup_set_fragment_sampler_views;
-}