KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '7.8' 

Conflicts:

	src/mesa/state_tracker/st_gen_mipmap.c
This commit is contained in:
Brian Paul 2010-04-28 10:10:51 -06:00
parent 40dcbb87a9 7b640f9f70
commit c7f5c9a3dc
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mesa/state_tracker/st_cb_texture.c
View File

@ -974,7 +974,10 @@ st_get_tex_image(GLcontext * ctx, GLenum target, GLint level,
PIPE_TRANSFER_READ, 0, 0,
stImage->base.Width,
stImage->base.Height);
texImage->RowStride = stImage->transfer->stride / util_format_get_blocksize(stImage->pt->format);
/* compute stride in texels from stride in bytes */
texImage->RowStride = stImage->transfer->stride
* util_format_get_blockwidth(stImage->pt->format)
/ util_format_get_blocksize(stImage->pt->format);
}
else {
/* Otherwise, the image should actually be stored in

4
src/mesa/state_tracker/st_gen_mipmap.c
View File

@ -377,7 +377,9 @@ st_generate_mipmap(GLcontext *ctx, GLenum target,
dstImage->TexFormat = srcImage->TexFormat;
stImage = (struct st_texture_image *) dstImage;
stImage = st_texture_image(dstImage);
stImage->level = dstLevel;
pipe_resource_reference(&stImage->pt, pt);
}
}