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

i965: Fix miptree matching for multisampled, non-interleaved miptrees. 

We haven't been executing this code before the meta-blit case, because
we've been flagging the miptree as validated at texstorage time, and never
having to revalidate.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Eric Anholt 2014-02-18 15:14:30 -08:00
parent 941769be81
commit aba85d960e
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mesa/drivers/dri/i965/intel_mipmap_tree.c
View File

@ -876,13 +876,26 @@ intel_miptree_match_image(struct intel_mipmap_tree *mt,
if (mt->target == GL_TEXTURE_CUBE_MAP)
depth = 6;
int level_depth = mt->level[level].depth;
if (mt->num_samples > 1) {
switch (mt->msaa_layout) {
case INTEL_MSAA_LAYOUT_NONE:
case INTEL_MSAA_LAYOUT_IMS:
break;
case INTEL_MSAA_LAYOUT_UMS:
case INTEL_MSAA_LAYOUT_CMS:
level_depth /= mt->num_samples;
break;
}
}
/* Test image dimensions against the base level image adjusted for
* minification. This will also catch images not present in the
* tree, changed targets, etc.
*/
if (width != minify(mt->logical_width0, level) ||
height != minify(mt->logical_height0, level) ||
depth != mt->level[level].depth) {
depth != level_depth) {
return false;
}

2
src/mesa/drivers/dri/i965/intel_mipmap_tree.h
View File

@ -115,6 +115,8 @@ struct intel_mipmap_level
* - For GL_TEXTURE_3D, it is the texture's depth at this miplevel. Its
* value, like width and height, varies with miplevel.
* - For other texture types, depth is 1.
* - Additionally, for UMS and CMS miptrees, depth is multiplied by
* sample count.
*/
GLuint depth;