January 2016 - Wine-commits

Alexandre Julliard : ntdll: Add tests for NULL object attributes.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 38f9a788c44907a798592df6b5d60edc145f7f78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=38f9a788c44907a798592df6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 15:04:47 2016 +0900 ntdll: Add tests for NULL object attributes. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/file.c | 3 ++- dlls/ntdll/om.c | 2 +- dlls/ntdll/tests/file.c | 14 ----------- dlls/ntdll/tests/om.c | 64 +++++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 65 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=38f9a788c44907a798592…

1 0

Alexandre Julliard : server: Use a common helper function to implement open object calls.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: ed268bbf9183392e21e771f64bd91c19316f8361 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed268bbf9183392e21e771f64… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 16:23:29 2016 +0900 server: Use a common helper function to implement open object calls. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/completion.c | 16 ++-------------- server/directory.c | 13 ++----------- server/event.c | 26 ++++---------------------- server/handle.c | 21 +++++++++++---------- server/handle.h | 5 +++-- server/mapping.c | 14 ++------------ server/mutex.c | 14 ++------------ server/process.c | 12 ++---------- server/semaphore.c | 14 ++------------ server/symlink.c | 14 ++------------ server/timer.c | 14 ++------------ server/winstation.c | 26 ++++++++++++-------------- 12 files changed, 46 insertions(+), 143 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed268bbf9183392e21e77…

1 0

Alexandre Julliard : server: Directly return a structure in get_req_unicode_str().
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 008f14f03f28694e17a76b3f778de4f22d3d6c4b URL: http://source.winehq.org/git/wine.git/?a=commit;h=008f14f03f28694e17a76b3f7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jan 29 16:36:45 2016 +0900 server: Directly return a structure in get_req_unicode_str(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/atom.c | 6 ++---- server/class.c | 6 ++---- server/completion.c | 3 +-- server/device.c | 3 +-- server/directory.c | 3 +-- server/event.c | 6 ++---- server/fd.c | 3 +-- server/mapping.c | 3 +-- server/mutex.c | 3 +-- server/process.c | 3 +-- server/registry.c | 6 ++---- server/request.h | 8 +++++--- server/semaphore.c | 3 +-- server/symlink.c | 3 +-- server/timer.c | 3 +-- server/window.c | 15 +++++---------- server/winstation.c | 13 ++++--------- 17 files changed, 32 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=008f14f03f28694e17a76…

1 0

Snorri Sturluson : ntdll: Fill in memory counters under OS X.
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 1f9fe124b2bd7e69dad5c90b7897380e32d43481 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1f9fe124b2bd7e69dad5c90b7… Author: Snorri Sturluson <snorri.sturluson(a)ccpgames.com> Date: Thu Jan 28 17:22:10 2016 +0000 ntdll: Fill in memory counters under OS X. Signed-off-by: Snorri Sturluson <snorri.sturluson(a)ccpgames.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/process.c | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/process.c b/dlls/ntdll/process.c index 5a5c3ef..a93b8fb 100644 --- a/dlls/ntdll/process.c +++ b/dlls/ntdll/process.c @@ -40,6 +40,10 @@ #include "ntdll_misc.h" #include "wine/server.h" +#ifdef HAVE_MACH_MACH_H +#include <mach/mach.h> +#endif + WINE_DEFAULT_DEBUG_CHANNEL(ntdll); static ULONG execute_flags = MEM_EXECUTE_OPTION_DISABLE; @@ -110,6 +114,32 @@ ULONG_PTR get_system_affinity_mask(void) return ((ULONG_PTR)1 << num_cpus) - 1; } +#if defined(HAVE_MACH_MACH_H) + +static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) +{ +#if defined(MACH_TASK_BASIC_INFO) + struct mach_task_basic_info info; + mach_msg_type_number_t infoCount = MACH_TASK_BASIC_INFO_COUNT; + if(task_info(mach_task_self(), MACH_TASK_BASIC_INFO, (task_info_t)&info, &infoCount) == KERN_SUCCESS) + { + pvmi->VirtualSize = info.resident_size + info.virtual_size; + pvmi->PagefileUsage = info.virtual_size; + pvmi->WorkingSetSize = info.resident_size; + pvmi->PeakWorkingSetSize = info.resident_size_max; + } +#endif +} + +#else + +static void fill_VM_COUNTERS(VM_COUNTERS* pvmi) +{ + /* FIXME : real data */ +} + +#endif + /****************************************************************************** * NtQueryInformationProcess [NTDLL.@] * ZwQueryInformationProcess [NTDLL.@] @@ -240,8 +270,8 @@ NTSTATUS WINAPI NtQueryInformationProcess( ret = STATUS_INVALID_HANDLE; else { - /* FIXME : real data */ memset(&pvmi, 0 , sizeof(VM_COUNTERS)); + fill_VM_COUNTERS(&pvmi); len = ProcessInformationLength; if (len != FIELD_OFFSET(VM_COUNTERS,PrivatePageCount)) len = sizeof(VM_COUNTERS);

