diff options
| author | Brian Paul <[email protected]> | 2008-07-02 19:11:49 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2008-07-02 19:11:49 -0600 |
| commit | 98b7174ad6f6a74361e58136bdd235a092b07a40 (patch) | |
| tree | f54391c81b8ab6332c31108ceb7bee2f22e64b0d /src/mesa/state_tracker | |
| parent | dad8a7c90d96f37fedfe912a10ba3754c1666161 (diff) | |
gallium: replace an assertion with "if (!texobj) continue"
It's possible to call update_samplers() between the time a fragment shader
is bound and when a texture image is defined (such as glClear). This
fixes the case where we don't have a complete texture object yet.
Diffstat (limited to 'src/mesa/state_tracker')
| -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 1e182eef1c5..3ba6a971f6f 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); |