st/mesa: remove st_texture_object::pipe field

Just pass the pipe context to st_get_texture_sampler_view()
as is done for st_get_renderbuffer_sampler_view().
This commit is contained in:
Brian Paul
2010-04-18 17:55:23 -06:00
parent 073048c872
commit 5d3d63d45a
8 changed files with 15 additions and 14 deletions

View File

@@ -46,6 +46,7 @@
static void
update_textures(struct st_context *st)
{
struct pipe_context *pipe = st->pipe;
struct gl_vertex_program *vprog = st->ctx->VertexProgram._Current;
struct gl_fragment_program *fprog = st->ctx->FragmentProgram._Current;
const GLbitfield samplersUsed = (vprog->Base.SamplersUsed |
@@ -84,7 +85,7 @@ update_textures(struct st_context *st)
st->state.num_textures = su + 1;
sampler_view = st_get_texture_sampler_view(stObj);
sampler_view = st_get_texture_sampler_view(stObj, pipe);
}
/*