Mesa (master): i965/miptree: Use > 1 instead of > 0 to check for multisampling

Topi Pohjolainen tpohjola at kemper.freedesktop.org
Tue Jul 18 19:27:32 UTC 2017


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

Author: Topi Pohjolainen <topi.pohjolainen at intel.com>
Date:   Wed Jun 28 11:40:15 2017 +0300

i965/miptree: Use > 1 instead of > 0 to check for multisampling

Checking against zero currently works as single sampling is
represented with zero. Once one moves to isl single sampling
really has sample number of one.

This keeps later patches simpler.

Reviewed-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Jason Ekstrand <jason at jlekstrand.net>
Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>

---

 src/mesa/drivers/dri/i965/intel_blit.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/intel_blit.c b/src/mesa/drivers/dri/i965/intel_blit.c
index e79e02a075..2471380a0a 100644
--- a/src/mesa/drivers/dri/i965/intel_blit.c
+++ b/src/mesa/drivers/dri/i965/intel_blit.c
@@ -298,7 +298,7 @@ intel_miptree_blit(struct brw_context *brw,
                    GLenum logicop)
 {
    /* The blitter doesn't understand multisampling at all. */
-   if (src_mt->num_samples > 0 || dst_mt->num_samples > 0)
+   if (src_mt->num_samples > 1 || dst_mt->num_samples > 1)
       return false;
 
    /* No sRGB decode or encode is done by the hardware blitter, which is
@@ -371,7 +371,7 @@ intel_miptree_copy(struct brw_context *brw,
                    uint32_t src_width, uint32_t src_height)
 {
    /* The blitter doesn't understand multisampling at all. */
-   if (src_mt->num_samples > 0 || dst_mt->num_samples > 0)
+   if (src_mt->num_samples > 1 || dst_mt->num_samples > 1)
       return false;
 
    if (src_mt->format == MESA_FORMAT_S_UINT8)




More information about the mesa-commit mailing list