July 2016 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Add ARB_derivative_control extension.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: 12421b2ef409c6e164a16cc73a498a09200c216e URL: http://source.winehq.org/git/wine.git/?a=commit;h=12421b2ef409c6e164a16cc73… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 22 12:28:17 2016 +0200 wined3d: Add ARB_derivative_control extension. 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/directx.c | 3 +++ dlls/wined3d/glsl_shader.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 3 files changed, 6 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a1af01c..6916974 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -114,6 +114,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE }, + {"GL_ARB_derivative_control", ARB_DERIVATIVE_CONTROL }, {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS }, {"GL_ARB_draw_elements_base_vertex", ARB_DRAW_ELEMENTS_BASE_VERTEX }, {"GL_ARB_draw_instanced", ARB_DRAW_INSTANCED }, @@ -3557,6 +3558,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_INTERNALFORMAT_QUERY2, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_QUERY_LEVELS, MAKEDWORD_VERSION(4, 3)}, {ARB_TEXTURE_VIEW, MAKEDWORD_VERSION(4, 3)}, + + {ARB_DERIVATIVE_CONTROL, MAKEDWORD_VERSION(4, 5)}, }; struct wined3d_driver_info *driver_info = &adapter->driver_info; const char *gl_vendor_str, *gl_renderer_str, *gl_version_str; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 286e6ee..d391cc1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5851,6 +5851,8 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); shader_glsl_enable_extensions(buffer, gl_info); + if (gl_info->supported[ARB_DERIVATIVE_CONTROL]) + shader_addline(buffer, "#extension GL_ARB_derivative_control : enable\n"); if (gl_info->supported[ARB_SHADER_TEXTURE_LOD]) shader_addline(buffer, "#extension GL_ARB_shader_texture_lod : enable\n"); /* The spec says that it doesn't have to be explicitly enabled, but the diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 828acf4..34bf88d 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -49,6 +49,7 @@ enum wined3d_gl_extension ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT, ARB_DEPTH_TEXTURE, + ARB_DERIVATIVE_CONTROL, ARB_DRAW_BUFFERS, ARB_DRAW_ELEMENTS_BASE_VERTEX, ARB_DRAW_INSTANCED,

1 0

Józef Kucia : wined3d: Introduce helper function for enabling common GLSL extensions.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: 4f946d87a220706d35150c7b525712d97db14914 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f946d87a220706d35150c7b5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 22 12:28:16 2016 +0200 wined3d: Introduce helper function for enabling common GLSL extensions. 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 | 48 +++++++++++++++++----------------------------- 1 file changed, 18 insertions(+), 30 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c239a47..286e6ee 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5813,6 +5813,21 @@ static void shader_glsl_generate_alpha_test(struct wined3d_string_buffer *buffer shader_addline(buffer, " discard;\n"); } +static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, + const struct wined3d_gl_info *gl_info) +{ + if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) + shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); + if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) + shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n"); + if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) + shader_addline(buffer, "#extension GL_ARB_uniform_buffer_object : enable\n"); + if (gl_info->supported[EXT_GPU_SHADER4]) + shader_addline(buffer, "#extension GL_EXT_gpu_shader4 : enable\n"); + if (gl_info->supported[EXT_TEXTURE_ARRAY]) + shader_addline(buffer, "#extension GL_EXT_texture_array : enable\n"); +} + /* Context activation is done by the caller. */ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context, struct wined3d_string_buffer *buffer, struct wined3d_string_buffer_list *string_buffers, @@ -5835,22 +5850,13 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); - if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) - shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); + shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_SHADER_TEXTURE_LOD]) shader_addline(buffer, "#extension GL_ARB_shader_texture_lod : enable\n"); - if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) - shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n"); /* The spec says that it doesn't have to be explicitly enabled, but the * nvidia drivers write a warning if we don't do so. */ if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n"); - if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) - shader_addline(buffer, "#extension GL_ARB_uniform_buffer_object : enable\n"); - if (gl_info->supported[EXT_GPU_SHADER4]) - shader_addline(buffer, "#extension GL_EXT_gpu_shader4 : enable\n"); - if (gl_info->supported[EXT_TEXTURE_ARRAY]) - shader_addline(buffer, "#extension GL_EXT_texture_array : enable\n"); /* Base Declarations */ shader_generate_glsl_declarations(context, buffer, shader, reg_maps, &priv_ctx); @@ -5961,20 +5967,11 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); + shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_DRAW_INSTANCED]) shader_addline(buffer, "#extension GL_ARB_draw_instanced : enable\n"); if (gl_info->supported[ARB_EXPLICIT_ATTRIB_LOCATION]) shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); - if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) - shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); - if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) - shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n"); - if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) - shader_addline(buffer, "#extension GL_ARB_uniform_buffer_object : enable\n"); - if (gl_info->supported[EXT_GPU_SHADER4]) - shader_addline(buffer, "#extension GL_EXT_gpu_shader4 : enable\n"); - if (gl_info->supported[EXT_TEXTURE_ARRAY]) - shader_addline(buffer, "#extension GL_EXT_texture_array : enable\n"); memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.cur_vs_args = args; @@ -6057,18 +6054,9 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); + shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_GEOMETRY_SHADER4]) shader_addline(buffer, "#extension GL_ARB_geometry_shader4 : enable\n"); - if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) - shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); - if (gl_info->supported[ARB_TEXTURE_QUERY_LEVELS]) - shader_addline(buffer, "#extension GL_ARB_texture_query_levels : enable\n"); - if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) - shader_addline(buffer, "#extension GL_ARB_uniform_buffer_object : enable\n"); - if (gl_info->supported[EXT_GPU_SHADER4]) - shader_addline(buffer, "#extension GL_EXT_gpu_shader4 : enable\n"); - if (gl_info->supported[EXT_TEXTURE_ARRAY]) - shader_addline(buffer, "#extension GL_EXT_texture_array : enable\n"); memset(&priv_ctx, 0, sizeof(priv_ctx)); priv_ctx.string_buffers = string_buffers;

