diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-02-13 23:34:53 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-02-13 23:34:53 +1000 |
| commit | 2753dd42fd42a3383d2e74ab231d0b1373a2d46d (patch) | |
| tree | c6f6b1a4f99fedefd6617b83a3d2e2bd9bdf73f2 /src/mesa/drivers/dri/radeon/radeon_state_init.c | |
| parent | f363a97d2586a8487bfa64f882fbfc204a56fd05 (diff) | |
radeon/r200: make setTexOffset work again
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_state_init.c')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_state_init.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_state_init.c b/src/mesa/drivers/dri/radeon/radeon_state_init.c index fc42318017..40317d570a 100644 --- a/src/mesa/drivers/dri/radeon/radeon_state_init.c +++ b/src/mesa/drivers/dri/radeon/radeon_state_init.c @@ -445,11 +445,12 @@ static void tex_emit(GLcontext *ctx, struct radeon_state_atom *atom) if (t && t->mt && !t->image_override) { OUT_BATCH_RELOC(t->tile_bits, t->mt->bo, 0, RADEON_GEM_DOMAIN_VRAM, 0, 0); - } else { + } else if (!t) { /* workaround for old CS mechanism */ OUT_BATCH(r100->radeon.radeonScreen->texOffset[RADEON_LOCAL_TEX_HEAP]); // OUT_BATCH(r100->radeon.radeonScreen); - } + } else if (t->image_override) + OUT_BATCH(atom->cmd[4]); OUT_BATCH_TABLE((atom->cmd+4), 5); END_BATCH(); |