[ros-diffs] [reactos] 124/218: [WINESYNC] d3dx9: Add traces to filtering functions.

[winesync]

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

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

    [WINESYNC] d3dx9: Add traces to filtering functions.
    
    Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 1f9243c757589c6ff2333794c3a44327d64855ae by Matteo Bruni
<mbruni(a)codeweavers.com>
---
 dll/directx/wine/d3dx9_36/surface.c | 10 ++++++++++
 dll/directx/wine/d3dx9_36/texture.c |  4 +---
 sdk/tools/winesync/d3dx9.cfg        |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/dll/directx/wine/d3dx9_36/surface.c b/dll/directx/wine/d3dx9_36/surface.c
index 245f902b181..b1caec724e1 100644
--- a/dll/directx/wine/d3dx9_36/surface.c
+++ b/dll/directx/wine/d3dx9_36/surface.c
@@ -1623,6 +1623,11 @@ void convert_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT
src_slice_pit
     UINT min_width, min_height, min_depth;
     UINT x, y, z;
 
+    TRACE("src %p, src_row_pitch %u, src_slice_pitch %u, src_size %p, src_format %p,
dst %p, "
+            "dst_row_pitch %u, dst_slice_pitch %u, dst_size %p, dst_format %p,
color_key 0x%08x, palette %p.\n",
+            src, src_row_pitch, src_slice_pitch, src_size, src_format, dst,
dst_row_pitch, dst_slice_pitch, dst_size,
+            dst_format, color_key, palette);
+
     ZeroMemory(channels, sizeof(channels));
     init_argb_conversion_info(src_format, dst_format, &conv_info);
 
@@ -1725,6 +1730,11 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch,
UINT src_slic
     DWORD channels[4];
     UINT x, y, z;
 
+    TRACE("src %p, src_row_pitch %u, src_slice_pitch %u, src_size %p, src_format %p,
dst %p, "
+            "dst_row_pitch %u, dst_slice_pitch %u, dst_size %p, dst_format %p,
color_key 0x%08x, palette %p.\n",
+            src, src_row_pitch, src_slice_pitch, src_size, src_format, dst,
dst_row_pitch, dst_slice_pitch, dst_size,
+            dst_format, color_key, palette);
+
     ZeroMemory(channels, sizeof(channels));
     init_argb_conversion_info(src_format, dst_format, &conv_info);
 
diff --git a/dll/directx/wine/d3dx9_36/texture.c b/dll/directx/wine/d3dx9_36/texture.c
index 25a0fe0524a..85515c73bbd 100644
--- a/dll/directx/wine/d3dx9_36/texture.c
+++ b/dll/directx/wine/d3dx9_36/texture.c
@@ -434,7 +434,6 @@ HRESULT WINAPI D3DXCheckCubeTextureRequirements(struct
IDirect3DDevice9 *device,
     if (!(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP))
         return D3DERR_NOTAVAILABLE;
 
-    /* ensure width/height is power of 2 */
     if ((caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2) && (!is_pow2(s)))
         s = make_pow2(s);
 
@@ -474,7 +473,6 @@ HRESULT WINAPI D3DXCheckVolumeTextureRequirements(struct
IDirect3DDevice9 *devic
     if (d == D3DX_DEFAULT)
         d = 1;
 
-    /* ensure width/height is power of 2 */
     if ((caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2) &&
         (!is_pow2(w) || !is_pow2(h) || !is_pow2(d)))
     {
@@ -650,7 +648,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct
IDirect3DDevice9 *devi
         skip_levels = 0;
     }
 
-    /* fix texture creation parameters */
+    /* Fix up texture creation parameters. */
     hr = D3DXCheckTextureRequirements(device, &width, &height, &miplevels,
usage, &format, pool);
     if (FAILED(hr))
     {
diff --git a/sdk/tools/winesync/d3dx9.cfg b/sdk/tools/winesync/d3dx9.cfg
index e9d2e456911..cc418c43615 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: 5472b8b98332400a7ad434ed94bed82b21f622fe}
+tags: {wine: 1f9243c757589c6ff2333794c3a44327d64855ae}