[ros-diffs] [reactos] 141/218: [WINESYNC] d3dx9: Don't pass usage flags for staging texture in D3DXCreateVolumeTextureFromFileInMemoryEx().

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=7e7d7d48f9781f0c1bbaf…

commit 7e7d7d48f9781f0c1bbafcd799204a907760fa17
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Mon Sep 21 23:01:48 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Thu Feb 4 16:37:04 2021 +0100

    [WINESYNC] d3dx9: Don't pass usage flags for staging texture in
D3DXCreateVolumeTextureFromFileInMemoryEx().
    
    Signed-off-by: Paul Gofman <gofmanp(a)gmail.com>
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 29c02234eb2be9c8fa48cfc021d0d6f84de58add by Paul Gofman
<gofmanp(a)gmail.com>
---
 dll/directx/wine/d3dx9_36/texture.c | 2 +-
 sdk/tools/winesync/d3dx9.cfg        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/texture.c b/dll/directx/wine/d3dx9_36/texture.c
index 90c158de0d7..8f836694527 100644
--- a/dll/directx/wine/d3dx9_36/texture.c
+++ b/dll/directx/wine/d3dx9_36/texture.c
@@ -1242,7 +1242,7 @@ HRESULT WINAPI
D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic
     dynamic_texture = (caps.Caps2 & D3DCAPS2_DYNAMICTEXTURES) && (usage &
D3DUSAGE_DYNAMIC);
     if (pool == D3DPOOL_DEFAULT && !dynamic_texture)
     {
-        hr = D3DXCreateVolumeTexture(device, width, height, depth, mip_levels, usage,
format, D3DPOOL_SYSTEMMEM, &buftex);
+        hr = D3DXCreateVolumeTexture(device, width, height, depth, mip_levels, 0, format,
D3DPOOL_SYSTEMMEM, &buftex);
         tex = buftex;
     }
     else
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 470c427dfbb..cb1a169051a 100644
--- a/sdk/tools/winesync/d3dx9.cfg
+++ b/sdk/tools/winesync/d3dx9.cfg
@@ -15,4 +15,4 @@ files: {include/d3dx9.h: sdk/include/dxsdk/d3dx9.h, include/d3dx9anim.h:
sdk/inc
   include/d3dx9mesh.h: sdk/include/dxsdk/d3dx9mesh.h, include/d3dx9of.h:
sdk/include/dxsdk/d3dx9of.h,
   include/d3dx9shader.h: sdk/include/dxsdk/d3dx9shader.h, include/d3dx9shape.h:
sdk/include/dxsdk/d3dx9shape.h,
   include/d3dx9tex.h: sdk/include/dxsdk/d3dx9tex.h, include/d3dx9xof.h:
sdk/include/dxsdk/d3dx9xof.h}
-tags: {wine: 0b03d21c8f89b3f9dbd68ac849f9923197095eb5}
+tags: {wine: 29c02234eb2be9c8fa48cfc021d0d6f84de58add}