wined3d: Don't set a NULL container of type WINED3D_CONTAINER_TEXTURE.

Any container type other than WINED3D_CONTAINER_NONE implies a valid pointer of the specified type. This fixes a regression introduced by 368e5eb8.

wined3d: Don't set a NULL container of type WINED3D_CONTAINER_TEXTURE.
22428d97 · Henri Verbeet · Alexandre Julliard · 69637dbe · 22428d97 · 22428d97
Commit 22428d97 authored Aug 25, 2010 by Henri Verbeet Committed by Alexandre Julliard Aug 26, 2010
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

device.c dlls/wined3d/device.c +1 -1

surface.c dlls/wined3d/surface.c +3 -0

No files found.
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -5663,7 +5663,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *ifa
        TRACE("Changing the back buffer from %p to %p.\n", swapchain->back_buffers[0], back_impl);

        if (swapchain->back_buffers[0])
-            surface_set_container(swapchain->back_buffers[0], WINED3D_CONTAINER_TEXTURE, NULL);
+            surface_set_container(swapchain->back_buffers[0], WINED3D_CONTAINER_NONE, NULL);
        swapchain->back_buffers[0] = back_impl;

        if (back_impl)

--- a/dlls/wined3d/surface.c
+++ b/dlls/wined3d/surface.c
@@ -96,6 +96,9 @@ void surface_set_container(IWineD3DSurfaceImpl *surface, enum wined3d_container_
 {
    TRACE("surface %p, container %p.\n", surface, container);

+    if (!container && type != WINED3D_CONTAINER_NONE)
+        ERR("Setting NULL container of type %#x.\n", type);
+
    if (type == WINED3D_CONTAINER_SWAPCHAIN)
    {
        surface->get_drawable_size = get_drawable_size_swapchain;