diff options
| author | marha <marha@users.sourceforge.net> | 2012-02-22 09:28:23 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-02-22 09:28:23 +0100 |
| commit | ecc59cb52ffe4a84fddae997bba64adad35d5e93 (patch) | |
| tree | 233c2cf0ea65dcf0b671f28e14b1fb083dac87e3 /mesalib/src/mesa/state_tracker/st_atom_sampler.c | |
| parent | d19dd4c9cf37b7b691552c4f4dd873471e31ca68 (diff) | |
| parent | 6baac61e6ca9cd314e689dfe7f84771aad08c66e (diff) | |
| download | vcxsrv-ecc59cb52ffe4a84fddae997bba64adad35d5e93.tar.gz vcxsrv-ecc59cb52ffe4a84fddae997bba64adad35d5e93.tar.bz2 vcxsrv-ecc59cb52ffe4a84fddae997bba64adad35d5e93.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_atom_sampler.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_sampler.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_sampler.c b/mesalib/src/mesa/state_tracker/st_atom_sampler.c index ee69fc390..dc0c789c5 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_sampler.c +++ b/mesalib/src/mesa/state_tracker/st_atom_sampler.c @@ -35,6 +35,7 @@ #include "main/macros.h" #include "main/mtypes.h" #include "main/samplerobj.h" +#include "main/texobj.h" #include "st_context.h" #include "st_cb_texture.h" @@ -132,7 +133,7 @@ convert_sampler(struct st_context *st, texobj = ctx->Texture.Unit[texUnit]._Current; if (!texobj) { - texobj = st_get_default_texture(st); + texobj = _mesa_get_fallback_texture(ctx, TEXTURE_2D_INDEX); } msamp = _mesa_get_samplerobj(ctx, texUnit); |