1 0

Henri Verbeet : d3d9: Pass non-NULL rectangles to wined3d_texture_blt() in d3d9_device_StretchRect().
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 7b266e844e6701c65cb3304c0e1e5b3c110a6b04 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b266e844e6701c65cb3304c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 28 18:40:21 2016 +0100 d3d9: Pass non-NULL rectangles to wined3d_texture_blt() in d3d9_device_StretchRect(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 45 +++++++++++++++++++++++++++++---------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index f357570..7827c75 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1331,6 +1331,7 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect HRESULT hr = D3DERR_INVALIDCALL; struct wined3d_resource_desc src_desc, dst_desc; struct wined3d_resource *sub_resource; + RECT d, s; TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %#x.\n", iface, src_surface, src_rect, dst_surface, dst_rect, filter); @@ -1338,9 +1339,25 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect wined3d_mutex_lock(); sub_resource = wined3d_texture_get_sub_resource(dst->wined3d_texture, dst->sub_resource_idx); wined3d_resource_get_desc(sub_resource, &dst_desc); + if (!dst_rect) + { + d.left = 0; + d.top = 0; + d.right = dst_desc.width; + d.bottom = dst_desc.height; + dst_rect = &d; + } sub_resource = wined3d_texture_get_sub_resource(src->wined3d_texture, src->sub_resource_idx); wined3d_resource_get_desc(sub_resource, &src_desc); + if (!src_rect) + { + s.left = 0; + s.top = 0; + s.right = src_desc.width; + s.bottom = src_desc.height; + src_rect = &s; + } if (src_desc.usage & WINED3DUSAGE_DEPTHSTENCIL) { @@ -1350,26 +1367,22 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect goto done; } - if (src_rect) + if (src_rect->left || src_rect->top || src_rect->right != src_desc.width + || src_rect->bottom != src_desc.height) { - if (src_rect->left || src_rect->top || src_rect->right != src_desc.width - || src_rect->bottom != src_desc.height) - { - WARN("Rejecting depth / stencil blit with invalid source rect %s.\n", - wine_dbgstr_rect(src_rect)); - goto done; - } + WARN("Rejecting depth / stencil blit with invalid source rect %s.\n", + wine_dbgstr_rect(src_rect)); + goto done; } - if (dst_rect) + + if (dst_rect->left || dst_rect->top || dst_rect->right != dst_desc.width + || dst_rect->bottom != dst_desc.height) { - if (dst_rect->left || dst_rect->top || dst_rect->right != dst_desc.width - || dst_rect->bottom != dst_desc.height) - { - WARN("Rejecting depth / stencil blit with invalid destination rect %s.\n", - wine_dbgstr_rect(dst_rect)); - goto done; - } + WARN("Rejecting depth / stencil blit with invalid destination rect %s.\n", + wine_dbgstr_rect(dst_rect)); + goto done; } + if (src_desc.width != dst_desc.width || src_desc.height != dst_desc.height) { WARN("Rejecting depth / stencil blit with mismatched surface sizes.\n");

1 0

Henri Verbeet : d3d9: Pass non-NULL rectangles to wined3d_texture_blt() in d3d9_device_GetRenderTargetData().
by Alexandre Julliard 29 Jan '16

29 Jan '16

Module: wine Branch: master Commit: 04c216d79806fddbb8f57f9ecbf1e5c8e7fef9a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04c216d79806fddbb8f57f9ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 28 18:40:22 2016 +0100 d3d9: Pass non-NULL rectangles to wined3d_texture_blt() in d3d9_device_GetRenderTargetData(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 7827c75..7f14cd0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1285,20 +1285,32 @@ static HRESULT WINAPI d3d9_device_GetRenderTargetData(IDirect3DDevice9Ex *iface, struct d3d9_surface *dst_impl = unsafe_impl_from_IDirect3DSurface9(dst_surface); struct wined3d_resource_desc wined3d_desc; struct wined3d_resource *sub_resource; + RECT dst_rect, src_rect; HRESULT hr; TRACE("iface %p, render_target %p, dst_surface %p.\n", iface, render_target, dst_surface); wined3d_mutex_lock(); + sub_resource = wined3d_texture_get_sub_resource(dst_impl->wined3d_texture, dst_impl->sub_resource_idx); + wined3d_resource_get_desc(sub_resource, &wined3d_desc); + dst_rect.left = 0; + dst_rect.top = 0; + dst_rect.right = wined3d_desc.width; + dst_rect.bottom = wined3d_desc.height; + sub_resource = wined3d_texture_get_sub_resource(rt_impl->wined3d_texture, rt_impl->sub_resource_idx); wined3d_resource_get_desc(sub_resource, &wined3d_desc); + src_rect.left = 0; + src_rect.top = 0; + src_rect.right = wined3d_desc.width; + src_rect.bottom = wined3d_desc.height; /* TODO: Check surface sizes, pools, etc. */ if (wined3d_desc.multisample_type) hr = D3DERR_INVALIDCALL; else - hr = wined3d_texture_blt(dst_impl->wined3d_texture, dst_impl->sub_resource_idx, NULL, - rt_impl->wined3d_texture, rt_impl->sub_resource_idx, NULL, 0, NULL, WINED3D_TEXF_POINT); + hr = wined3d_texture_blt(dst_impl->wined3d_texture, dst_impl->sub_resource_idx, &dst_rect, + rt_impl->wined3d_texture, rt_impl->sub_resource_idx, &src_rect, 0, NULL, WINED3D_TEXF_POINT); wined3d_mutex_unlock(); return hr;

1 0

Julian Rüger : German translation for release 1.9.2
by Jeremy Newman 28 Jan '16

28 Jan '16

Module: website Branch: master Commit: 5dd6350ff802cb6f6254f29ba67f80b2f93a160e URL: http://source.winehq.org/git/website.git/?a=commit;h=5dd6350ff802cb6f6254f2… Author: Julian Rüger <jr98(a)gmx.net> Date: Thu Jan 28 16:48:58 2016 +0100 German translation for release 1.9.2 Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- news/de/2016012201.xml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/news/de/2016012201.xml b/news/de/2016012201.xml new file mode 100644 index 0000000..61b53dc --- /dev/null +++ b/news/de/2016012201.xml @@ -0,0 +1,17 @@ +<news> +<date>22. Januar 2016</date> +<title>Wine 1.9.2 freigegeben</title> +<body> + Die Entwicklungsversion 1.9.2 von Wine ist jetzt verfügbar. + <a href="{$root}/announce/1.9.2">Neuerungen (en)</a> in dieser Version: +<ul> + <li>GStreamer-1.0-Unterstützung.</li> + <li>Unterstützung von SHA-Hashes in BCrypt.</li> + <li>Fette Glyphen werden auch für Bitmap-Fonts synthetisiert.</li> + <li>Unterstützung für Unterstreichung in DirectWrite.</li> + <li>Noch weitere Shader-Model-4-Befehle.</li> + <li>Diverse Fehlerkorrekturen.</li> +</ul> +Der Quelltext ist ab sofort <a href="//dl.winehq.org/wine/source/1.9/wine-1.9.2.tar.bz2">verfügbar</a>. +Binärpakete werden gerade erstellt und stehen bald auf den jeweiligen <a href="{$root}/download">Downloadseiten</a> zur Verfügung. +</body></news>

1 0

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

28 Jan '16

Module: wine Branch: master Commit: b79141d7580af4ca7b6069462fc9334b633975c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b79141d7580af4ca7b6069462… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 27 23:43:43 2016 +0100 wined3d: Implement SM4 round_pi 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 697f5e9..a51032f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3260,6 +3260,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_MAX: instruction = "max"; break; case WINED3DSIH_MIN: instruction = "min"; break; case WINED3DSIH_ROUND_NI: instruction = "floor"; break; + case WINED3DSIH_ROUND_PI: instruction = "ceil"; break; case WINED3DSIH_SQRT: instruction = "sqrt"; break; default: instruction = ""; FIXME("Opcode %s not yet handled in GLSL.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); @@ -8074,7 +8075,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_RESINFO */ shader_glsl_resinfo, /* WINED3DSIH_RET */ shader_glsl_ret, /* WINED3DSIH_ROUND_NI */ shader_glsl_map2gl, - /* WINED3DSIH_ROUND_PI */ NULL, + /* WINED3DSIH_ROUND_PI */ shader_glsl_map2gl, /* WINED3DSIH_ROUND_Z */ NULL, /* WINED3DSIH_RSQ */ shader_glsl_scalar_op, /* WINED3DSIH_SAMPLE */ shader_glsl_sample,

1 0

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

28 Jan '16

Module: wine Branch: master Commit: e4244954c67bd889b24105d3cb996e2bfe68f192 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4244954c67bd889b24105d3c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 27 23:43:44 2016 +0100 wined3d: Implement SM4 round_z 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a51032f..3bcd6aa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3261,6 +3261,7 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_MIN: instruction = "min"; break; case WINED3DSIH_ROUND_NI: instruction = "floor"; break; case WINED3DSIH_ROUND_PI: instruction = "ceil"; break; + case WINED3DSIH_ROUND_Z: instruction = "trunc"; break; case WINED3DSIH_SQRT: instruction = "sqrt"; break; default: instruction = ""; FIXME("Opcode %s not yet handled in GLSL.\n", debug_d3dshaderinstructionhandler(ins->handler_idx)); @@ -8076,7 +8077,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_RET */ shader_glsl_ret, /* WINED3DSIH_ROUND_NI */ shader_glsl_map2gl, /* WINED3DSIH_ROUND_PI */ shader_glsl_map2gl, - /* WINED3DSIH_ROUND_Z */ NULL, + /* WINED3DSIH_ROUND_Z */ shader_glsl_map2gl, /* WINED3DSIH_RSQ */ shader_glsl_scalar_op, /* WINED3DSIH_SAMPLE */ shader_glsl_sample, /* WINED3DSIH_SAMPLE_GRAD */ NULL,

1 0

Józef Kucia : wined3d: Recognize SM4 sample_c_lz opcode.
by Alexandre Julliard 28 Jan '16

28 Jan '16

Module: wine Branch: master Commit: 6ba0fee3697f2598d9735ae1ca862d1837f569f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ba0fee3697f2598d9735ae1c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jan 27 23:43:45 2016 +0100 wined3d: Recognize SM4 sample_c_lz opcode. 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/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 2 ++ dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 3674cfa..6c1e048 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5304,6 +5304,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_ROUND_Z */ NULL, /* WINED3DSIH_RSQ */ shader_hw_scalar_op, /* WINED3DSIH_SAMPLE */ NULL, + /* WINED3DSIH_SAMPLE_C_LZ */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL, /* WINED3DSIH_SAMPLE_LOD */ NULL, /* WINED3DSIH_SETP */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3bcd6aa..23680ea 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8080,6 +8080,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ROUND_Z */ shader_glsl_map2gl, /* WINED3DSIH_RSQ */ shader_glsl_scalar_op, /* WINED3DSIH_SAMPLE */ shader_glsl_sample, + /* WINED3DSIH_SAMPLE_C_LZ */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL, /* WINED3DSIH_SAMPLE_LOD */ shader_glsl_sample_lod, /* WINED3DSIH_SETP */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 53f90af..7df4d1d 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -132,6 +132,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_ROUND_Z */ "round_z", /* WINED3DSIH_RSQ */ "rsq", /* WINED3DSIH_SAMPLE */ "sample", + /* WINED3DSIH_SAMPLE_C_LZ */ "sample_c_lz", /* WINED3DSIH_SAMPLE_GRAD */ "sample_d", /* WINED3DSIH_SAMPLE_LOD */ "sample_l", /* WINED3DSIH_SETP */ "setp", @@ -1072,6 +1073,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st --cur_loop_depth; } else if (ins.handler_idx == WINED3DSIH_SAMPLE + || ins.handler_idx == WINED3DSIH_SAMPLE_C_LZ || ins.handler_idx == WINED3DSIH_SAMPLE_GRAD || ins.handler_idx == WINED3DSIH_SAMPLE_LOD) { diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index bad6567..dde341b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -134,6 +134,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_ROUND_Z = 0x43, WINED3D_SM4_OP_RSQ = 0x44, WINED3D_SM4_OP_SAMPLE = 0x45, + WINED3D_SM4_OP_SAMPLE_C_LZ = 0x47, WINED3D_SM4_OP_SAMPLE_LOD = 0x48, WINED3D_SM4_OP_SAMPLE_GRAD = 0x49, WINED3D_SM4_OP_SQRT = 0x4b, @@ -318,6 +319,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_ROUND_Z, WINED3DSIH_ROUND_Z, "F", "F"}, {WINED3D_SM4_OP_RSQ, WINED3DSIH_RSQ, "F", "F"}, {WINED3D_SM4_OP_SAMPLE, WINED3DSIH_SAMPLE, "U", "FRS"}, + {WINED3D_SM4_OP_SAMPLE_C_LZ, WINED3DSIH_SAMPLE_C_LZ, "F", "FRSF"}, {WINED3D_SM4_OP_SAMPLE_LOD, WINED3DSIH_SAMPLE_LOD, "U", "FRSF"}, {WINED3D_SM4_OP_SAMPLE_GRAD, WINED3DSIH_SAMPLE_GRAD, "U", "FRSFF"}, {WINED3D_SM4_OP_SQRT, WINED3DSIH_SQRT, "F", "F"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 78a49dd..461a1fe 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -560,6 +560,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_ROUND_Z, WINED3DSIH_RSQ, WINED3DSIH_SAMPLE, + WINED3DSIH_SAMPLE_C_LZ, WINED3DSIH_SAMPLE_GRAD, WINED3DSIH_SAMPLE_LOD, WINED3DSIH_SETP,

1 0