From: Chad Versace Date: Thu, 9 Aug 2012 20:55:07 +0000 (-0700) Subject: intel: Always downsample in intel_miptree_map_multisample X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6cb9e99a757bd5a9d908ed6c5515a9ae5fb041ba;p=mesa.git intel: Always downsample in intel_miptree_map_multisample Always downsample before mapping, even if the map mode contains GL_MAP_INVALIDATE_RANGE_BIT. If we neglect to downsample when only a subrect is mapped then the upsample in intel_miptree_unmap_multisample may write garbage to the region outside the subrect. (Eric gave my patch e88cfbb a conditional reviewed-by with the condition that it always downsample before mapping. I forgot to make that change before pushing the patch.) Signed-off-by: Chad Versace --- diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c index e002c743b92..24cd9e9ad99 100644 --- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c @@ -1626,9 +1626,6 @@ intel_miptree_map_multisample(struct intel_context *intel, mt->need_downsample = true; } - if (mode & GL_MAP_INVALIDATE_RANGE_BIT) - mt->need_downsample = false; - intel_miptree_downsample(intel, mt); intel_miptree_map_singlesample(intel, mt->singlesample_mt, level, slice,