diff options
| author | Chris Rankin <rankincj@yahoo.com> | 2007-09-29 18:14:06 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2007-09-29 18:14:06 +0200 |
| commit | 4f96000e294fa0d6ba6f5915ff508017d9c26d50 (patch) | |
| tree | 2255b2d416ada6c089ef31a4db2bfabafbd5ce23 /src/mesa/drivers/dri/r200/r200_texmem.c | |
| parent | 2a3e33865dd9a3d064a3c0af94ef11d4aa4a6ce4 (diff) | |
r200: Implement SetTexOffset hook.
Implementation guidance by Michel Dänzer, final testing by Timo Aaltonen.
Diffstat (limited to 'src/mesa/drivers/dri/r200/r200_texmem.c')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_texmem.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_texmem.c b/src/mesa/drivers/dri/r200/r200_texmem.c index d926313d57..183c4ca424 100644 --- a/src/mesa/drivers/dri/r200/r200_texmem.c +++ b/src/mesa/drivers/dri/r200/r200_texmem.c @@ -181,7 +181,8 @@ static void r200UploadRectSubImage( r200ContextPtr rmesa, /* In this case, could also use GART texturing. This is * currently disabled, but has been tested & works. */ - t->pp_txoffset = r200GartOffsetFromVirtual( rmesa, texImage->Data ); + if ( !t->image_override ) + t->pp_txoffset = r200GartOffsetFromVirtual( rmesa, texImage->Data ); t->pp_txpitch = texImage->RowStride * texFormat->TexelBytes - 32; if (R200_DEBUG & DEBUG_TEXTURE) @@ -467,7 +468,7 @@ int r200UploadTexImages( r200ContextPtr rmesa, r200TexObjPtr t, GLuint face ) t->base.firstLevel, t->base.lastLevel ); } - if ( !t || t->base.totalSize == 0 ) + if ( !t || t->base.totalSize == 0 || t->image_override ) return 0; if (R200_DEBUG & DEBUG_SYNC) { |