summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/intel/intel_tex_image.c
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-10-01 21:13:25 -0600
committerBrian Paul <brianp@vmware.com>2009-10-01 21:13:34 -0600
commit32aa40eee46fd0b15f3873069f2440ea2dd75408 (patch)
tree68290ae1fc589a11650093cb0840405e8a520053 /src/mesa/drivers/dri/intel/intel_tex_image.c
parent8c92a531fb7e0d2de2a06610b2dff98eeb19c985 (diff)
mesa: removed gl_texture_image::CompressedSize field
Just call ctx->Driver.CompressedTextureSize() when we need to get the compressed image size.
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_tex_image.c')
-rw-r--r--src/mesa/drivers/dri/intel/intel_tex_image.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_tex_image.c b/src/mesa/drivers/dri/intel/intel_tex_image.c
index 9e13ba6871..dd436becab 100644
--- a/src/mesa/drivers/dri/intel/intel_tex_image.c
+++ b/src/mesa/drivers/dri/intel/intel_tex_image.c
@@ -340,11 +340,8 @@ intelTexImage(GLcontext * ctx,
if (_mesa_is_format_compressed(texImage->TexFormat)) {
texelBytes = 0;
- texImage->CompressedSize =
- ctx->Driver.CompressedTextureSize(ctx, texImage->Width,
- texImage->Height, texImage->Depth,
- texImage->TexFormat);
- } else {
+ }
+ else {
texelBytes = _mesa_get_format_bytes(texImage->TexFormat);
/* Minimum pitch of 32 bytes */
@@ -495,7 +492,11 @@ intelTexImage(GLcontext * ctx,
else {
/* Allocate regular memory and store the image there temporarily. */
if (_mesa_is_format_compressed(texImage->TexFormat)) {
- sizeInBytes = texImage->CompressedSize;
+ sizeInBytes = ctx->Driver.CompressedTextureSize(ctx,
+ texImage->Width,
+ texImage->Height,
+ texImage->Depth,
+ texImage->TexFormat);
dstRowStride =
_mesa_compressed_row_stride(texImage->TexFormat, width);
assert(dims != 3);