diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-07-02 20:57:45 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-07-02 20:57:45 +1000 |
| commit | 54ee188a00e31d239cbd256e7ba5ffd2c1259650 (patch) | |
| tree | a3f6982df4d866b71c0a53fcf44e0e6280cf5a06 /src/mesa/drivers/dri/radeon/radeon_texstate.c | |
| parent | 2ed3eddf9a828f2ff6c74b0913ca37fb60672950 (diff) | |
radeon/r200/r300: drop radeon renderbuffer private width/height
half stealing the code without taking the intel regions
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_texstate.c')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_texstate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_texstate.c b/src/mesa/drivers/dri/radeon/radeon_texstate.c index 279bcd4df6a..d33eb9988f1 100644 --- a/src/mesa/drivers/dri/radeon/radeon_texstate.c +++ b/src/mesa/drivers/dri/radeon/radeon_texstate.c @@ -706,7 +706,7 @@ void radeonSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint glx_texture_ rImage->mt = NULL; } _mesa_init_teximage_fields(radeon->glCtx, target, texImage, - rb->width, rb->height, 1, 0, rb->cpp); + rb->base.Width, rb->base.Height, 1, 0, rb->cpp); texImage->RowStride = rb->pitch / rb->cpp; texImage->TexFormat = radeonChooseTextureFormat(radeon->glCtx, internalFormat, @@ -738,8 +738,8 @@ void radeonSetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint glx_texture_ t->pp_txfilter |= tx_table[MESA_FORMAT_RGB565].filter; break; } - t->pp_txsize = ((rb->width - 1) << RADEON_TEX_USIZE_SHIFT) - | ((rb->height - 1) << RADEON_TEX_VSIZE_SHIFT); + t->pp_txsize = ((rb->base.Width - 1) << RADEON_TEX_USIZE_SHIFT) + | ((rb->base.Height - 1) << RADEON_TEX_VSIZE_SHIFT); t->pp_txformat |= RADEON_TXFORMAT_NON_POWER2; t->pp_txpitch = pitch_val; t->pp_txpitch -= 32; |