summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers/nine
diff options
context:
space:
mode:
authorPatrick Rudolph <siro@das-labor.org>2016-05-07 16:02:59 +0200
committerAxel Davy <axel.davy@ens.fr>2016-10-10 23:43:49 +0200
commita719800cb82c3634e48843c4348c533ed29381d3 (patch)
treeb3fb8592c993164a394fad96b4c6a7428ba8918e /src/gallium/state_trackers/nine
parent9ff0dc31296fe8b40689948101ba2eb6e56a3755 (diff)
downloadexternal_mesa3d-a719800cb82c3634e48843c4348c533ed29381d3.zip
external_mesa3d-a719800cb82c3634e48843c4348c533ed29381d3.tar.gz
external_mesa3d-a719800cb82c3634e48843c4348c533ed29381d3.tar.bz2
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>
Diffstat (limited to 'src/gallium/state_trackers/nine')
-rw-r--r--src/gallium/state_trackers/nine/swapchain9.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/gallium/state_trackers/nine/swapchain9.c b/src/gallium/state_trackers/nine/swapchain9.c
index 87beabc..e672f94 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;
}