st/mesa: remove st_texture_object::pipe field

[mesa.git] / src / mesa / state_tracker / st_cb_fbo.c

diff --git a/src/mesa/state_tracker/st_cb_fbo.c b/src/mesa/state_tracker/st_cb_fbo.c
index aec487b001b164fce8cb6a091d847656c2917fb2..e13bc1921a007ed5c76327e164ed42c324721710 100644 (file)
--- a/src/mesa/state_tracker/st_cb_fbo.c
+++ b/src/mesa/state_tracker/st_cb_fbo.c
@@ -310,6 +310,8 @@ st_render_texture(GLcontext *ctx,
                   struct gl_framebuffer *fb,
                   struct gl_renderbuffer_attachment *att)
 {
+   struct st_context *st = ctx->st;
+   struct pipe_context *pipe = st->pipe;
    struct pipe_screen *screen = ctx->st->pipe->screen;
    struct st_renderbuffer *strb;
    struct gl_renderbuffer *rb;
@@ -360,7 +362,8 @@ st_render_texture(GLcontext *ctx,
 
    pipe_surface_reference(&strb->surface, NULL);
 
-   pipe_sampler_view_reference(&strb->sampler_view, st_get_stobj_sampler_view(stObj));
+   pipe_sampler_view_reference(&strb->sampler_view,
+                               st_get_texture_sampler_view(stObj, pipe));
 
    assert(strb->rtt_level <= strb->texture->last_level);
 
@@ -542,11 +545,11 @@ void st_init_fbo_functions(struct dd_function_table *functions)
 }
 
 struct pipe_sampler_view *
-st_renderbuffer_get_sampler_view(struct st_renderbuffer *rb,
+st_get_renderbuffer_sampler_view(struct st_renderbuffer *rb,
                                  struct pipe_context *pipe)
 {
    if (!rb->sampler_view) {
-      rb->sampler_view = st_sampler_view_from_texture(pipe, rb->texture);
+      rb->sampler_view = st_create_texture_sampler_view(pipe, rb->texture);
    }
 
    return rb->sampler_view;