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

st/mesa: remove old convolution-related vars and min pitch code

Browse source
This commit is contained in:
Brian Paul 2010-05-03 15:35:21 -06:00
parent b02619914e
commit 682fec0dca
1 changed files with 2 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -526,7 +526,6 @@ st_TexImage(GLcontext * ctx,
struct pipe_screen *screen = st->pipe->screen;
struct st_texture_object *stObj = st_texture_object(texObj);
struct st_texture_image *stImage = st_texture_image(texImage);
GLint postConvWidth, postConvHeight;
GLint texelBytes, sizeInBytes;
GLuint dstRowStride = 0;
struct gl_pixelstore_attrib unpackNB;
@ -558,9 +557,6 @@ st_TexImage(GLcontext * ctx,
border = 0;
}
postConvWidth = width;
postConvHeight = height;
stImage->face = _mesa_tex_target_to_face(target);
stImage->level = level;
@ -572,15 +568,6 @@ st_TexImage(GLcontext * ctx,
}
else {
texelBytes = _mesa_get_format_bytes(texImage->TexFormat);
/* Minimum pitch of 32 bytes */
if (postConvWidth * texelBytes < 32) {
postConvWidth = 32 / texelBytes;
texImage->RowStride = postConvWidth;
}
/* we'll set RowStride elsewhere when the texture is a "mapped" state */
/*assert(texImage->RowStride == postConvWidth);*/
}
/* Release the reference to a potentially orphaned buffer.
@ -704,8 +691,8 @@ st_TexImage(GLcontext * ctx,
assert(dims != 3);
}
else {
dstRowStride = postConvWidth * texelBytes;
sizeInBytes = depth * dstRowStride * postConvHeight;
dstRowStride = width * texelBytes;
sizeInBytes = depth * dstRowStride * height;
}
texImage->Data = _mesa_align_malloc(sizeInBytes, 16);