Mesa (master): st/nine: Fix multisample limit check

Axel Davy axeldavy at kemper.freedesktop.org
Sun Oct 16 22:03:08 UTC 2016


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

Author: Axel Davy <axel.davy at ens.fr>
Date:   Sun Oct 16 11:44:09 2016 +0200

st/nine: Fix multisample limit check

Fixes regression introduced by
b5603056872708fdd82f1224854097805a01d4c0

The regression prevents some apps to start.

Signed-off-by: Axel Davy <axel.davy at ens.fr>

---

 src/gallium/state_trackers/nine/adapter9.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/nine/adapter9.c b/src/gallium/state_trackers/nine/adapter9.c
index e9c911b..f00590d 100644
--- a/src/gallium/state_trackers/nine/adapter9.c
+++ b/src/gallium/state_trackers/nine/adapter9.c
@@ -393,7 +393,7 @@ NineAdapter9_CheckDeviceMultiSampleType( struct NineAdapter9 *This,
         /* In error cases return only 1 quality level supported */
         *pQualityLevels = 1;
     }
-    user_assert(MultiSampleType < D3DMULTISAMPLE_16_SAMPLES, D3DERR_INVALIDCALL);
+    user_assert(MultiSampleType <= D3DMULTISAMPLE_16_SAMPLES, D3DERR_INVALIDCALL);
 
     hr = NineAdapter9_GetScreen(This, DeviceType, &screen);
     if (FAILED(hr))




More information about the mesa-commit mailing list