From: Connor McAdams cmcadams@codeweavers.com
Signed-off-by: Connor McAdams cmcadams@codeweavers.com --- dlls/d3dx9_36/d3dx9_private.h | 8 ++ dlls/d3dx9_36/surface.c | 107 ++++++++++++++---------- dlls/d3dx9_36/tests/volume.c | 2 +- dlls/d3dx9_36/volume.c | 149 +++++++++++++--------------------- 4 files changed, 130 insertions(+), 136 deletions(-)
diff --git a/dlls/d3dx9_36/d3dx9_private.h b/dlls/d3dx9_36/d3dx9_private.h index 4fc755338df..a442e6ea1b5 100644 --- a/dlls/d3dx9_36/d3dx9_private.h +++ b/dlls/d3dx9_36/d3dx9_private.h @@ -181,6 +181,14 @@ HRESULT lock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, D3DLO IDirect3DSurface9 **temp_surface, BOOL write); HRESULT unlock_surface(IDirect3DSurface9 *surface, const RECT *surface_rect, IDirect3DSurface9 *temp_surface, BOOL update); +HRESULT set_d3dx_sub_resource_from_memory(const void *data, uint32_t row_pitch, uint32_t slice_pitch, + const PALETTEENTRY *palette, D3DFORMAT format, int32_t left, int32_t top, int32_t right, int32_t bottom, + uint32_t front, uint32_t back, struct d3dx_sub_resource *sub_rsrc); +HRESULT d3dx_load_sub_resource_from_sub_resource(struct d3dx_sub_resource *dst_sub_rsrc, + const struct pixel_format_desc *dst_desc, struct d3dx_sub_resource *src_sub_rsrc, + const struct pixel_format_desc *src_desc, uint32_t filter_flags, uint32_t color_key); +void get_aligned_rect(int32_t left, int32_t top, int32_t right, int32_t bottom, uint32_t width, uint32_t height, + const struct pixel_format_desc *fmt_desc, RECT *aligned_rect);
unsigned short float_32_to_16(const float in); float float_16_to_32(const unsigned short in); diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index ea4a900c82b..377467dce55 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1934,11 +1934,12 @@ void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slic }
static HRESULT d3dx_sub_resource_decompress(struct d3dx_sub_resource *sub_rsrc, const struct pixel_format_desc *desc, - BOOL is_dst, void **out_memory, uint32_t *out_row_pitch, const struct pixel_format_desc **out_desc) + BOOL is_dst, void **out_memory, uint32_t *out_row_pitch, uint32_t *out_slice_pitch, + const struct pixel_format_desc **out_desc) { void (*fetch_dxt_texel)(int srcRowStride, const BYTE *pixdata, int i, int j, void *texel); + uint32_t x, y, z, tmp_pitch, uncompressed_slice_pitch, uncompressed_row_pitch; const struct pixel_format_desc *uncompressed_desc = NULL; - uint32_t x, y, tmp_pitch; BYTE *uncompressed_mem;
switch (desc->format) @@ -1962,7 +1963,9 @@ static HRESULT d3dx_sub_resource_decompress(struct d3dx_sub_resource *sub_rsrc, return E_NOTIMPL; }
- if (!(uncompressed_mem = malloc(sub_rsrc->width * sub_rsrc->height * sub_rsrc->depth * uncompressed_desc->bytes_per_pixel))) + uncompressed_row_pitch = sub_rsrc->width * uncompressed_desc->bytes_per_pixel; + uncompressed_slice_pitch = uncompressed_row_pitch * sub_rsrc->height; + if (!(uncompressed_mem = malloc(sub_rsrc->depth * uncompressed_slice_pitch))) return E_OUTOFMEMORY;
/* @@ -1985,25 +1988,31 @@ static HRESULT d3dx_sub_resource_decompress(struct d3dx_sub_resource *sub_rsrc,
TRACE("Decompressing sub resource.\n"); tmp_pitch = sub_rsrc->row_pitch * desc->block_width / desc->block_byte_count; - for (y = 0; y < sub_rsrc->height; ++y) + for (z = 0; z < sub_rsrc->depth; ++z) { - BYTE *ptr = &uncompressed_mem[y * sub_rsrc->width * uncompressed_desc->bytes_per_pixel]; - for (x = 0; x < sub_rsrc->width; ++x) + const BYTE *slice_data = ((BYTE *)sub_rsrc->data) + (sub_rsrc->slice_pitch * z); + + for (y = 0; y < sub_rsrc->height; ++y) { - const POINT pt = { x, y }; - - if (!is_dst) - fetch_dxt_texel(tmp_pitch, (BYTE *)sub_rsrc->data, x + sub_rsrc->unaligned_rect.left, - y + sub_rsrc->unaligned_rect.top, ptr); - else if (!PtInRect(&sub_rsrc->unaligned_rect, pt)) - fetch_dxt_texel(tmp_pitch, (BYTE *)sub_rsrc->data, x, y, ptr); - ptr += uncompressed_desc->bytes_per_pixel; + BYTE *ptr = &uncompressed_mem[(z * uncompressed_slice_pitch) + (y * uncompressed_row_pitch)]; + for (x = 0; x < sub_rsrc->width; ++x) + { + const POINT pt = { x, y }; + + if (!is_dst) + fetch_dxt_texel(tmp_pitch, slice_data, x + sub_rsrc->unaligned_rect.left, + y + sub_rsrc->unaligned_rect.top, ptr); + else if (!PtInRect(&sub_rsrc->unaligned_rect, pt)) + fetch_dxt_texel(tmp_pitch, slice_data, x, y, ptr); + ptr += uncompressed_desc->bytes_per_pixel; + } } }
exit: *out_memory = uncompressed_mem; - *out_row_pitch = sub_rsrc->width * uncompressed_desc->bytes_per_pixel; + *out_row_pitch = uncompressed_row_pitch; + *out_slice_pitch = uncompressed_slice_pitch; *out_desc = uncompressed_desc;
return S_OK; @@ -2013,7 +2022,7 @@ exit: * Pack a d3dx_sub_resource structure for an image in memory, offsetting the * base address if necessary. */ -static HRESULT set_d3dx_sub_resource_from_memory(const void *data, uint32_t row_pitch, uint32_t slice_pitch, +HRESULT set_d3dx_sub_resource_from_memory(const void *data, uint32_t row_pitch, uint32_t slice_pitch, const PALETTEENTRY *palette, D3DFORMAT format, int32_t left, int32_t top, int32_t right, int32_t bottom, uint32_t front, uint32_t back, struct d3dx_sub_resource *sub_rsrc) { @@ -2067,7 +2076,7 @@ static const char *debug_d3dx_sub_resource(struct d3dx_sub_resource *sub_rsrc) sub_rsrc->width, sub_rsrc->height, sub_rsrc->depth, wine_dbgstr_rect(&sub_rsrc->unaligned_rect)); }
-static HRESULT d3dx_load_sub_resource_from_sub_resource(struct d3dx_sub_resource *dst_sub_rsrc, +HRESULT d3dx_load_sub_resource_from_sub_resource(struct d3dx_sub_resource *dst_sub_rsrc, const struct pixel_format_desc *dst_desc, struct d3dx_sub_resource *src_sub_rsrc, const struct pixel_format_desc *src_desc, uint32_t filter_flags, uint32_t color_key) { @@ -2095,6 +2104,7 @@ static HRESULT d3dx_load_sub_resource_from_sub_resource(struct d3dx_sub_resource if (src_desc->format == dst_desc->format && (dst_size.width == src_size.width && !(dst_size.width % dst_desc->block_width)) && (dst_size.height == src_size.height && !(dst_size.height % dst_desc->block_height)) + && (dst_size.depth == src_size.depth) && color_key == 0 && !(src_sub_rsrc->unaligned_rect.left & (src_desc->block_width - 1)) && !(src_sub_rsrc->unaligned_rect.top & (src_desc->block_height - 1)) @@ -2121,19 +2131,19 @@ static HRESULT d3dx_load_sub_resource_from_sub_resource(struct d3dx_sub_resource */ if (src_desc->type == FORMAT_DXT) { + uint32_t uncompressed_row_pitch, uncompressed_slice_pitch; const struct pixel_format_desc *uncompressed_desc; - uint32_t uncompressed_row_pitch; void *uncompressed_mem = NULL;
hr = d3dx_sub_resource_decompress(src_sub_rsrc, src_desc, FALSE, &uncompressed_mem, &uncompressed_row_pitch, - &uncompressed_desc); + &uncompressed_slice_pitch, &uncompressed_desc); if (SUCCEEDED(hr)) { struct d3dx_sub_resource uncompressed_sub_rsrc;
- set_d3dx_sub_resource_from_memory((const void *)uncompressed_mem, uncompressed_row_pitch, 0, NULL, - uncompressed_desc->format, 0, 0, src_sub_rsrc->width, src_sub_rsrc->height, 0, src_sub_rsrc->depth, - &uncompressed_sub_rsrc); + set_d3dx_sub_resource_from_memory((const void *)uncompressed_mem, uncompressed_row_pitch, + uncompressed_slice_pitch, NULL, uncompressed_desc->format, 0, 0, src_sub_rsrc->width, + src_sub_rsrc->height, 0, src_sub_rsrc->depth, &uncompressed_sub_rsrc);
hr = d3dx_load_sub_resource_from_sub_resource(dst_sub_rsrc, dst_desc, &uncompressed_sub_rsrc, uncompressed_desc, filter_flags, color_key); @@ -2145,25 +2155,27 @@ static HRESULT d3dx_load_sub_resource_from_sub_resource(struct d3dx_sub_resource /* Same as the above, need to decompress the destination prior to modifying. */ if (dst_desc->type == FORMAT_DXT) { + uint32_t uncompressed_row_pitch, uncompressed_slice_pitch; const struct pixel_format_desc *uncompressed_desc; struct d3dx_sub_resource uncompressed_sub_rsrc; - uint32_t uncompressed_row_pitch; void *uncompressed_mem = NULL;
hr = d3dx_sub_resource_decompress(dst_sub_rsrc, dst_desc, TRUE, &uncompressed_mem, &uncompressed_row_pitch, - &uncompressed_desc); + &uncompressed_slice_pitch, &uncompressed_desc); if (FAILED(hr)) return hr;
- set_d3dx_sub_resource_from_memory((const void *)uncompressed_mem, uncompressed_row_pitch, 0, NULL, - uncompressed_desc->format, dst_sub_rsrc->unaligned_rect.left, dst_sub_rsrc->unaligned_rect.top, - dst_sub_rsrc->unaligned_rect.right, dst_sub_rsrc->unaligned_rect.bottom, 0, 1, &uncompressed_sub_rsrc); + set_d3dx_sub_resource_from_memory((const void *)uncompressed_mem, uncompressed_row_pitch, + uncompressed_slice_pitch, NULL, uncompressed_desc->format, dst_sub_rsrc->unaligned_rect.left, + dst_sub_rsrc->unaligned_rect.top, dst_sub_rsrc->unaligned_rect.right, + dst_sub_rsrc->unaligned_rect.bottom, 0, dst_sub_rsrc->depth, &uncompressed_sub_rsrc);
hr = d3dx_load_sub_resource_from_sub_resource(&uncompressed_sub_rsrc, uncompressed_desc, src_sub_rsrc, src_desc, filter_flags, color_key); if (SUCCEEDED(hr)) { GLenum gl_format = 0; + uint32_t i;
TRACE("Compressing DXTn surface.\n"); switch (dst_desc->format) @@ -2182,8 +2194,15 @@ static HRESULT d3dx_load_sub_resource_from_sub_resource(struct d3dx_sub_resource default: ERR("Unexpected destination compressed format %u.\n", dst_desc->format); } - tx_compress_dxtn(4, dst_size_aligned.width, dst_size_aligned.height, uncompressed_mem, gl_format, - (BYTE *)dst_sub_rsrc->data, dst_sub_rsrc->row_pitch); + + for (i = 0; i < dst_size_aligned.depth; ++i) + { + BYTE *uncompressed_mem_slice = (BYTE *)uncompressed_mem + (i * uncompressed_slice_pitch); + BYTE *dst_memory_slice = ((BYTE *)dst_sub_rsrc->data) + (i * dst_sub_rsrc->slice_pitch); + + tx_compress_dxtn(4, dst_size_aligned.width, dst_size_aligned.height, uncompressed_mem_slice, gl_format, + dst_memory_slice, dst_sub_rsrc->row_pitch); + } } free(uncompressed_mem); return hr; @@ -2210,6 +2229,22 @@ static HRESULT d3dx_load_sub_resource_from_sub_resource(struct d3dx_sub_resource return hr; }
+void get_aligned_rect(int32_t left, int32_t top, int32_t right, int32_t bottom, uint32_t width, uint32_t height, + const struct pixel_format_desc *fmt_desc, RECT *aligned_rect) +{ + SetRect(aligned_rect, left, top, right, bottom); + if (aligned_rect->left & (fmt_desc->block_width - 1)) + aligned_rect->left = aligned_rect->left & ~(fmt_desc->block_width - 1); + if (aligned_rect->top & (fmt_desc->block_height - 1)) + aligned_rect->top = aligned_rect->top & ~(fmt_desc->block_height - 1); + if (aligned_rect->right & (fmt_desc->block_width - 1) && aligned_rect->right != width) + aligned_rect->right = min((aligned_rect->right + fmt_desc->block_width - 1) + & ~(fmt_desc->block_width - 1), width); + if (aligned_rect->bottom & (fmt_desc->block_height - 1) && aligned_rect->bottom != height) + aligned_rect->bottom = min((aligned_rect->bottom + fmt_desc->block_height - 1) + & ~(fmt_desc->block_height - 1), height); +} + /************************************************************ * D3DXLoadSurfaceFromMemory * @@ -2306,18 +2341,6 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, } }
- dst_rect_aligned = *dst_rect; - if (dst_rect_aligned.left & (destformatdesc->block_width - 1)) - dst_rect_aligned.left = dst_rect_aligned.left & ~(destformatdesc->block_width - 1); - if (dst_rect_aligned.top & (destformatdesc->block_height - 1)) - dst_rect_aligned.top = dst_rect_aligned.top & ~(destformatdesc->block_height - 1); - if (dst_rect_aligned.right & (destformatdesc->block_width - 1) && dst_rect_aligned.right != surfdesc.Width) - dst_rect_aligned.right = min((dst_rect_aligned.right + destformatdesc->block_width - 1) - & ~(destformatdesc->block_width - 1), surfdesc.Width); - if (dst_rect_aligned.bottom & (destformatdesc->block_height - 1) && dst_rect_aligned.bottom != surfdesc.Height) - dst_rect_aligned.bottom = min((dst_rect_aligned.bottom + destformatdesc->block_height - 1) - & ~(destformatdesc->block_height - 1), surfdesc.Height); - if (filter == D3DX_DEFAULT) filter = D3DX_FILTER_TRIANGLE | D3DX_FILTER_DITHER;
@@ -2329,6 +2352,8 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, return hr; }
+ get_aligned_rect(dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom, surfdesc.Width, surfdesc.Height, + destformatdesc, &dst_rect_aligned); if (FAILED(hr = lock_surface(dst_surface, &dst_rect_aligned, &lockrect, &surface, TRUE))) return hr;
diff --git a/dlls/d3dx9_36/tests/volume.c b/dlls/d3dx9_36/tests/volume.c index 52075aa6314..f990221f06b 100644 --- a/dlls/d3dx9_36/tests/volume.c +++ b/dlls/d3dx9_36/tests/volume.c @@ -205,7 +205,7 @@ static void test_D3DXLoadVolumeFromMemory(IDirect3DDevice9 *device) set_box(&src_box, 1, 1, 7, 7, 0, 1); set_box(&dst_box, 1, 1, 7, 7, 0, 1); hr = D3DXLoadVolumeFromMemory(volume, NULL, &dst_box, pixels, D3DFMT_A8R8G8B8, 16, 32, NULL, &src_box, D3DX_DEFAULT, 0); - todo_wine ok(hr == D3D_OK, "D3DXLoadVolumeFromMemory returned %#lx, expected %#lx\n", hr, D3D_OK); + ok(hr == D3D_OK, "D3DXLoadVolumeFromMemory returned %#lx, expected %#lx\n", hr, D3D_OK);
IDirect3DVolume9_Release(volume); IDirect3DVolumeTexture9_Release(volume_texture); diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 4d29cfe1e31..eedde9e6ab2 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -71,16 +71,29 @@ HRESULT WINAPI D3DXLoadVolumeFromFileW(IDirect3DVolume9 *dst_volume, const PALET return hr; }
+static void set_d3dbox(D3DBOX *box, uint32_t left, uint32_t top, uint32_t right, uint32_t bottom, uint32_t front, + uint32_t back) +{ + box->Left = left; + box->Top = top; + box->Right = right; + box->Bottom = bottom; + box->Front = front; + box->Back = back; +} + HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette, const D3DBOX *dst_box, const void *src_memory, D3DFORMAT src_format, UINT src_row_pitch, UINT src_slice_pitch, const PALETTEENTRY *src_palette, const D3DBOX *src_box, DWORD filter, D3DCOLOR color_key) { - HRESULT hr; - D3DVOLUME_DESC desc; - D3DLOCKED_BOX locked_box; - struct volume dst_size, src_size; const struct pixel_format_desc *src_format_desc, *dst_format_desc; + struct d3dx_sub_resource src_sub_rsrc, dst_sub_rsrc; + D3DBOX dst_box_aligned, dst_box_tmp; + D3DLOCKED_BOX locked_box; + RECT dst_rect_aligned; + D3DVOLUME_DESC desc; + HRESULT hr;
TRACE("dst_volume %p, dst_palette %p, dst_box %p, src_memory %p, src_format %#x, " "src_row_pitch %u, src_slice_pitch %u, src_palette %p, src_box %p, filter %#lx, color_key 0x%08lx.\n", @@ -98,17 +111,19 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume, if (filter == D3DX_DEFAULT) filter = D3DX_FILTER_TRIANGLE | D3DX_FILTER_DITHER;
- IDirect3DVolume9_GetDesc(dst_volume, &desc); + src_format_desc = get_format_info(src_format); + if (src_format_desc->type == FORMAT_UNKNOWN) + return E_NOTIMPL;
- src_size.width = src_box->Right - src_box->Left; - src_size.height = src_box->Bottom - src_box->Top; - src_size.depth = src_box->Back - src_box->Front; + IDirect3DVolume9_GetDesc(dst_volume, &desc); + dst_format_desc = get_format_info(desc.Format); + if (dst_format_desc->type == FORMAT_UNKNOWN) + return E_NOTIMPL;
if (!dst_box) { - dst_size.width = desc.Width; - dst_size.height = desc.Height; - dst_size.depth = desc.Depth; + set_d3dbox(&dst_box_tmp, 0, 0, desc.Width, desc.Height, 0, desc.Depth); + dst_box = &dst_box_tmp; } else { @@ -118,94 +133,40 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume, return D3DERR_INVALIDCALL; if (dst_box->Front >= dst_box->Back || dst_box->Back > desc.Depth) return D3DERR_INVALIDCALL; - - dst_size.width = dst_box->Right - dst_box->Left; - dst_size.height = dst_box->Bottom - dst_box->Top; - dst_size.depth = dst_box->Back - dst_box->Front; }
- src_format_desc = get_format_info(src_format); - if (src_format_desc->type == FORMAT_UNKNOWN) - return E_NOTIMPL; + hr = set_d3dx_sub_resource_from_memory(src_memory, src_row_pitch, src_slice_pitch, + src_palette, src_format, src_box->Left, src_box->Top, src_box->Right, src_box->Bottom, + src_box->Front, src_box->Back, &src_sub_rsrc); + if (FAILED(hr)) + return hr;
- dst_format_desc = get_format_info(desc.Format); - if (dst_format_desc->type == FORMAT_UNKNOWN) - return E_NOTIMPL; + get_aligned_rect(dst_box->Left, dst_box->Top, dst_box->Right, dst_box->Bottom, desc.Width, desc.Height, + dst_format_desc, &dst_rect_aligned); + set_d3dbox(&dst_box_aligned, dst_rect_aligned.left, dst_rect_aligned.top, dst_rect_aligned.right, + dst_rect_aligned.bottom, dst_box->Front, dst_box->Back);
- if (desc.Format == src_format - && dst_size.width == src_size.width - && dst_size.height == src_size.height - && dst_size.depth == src_size.depth - && color_key == 0) - { - const BYTE *src_addr; - - if (src_box->Left & (src_format_desc->block_width - 1) - || src_box->Top & (src_format_desc->block_height - 1) - || (src_box->Right & (src_format_desc->block_width - 1) - && src_size.width != desc.Width) - || (src_box->Bottom & (src_format_desc->block_height - 1) - && src_size.height != desc.Height)) - { - FIXME("Source box (%u, %u, %u, %u) is misaligned\n", - src_box->Left, src_box->Top, src_box->Right, src_box->Bottom); - return E_NOTIMPL; - } - - src_addr = src_memory; - src_addr += src_box->Front * src_slice_pitch; - src_addr += (src_box->Top / src_format_desc->block_height) * src_row_pitch; - src_addr += (src_box->Left / src_format_desc->block_width) * src_format_desc->block_byte_count; - - hr = IDirect3DVolume9_LockBox(dst_volume, &locked_box, dst_box, 0); - if (FAILED(hr)) return hr; - - copy_pixels(src_addr, src_row_pitch, src_slice_pitch, - locked_box.pBits, locked_box.RowPitch, locked_box.SlicePitch, - &dst_size, dst_format_desc); - - IDirect3DVolume9_UnlockBox(dst_volume); - } - else - { - const BYTE *src_addr; - - if (!is_conversion_from_supported(src_format_desc) - || !is_conversion_to_supported(dst_format_desc)) - { - FIXME("Pixel format conversion is not implemented %#x -> %#x\n", - src_format_desc->format, dst_format_desc->format); - return E_NOTIMPL; - } - - src_addr = src_memory; - src_addr += src_box->Front * src_slice_pitch; - src_addr += src_box->Top * src_row_pitch; - src_addr += src_box->Left * src_format_desc->bytes_per_pixel; - - hr = IDirect3DVolume9_LockBox(dst_volume, &locked_box, dst_box, 0); - if (FAILED(hr)) return hr; - - if ((filter & 0xf) == D3DX_FILTER_NONE) - { - convert_argb_pixels(src_memory, src_row_pitch, src_slice_pitch, &src_size, src_format_desc, - locked_box.pBits, locked_box.RowPitch, locked_box.SlicePitch, &dst_size, dst_format_desc, color_key, - src_palette); - } - else - { - if ((filter & 0xf) != D3DX_FILTER_POINT) - FIXME("Unhandled filter %#lx.\n", filter); - - point_filter_argb_pixels(src_addr, src_row_pitch, src_slice_pitch, &src_size, src_format_desc, - locked_box.pBits, locked_box.RowPitch, locked_box.SlicePitch, &dst_size, dst_format_desc, color_key, - src_palette); - } - - IDirect3DVolume9_UnlockBox(dst_volume); - } + hr = IDirect3DVolume9_LockBox(dst_volume, &locked_box, &dst_box_aligned, 0); + if (FAILED(hr)) + return hr;
- return D3D_OK; + dst_sub_rsrc.data = locked_box.pBits; + dst_sub_rsrc.row_pitch = locked_box.RowPitch; + dst_sub_rsrc.slice_pitch = locked_box.SlicePitch; + dst_sub_rsrc.palette = dst_palette; + dst_sub_rsrc.width = dst_box_aligned.Right - dst_box_aligned.Left; + dst_sub_rsrc.height = dst_box_aligned.Bottom - dst_box_aligned.Top; + dst_sub_rsrc.depth = dst_box_aligned.Back - dst_box_aligned.Front; + SetRect(&dst_sub_rsrc.unaligned_rect, dst_box->Left, dst_box->Top, dst_box->Right, dst_box->Bottom); + OffsetRect(&dst_sub_rsrc.unaligned_rect, -dst_rect_aligned.left, -dst_rect_aligned.top); + + hr = d3dx_load_sub_resource_from_sub_resource(&dst_sub_rsrc, dst_format_desc, &src_sub_rsrc, src_format_desc, filter, + color_key); + if (FAILED(hr)) + WARN("d3dx_load_sub_resource_from_sub_resource failed with hr %#lx\n", hr); + + IDirect3DVolume9_UnlockBox(dst_volume); + return hr; }
HRESULT WINAPI D3DXLoadVolumeFromFileInMemory(IDirect3DVolume9 *dst_volume, const PALETTEENTRY *dst_palette,