diff options
| author | Zack Rusin <zackr@vmware.com> | 2010-03-30 21:10:33 -0400 |
|---|---|---|
| committer | Zack Rusin <zackr@vmware.com> | 2010-03-30 21:10:33 -0400 |
| commit | 880e3fb09b538f6f0b6fad2db7e0e10e9df43555 (patch) | |
| tree | e6cc8c691974e679ead73c3731c49a874019c8ba /src/gallium/drivers/nvfx/nv30_fragtex.c | |
| parent | 93e342574f5fc95789028dbe7cf637257562e9bb (diff) | |
| parent | 4afed821baa6993d85a07c67d42ea40d4e9a600a (diff) | |
Merge remote branch 'origin/master' into gallium_draw_llvm
Diffstat (limited to 'src/gallium/drivers/nvfx/nv30_fragtex.c')
| -rw-r--r-- | src/gallium/drivers/nvfx/nv30_fragtex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/nvfx/nv30_fragtex.c b/src/gallium/drivers/nvfx/nv30_fragtex.c index 2b56f45492..54e47574c4 100644 --- a/src/gallium/drivers/nvfx/nv30_fragtex.c +++ b/src/gallium/drivers/nvfx/nv30_fragtex.c @@ -91,7 +91,7 @@ struct nouveau_stateobj * nv30_fragtex_build(struct nvfx_context *nvfx, int unit) { struct nvfx_sampler_state *ps = nvfx->tex_sampler[unit]; - struct nvfx_miptree *nv30mt = nvfx->tex_miptree[unit]; + struct nvfx_miptree *nv30mt = (struct nvfx_miptree *)nvfx->fragment_sampler_views[unit]->texture; struct pipe_texture *pt = &nv30mt->base; struct nouveau_bo *bo = nouveau_bo(nv30mt->buffer); struct nv30_texture_format *tf; |