Module: wine Branch: master Commit: a4df391976e26dc60a822c2cebc278c486cf6daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4df391976e26dc60a822c2ceb...
Author: Józef Kucia joseph.kucia@gmail.com Date: Sun Oct 28 22:59:55 2012 +0100
d3dx9: Rename point_filter_simple_data to point_filter_argb_pixels.
---
dlls/d3dx9_36/d3dx9_36_private.h | 7 ++++--- dlls/d3dx9_36/surface.c | 8 ++++---- dlls/d3dx9_36/volume.c | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 860583f..125ebbc 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -76,9 +76,10 @@ void convert_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pit const struct volume *src_size, const struct pixel_format_desc *src_format, BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *dst_size, const struct pixel_format_desc *dst_format, D3DCOLOR color_key) DECLSPEC_HIDDEN; -void point_filter_simple_data(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, struct volume *src_size, const struct pixel_format_desc *src_format, - BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, struct volume *dst_size, const struct pixel_format_desc *dst_format, - D3DCOLOR color_key) DECLSPEC_HIDDEN; +void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, + const struct volume *src_size, const struct pixel_format_desc *src_format, + BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *dst_size, + const struct pixel_format_desc *dst_format, D3DCOLOR color_key) DECLSPEC_HIDDEN;
HRESULT load_texture_from_dds(IDirect3DTexture9 *texture, const void *src_data, const PALETTEENTRY *palette, DWORD filter, D3DCOLOR color_key, const D3DXIMAGE_INFO *src_info) DECLSPEC_HIDDEN; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 4641039..14df4ff 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1454,16 +1454,16 @@ void convert_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pit }
/************************************************************ - * point_filter_simple_data + * point_filter_argb_pixels * * Copies the source buffer to the destination buffer, performing * any necessary format conversion, color keying and stretching * using a point filter. * Works only for ARGB formats with 1 - 4 bytes per pixel. */ -void point_filter_simple_data(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, struct volume *src_size, +void point_filter_argb_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, const struct volume *src_size, const struct pixel_format_desc *src_format, BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, - struct volume *dst_size, const struct pixel_format_desc *dst_format, D3DCOLOR color_key) + const struct volume *dst_size, const struct pixel_format_desc *dst_format, D3DCOLOR color_key) { struct argb_conversion_info conv_info, ck_conv_info; const struct pixel_format_desc *ck_format = NULL; @@ -1701,7 +1701,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface,
/* Always apply a point filter until D3DX_FILTER_LINEAR, * D3DX_FILTER_TRIANGLE and D3DX_FILTER_BOX are implemented. */ - point_filter_simple_data(src_memory, src_pitch, 0, &src_size, srcformatdesc, + point_filter_argb_pixels(src_memory, src_pitch, 0, &src_size, srcformatdesc, lockrect.pBits, lockrect.Pitch, 0, &dst_size, destformatdesc, color_key); }
diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 5115368..1e19d9d 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -220,7 +220,7 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume, if ((filter & 0xf) != D3DX_FILTER_POINT) FIXME("Unhandled filter %#x.\n", filter);
- point_filter_simple_data(src_addr, src_row_pitch, src_slice_pitch, &src_size, src_format_desc, + 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); }