d3dx9: Add traces to filtering functions.
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
5472b8b983
commit
1f9243c757
|
@ -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 min_width, min_height, min_depth;
|
||||||
UINT x, y, z;
|
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));
|
ZeroMemory(channels, sizeof(channels));
|
||||||
init_argb_conversion_info(src_format, dst_format, &conv_info);
|
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];
|
DWORD channels[4];
|
||||||
UINT x, y, z;
|
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));
|
ZeroMemory(channels, sizeof(channels));
|
||||||
init_argb_conversion_info(src_format, dst_format, &conv_info);
|
init_argb_conversion_info(src_format, dst_format, &conv_info);
|
||||||
|
|
||||||
|
|
|
@ -430,7 +430,6 @@ HRESULT WINAPI D3DXCheckCubeTextureRequirements(struct IDirect3DDevice9 *device,
|
||||||
if (!(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP))
|
if (!(caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP))
|
||||||
return D3DERR_NOTAVAILABLE;
|
return D3DERR_NOTAVAILABLE;
|
||||||
|
|
||||||
/* ensure width/height is power of 2 */
|
|
||||||
if ((caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2) && (!is_pow2(s)))
|
if ((caps.TextureCaps & D3DPTEXTURECAPS_CUBEMAP_POW2) && (!is_pow2(s)))
|
||||||
s = make_pow2(s);
|
s = make_pow2(s);
|
||||||
|
|
||||||
|
@ -470,7 +469,6 @@ HRESULT WINAPI D3DXCheckVolumeTextureRequirements(struct IDirect3DDevice9 *devic
|
||||||
if (d == D3DX_DEFAULT)
|
if (d == D3DX_DEFAULT)
|
||||||
d = 1;
|
d = 1;
|
||||||
|
|
||||||
/* ensure width/height is power of 2 */
|
|
||||||
if ((caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2) &&
|
if ((caps.TextureCaps & D3DPTEXTURECAPS_VOLUMEMAP_POW2) &&
|
||||||
(!is_pow2(w) || !is_pow2(h) || !is_pow2(d)))
|
(!is_pow2(w) || !is_pow2(h) || !is_pow2(d)))
|
||||||
{
|
{
|
||||||
|
@ -646,7 +644,7 @@ HRESULT WINAPI D3DXCreateTextureFromFileInMemoryEx(struct IDirect3DDevice9 *devi
|
||||||
skip_levels = 0;
|
skip_levels = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* fix texture creation parameters */
|
/* Fix up texture creation parameters. */
|
||||||
hr = D3DXCheckTextureRequirements(device, &width, &height, &miplevels, usage, &format, pool);
|
hr = D3DXCheckTextureRequirements(device, &width, &height, &miplevels, usage, &format, pool);
|
||||||
if (FAILED(hr))
|
if (FAILED(hr))
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue