Henri Verbeet : wined3d: Only create a swapchain context array for GL swapchains.
Alexandre Julliard
julliard at winehq.org
Fri Apr 8 10:51:00 CDT 2011
Module: wine
Branch: master
Commit: 28137ba2e9a829e2f9a44cdf804eb5c315d2a7ec
URL: http://source.winehq.org/git/wine.git/?a=commit;h=28137ba2e9a829e2f9a44cdf804eb5c315d2a7ec
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Apr 8 14:30:59 2011 +0200
wined3d: Only create a swapchain context array for GL swapchains.
Lying about the number of contexts a swapchain has isn't very useful.
---
dlls/wined3d/swapchain.c | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
index 1c875bf..ddd946d 100644
--- a/dlls/wined3d/swapchain.c
+++ b/dlls/wined3d/swapchain.c
@@ -1043,15 +1043,6 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface
displaymode_set = TRUE;
}
- swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(swapchain->context));
- if (!swapchain->context)
- {
- ERR("Failed to create the context array.\n");
- hr = E_OUTOFMEMORY;
- goto err;
- }
- swapchain->num_contexts = 1;
-
if (surface_type == SURFACE_OPENGL)
{
static const enum wined3d_format_id formats[] =
@@ -1065,6 +1056,15 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface
const struct wined3d_gl_info *gl_info = &device->adapter->gl_info;
+ swapchain->context = HeapAlloc(GetProcessHeap(), 0, sizeof(swapchain->context));
+ if (!swapchain->context)
+ {
+ ERR("Failed to create the context array.\n");
+ hr = E_OUTOFMEMORY;
+ goto err;
+ }
+ swapchain->num_contexts = 1;
+
/* In WGL both color, depth and stencil are features of a pixel format. In case of D3D they are separate.
* You are able to add a depth + stencil surface at a later stage when you need it.
* In order to support this properly in WineD3D we need the ability to recreate the opengl context and
@@ -1099,10 +1099,6 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface
}
context_release(swapchain->context[0]);
}
- else
- {
- swapchain->context[0] = NULL;
- }
if (swapchain->presentParms.BackBufferCount > 0)
{
More information about the wine-cvs
mailing list