diff options
| author | Brian Paul <brianp@vmware.com> | 2010-04-18 08:38:03 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2010-04-18 08:38:03 -0600 |
| commit | d7c336dc49f980cd129ebc159e11cd3ed9500e68 (patch) | |
| tree | 908b6ae985728fde1efd3d60f20ac2db26b75838 /src/gallium/drivers/nvfx/nvfx_fragtex.c | |
| parent | f9ea7a2ea94275a3783dbc24ce8e6fec2930f493 (diff) | |
nvfx: move declarations before code to silence warnings
Diffstat (limited to 'src/gallium/drivers/nvfx/nvfx_fragtex.c')
| -rw-r--r-- | src/gallium/drivers/nvfx/nvfx_fragtex.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_fragtex.c b/src/gallium/drivers/nvfx/nvfx_fragtex.c index f5f6b0c0cb..0b4a434fec 100644 --- a/src/gallium/drivers/nvfx/nvfx_fragtex.c +++ b/src/gallium/drivers/nvfx/nvfx_fragtex.c @@ -40,11 +40,14 @@ nvfx_fragtex_relocate(struct nvfx_context *nvfx) samplers = nvfx->hw_samplers; while (samplers) { + struct nvfx_miptree* mt; + struct nouveau_bo *bo; + unit = ffs(samplers) - 1; samplers &= ~(1 << unit); - struct nvfx_miptree* mt = (struct nvfx_miptree*)nvfx->fragment_sampler_views[unit]->texture; - struct nouveau_bo *bo = mt->base.bo; + mt = (struct nvfx_miptree*)nvfx->fragment_sampler_views[unit]->texture; + bo = mt->base.bo; MARK_RING(chan, 3, 3); OUT_RELOC(chan, bo, RING_3D(NV34TCL_TX_OFFSET(unit), 2), tex_flags | NOUVEAU_BO_DUMMY, 0, 0); |