fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

st/mesa: consolidate and clean-up texture memory allocation code

Browse source
This commit is contained in:
Brian Paul 2010-05-03 15:48:00 -06:00
parent fe3332da78
commit c7d1d34c58
1 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/mesa/state_tracker/st_cb_texture.c
View file

@ -555,6 +555,11 @@ st_TexImage(GLcontext * ctx,
texImage->Border = 0;
border = 0;
}
else {
assert(texImage->Width == width);
assert(texImage->Height == height);
assert(texImage->Depth == depth);
}
stImage->face = _mesa_tex_target_to_face(target);
stImage->level = level;
@ -666,32 +671,17 @@ st_TexImage(GLcontext * ctx,
transfer_usage = PIPE_TRANSFER_WRITE;
texImage->Data = st_texture_image_map(st, stImage, 0,
transfer_usage, 0, 0,
stImage->base.Width,
stImage->base.Height);
transfer_usage, 0, 0, width, height);
if(stImage->transfer)
dstRowStride = stImage->transfer->stride;
}
else {
/* Allocate regular memory and store the image there temporarily. */
GLint sizeInBytes;
GLuint imageSize = _mesa_format_image_size(texImage->TexFormat,
width, height, depth);
dstRowStride = _mesa_format_row_stride(texImage->TexFormat, width);
if (_mesa_is_format_compressed(texImage->TexFormat)) {
sizeInBytes = _mesa_format_image_size(texImage->TexFormat,
texImage->Width,
texImage->Height,
texImage->Depth);
dstRowStride = _mesa_format_row_stride(texImage->TexFormat, width);
assert(dims != 3);
}
else {
GLint texelBytes;
texelBytes = _mesa_get_format_bytes(texImage->TexFormat);
dstRowStride = width * texelBytes;
sizeInBytes = depth * dstRowStride * height;
}
texImage->Data = _mesa_align_malloc(sizeInBytes, 16);
texImage->Data = _mesa_align_malloc(imageSize, 16);
}
if (!texImage->Data) {
@ -754,8 +744,7 @@ st_TexImage(GLcontext * ctx,
/* map next slice of 3D texture */
texImage->Data = st_texture_image_map(st, stImage, i + 1,
transfer_usage, 0, 0,
stImage->base.Width,
stImage->base.Height);
width, height);
src += srcImageStride;
}
}