[PATCH 3/5] d3dx9: Add traces to filtering functions.
Matteo Bruni
mbruni at codeweavers.com
Thu Sep 26 13:53:58 CDT 2019
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
---
Also touch up a couple of comments while at it...
dlls/d3dx9_36/surface.c | 10 ++++++++++
dlls/d3dx9_36/texture.c | 4 +---
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c
index 39dfbf16ac6..b78742c041c 100644
--- a/dlls/d3dx9_36/surface.c
+++ b/dlls/d3dx9_36/surface.c
@@ -1619,6 +1619,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);
@@ -1721,6 +1726,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/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c
index 26d07ca9f66..b7d017a836f 100644
--- a/dlls/d3dx9_36/texture.c
+++ b/dlls/d3dx9_36/texture.c
@@ -430,7 +430,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);
@@ -470,7 +469,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)))
{
@@ -646,7 +644,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))
{
--
2.21.0
More information about the wine-devel
mailing list