diff options
| author | Chad Versace <[email protected]> | 2012-08-09 13:55:07 -0700 |
|---|---|---|
| committer | Chad Versace <[email protected]> | 2012-08-09 15:21:02 -0700 |
| commit | 6cb9e99a757bd5a9d908ed6c5515a9ae5fb041ba (patch) | |
| tree | e3b893f45bfc94cd747632ce6d44243b26b01f48 /src/mesa/drivers | |
| parent | 04a11b5f5e22155e5816e2da560b485eb0eaaec9 (diff) | |
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 <[email protected]>
Diffstat (limited to 'src/mesa/drivers')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 3 |
1 files changed, 0 insertions, 3 deletions
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, |