fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 00:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i915g: Get rid of the fixup state functions.

Browse source 
Now that the saved_* state is gone, we don't need those any longer.
This commit is contained in:
Stéphane Marchesin 2012-10-04 17:57:31 -07:00
parent dca9e3c477
commit 74b6ea49df
3 changed files with 0 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/gallium/drivers/i915/i915_context.c
View file

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

8
src/gallium/drivers/i915/i915_context.h
View file

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

37
src/gallium/drivers/i915/i915_state.c
View file

@ -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,
@ -578,14 +570,6 @@ i915_create_fs_state(struct pipe_context *pipe,
return ifs;
}
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)
{
@ -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;
}