mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-01-02 11:40:10 +01:00
mesa/samplerobj: Avoid crash in sampler query if texture unit is disabled
Sampler queries are so far made only for enabled texture unit. But if any code would query sampler before checking texture unit state that would result to NULL deference. Making the inline helper easier to use with NULL check makes a lot sense because compiler is likely to combine the checks for the current texture. Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
parent
5606bd574e
commit
ac4dc5e931
1 changed files with 3 additions and 1 deletions
|
|
@ -33,8 +33,10 @@ _mesa_get_samplerobj(struct gl_context *ctx, GLuint unit)
|
|||
{
|
||||
if (ctx->Texture.Unit[unit].Sampler)
|
||||
return ctx->Texture.Unit[unit].Sampler;
|
||||
else
|
||||
else if (ctx->Texture.Unit[unit]._Current)
|
||||
return &ctx->Texture.Unit[unit]._Current->Sampler;
|
||||
else
|
||||
return NULL;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue