ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wined3d: Pass an IWineD3DSwapChainImpl pointer to swapchain_create_context_for_thread().

This commit is contained in:
Henri Verbeet 2011-01-18 17:55:21 +01:00 committed by Alexandre Julliard
parent 237cdefe7f
commit b439fa9d8f
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/wined3d/context.c
View File

@ -1878,7 +1878,7 @@ static struct wined3d_context *findThreadContextForSwapChain(IWineD3DSwapChain *
} }
/* Create a new context for the thread */ /* Create a new context for the thread */
return swapchain_create_context_for_thread(swapchain); return swapchain_create_context_for_thread((IWineD3DSwapChainImpl *)swapchain);
} }
/* Do not call while under the GL lock. */ /* Do not call while under the GL lock. */

21
dlls/wined3d/swapchain.c
View File

@ -783,32 +783,31 @@ err:
} }
/* Do not call while under the GL lock. */ /* Do not call while under the GL lock. */
struct wined3d_context *swapchain_create_context_for_thread(IWineD3DSwapChain *iface) struct wined3d_context *swapchain_create_context_for_thread(IWineD3DSwapChainImpl *swapchain)
{ {
IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *) iface;
struct wined3d_context **newArray; struct wined3d_context **newArray;
struct wined3d_context *ctx; struct wined3d_context *ctx;
TRACE("Creating a new context for swapchain %p, thread %d\n", This, GetCurrentThreadId()); TRACE("Creating a new context for swapchain %p, thread %u.\n", swapchain, GetCurrentThreadId());
if (!(ctx = context_create(This, This->front_buffer, This->ds_format))) if (!(ctx = context_create(swapchain, swapchain->front_buffer, swapchain->ds_format)))
{ {
ERR("Failed to create a new context for the swapchain\n"); ERR("Failed to create a new context for the swapchain\n");
return NULL; return NULL;
} }
context_release(ctx); context_release(ctx);
newArray = HeapAlloc(GetProcessHeap(), 0, sizeof(*newArray) * (This->num_contexts + 1)); newArray = HeapAlloc(GetProcessHeap(), 0, sizeof(*newArray) * (swapchain->num_contexts + 1));
if(!newArray) { if(!newArray) {
ERR("Out of memory when trying to allocate a new context array\n"); ERR("Out of memory when trying to allocate a new context array\n");
context_destroy(This->device, ctx); context_destroy(swapchain->device, ctx);
return NULL; return NULL;
} }
memcpy(newArray, This->context, sizeof(*newArray) * This->num_contexts); memcpy(newArray, swapchain->context, sizeof(*newArray) * swapchain->num_contexts);
HeapFree(GetProcessHeap(), 0, This->context); HeapFree(GetProcessHeap(), 0, swapchain->context);
newArray[This->num_contexts] = ctx; newArray[swapchain->num_contexts] = ctx;
This->context = newArray; swapchain->context = newArray;
This->num_contexts++; swapchain->num_contexts++;
TRACE("Returning context %p\n", ctx); TRACE("Returning context %p\n", ctx);
return ctx; return ctx;

2
dlls/wined3d/wined3d_private.h
View File

@ -2634,7 +2634,7 @@ HRESULT WINAPI IWineD3DBaseSwapChainImpl_SetGammaRamp(IWineD3DSwapChain *iface,
HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetGammaRamp(IWineD3DSwapChain *iface, HRESULT WINAPI IWineD3DBaseSwapChainImpl_GetGammaRamp(IWineD3DSwapChain *iface,
WINED3DGAMMARAMP *pRamp) DECLSPEC_HIDDEN; WINED3DGAMMARAMP *pRamp) DECLSPEC_HIDDEN;
struct wined3d_context *swapchain_create_context_for_thread(IWineD3DSwapChain *iface) DECLSPEC_HIDDEN; struct wined3d_context *swapchain_create_context_for_thread(struct IWineD3DSwapChainImpl *swapchain) DECLSPEC_HIDDEN;
HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface_type, HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface_type,
IWineD3DDeviceImpl *device, WINED3DPRESENT_PARAMETERS *present_parameters, void *parent) DECLSPEC_HIDDEN; IWineD3DDeviceImpl *device, WINED3DPRESENT_PARAMETERS *present_parameters, void *parent) DECLSPEC_HIDDEN;