1 0

Nikolay Sivov : dwrite: Added missing script tags.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: fe2aa15516eb598b86929821d99c248ed1e185e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe2aa15516eb598b86929821d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 25 11:42:57 2016 +0300 dwrite: Added missing script tags. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index c6bd8fa..745dc6a 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -142,33 +142,33 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last { /* Cakm */ { 0x6d6b6143, 349, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('c','a','k','m') }, { /* Merc */ { 0x6372654d, 101, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('m','e','r','c') }, { /* Mero */ { 0x6f72654d, 100, 1, 0x0020, 0, 1, 1, 1, 0, 0, 0 }, _OT('m','e','r','o') }, - { /* Plrd */ { 0x64726c50, 282, 8, 0x0020, 1, 0, 1, 0, 0, 0, 0 } }, + { /* Plrd */ { 0x64726c50, 282, 8, 0x0020, 1, 0, 1, 0, 0, 0, 0 }, _OT('p','l','r','d') }, { /* Shrd */ { 0x64726853, 319, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('s','h','r','d') }, { /* Sora */ { 0x61726f53, 398, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('s','o','r','a') }, { /* Takr */ { 0x726b6154, 321, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('t','a','k','r') }, - { /* Bass */ { 0x73736142, 259, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, - { /* Aghb */ { 0x62686741, 239, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, - { /* Dupl */ { 0x6c707544, 755, 8, 0x0020, 0, 1, 0, 0, 0, 1, 1 } }, - { /* Elba */ { 0x61626c45, 226, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, - { /* Gran */ { 0x6e617247, 343, 15, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, - { /* Khoj */ { 0x6a6f684b, 322, 15, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, - { /* Sind */ { 0x646e6953, 318, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, - { /* Lina */ { 0x616e694c, 400, 1, 0x0020, 0, 0, 1, 1, 0, 0, 0 } }, - { /* Mahj */ { 0x6a68614d, 314, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, - { /* Mani */ { 0x696e614d, 139, 8, 0x0640, 0, 1, 0, 0, 0, 1, 1 } }, - { /* Mend */ { 0x646e654d, 438, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, - { /* Modi */ { 0x69646f4d, 324, 15, 0x0020, 1, 1, 0, 0, 0, 1, 0 } }, - { /* Mroo */ { 0x6f6f724d, 199, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, - { /* Nbat */ { 0x7461624e, 159, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, - { /* Narb */ { 0x6272614e, 106, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, - { /* Perm */ { 0x6d726550, 227, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, - { /* Hmng */ { 0x676e6d48, 450, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, - { /* Palm */ { 0x6d6c6150, 126, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 } }, - { /* Pauc */ { 0x63756150, 263, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, - { /* Phlp */ { 0x706c6850, 132, 8, 0x0640, 0, 1, 0, 0, 0, 1, 1 } }, - { /* Sidd */ { 0x64646953, 302, 8, 0x0020, 1, 0, 1, 1, 0, 0, 0 } }, - { /* Tirh */ { 0x68726954, 326, 15, 0x0020, 1, 1, 0, 0, 0, 1, 0 } }, - { /* Wara */ { 0x61726157, 262, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 } }, + { /* Bass */ { 0x73736142, 259, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('b','a','s','s') }, + { /* Aghb */ { 0x62686741, 239, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('a','g','h','b') }, + { /* Dupl */ { 0x6c707544, 755, 8, 0x0020, 0, 1, 0, 0, 0, 1, 1 }, _OT('d','u','p','l') }, + { /* Elba */ { 0x61626c45, 226, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('e','l','b','a') }, + { /* Gran */ { 0x6e617247, 343, 15, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('g','r','a','n') }, + { /* Khoj */ { 0x6a6f684b, 322, 15, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('k','h','o','j') }, + { /* Sind */ { 0x646e6953, 318, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('s','i','n','d') }, + { /* Lina */ { 0x616e694c, 400, 1, 0x0020, 0, 0, 1, 1, 0, 0, 0 }, _OT('l','i','n','a') }, + { /* Mahj */ { 0x6a68614d, 314, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('m','a','h','j') }, + { /* Mani */ { 0x696e614d, 139, 8, 0x0640, 0, 1, 0, 0, 0, 1, 1 }, _OT('m','a','n','i') }, + { /* Mend */ { 0x646e654d, 438, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('m','e','n','d') }, + { /* Modi */ { 0x69646f4d, 324, 15, 0x0020, 1, 1, 0, 0, 0, 1, 0 }, _OT('m','o','d','i') }, + { /* Mroo */ { 0x6f6f724d, 199, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('m','r','o','o') }, + { /* Nbat */ { 0x7461624e, 159, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('n','b','a','t') }, + { /* Narb */ { 0x6272614e, 106, 1, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('n','a','r','b') }, + { /* Perm */ { 0x6d726550, 227, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('p','e','r','m') }, + { /* Hmng */ { 0x676e6d48, 450, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('h','m','n','g') }, + { /* Palm */ { 0x6d6c6150, 126, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, _OT('p','a','l','m') }, + { /* Pauc */ { 0x63756150, 263, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('p','a','u','c') }, + { /* Phlp */ { 0x706c6850, 132, 8, 0x0640, 0, 1, 0, 0, 0, 1, 1 }, _OT('p','h','l','p') }, + { /* Sidd */ { 0x64646953, 302, 8, 0x0020, 1, 0, 1, 1, 0, 0, 0 }, _OT('s','i','d','d') }, + { /* Tirh */ { 0x68726954, 326, 15, 0x0020, 1, 1, 0, 0, 0, 1, 0 }, _OT('t','i','r','h') }, + { /* Wara */ { 0x61726157, 262, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, _OT('w','a','r','a') }, }; #undef _OT

1 0

Corentin Rossignon : dinput: Retrieve vendor ID and product ID in Linux joystick API.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: 4f01bcb85f758f63f08b41201c1e5bd5a6b96f67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f01bcb85f758f63f08b41201… Author: Corentin Rossignon <corossig(a)gmail.com> Date: Sun Jul 24 16:46:41 2016 +0100 dinput: Retrieve vendor ID and product ID in Linux joystick API. Signed-off-by: Corentin Rossignon <corossig(a)gmail.com> Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linux.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/dlls/dinput/joystick_linux.c b/dlls/dinput/joystick_linux.c index 5b02df4..1b041c6 100644 --- a/dlls/dinput/joystick_linux.c +++ b/dlls/dinput/joystick_linux.c @@ -81,6 +81,8 @@ struct JoyDev BYTE axis_count; BYTE button_count; int *dev_axes_map; + + WORD vendor_id, product_id; }; typedef struct JoystickImpl JoystickImpl; @@ -135,9 +137,10 @@ static INT find_joystick_devices(void) joystick_devices_count = 0; for (i = 0; i < MAX_JOYSTICKS; i++) { - int fd; + int fd, sys_fd; struct JoyDev joydev, *new_joydevs; BYTE axes_map[ABS_MAX + 1]; + char sys_path[sizeof("/sys/class/input/js/device/id/product") + 10], id_str[5]; snprintf(joydev.device, sizeof(joydev.device), "%s%d", JOYDEV_NEW, i); if ((fd = open(joydev.device, O_RDONLY)) < 0) @@ -204,6 +207,36 @@ static INT find_joystick_devices(void) joydev.dev_axes_map[j] = -1; } + /* Find vendor_id and product_id in sysfs */ + joydev.vendor_id = 0; + joydev.product_id = 0; + + sprintf(sys_path, "/sys/class/input/js%d/device/id/vendor", i); + sys_fd = open(sys_path, O_RDONLY); + if (sys_fd > 0) + { + if (read(sys_fd, id_str, 4) == 4) + { + id_str[4] = '\0'; + joydev.vendor_id = strtol(id_str, NULL, 16); + } + + close(sys_fd); + } + + sprintf(sys_path, "/sys/class/input/js%d/device/id/product", i); + sys_fd = open(sys_path, O_RDONLY); + if (sys_fd > 0) + { + if (read(sys_fd, id_str, 4) == 4) + { + id_str[4] = '\0'; + joydev.product_id = strtol(id_str, NULL, 16); + } + + close(sys_fd); + } + close(fd); if (!joystick_devices_count)

1 0

Józef Kucia : wined3d: Implement SM5 deriv_rty_coarse instruction.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: 9ace07c209b4b93e93ee02137338127b776c115a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ace07c209b4b93e93ee02137… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 22 12:28:19 2016 +0200 wined3d: Implement SM5 deriv_rty_coarse 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 99523fa..ba3bf35 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3579,6 +3579,7 @@ static void shader_glsl_derivative(const struct wined3d_shader_instruction *ins) switch (ins->handler_idx) { case WINED3DSIH_DSX_COARSE: instruction = "dFdxCoarse"; break; + case WINED3DSIH_DSY_COARSE: instruction = "ycorrection.y * dFdyCoarse"; break; default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); return; } @@ -8707,7 +8708,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DSX_COARSE */ shader_glsl_derivative, /* WINED3DSIH_DSX_FINE */ NULL, /* WINED3DSIH_DSY */ shader_glsl_map2gl, - /* WINED3DSIH_DSY_COARSE */ NULL, + /* WINED3DSIH_DSY_COARSE */ shader_glsl_derivative, /* WINED3DSIH_DSY_FINE */ NULL, /* WINED3DSIH_ELSE */ shader_glsl_else, /* WINED3DSIH_EMIT */ shader_glsl_emit,

1 0

Józef Kucia : wined3d: Implement SM5 deriv_rtx_coarse instruction.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: 2c2c9c0171c2c4409aaf828a54def67aa6f6c430 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c2c9c0171c2c4409aaf828a5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jul 22 12:28:18 2016 +0200 wined3d: Implement SM5 deriv_rtx_coarse 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 | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d391cc1..99523fa 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3562,6 +3562,31 @@ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "));\n"); } +static void shader_glsl_derivative(const struct wined3d_shader_instruction *ins) +{ + const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; + struct wined3d_string_buffer *buffer = ins->ctx->buffer; + struct glsl_src_param src_param; + const char *instruction; + DWORD write_mask; + + if (!gl_info->supported[ARB_DERIVATIVE_CONTROL]) + { + FIXME("OpenGL implementation does not support ARB_derivative_control.\n"); + return; + } + + switch (ins->handler_idx) + { + case WINED3DSIH_DSX_COARSE: instruction = "dFdxCoarse"; break; + default: ERR("Unhandled opcode %#x.\n", ins->handler_idx); return; + } + + write_mask = shader_glsl_append_dst(buffer, ins); + shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); + shader_addline(buffer, "%s(%s));\n", instruction, src_param.param_str); +} + static void shader_glsl_nop(const struct wined3d_shader_instruction *ins) {} static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) @@ -8679,7 +8704,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DP4 */ shader_glsl_dot, /* WINED3DSIH_DST */ shader_glsl_dst, /* WINED3DSIH_DSX */ shader_glsl_map2gl, - /* WINED3DSIH_DSX_COARSE */ NULL, + /* WINED3DSIH_DSX_COARSE */ shader_glsl_derivative, /* WINED3DSIH_DSX_FINE */ NULL, /* WINED3DSIH_DSY */ shader_glsl_map2gl, /* WINED3DSIH_DSY_COARSE */ NULL,

1 0

Aaryaman Vasishta : d3drm: Fix IDirect3DRMViewport*:: QueryInterface returning wrong HRESULT for invalid interfaces.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: 3fa736e97818947e518220e42addeeeeab1e0aec URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fa736e97818947e518220e42… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Tue Jul 19 23:56:42 2016 +0530 d3drm: Fix IDirect3DRMViewport*::QueryInterface returning wrong HRESULT for invalid interfaces. Signed-off-by: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/viewport.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3drm/viewport.c b/dlls/d3drm/viewport.c index 9fd627d..6986a16 100644 --- a/dlls/d3drm/viewport.c +++ b/dlls/d3drm/viewport.c @@ -66,8 +66,8 @@ static HRESULT WINAPI d3drm_viewport2_QueryInterface(IDirect3DRMViewport2 *iface else { *out = NULL; - WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); - return E_NOINTERFACE; + WARN("%s not implemented, returning CLASS_E_CLASSNOTAVAILABLE.\n", debugstr_guid(riid)); + return CLASS_E_CLASSNOTAVAILABLE; } IUnknown_AddRef((IUnknown *)*out);

1 0

Iván Matellanes : msvcirt: Get rid of specific functions for signed and unsigned chars.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: d420bf18c01bd9bbb029131cdd004b68c57c91f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d420bf18c01bd9bbb029131cd… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Fri Jul 22 12:30:33 2016 +0100 msvcirt: Get rid of specific functions for signed and unsigned chars. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 113 +++++++++++----------------------------------- dlls/msvcirt/msvcirt.spec | 48 ++++++++++---------- 2 files changed, 50 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d420bf18c01bd9bbb0291…

1 0

Nikolay Sivov : dwrite: Implement newer SetLineSpacing/GetLineSpacing.
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: 9ec714db5dc4509064f48b7e7f70da99afb7044a URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ec714db5dc4509064f48b7e7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jul 25 11:42:54 2016 +0300 dwrite: Implement newer SetLineSpacing/GetLineSpacing. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/layout.c | 118 ++++++++++++++++++++++++++++----------------- dlls/dwrite/tests/layout.c | 102 ++++++++++++++++++++++++++++++++++----- 2 files changed, 165 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9ec714db5dc4509064f48…

1 0

Xiaoshan Sun : comctl32/dsa: Handle overflow in DSA_InsertItem().
by Alexandre Julliard July 25, 2016

July 25, 2016

Module: wine Branch: master Commit: 0d57ff3d1f63f7486733f8619f3916867ebd26c5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d57ff3d1f63f7486733f8619… Author: Xiaoshan Sun <sunxs(a)is.iscas.ac.cn> Date: Sun Jul 24 14:44:40 2016 +0300 comctl32/dsa: Handle overflow in DSA_InsertItem(). Signed-off-by: Xiaoshan Sun <sunxs(a)is.iscas.ac.cn> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/dsa.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/comctl32/dsa.c b/dlls/comctl32/dsa.c index a73a54a..d5e8234 100644 --- a/dlls/comctl32/dsa.c +++ b/dlls/comctl32/dsa.c @@ -267,6 +267,9 @@ INT WINAPI DSA_InsertItem (HDSA hdsa, INT nIndex, LPVOID pSrc) nNewItems = hdsa->nMaxCount + hdsa->nGrow; nSize = hdsa->nItemSize * nNewItems; + if (nSize / hdsa->nItemSize != nNewItems) + return -1; + lpTemp = ReAlloc (hdsa->pData, nSize); if (!lpTemp) return -1;

1 0