From: Patrick Rudolph <siro@das-labor.org>
Date: Sat, 7 May 2016 14:02:59 +0000 (+0200)
Subject: st/nine: Fix buffer count check for Ex devices
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a719800cb82c3634e48843c4348c533ed29381d3;p=mesa.git

st/nine: Fix buffer count check for Ex devices

Signed-off-by: Patrick Rudolph <siro@das-labor.org>
Reviewed-by: Axel Davy <axel.davy@ens.fr>
---

diff --git a/src/gallium/state_trackers/nine/swapchain9.c b/src/gallium/state_trackers/nine/swapchain9.c
index 87beabc9143..e672f948b04 100644
--- a/src/gallium/state_trackers/nine/swapchain9.c
+++ b/src/gallium/state_trackers/nine/swapchain9.c
@@ -127,7 +127,10 @@ NineSwapChain9_Resize( struct NineSwapChain9 *This,
     user_assert(pParams->SwapEffect, D3DERR_INVALIDCALL);
     user_assert((pParams->SwapEffect != D3DSWAPEFFECT_COPY) ||
                 (pParams->BackBufferCount <= 1), D3DERR_INVALIDCALL);
-    user_assert(pDevice->ex || pParams->BackBufferCount <= 3, D3DERR_INVALIDCALL);
+    user_assert(pDevice->ex || pParams->BackBufferCount <=
+                D3DPRESENT_BACK_BUFFERS_MAX, D3DERR_INVALIDCALL);
+    user_assert(!pDevice->ex || pParams->BackBufferCount <=
+                D3DPRESENT_BACK_BUFFERS_MAX_EX, D3DERR_INVALIDCALL);
     user_assert(pDevice->ex ||
                 (pParams->SwapEffect == D3DSWAPEFFECT_FLIP) ||
                 (pParams->SwapEffect == D3DSWAPEFFECT_COPY) ||
@@ -159,10 +162,6 @@ NineSwapChain9_Resize( struct NineSwapChain9 *This,
         pParams->FullScreen_RefreshRateInHz,
         pParams->PresentationInterval);
 
-    if (pParams->BackBufferCount > 3) {
-        pParams->BackBufferCount = 3;
-    }
-
     if (pParams->BackBufferCount == 0) {
         pParams->BackBufferCount = 1;
     }