Henri Verbeet : ddraw: Don' t try to create surfaces for wined3d internal textures.
Alexandre Julliard
julliard at winehq.org
Fri Jun 13 10:10:35 CDT 2014
Module: wine
Branch: master
Commit: d30720d825fc594559104c12f27858f89a8673ba
URL: http://source.winehq.org/git/wine.git/?a=commit;h=d30720d825fc594559104c12f27858f89a8673ba
Author: Henri Verbeet <hverbeet at codeweavers.com>
Date: Fri Jun 13 10:01:18 2014 +0200
ddraw: Don't try to create surfaces for wined3d internal textures.
---
dlls/ddraw/ddraw.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c
index aa74a1e..062fe02 100644
--- a/dlls/ddraw/ddraw.c
+++ b/dlls/ddraw/ddraw.c
@@ -4733,8 +4733,8 @@ static HRESULT CDECL device_parent_surface_created(struct wined3d_device_parent
TRACE("device_parent %p, container_parent %p, surface %p, parent %p, parent_ops %p.\n",
device_parent, container_parent, surface, parent, parent_ops);
- /* We have a swapchain texture. */
- if (container_parent == ddraw)
+ /* We have a swapchain or wined3d internal texture. */
+ if (!container_parent || container_parent == ddraw)
{
*parent = NULL;
*parent_ops = &ddraw_null_wined3d_parent_ops;
More information about the wine-cvs
mailing list