diff options
| author | Brian Paul <brianp@vmware.com> | 2009-10-01 16:29:44 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-10-01 16:29:44 -0600 |
| commit | b6bdafdf2cf1110b4a5ca7cf9e1c3dcb124b800f (patch) | |
| tree | af668a98fe8ec899b8da9c25533f299c5c3f90d1 /src/mesa/drivers/dri/radeon/radeon_texstate.c | |
| parent | 040fd7ed44c21a1faaa6475888e9365e8f0de42b (diff) | |
mesa: remove gl_texture_image::IsCompressed field
Use _mesa_is_format_compressed() instead.
Diffstat (limited to 'src/mesa/drivers/dri/radeon/radeon_texstate.c')
| -rw-r--r-- | src/mesa/drivers/dri/radeon/radeon_texstate.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/radeon/radeon_texstate.c b/src/mesa/drivers/dri/radeon/radeon_texstate.c index 1064602504f..5d22a118595 100644 --- a/src/mesa/drivers/dri/radeon/radeon_texstate.c +++ b/src/mesa/drivers/dri/radeon/radeon_texstate.c @@ -81,8 +81,10 @@ struct tx_table { GLuint format, filter; }; +/* XXX verify this table against MESA_FORMAT_x values */ static const struct tx_table tx_table[] = { + 0, /* MESA_FORMAT_NONE */ _ALPHA(RGBA8888), _ALPHA_REV(RGBA8888), _ALPHA(ARGB8888), @@ -1083,7 +1085,7 @@ static GLboolean setup_hardware_state(r100ContextPtr rmesa, radeonTexObj *t, int | ((firstImage->Height - 1) << RADEON_TEX_VSIZE_SHIFT)); if ( !t->image_override ) { - if (firstImage->IsCompressed) + if (_mesa_is_format_compressed(firstImage->TexFormat)) t->pp_txpitch = (firstImage->Width + 63) & ~(63); else t->pp_txpitch = ((firstImage->Width * texelBytes) + 63) & ~(63); |