wine-commits January 2016

wine-commits@winehq.org

2 participants
627 discussions

Alexandre Julliard : server: Add a helper function to skip the object attributes structure.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: c4843d4a45c5af5e536fdf51c4456f935c16c075 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4843d4a45c5af5e536fdf51c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Jan 19 15:00:21 2016 +0900 server: Add a helper function to skip the object attributes structure. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/file.c | 3 +-- server/request.c | 9 +++++++++ server/request.h | 1 + server/symlink.c | 5 ++--- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/server/file.c b/server/file.c index 9fd3a9e..39f6ff0 100644 --- a/server/file.c +++ b/server/file.c @@ -711,8 +711,7 @@ DECL_HANDLER(create_file) if (!root_fd) return; } - name = (const char *)get_req_data() + sizeof(*objattr) + objattr->sd_len; - name_len = get_req_data_size() - sizeof(*objattr) - objattr->sd_len; + name = get_req_data_after_objattr( objattr, &name_len ); reply->handle = 0; if ((file = create_file( root_fd, name, name_len, req->access, req->sharing, diff --git a/server/request.c b/server/request.c index 2debf6d..942bc42 100644 --- a/server/request.c +++ b/server/request.c @@ -198,6 +198,15 @@ const struct object_attributes *get_req_object_attributes( const struct security return attr; } +/* return a pointer to the request data following an object attributes structure */ +const void *get_req_data_after_objattr( const struct object_attributes *attr, data_size_t *len ) +{ + const void *ptr = (const WCHAR *)((const struct object_attributes *)get_req_data() + 1) + + attr->sd_len / sizeof(WCHAR) + attr->name_len / sizeof(WCHAR); + *len = get_req_data_size() - ((const char *)ptr - (const char *)get_req_data()); + return ptr; +} + /* write the remaining part of the reply */ void write_reply( struct thread *thread ) { diff --git a/server/request.h b/server/request.h index 2c99c79..caaa30e 100644 --- a/server/request.h +++ b/server/request.h @@ -48,6 +48,7 @@ extern const char *get_config_dir(void); extern void *set_reply_data_size( data_size_t size ); extern const struct object_attributes *get_req_object_attributes( const struct security_descriptor **sd, struct unicode_str *name ); +extern const void *get_req_data_after_objattr( const struct object_attributes *attr, data_size_t *len ); extern int receive_fd( struct process *process ); extern int send_client_fd( struct process *process, int fd, obj_handle_t handle ); extern void read_request( struct thread *thread ); diff --git a/server/symlink.c b/server/symlink.c index 28d51ab..abc34f2 100644 --- a/server/symlink.c +++ b/server/symlink.c @@ -174,9 +174,8 @@ DECL_HANDLER(create_symlink) if (!objattr) return; - target.str = (const WCHAR *)get_req_data() + sizeof(*objattr) / sizeof(WCHAR) + - objattr->sd_len / sizeof(WCHAR) + name.len / sizeof(WCHAR); - target.len = get_req_data_size() - ((const char *)target.str - (const char *)get_req_data()); + target.str = get_req_data_after_objattr( objattr, &target.len ); + target.len = (target.len / sizeof(WCHAR)) * sizeof(WCHAR); if (objattr->rootdir && !(root = get_directory_obj( current->process, objattr->rootdir, 0 ))) return;

1 0

Andrew Eikum : xaudio2: Don't build interfaces for other versions.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: d9e6a31c6e4207c36f56d2bccae6cc839058d085 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9e6a31c6e4207c36f56d2bcc… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 18 13:15:57 2016 -0600 xaudio2: Don't build interfaces for other versions. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/compat.c | 2461 ++++++++++++++++++++------------------- dlls/xaudio2_7/tests/xaudio2.c | 3 + dlls/xaudio2_7/xaudio_dll.c | 32 +- dlls/xaudio2_7/xaudio_private.h | 48 +- 4 files changed, 1311 insertions(+), 1233 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9e6a31c6e4207c36f56d…

1 0

Andrew Eikum : xaudio2_8: Don' t use IXAudio27 interface to call Initialize.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: fb954b7b9f2ddc477464a22e39426a0c27ab397c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb954b7b9f2ddc477464a22e3… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 18 13:15:54 2016 -0600 xaudio2_8: Don't use IXAudio27 interface to call Initialize. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/compat.c | 6 +++--- dlls/xaudio2_7/xaudio_dll.c | 21 ++++++++++----------- dlls/xaudio2_7/xaudio_private.h | 1 + 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index ffe6531..88dd850 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -468,7 +468,7 @@ static HRESULT WINAPI XA27_Initialize(IXAudio27 *iface, UINT32 flags, { IXAudio2Impl *This = impl_from_IXAudio27(iface); TRACE("(%p)->(0x%x, 0x%x)\n", This, flags, processor); - return S_OK; + return xaudio2_initialize(This, flags, processor); } static HRESULT WINAPI XA27_RegisterForCallbacks(IXAudio27 *iface, @@ -1305,7 +1305,7 @@ static HRESULT WINAPI XA22_Initialize(IXAudio22 *iface, UINT32 flags, { IXAudio2Impl *This = impl_from_IXAudio22(iface); TRACE("(%p)->(0x%x, 0x%x)\n", This, flags, processor); - return S_OK; + return xaudio2_initialize(This, flags, processor); } static HRESULT WINAPI XA22_RegisterForCallbacks(IXAudio22 *iface, @@ -2163,7 +2163,7 @@ static HRESULT WINAPI XA20_Initialize(IXAudio20 *iface, UINT32 flags, { IXAudio2Impl *This = impl_from_IXAudio20(iface); TRACE("(%p)->(0x%x, 0x%x)\n", This, flags, processor); - return S_OK; + return xaudio2_initialize(This, flags, processor); } static HRESULT WINAPI XA20_RegisterForCallbacks(IXAudio20 *iface, diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index efa6279..86c8cbf 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -2046,14 +2046,22 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, void **ppv) return IClassFactory_QueryInterface(factory, riid, ppv); } +HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) +{ + if(flags) + FIXME("Unimplemented flags: 0x%x\n", flags); + return S_OK; +} + #if XAUDIO2_VER >= 8 HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR proc) { HRESULT hr; IXAudio2 *xa2; - IXAudio27 *xa27; IClassFactory *cf; + TRACE("%p 0x%x 0x%x\n", ppxa2, flags, proc); + cf = make_xaudio2_factory(); hr = IClassFactory_CreateInstance(cf, NULL, &IID_IXAudio2, (void**)&xa2); @@ -2061,21 +2069,12 @@ HRESULT WINAPI XAudio2Create(IXAudio2 **ppxa2, UINT32 flags, XAUDIO2_PROCESSOR p if(FAILED(hr)) return hr; - hr = IXAudio2_QueryInterface(xa2, &IID_IXAudio27, (void**)&xa27); + hr = xaudio2_initialize(impl_from_IXAudio2(xa2), flags, proc); if(FAILED(hr)){ IXAudio2_Release(xa2); return hr; } - hr = IXAudio27_Initialize(xa27, flags, proc); - if(FAILED(hr)){ - IXAudio27_Release(xa27); - IXAudio2_Release(xa2); - return hr; - } - - IXAudio27_Release(xa27); - *ppxa2 = xa2; return S_OK; diff --git a/dlls/xaudio2_7/xaudio_private.h b/dlls/xaudio2_7/xaudio_private.h index a75f721..39ed2c8 100644 --- a/dlls/xaudio2_7/xaudio_private.h +++ b/dlls/xaudio2_7/xaudio_private.h @@ -150,3 +150,4 @@ extern const IXAudio20SubmixVoiceVtbl XAudio20SubmixVoice_Vtbl DECLSPEC_HIDDEN; extern const IXAudio20MasteringVoiceVtbl XAudio20MasteringVoice_Vtbl DECLSPEC_HIDDEN; extern IClassFactory *make_xapo_factory(REFCLSID clsid) DECLSPEC_HIDDEN; +extern HRESULT xaudio2_initialize(IXAudio2Impl *This, UINT32 flags, XAUDIO2_PROCESSOR proc) DECLSPEC_HIDDEN;

1 0

Nikolay Sivov : dwrite: Use callback freetype API to implement GetGlyphRunOutline().
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: ff8f129af64c1ef4d237cc6698d1d6bf85510ab6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff8f129af64c1ef4d237cc669… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Jan 19 00:47:09 2016 +0300 dwrite: Use callback freetype API to implement GetGlyphRunOutline(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/dwrite_private.h | 19 +-- dlls/dwrite/font.c | 110 +---------------- dlls/dwrite/freetype.c | 281 +++++++++++++++++++++++++------------------ 3 files changed, 169 insertions(+), 241 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff8f129af64c1ef4d237c…

1 0

Józef Kucia : wined3d: Fix SM4 udiv instruction.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: f92d7726881029f159cb9d2f92acf7cf0cab600f URL: http://source.winehq.org/git/wine.git/?a=commit;h=f92d7726881029f159cb9d2f9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:48 2016 +0100 wined3d: Fix SM4 udiv instruction. Previously, it generated syntactically incorrect GLSL when both dst params were not equal to NULL. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 07a8fc4..8dc97b9 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3019,7 +3019,6 @@ static void shader_glsl_udiv(const struct wined3d_shader_instruction *ins) if (ins->dst[0].reg.type != WINED3DSPR_NULL) { - if (ins->dst[1].reg.type != WINED3DSPR_NULL) { char dst_mask[6]; @@ -3027,15 +3026,15 @@ static void shader_glsl_udiv(const struct wined3d_shader_instruction *ins) write_mask = shader_glsl_get_write_mask(&ins->dst[0], dst_mask); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); - shader_addline(buffer, "tmp0%s = %s / %s;\n", + shader_addline(buffer, "tmp0%s = uintBitsToFloat(%s / %s);\n", dst_mask, src0_param.param_str, src1_param.param_str); write_mask = shader_glsl_append_dst_ext(buffer, ins, &ins->dst[1], ins->dst[1].reg.data_type); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); - shader_addline(buffer, "%s %% %s));\n", src0_param.param_str, src1_param.param_str); + shader_addline(buffer, "%s %% %s);\n", src0_param.param_str, src1_param.param_str); - shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], ins->dst[0].reg.data_type); + shader_glsl_append_dst_ext(buffer, ins, &ins->dst[0], WINED3D_DATA_FLOAT); shader_addline(buffer, "tmp0%s);\n", dst_mask); } else

1 0

Józef Kucia : wined3d: Recognize SM4 _sat instruction modifier.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: ee85c032652adeb2c0c8f87f5ecc9aa73c4d0c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee85c032652adeb2c0c8f87f5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:47 2016 +0100 wined3d: Recognize SM4 _sat instruction modifier. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index fb104fc..d275923 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -30,7 +30,7 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_INSTRUCTION_LENGTH_MASK (0x1fu << WINED3D_SM4_INSTRUCTION_LENGTH_SHIFT) #define WINED3D_SM4_INSTRUCTION_FLAGS_SHIFT 11 -#define WINED3D_SM4_INSTRUCTION_FLAGS_MASK (0x3u << WINED3D_SM4_INSTRUCTION_FLAGS_SHIFT) +#define WINED3D_SM4_INSTRUCTION_FLAGS_MASK (0x7u << WINED3D_SM4_INSTRUCTION_FLAGS_SHIFT) #define WINED3D_SM4_RESOURCE_TYPE_SHIFT 11 #define WINED3D_SM4_RESOURCE_TYPE_MASK (0xfu << WINED3D_SM4_RESOURCE_TYPE_SHIFT) @@ -75,6 +75,8 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_bytecode); #define WINED3D_SM4_ADDRESSING_RELATIVE 0x2 #define WINED3D_SM4_ADDRESSING_OFFSET 0x1 +#define WINED3D_SM4_INSTRUCTION_FLAG_SATURATE 0x4 + enum wined3d_sm4_opcode { WINED3D_SM4_OP_ADD = 0x00, @@ -900,8 +902,16 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi } else { + enum wined3d_shader_dst_modifier instruction_dst_modifier = WINED3DSPDM_NONE; + ins->flags = (opcode_token & WINED3D_SM4_INSTRUCTION_FLAGS_MASK) >> WINED3D_SM4_INSTRUCTION_FLAGS_SHIFT; + if (ins->flags & WINED3D_SM4_INSTRUCTION_FLAG_SATURATE) + { + ins->flags &= ~WINED3D_SM4_INSTRUCTION_FLAG_SATURATE; + instruction_dst_modifier = WINED3DSPDM_SATURATE; + } + for (i = 0; i < ins->dst_count; ++i) { if (!(shader_sm4_read_dst_param(priv, &p, map_data_type(opcode_info->dst_info[i]), &priv->dst_param[i]))) @@ -909,6 +919,7 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi ins->handler_idx = WINED3DSIH_TABLE_SIZE; return; } + priv->dst_param[i].modifiers |= instruction_dst_modifier; } for (i = 0; i < ins->src_count; ++i)

1 0

Józef Kucia : wined3d: Implement SM4 imad instruction.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: c6223c29600bb60f0bd06c5c91a33ddf057f9288 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6223c29600bb60f0bd06c5c9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:46 2016 +0100 wined3d: Implement SM4 imad instruction. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader_sm4.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 51d2cce..07a8fc4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7983,7 +7983,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_IFC */ shader_glsl_ifc, /* WINED3DSIH_IGE */ shader_glsl_relop, /* WINED3DSIH_ILT */ NULL, - /* WINED3DSIH_IMAD */ NULL, + /* WINED3DSIH_IMAD */ shader_glsl_mad, /* WINED3DSIH_IMAX */ shader_glsl_map2gl, /* WINED3DSIH_IMIN */ shader_glsl_map2gl, /* WINED3DSIH_IMUL */ shader_glsl_imul, diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 6972ea4..fb104fc 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -282,7 +282,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_IEQ, WINED3DSIH_IEQ, "U", "II"}, {WINED3D_SM4_OP_IGE, WINED3DSIH_IGE, "U", "II"}, {WINED3D_SM4_OP_ILT, WINED3DSIH_ILT, "U", "II"}, - {WINED3D_SM4_OP_IMAD, WINED3DSIH_IMAD, "I", "II"}, + {WINED3D_SM4_OP_IMAD, WINED3DSIH_IMAD, "I", "III"}, {WINED3D_SM4_OP_IMAX, WINED3DSIH_IMAX, "I", "II"}, {WINED3D_SM4_OP_IMIN, WINED3DSIH_IMIN, "I", "II"}, {WINED3D_SM4_OP_IMUL, WINED3DSIH_IMUL, "II", "II"},

1 0

Józef Kucia : wined3d: Recognize SM4 oDepth register.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: cf52e6c672f51bad0746b1cbeed778a7562e1cdb URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf52e6c672f51bad0746b1cbe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:45 2016 +0100 wined3d: Recognize SM4 oDepth register. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index f102ed1..6972ea4 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -154,6 +154,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_RESOURCE = 0x7, WINED3D_SM4_RT_CONSTBUFFER = 0x8, WINED3D_SM4_RT_PRIMID = 0xb, + WINED3D_SM4_RT_DEPTHOUT = 0xc, WINED3D_SM4_RT_NULL = 0xd, }; @@ -336,7 +337,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* UNKNOWN */ 0, /* UNKNOWN */ 0, /* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID, - /* UNKNOWN */ 0, + /* WINED3D_SM4_RT_DEPTHOUT */ WINED3DSPR_DEPTHOUT, /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, };

1 0

Józef Kucia : wined3d: Allow both SM4 parameter modifiers simultaneously.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: 9adf1c21b6dfd0ae6163da1cb62f80e4fb02a806 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9adf1c21b6dfd0ae6163da1cb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:44 2016 +0100 wined3d: Allow both SM4 parameter modifiers simultaneously. It seems that negate and abs are the only source parameter modifiers allowed in SM 4 and 5. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index ae148da..f102ed1 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -621,9 +621,6 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p { DWORD m = *(*ptr)++; - /* FIXME: This will probably break down at some point. The SM4 - * modifiers look like flags, while wined3d currently has an enum - * with possible combinations, e.g. WINED3DSPSM_ABSNEG. */ switch (m) { case 0x41: @@ -634,6 +631,10 @@ static BOOL shader_sm4_read_param(struct wined3d_sm4_data *priv, const DWORD **p *modifier = WINED3DSPSM_ABS; break; + case 0xc1: + *modifier = WINED3DSPSM_ABSNEG; + break; + default: FIXME("Skipping modifier 0x%08x.\n", m); *modifier = WINED3DSPSM_NONE;

1 0

Józef Kucia : wined3d: Fix destination swizzle in few SM4 instructions.
by Alexandre Julliard 19 Jan '16

19 Jan '16

Module: wine Branch: master Commit: 0fb543bb719ce968065eb6c209cf8f82e76ad871 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0fb543bb719ce968065eb6c20… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jan 18 21:16:43 2016 +0100 wined3d: Fix destination swizzle in few SM4 instructions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index feaa9e3..51d2cce 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4324,7 +4324,7 @@ static void shader_glsl_ld(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); sampler_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, ins->src[1].reg.idx[0].offset, WINED3D_SAMPLER_DEFAULT); - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, + shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, ins->src[1].swizzle, NULL, NULL, lod_param.param_str, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); } @@ -4339,7 +4339,7 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); sampler_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, ins->src[1].reg.idx[0].offset, ins->src[2].reg.idx[0].offset); - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, + shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, ins->src[1].swizzle, NULL, NULL, NULL, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); } @@ -4356,7 +4356,7 @@ static void shader_glsl_sample_lod(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[3], WINED3DSP_WRITEMASK_0, &lod_param); sampler_idx = shader_glsl_find_sampler(&ins->ctx->reg_maps->sampler_map, ins->src[1].reg.idx[0].offset, ins->src[2].reg.idx[0].offset); - shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, WINED3DSP_NOSWIZZLE, + shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, ins->src[1].swizzle, NULL, NULL, lod_param.param_str, "%s", coord_param.param_str); shader_glsl_release_sample_function(ins->ctx, &sample_function); }

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
63
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2016