diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-27 15:56:59 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-27 15:56:59 +0000 |
| commit | 100633b3e7619842f345cb7603b0db6b5761dd11 (patch) | |
| tree | 3c3af754c7e801c07263269837d6a05072ff834c /mesalib/src/mesa/state_tracker/st_atom_texture.c | |
| parent | 205a4bdae76f287126db9f45a4f0ba631e3efca1 (diff) | |
| parent | 96d6df5da9cddedf4931bf8e17f96e242467c661 (diff) | |
| download | vcxsrv-100633b3e7619842f345cb7603b0db6b5761dd11.tar.gz vcxsrv-100633b3e7619842f345cb7603b0db6b5761dd11.tar.bz2 vcxsrv-100633b3e7619842f345cb7603b0db6b5761dd11.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_atom_texture.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_texture.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_texture.c b/mesalib/src/mesa/state_tracker/st_atom_texture.c index 4277a24b0..fb532644f 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_texture.c +++ b/mesalib/src/mesa/state_tracker/st_atom_texture.c @@ -33,6 +33,8 @@ #include "main/macros.h"
+#include "main/mtypes.h"
+#include "main/samplerobj.h"
#include "program/prog_instruction.h"
#include "st_context.h"
@@ -209,7 +211,7 @@ update_textures(struct st_context *st) else
texUnit = vprog->Base.SamplerUnits[su];
- samp = st_get_mesa_sampler(st->ctx, texUnit);
+ samp = _mesa_get_samplerobj(st->ctx, texUnit);
texObj = st->ctx->Texture.Unit[texUnit]._Current;
|