diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-07-05 00:53:13 +1000 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-07-05 00:53:13 +1000 |
| commit | 77f8167d75d0016c76812fc147c06072e5729965 (patch) | |
| tree | f610929b3fa6d62013593df797b9e05d7c1452b4 /src/mesa/state_tracker/st_atom_sampler.c | |
| parent | 6f56b527d866506a323feb19f9d8529d40034af2 (diff) | |
| parent | 194cfc7a4ed86653db34be0e331ad7c23b5334eb (diff) | |
Merge remote branch 'upstream/gallium-0.1' into gallium-0.1
Diffstat (limited to 'src/mesa/state_tracker/st_atom_sampler.c')
| -rw-r--r-- | src/mesa/state_tracker/st_atom_sampler.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c index 1e182eef1c..3ba6a971f6 100644 --- a/src/mesa/state_tracker/st_atom_sampler.c +++ b/src/mesa/state_tracker/st_atom_sampler.c @@ -136,7 +136,8 @@ update_samplers(struct st_context *st) const struct gl_texture_object *texobj = st->ctx->Texture.Unit[texUnit]._Current; - assert(texobj); + if (!texobj) + continue; sampler->wrap_s = gl_wrap_to_sp(texobj->WrapS); sampler->wrap_t = gl_wrap_to_sp(texobj->WrapT); |