=?UTF-8?Q?Stefan=20D=C3=B6singer=20?=: wined3d: Disallow MANAGED or SCRATCH pool dynamic volumes.

Alexandre Julliard julliard at winehq.org
Mon Aug 26 13:21:58 CDT 2013


Module: wine
Branch: master
Commit: e69670f76b009a161d04cc13f36cdbaaddc93082
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=e69670f76b009a161d04cc13f36cdbaaddc93082

Author: Stefan Dösinger <stefan at codeweavers.com>
Date:   Mon Aug 26 02:01:32 2013 +0200

wined3d: Disallow MANAGED or SCRATCH pool dynamic volumes.

---

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

diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c
index 9f49f87..c472b3c 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);
 




More information about the wine-cvs mailing list