Module: Mesa
Branch: master
Commit: d73f1f2ad879d0c6712931b75f2bfb995c2c9fcb
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=d73f1f2ad879d0c6712931b75f2bfb995c2c9fcb

Author: Ilia Mirkin <imir...@alum.mit.edu>
Date:   Wed Feb 21 23:32:49 2018 -0500

nv50,nvc0: fix integer MS resolves using 2d engine

We don't want filtering for integer textures, same as depth/stencil.

Fixes: KHR-GL45.direct_state_access.renderbuffers_storage_multisample
Signed-off-by: Ilia Mirkin <imir...@alum.mit.edu>
Tested-by: Karol Herbst <kher...@redhat.com>

---

 src/gallium/drivers/nouveau/nv50/nv50_blit.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/nouveau/nv50/nv50_blit.h 
b/src/gallium/drivers/nouveau/nv50/nv50_blit.h
index 0ccec568d3..10fe5274b1 100644
--- a/src/gallium/drivers/nouveau/nv50/nv50_blit.h
+++ b/src/gallium/drivers/nouveau/nv50/nv50_blit.h
@@ -85,7 +85,8 @@ static inline unsigned
 nv50_blit_get_filter(const struct pipe_blit_info *info)
 {
    if (info->dst.resource->nr_samples < info->src.resource->nr_samples)
-      return util_format_is_depth_or_stencil(info->src.format) ? 0 : 1;
+      return (util_format_is_depth_or_stencil(info->src.format) ||
+              util_format_is_pure_integer(info->src.format)) ? 0 : 1;
 
    if (info->filter != PIPE_TEX_FILTER_LINEAR)
       return 0;

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to