diff options
| author | Dave Airlie <airlied@redhat.com> | 2009-04-01 16:13:30 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2009-04-01 16:13:30 +1000 |
| commit | f9d272fa414ec04d9cc608840436f29e6adf84bc (patch) | |
| tree | 4677ee291c91e9e976e62098f5e0d85672af3437 /src/mesa/drivers/dri/r200 | |
| parent | 6e30fe4873f30ccf9edec9ab6113ea647dccb9b7 (diff) | |
radeon: go back and repick texture formats.
This might trip up some serious FBO users, will have to see, but
it avoids the slow paths for all the demos I have.
Diffstat (limited to 'src/mesa/drivers/dri/r200')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_tex.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_texstate.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_tex.c b/src/mesa/drivers/dri/r200/r200_tex.c index 19a6cad80b..fc2caabb5a 100644 --- a/src/mesa/drivers/dri/r200/r200_tex.c +++ b/src/mesa/drivers/dri/r200/r200_tex.c @@ -493,7 +493,7 @@ void r200InitTextureFuncs( struct dd_function_table *functions ) /* Note: we only plug in the functions we implement in the driver * since _mesa_init_driver_functions() was already called. */ - functions->ChooseTextureFormat = radeonChooseTextureFormat; + functions->ChooseTextureFormat = radeonChooseTextureFormat_mesa; functions->TexImage1D = radeonTexImage1D; functions->TexImage2D = radeonTexImage2D; #if ENABLE_HW_3D_TEXTURE diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c b/src/mesa/drivers/dri/r200/r200_texstate.c index 72b7f3dafa..9797f77ec4 100644 --- a/src/mesa/drivers/dri/r200/r200_texstate.c +++ b/src/mesa/drivers/dri/r200/r200_texstate.c @@ -839,7 +839,7 @@ void r200SetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint glx_texture_fo texImage->RowStride = rb->pitch / rb->cpp; texImage->TexFormat = radeonChooseTextureFormat(radeon->glCtx, internalFormat, - type, format); + type, format, 0); rImage->bo = rb->bo; radeon_bo_ref(rImage->bo); t->bo = rb->bo; |