October 2012 - Wine-commits

Henri Verbeet : d3dx9: Avoid LPDIRECT3DDEVICE9.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 4ba6974345845030d56289de71ed1ce68d25d8e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ba6974345845030d56289de7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 28 20:54:52 2012 +0100 d3dx9: Avoid LPDIRECT3DDEVICE9. --- dlls/d3dx9_36/d3dx9_36_main.c | 2 +- dlls/d3dx9_36/effect.c | 90 ++++++++++------------- dlls/d3dx9_36/font.c | 5 +- dlls/d3dx9_36/line.c | 4 +- dlls/d3dx9_36/mesh.c | 160 ++++++++++++++--------------------------- dlls/d3dx9_36/shader.c | 66 +++++++++-------- dlls/d3dx9_36/sprite.c | 4 +- dlls/d3dx9_36/tests/line.c | 2 +- dlls/d3dx9_36/texture.c | 27 ++------ include/d3dx9anim.h | 13 +++- include/d3dx9core.h | 46 +++++++----- include/d3dx9effect.h | 131 +++++++++------------------------- include/d3dx9mesh.h | 113 ++++++++++++++++++----------- include/d3dx9shader.h | 46 +++++++----- include/d3dx9shape.h | 56 +++----------- include/d3dx9tex.h | 28 ++------ 16 files changed, 329 insertions(+), 464 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4ba6974345845030d5628…

1 0

Henri Verbeet : dxdiagn: Avoid depending on ddraw.h.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 435e5c89b586c3ac527f2c410ab396e5af6b3783 URL: http://source.winehq.org/git/wine.git/?a=commit;h=435e5c89b586c3ac527f2c410… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 28 20:54:53 2012 +0100 dxdiagn: Avoid depending on ddraw.h. --- dlls/dxdiagn/provider.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index b207c9a..8132b8f 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -29,10 +29,9 @@ #include "wine/unicode.h" #include "winver.h" #include "objidl.h" -#include "dshow.h" +#include "uuids.h" #include "vfw.h" #include "mmddk.h" -#include "ddraw.h" #include "d3d9.h" #include "strmif.h" #include "initguid.h"

1 0

