[PATCH 7/7] wined3d: Disallow MANAGED or SCRATCH pool dynamic volumes

Stefan Dösinger stefan at codeweavers.com
Sun Aug 25 19:01:32 CDT 2013


---
 dlls/wined3d/volume.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index f940ae3..35b7256 100644
--- a/dlls/wined3d/volume.c
+++ b/dlls/wined3d/volume.c
@@ -676,6 +676,14 @@ static HRESULT volume_init(struct wined3d_volume *volume, struct wined3d_device
         WARN("Volume cannot be created - no volume texture support.\n");
         return WINED3DERR_INVALIDCALL;
     }
+    /* TODO: Write tests for other resources and move this check
+     * to resource_init, if applicable. */
+    if (usage & WINED3DUSAGE_DYNAMIC
+            && (pool == WINED3D_POOL_MANAGED || pool == WINED3D_POOL_SCRATCH))
+    {
+        WARN("Attempted to create a DYNAMIC texture in pool %u.\n", pool);
+        return WINED3DERR_INVALIDCALL;
+    }
 
     size = wined3d_format_calculate_size(format, device->surface_alignment, width, height, depth);
 
-- 
1.8.1.5




More information about the wine-patches mailing list