From b5603056872708fdd82f1224854097805a01d4c0 Mon Sep 17 00:00:00 2001 From: Patrick Rudolph Date: Fri, 30 Sep 2016 16:15:38 +0200 Subject: st/nine: Add additional error handling in CheckDeviceMultiSampleType Return one supported quality level in error cases. Return error on invalid multisample count. Fixes failing wine tests. Signed-off-by: Patrick Rudolph Reviewed-by: Axel Davy --- src/gallium/state_trackers/nine/adapter9.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/gallium/state_trackers') diff --git a/src/gallium/state_trackers/nine/adapter9.c b/src/gallium/state_trackers/nine/adapter9.c index dad5fcb..fbbc586 100644 --- a/src/gallium/state_trackers/nine/adapter9.c +++ b/src/gallium/state_trackers/nine/adapter9.c @@ -385,6 +385,12 @@ NineAdapter9_CheckDeviceMultiSampleType( struct NineAdapter9 *This, d3dformat_to_string(SurfaceFormat), Windowed, MultiSampleType, pQualityLevels); + if (pQualityLevels) { + /* In error cases return only 1 quality level supported */ + *pQualityLevels = 1; + } + user_assert(MultiSampleType < D3DMULTISAMPLE_16_SAMPLES, D3DERR_INVALIDCALL); + hr = NineAdapter9_GetScreen(This, DeviceType, &screen); if (FAILED(hr)) return hr; -- cgit v1.1