s/pipe_texture_object/pipe_mipmap_tree/, drop st_texobj.c

diff --git a/src/mesa/pipe/p_context.h b/src/mesa/pipe/p_context.h
index db9429f8d3f7134a38d995981741e1202aaf946a..08b9b18393d0f7e0eb4bc95cc5cfebc2520d5766 100644 (file)
--- 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 be4b0ebdc79bb2dbce15598961d97b9966c6599d..f75d8f1957d1b140ed10d438a5c87e292de9ab0d 100644 (file)
--- 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 43fa8acd763e27c87046d4dfecc5f6934cb8264a..a99c083caa535875befdd009c26c66c22785c662 100644 (file)
--- 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 71c1a2d9ba0b87a23f880547bd9123e5635f1d06..3c572cdb6a406516cfb7c2bc9e2b274de0d248b1 100644 (file)
--- 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 9ef71f73cbb4d90f8a56555b74ebb5074073efab..34cf210834837a8891ef4975afe5125d3a03913d 100644 (file)
--- 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 0a69da9efc7baf90b9213b2c0440830dd02e46de..b648b6b8de70ea2b788b7936aa152fc2f96555a1 100644 (file)
--- 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 \