Henri Verbeet : wined3d: Don' t depend on device internals in fragment_pipeline.alloc_private().
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 5059da9e32a16bc7a036c75e40f0c3b66550d940 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5059da9e32a16bc7a036c75e4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 28 20:54:54 2012 +0100 wined3d: Don't depend on device internals in fragment_pipeline.alloc_private(). In particular, device->shader_backend and device->shader_priv aren't initialized yet when the fragment pipe is initialized. --- dlls/wined3d/arb_program_shader.c | 43 ++++++++++++++++----------------- dlls/wined3d/ati_fragment_shader.c | 17 ++++++------- dlls/wined3d/glsl_shader.c | 9 ++++--- dlls/wined3d/nvidia_texture_shader.c | 6 ++++- dlls/wined3d/shader.c | 9 ++++--- dlls/wined3d/state.c | 6 ++++- dlls/wined3d/wined3d_private.h | 2 +- 7 files changed, 50 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 86b2c2f..3db3b54 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4881,13 +4881,13 @@ static const struct wine_rb_functions sig_tree_functions = static HRESULT shader_arb_alloc(struct wined3d_device *device, const struct fragment_pipeline *fragment_pipe) { struct shader_arb_priv *priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*priv)); - HRESULT hr; + void *fragment_priv; - if (FAILED(hr = fragment_pipe->alloc_private(device))) + if (!(fragment_priv = fragment_pipe->alloc_private(&arb_program_shader_backend, priv))) { - ERR("Failed to initialize fragment pipe, hr %#x.\n", hr); + ERR("Failed to initialize fragment pipe.\n"); HeapFree(GetProcessHeap(), 0, priv); - return hr; + return E_FAIL; } priv->vshader_const_dirty = HeapAlloc(GetProcessHeap(), 0, @@ -4909,6 +4909,7 @@ static HRESULT shader_arb_alloc(struct wined3d_device *device, const struct frag ERR("RB tree init failed\n"); goto fail; } + device->fragment_priv = fragment_priv; priv->fragment_pipe = fragment_pipe; device->shader_priv = priv; return WINED3D_OK; @@ -5665,31 +5666,29 @@ static void arbfp_enable(const struct wined3d_gl_info *gl_info, BOOL enable) } } -static HRESULT arbfp_alloc(struct wined3d_device *device) +static void *arbfp_alloc(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv) { struct shader_arb_priv *priv; - /* Share private data between the shader backend and the pipeline replacement, if both - * are the arb implementation. This is needed to figure out whether ARBfp should be disabled - * if no pixel shader is bound or not - */ - if (device->shader_backend == &arb_program_shader_backend) - { - device->fragment_priv = device->shader_priv; - } - else - { - device->fragment_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct shader_arb_priv)); - if (!device->fragment_priv) return E_OUTOFMEMORY; - } - priv = device->fragment_priv; + + /* Share private data between the shader backend and the pipeline + * replacement, if both are the arb implementation. This is needed to + * figure out whether ARBfp should be disabled if no pixel shader is bound + * or not. */ + if (shader_backend == &arb_program_shader_backend) + priv = shader_priv; + else if (!(priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*priv)))) + return NULL; + if (wine_rb_init(&priv->fragment_shaders, &wined3d_ffp_frag_program_rb_functions) == -1) { ERR("Failed to initialize rbtree.\n"); - HeapFree(GetProcessHeap(), 0, device->fragment_priv); - return E_OUTOFMEMORY; + if (priv != shader_priv) + HeapFree(GetProcessHeap(), 0, priv); + return NULL; } priv->use_arbfp_fixed_func = TRUE; - return WINED3D_OK; + + return priv; } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index bc816fb..5e04878 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1154,24 +1154,23 @@ static void atifs_get_caps(const struct wined3d_gl_info *gl_info, struct fragmen caps->MaxSimultaneousTextures = 6; } -static HRESULT atifs_alloc(struct wined3d_device *device) +static void *atifs_alloc(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv) { struct atifs_private_data *priv; - device->fragment_priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct atifs_private_data)); - if (!device->fragment_priv) + if (!(priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*priv)))) { - ERR("Out of memory\n"); - return E_OUTOFMEMORY; + ERR("Out of memory.\n"); + return NULL; } - priv = device->fragment_priv; if (wine_rb_init(&priv->fragment_shaders, &wined3d_ffp_frag_program_rb_functions) == -1) { ERR("Failed to initialize rbtree.\n"); - HeapFree(GetProcessHeap(), 0, device->fragment_priv); - return E_OUTOFMEMORY; + HeapFree(GetProcessHeap(), 0, priv); + return NULL; } - return WINED3D_OK; + + return priv; } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bf06aee..d7d7e3c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5233,13 +5233,13 @@ static HRESULT shader_glsl_alloc(struct wined3d_device *device, const struct fra struct shader_glsl_priv *priv = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct shader_glsl_priv)); SIZE_T stack_size = wined3d_log2i(max(gl_info->limits.glsl_vs_float_constants, gl_info->limits.glsl_ps_float_constants)) + 1; - HRESULT hr; + void *fragment_priv; - if (FAILED(hr = fragment_pipe->alloc_private(device))) + if (!(fragment_priv = fragment_pipe->alloc_private(&glsl_shader_backend, priv))) { - ERR("Failed to initialize fragment pipe, hr %#x.\n", hr); + ERR("Failed to initialize fragment pipe.\n"); HeapFree(GetProcessHeap(), 0, priv); - return hr; + return E_FAIL; } if (!shader_buffer_init(&priv->shader_buffer)) @@ -5274,6 +5274,7 @@ static HRESULT shader_glsl_alloc(struct wined3d_device *device, const struct fra } priv->next_constant_version = 1; + device->fragment_priv = fragment_priv; priv->fragment_pipe = fragment_pipe; device->shader_priv = priv; diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index bc38cb8..9a77e1d 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -720,7 +720,11 @@ static void nvrc_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct caps->MaxSimultaneousTextures = gl_info->limits.textures; } -static HRESULT nvrc_fragment_alloc(struct wined3d_device *device) { return WINED3D_OK; } +static void *nvrc_fragment_alloc(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv) +{ + return shader_priv; +} + /* Context activation is done by the caller. */ static void nvrc_fragment_free(struct wined3d_device *device) {} diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1ca79ce..6143ac5 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1473,7 +1473,7 @@ static void shader_none_context_destroyed(void *shader_priv, const struct wined3 static HRESULT shader_none_alloc(struct wined3d_device *device, const struct fragment_pipeline *fragment_pipe) { struct shader_none_priv *priv; - HRESULT hr; + void *fragment_priv; if (!(priv = HeapAlloc(GetProcessHeap(), 0, sizeof(*priv)))) { @@ -1481,13 +1481,14 @@ static HRESULT shader_none_alloc(struct wined3d_device *device, const struct fra return E_OUTOFMEMORY; } - if (FAILED(hr = fragment_pipe->alloc_private(device))) + if (!(fragment_priv = fragment_pipe->alloc_private(&none_shader_backend, priv))) { - ERR("Failed to initialize fragment pipe, hr %#x.\n", hr); + ERR("Failed to initialize fragment pipe.\n"); HeapFree(GetProcessHeap(), 0, priv); - return hr; + return E_FAIL; } + device->fragment_priv = fragment_priv; priv->fragment_pipe = fragment_pipe; device->shader_priv = priv; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index cab31f8..32e6d73 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5701,7 +5701,11 @@ static void ffp_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct caps->MaxSimultaneousTextures = gl_info->limits.textures; } -static HRESULT ffp_fragment_alloc(struct wined3d_device *device) { return WINED3D_OK; } +static void *ffp_fragment_alloc(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv) +{ + return shader_priv; +} + static void ffp_fragment_free(struct wined3d_device *device) {} static BOOL ffp_color_fixup_supported(struct color_fixup_desc fixup) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4a3779f..c189963 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1183,7 +1183,7 @@ struct fragment_pipeline { void (*enable_extension)(const struct wined3d_gl_info *gl_info, BOOL enable); void (*get_caps)(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps); - HRESULT (*alloc_private)(struct wined3d_device *device); + void *(*alloc_private)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv); void (*free_private)(struct wined3d_device *device); BOOL (*color_fixup_supported)(struct color_fixup_desc fixup); const struct StateEntryTemplate *states;

1 0

Józef Kucia : d3dx9: Rename copy_simple_data to convert_argb_pixels.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: a513da063fa594d301845d4137ffc66c48a678c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a513da063fa594d301845d413… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Oct 28 22:59:54 2012 +0100 d3dx9: Rename copy_simple_data to convert_argb_pixels. --- dlls/d3dx9_36/d3dx9_36_private.h | 7 ++++--- dlls/d3dx9_36/surface.c | 12 ++++++------ dlls/d3dx9_36/volume.c | 2 +- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index a7efbee..860583f 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -72,9 +72,10 @@ HRESULT write_buffer_to_file(const WCHAR *filename, ID3DXBuffer *buffer) DECLSPE const struct pixel_format_desc *get_format_info(D3DFORMAT format) DECLSPEC_HIDDEN; const struct pixel_format_desc *get_format_info_idx(int idx) DECLSPEC_HIDDEN; -void copy_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 convert_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; 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; diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index d49730d..4641039 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -504,7 +504,7 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur volume.width = src_desc.Width; volume.height = src_desc.Height; volume.depth = 1; - copy_simple_data(locked_rect.pBits, locked_rect.Pitch, 0, &volume, pixel_format, + convert_argb_pixels(locked_rect.pBits, locked_rect.Pitch, 0, &volume, pixel_format, pixels, dst_pitch, 0, &volume, pixel_format, 0); IDirect3DSurface9_UnlockRect(src_surface); @@ -1355,16 +1355,16 @@ static void format_from_vec4(const struct pixel_format_desc *format, const struc } /************************************************************ - * copy_simple_data + * convert_argb_pixels * * Copies the source buffer to the destination buffer, performing * any necessary format conversion and color keying. * Pixels outsize the source rect are blacked out. * Works only for ARGB formats with 1 - 4 bytes per pixel. */ -void copy_simple_data(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, struct volume *src_size, +void convert_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; @@ -1691,7 +1691,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, if ((filter & 0xf) == D3DX_FILTER_NONE) { - copy_simple_data(src_memory, src_pitch, 0, &src_size, srcformatdesc, + convert_argb_pixels(src_memory, src_pitch, 0, &src_size, srcformatdesc, lockrect.pBits, lockrect.Pitch, 0, &dst_size, destformatdesc, color_key); } else /* if ((filter & 0xf) == D3DX_FILTER_POINT) */ @@ -1976,7 +1976,7 @@ HRESULT WINAPI D3DXSaveSurfaceToFileInMemory(ID3DXBuffer **dst_buffer, D3DXIMAGE hr = IDirect3DSurface9_LockRect(src_surface, &locked_rect, src_rect, D3DLOCK_READONLY); if (SUCCEEDED(hr)) { - copy_simple_data(locked_rect.pBits, locked_rect.Pitch, 0, &size, src_format_desc, + convert_argb_pixels(locked_rect.pBits, locked_rect.Pitch, 0, &size, src_format_desc, dst_data, dst_pitch, 0, &size, dst_format_desc, 0); IDirect3DSurface9_UnlockRect(src_surface); } diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index f773c7f..5115368 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -212,7 +212,7 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume, if ((filter & 0xf) == D3DX_FILTER_NONE) { - copy_simple_data(src_memory, src_row_pitch, src_slice_pitch, &src_size, src_format_desc, + 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); } else

1 0

Józef Kucia : d3dx9: Rename point_filter_simple_data to point_filter_argb_pixels.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: a4df391976e26dc60a822c2cebc278c486cf6daf URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4df391976e26dc60a822c2ce… Author: Józef Kucia <joseph.kucia(a)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); }

1 0

Józef Kucia : d3dx9: Introduce a function for copying pixels.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 08a5dbbb8e04d6a6fdcf6b78ca1258b569716ecf URL: http://source.winehq.org/git/wine.git/?a=commit;h=08a5dbbb8e04d6a6fdcf6b78c… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Oct 28 22:59:56 2012 +0100 d3dx9: Introduce a function for copying pixels. --- dlls/d3dx9_36/d3dx9_36_private.h | 3 ++ dlls/d3dx9_36/surface.c | 63 ++++++++++++++++++++++--------------- dlls/d3dx9_36/volume.c | 29 +++++------------ 3 files changed, 48 insertions(+), 47 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index 125ebbc..b010310 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -72,6 +72,9 @@ HRESULT write_buffer_to_file(const WCHAR *filename, ID3DXBuffer *buffer) DECLSPE const struct pixel_format_desc *get_format_info(D3DFORMAT format) DECLSPEC_HIDDEN; const struct pixel_format_desc *get_format_info_idx(int idx) DECLSPEC_HIDDEN; +void copy_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, + BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *size, + const struct pixel_format_desc *format) DECLSPEC_HIDDEN; void convert_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, diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index 14df4ff..eae1649 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -460,11 +460,7 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur if (FAILED(hr)) return hr; pixel_format = get_format_info(src_desc.Format); - if (pixel_format->type != FORMAT_ARGB) - { - FIXME("Unsupported pixel format %#x\n", src_desc.Format); - return E_NOTIMPL; - } + if (pixel_format->type == FORMAT_UNKNOWN) return E_NOTIMPL; file_size = calculate_dds_file_size(src_desc.Format, src_desc.Width, src_desc.Height, 1, 1, 1); @@ -504,8 +500,8 @@ static HRESULT save_dds_surface_to_memory(ID3DXBuffer **dst_buffer, IDirect3DSur volume.width = src_desc.Width; volume.height = src_desc.Height; volume.depth = 1; - convert_argb_pixels(locked_rect.pBits, locked_rect.Pitch, 0, &volume, pixel_format, - pixels, dst_pitch, 0, &volume, pixel_format, 0); + copy_pixels(locked_rect.pBits, locked_rect.Pitch, 0, pixels, dst_pitch, 0, + &volume, pixel_format); IDirect3DSurface9_UnlockRect(src_surface); @@ -1355,6 +1351,37 @@ static void format_from_vec4(const struct pixel_format_desc *format, const struc } /************************************************************ + * copy_pixels + * + * Copies the source buffer to the destination buffer. + * Works for any pixel format. + * The source and the destination must be block-aligned. + */ +void copy_pixels(const BYTE *src, UINT src_row_pitch, UINT src_slice_pitch, + BYTE *dst, UINT dst_row_pitch, UINT dst_slice_pitch, const struct volume *size, + const struct pixel_format_desc *format) +{ + UINT row, slice; + BYTE *dst_addr; + const BYTE *src_addr; + UINT row_block_count = (size->width + format->block_width - 1) / format->block_width; + UINT row_count = (size->height + format->block_height - 1) / format->block_height; + + for (slice = 0; slice < size->depth; slice++) + { + src_addr = src + slice * src_slice_pitch; + dst_addr = dst + slice * dst_slice_pitch; + + for (row = 0; row < row_count; row++) + { + memcpy(dst_addr, src_addr, row_block_count * format->block_byte_count); + src_addr += src_row_pitch; + dst_addr += dst_row_pitch; + } + } +} + +/************************************************************ * convert_argb_pixels * * Copies the source buffer to the destination buffer, performing @@ -1584,7 +1611,6 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, D3DSURFACE_DESC surfdesc; D3DLOCKED_RECT lockrect; struct volume src_size, dst_size; - HRESULT hr; TRACE("(%p, %p, %s, %p, %#x, %u, %p, %s %#x, 0x%08x)\n", dst_surface, dst_palette, wine_dbgstr_rect(dst_rect), src_memory, src_format, @@ -1644,12 +1670,6 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, && dst_size.width == src_size.width && dst_size.height == src_size.height) /* Simple copy. */ { - UINT row_block_count = ((src_size.width + srcformatdesc->block_width - 1) / srcformatdesc->block_width); - UINT row_count = (src_size.height + srcformatdesc->block_height - 1) / srcformatdesc->block_height; - const BYTE *src_addr; - BYTE *dst_addr; - UINT row; - if (src_rect->left & (srcformatdesc->block_width - 1) || src_rect->top & (srcformatdesc->block_height - 1) || (src_rect->right & (srcformatdesc->block_width - 1) @@ -1661,20 +1681,11 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, return D3DXERR_INVALIDDATA; } - if (FAILED(hr = IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0))) + if (FAILED(IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0))) return D3DXERR_INVALIDDATA; - src_addr = src_memory; - src_addr += (src_rect->top / srcformatdesc->block_height) * src_pitch; - src_addr += (src_rect->left / srcformatdesc->block_width) * srcformatdesc->block_byte_count; - dst_addr = lockrect.pBits; - - for (row = 0; row < row_count; ++row) - { - memcpy(dst_addr, src_addr, row_block_count * srcformatdesc->block_byte_count); - src_addr += src_pitch; - dst_addr += lockrect.Pitch; - } + copy_pixels(src_memory, src_pitch, 0, lockrect.pBits, lockrect.Pitch, 0, + &src_size, srcformatdesc); IDirect3DSurface9_UnlockRect(dst_surface); } diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 1e19d9d..5664c79 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -150,11 +150,7 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume, if (desc.Format == src_format && dst_size.width == src_size.width && dst_size.height == src_size.height && dst_size.depth == src_size.depth) { - UINT row, slice; - BYTE *dst_addr; const BYTE *src_addr; - UINT row_block_count = (src_size.width + src_format_desc->block_width - 1) / src_format_desc->block_width; - UINT row_count = (src_size.height + src_format_desc->block_height - 1) / src_format_desc->block_height; if (src_box->Left & (src_format_desc->block_width - 1) || src_box->Top & (src_format_desc->block_height - 1) @@ -168,26 +164,17 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume, 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; - for (slice = 0; slice < src_size.depth; slice++) - { - src_addr = src_memory; - src_addr += (src_box->Front + slice) * 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; - - dst_addr = locked_box.pBits; - dst_addr += slice * locked_box.SlicePitch; - - for (row = 0; row < row_count; row++) - { - memcpy(dst_addr, src_addr, row_block_count * src_format_desc->block_byte_count); - src_addr += src_row_pitch; - dst_addr += locked_box.RowPitch; - } - } + 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); }

1 0

Józef Kucia : d3dx9: A simple copy isn' t enough when a color key is provided.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 4f50e751e1b11ed5263971486fddfc43b1299ff8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f50e751e1b11ed5263971486… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Oct 28 22:59:57 2012 +0100 d3dx9: A simple copy isn't enough when a color key is provided. --- dlls/d3dx9_36/surface.c | 3 ++- dlls/d3dx9_36/volume.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index eae1649..fa63e01 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1668,7 +1668,8 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, if (src_format == surfdesc.Format && dst_size.width == src_size.width - && dst_size.height == src_size.height) /* Simple copy. */ + && dst_size.height == src_size.height + && color_key == 0) /* Simple copy. */ { if (src_rect->left & (srcformatdesc->block_width - 1) || src_rect->top & (srcformatdesc->block_height - 1) diff --git a/dlls/d3dx9_36/volume.c b/dlls/d3dx9_36/volume.c index 5664c79..0dc0810 100644 --- a/dlls/d3dx9_36/volume.c +++ b/dlls/d3dx9_36/volume.c @@ -148,7 +148,10 @@ HRESULT WINAPI D3DXLoadVolumeFromMemory(IDirect3DVolume9 *dst_volume, return E_NOTIMPL; if (desc.Format == src_format - && dst_size.width == src_size.width && dst_size.height == src_size.height && dst_size.depth == src_size.depth) + && 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;

1 0

Józef Kucia : d3dx9: Correct the FIXME message in ID3DXFont::GetGlyphData.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: d1a99feee6ed097d3f2e1c5e1937014d86c4c0c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1a99feee6ed097d3f2e1c5e1… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Oct 28 22:59:58 2012 +0100 d3dx9: Correct the FIXME message in ID3DXFont::GetGlyphData. --- dlls/d3dx9_36/font.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/font.c b/dlls/d3dx9_36/font.c index 1aeebea..65adff1 100644 --- a/dlls/d3dx9_36/font.c +++ b/dlls/d3dx9_36/font.c @@ -147,7 +147,7 @@ static HDC WINAPI ID3DXFontImpl_GetDC(ID3DXFont *iface) static HRESULT WINAPI ID3DXFontImpl_GetGlyphData(ID3DXFont *iface, UINT glyph, IDirect3DTexture9 **texture, RECT *blackbox, POINT *cellinc) { - FIXME("iface %p, glyph %#x, texture %p, baclbox %s, cellinc %s stub!\n", + FIXME("iface %p, glyph %#x, texture %p, blackbox %s, cellinc %s stub!\n", iface, glyph, texture, wine_dbgstr_rect(blackbox), wine_dbgstr_point(cellinc)); return E_NOTIMPL; }

1 0

Józef Kucia : d3dx9: Handle NULL viewport in D3DXVec3Unproject.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: 7bfd634286bd3a9afdcd790fee3af3050671b6e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bfd634286bd3a9afdcd790fe… Author: Józef Kucia <joseph.kucia(a)gmail.com> Date: Sun Oct 28 23:20:08 2012 +0100 d3dx9: Handle NULL viewport in D3DXVec3Unproject. --- dlls/d3dx9_36/math.c | 21 +++++++++++++-------- dlls/d3dx9_36/tests/math.c | 4 ++++ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/d3dx9_36/math.c b/dlls/d3dx9_36/math.c index 5342bc9..117bb84 100644 --- a/dlls/d3dx9_36/math.c +++ b/dlls/d3dx9_36/math.c @@ -1928,22 +1928,27 @@ D3DXVECTOR3* WINAPI D3DXVec3TransformNormalArray(D3DXVECTOR3* out, UINT outstrid D3DXVECTOR3* WINAPI D3DXVec3Unproject(D3DXVECTOR3 *pout, CONST D3DXVECTOR3 *pv, CONST D3DVIEWPORT9 *pviewport, CONST D3DXMATRIX *pprojection, CONST D3DXMATRIX *pview, CONST D3DXMATRIX *pworld) { D3DXMATRIX m; - D3DXVECTOR3 out; TRACE("(%p, %p, %p, %p, %p, %p)\n", pout, pv, pviewport, pprojection, pview, pworld); - if (pworld) { + if (pworld) + { D3DXMatrixMultiply(&m, pworld, pview); D3DXMatrixMultiply(&m, &m, pprojection); - } else { + } + else + { D3DXMatrixMultiply(&m, pview, pprojection); } D3DXMatrixInverse(&m, NULL, &m); - out.x = 2.0f * ( pv->x - pviewport->X ) / pviewport->Width - 1.0f; - out.y = 1.0f - 2.0f * ( pv->y - pviewport->Y ) / pviewport->Height; - out.z = ( pv->z - pviewport->MinZ) / ( pviewport->MaxZ - pviewport->MinZ ); - D3DXVec3TransformCoord(&out, &out, &m); - *pout = out; + *pout = *pv; + if (pviewport) + { + pout->x = 2.0f * ( pout->x - pviewport->X ) / pviewport->Width - 1.0f; + pout->y = 1.0f - 2.0f * ( pout->y - pviewport->Y ) / pviewport->Height; + pout->z = ( pout->z - pviewport->MinZ) / ( pviewport->MaxZ - pviewport->MinZ ); + } + D3DXVec3TransformCoord(pout, pout, &m); return pout; } diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c index 166b14a..a066ea8 100644 --- a/dlls/d3dx9_36/tests/math.c +++ b/dlls/d3dx9_36/tests/math.c @@ -1381,6 +1381,10 @@ static void D3DXVector3Test(void) D3DXMatrixMultiply(&mat,&world,&view); D3DXVec3Unproject(&gotvec,&u,&viewport,&projection,&mat,NULL); expect_vec3(expectedvec,gotvec); + /* Viewport can be omitted */ + expectedvec.x = -11.018396f; expectedvec.y = 3.218991f; expectedvec.z = 1.380329f; + D3DXVec3Unproject(&gotvec,&u,NULL,&projection,&view,&world); + expect_vec3(expectedvec,gotvec); } static void D3DXVector4Test(void)

1 0

Sam Edwards : opengl32: Fix outline-font glyphs rendering with incorrect front faces.
by Alexandre Julliard 29 Oct '12

29 Oct '12

Module: wine Branch: master Commit: a428416a8ab7174ed477cc0842e6e4e4dca57726 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a428416a8ab7174ed477cc084… Author: Sam Edwards <CFSworks(a)gmail.com> Date: Mon Oct 29 04:06:45 2012 +0000 opengl32: Fix outline-font glyphs rendering with incorrect front faces. --- dlls/opengl32/wgl.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index eb24b0f..b6efdba 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -1399,6 +1399,7 @@ static BOOL wglUseFontOutlines_common(HDC hdc, } funcs->gl.p_glNewList(listBase++, GL_COMPILE); + funcs->gl.p_glFrontFace(GL_CW); pgluTessBeginPolygon(tess, NULL); pph = (TTPOLYGONHEADER*)buf;

1 0