[ros-diffs] [reactos] 139/218: [WINESYNC] d3dx9: Use check_texture_requirements() in D3DXCheckCubeTextureRequirements() with correct resource type.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=849074f0c69820494c71d…

commit 849074f0c69820494c71dba6c670b076c56c975f
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: Use check_texture_requirements() in
D3DXCheckCubeTextureRequirements() with correct resource type.
    
    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 e50873f504b4693c9efcf7113afcb633155babbc 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 ab59f7db9c9..a47d2380403 100644
--- a/dll/directx/wine/d3dx9_36/texture.c
+++ b/dll/directx/wine/d3dx9_36/texture.c
@@ -454,7 +454,7 @@ HRESULT WINAPI D3DXCheckCubeTextureRequirements(struct
IDirect3DDevice9 *device,
     if ((caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2) && (!is_pow2(s)))
         s = make_pow2(s);
 
-    hr = D3DXCheckTextureRequirements(device, &s, &s, miplevels, usage, format,
pool);
+    hr = check_texture_requirements(device, &s, &s, miplevels, usage, format,
pool, D3DRTYPE_CUBETEXTURE);
 
     if (!(caps.TextureCaps & D3DPTEXTURECAPS_MIPCUBEMAP))
     {
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index 7dc33a8c42d..76197d5aabf 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: 92c8c0fc7fb95209fa9dec25234d16b1dbddcf2a}
+tags: {wine: e50873f504b4693c9efcf7113afcb633155babbc}