diff options
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/pipe/p_context.h | 2 | ||||
| -rw-r--r-- | src/mesa/pipe/p_state.h | 2 | ||||
| -rw-r--r-- | src/mesa/pipe/softpipe/sp_context.h | 2 | ||||
| -rw-r--r-- | src/mesa/pipe/softpipe/sp_state.h | 2 | ||||
| -rw-r--r-- | src/mesa/pipe/softpipe/sp_state_sampler.c | 2 | ||||
| -rw-r--r-- | src/mesa/sources | 3 |
6 files changed, 7 insertions, 6 deletions
diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h index db9429f8d3..08b9b18393 100644 --- a/src/mesa/pipe/p_context.h +++ b/src/mesa/pipe/p_context.h @@ -117,7 +117,7 @@ struct pipe_context { void (*set_texture_state)( struct pipe_context *, GLuint unit, - struct pipe_texture_object * ); + struct pipe_mipmap_tree * ); void (*set_viewport_state)( struct pipe_context *, const struct pipe_viewport_state * ); diff --git a/src/mesa/pipe/p_state.h b/src/mesa/pipe/p_state.h index be4b0ebdc7..f75d8f1957 100644 --- a/src/mesa/pipe/p_state.h +++ b/src/mesa/pipe/p_state.h @@ -264,6 +264,7 @@ struct pipe_surface }; +#if 0 /** * Texture object. * Mipmap levels, cube faces, 3D slices can be accessed as surfaces. @@ -290,6 +291,7 @@ struct pipe_texture_object void (*release_surface)(struct pipe_texture_object *pto, struct pipe_surface *ps); }; +#endif /** diff --git a/src/mesa/pipe/softpipe/sp_context.h b/src/mesa/pipe/softpipe/sp_context.h index 43fa8acd76..a99c083caa 100644 --- a/src/mesa/pipe/softpipe/sp_context.h +++ b/src/mesa/pipe/softpipe/sp_context.h @@ -86,7 +86,7 @@ struct softpipe_context { struct pipe_sampler_state sampler[PIPE_MAX_SAMPLERS]; struct pipe_setup_state setup; struct pipe_stencil_state stencil; - struct pipe_texture_object *texture[PIPE_MAX_SAMPLERS]; + struct pipe_mipmap_tree *texture[PIPE_MAX_SAMPLERS]; struct pipe_viewport_state viewport; GLuint dirty; diff --git a/src/mesa/pipe/softpipe/sp_state.h b/src/mesa/pipe/softpipe/sp_state.h index 71c1a2d9ba..3c572cdb6a 100644 --- a/src/mesa/pipe/softpipe/sp_state.h +++ b/src/mesa/pipe/softpipe/sp_state.h @@ -77,7 +77,7 @@ void softpipe_set_stencil_state( struct pipe_context *, void softpipe_set_texture_state( struct pipe_context *, GLuint unit, - struct pipe_texture_object * ); + struct pipe_mipmap_tree * ); void softpipe_set_viewport_state( struct pipe_context *, const struct pipe_viewport_state * ); diff --git a/src/mesa/pipe/softpipe/sp_state_sampler.c b/src/mesa/pipe/softpipe/sp_state_sampler.c index 9ef71f73cb..34cf210834 100644 --- a/src/mesa/pipe/softpipe/sp_state_sampler.c +++ b/src/mesa/pipe/softpipe/sp_state_sampler.c @@ -53,7 +53,7 @@ softpipe_set_sampler_state(struct pipe_context *pipe, void softpipe_set_texture_state(struct pipe_context *pipe, GLuint unit, - struct pipe_texture_object *texture) + struct pipe_mipmap_tree *texture) { struct softpipe_context *softpipe = softpipe_context(pipe); diff --git a/src/mesa/sources b/src/mesa/sources index 0a69da9efc..b648b6b8de 100644 --- a/src/mesa/sources +++ b/src/mesa/sources @@ -200,8 +200,7 @@ STATETRACKER_SOURCES = \ state_tracker/st_cb_bufferobjects.c \ state_tracker/st_draw.c \ state_tracker/st_context.c \ - state_tracker/st_mipmap_tree.c \ - state_tracker/st_texobj.c + state_tracker/st_mipmap_tree.c SHADER_SOURCES = \ shader/arbprogparse.c \ |