diff options
| author | Brian Paul <brianp@vmware.com> | 2010-04-18 17:55:23 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-04-18 18:02:42 -0600 |
| commit | 5d3d63d45a037fdf603ddcff88da635c3ce8075e (patch) | |
| tree | ba14ab292129e2680cffcb7ec2c6ce911998deb7 /src/mesa/state_tracker/st_atom_texture.c | |
| parent | 073048c872ea5893ad0c39b32ca171893c17148b (diff) | |
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().
Diffstat (limited to 'src/mesa/state_tracker/st_atom_texture.c')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_texture.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c index e056487f1a..f4294ac1e6 100644 --- a/src/mesa/state_tracker/st_atom_texture.c +++ b/src/mesa/state_tracker/st_atom_texture.c @@ -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); } /* |