September 2016 - Wine-commits

Andrey Gusev : user32/tests: Fix incorrect usage of broken() function.
by Alexandre Julliard 27 Sep '16

27 Sep '16

Module: wine Branch: master Commit: f669dc69cdcaf08aa197c98f68a1dfb4f8a265b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f669dc69cdcaf08aa197c98f6… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Sep 8 21:18:59 2016 +0300 user32/tests: Fix incorrect usage of broken() function. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/msg.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 9162aba..b132dfe 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -15554,8 +15554,8 @@ static void test_layered_window(void) size.cx = 0; ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE ); ok( !ret, "UpdateLayeredWindow should fail on non-layered window\n" ); - ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(ERROR_MR_MID_NOT_FOUND) /* win7 */, - "wrong error %u\n", GetLastError() ); + ok( GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == ERROR_MR_MID_NOT_FOUND) || + broken(GetLastError() == ERROR_GEN_FAILURE) /* win7 */, "wrong error %u\n", GetLastError() ); size.cx = 1; size.cy = -1; ret = pUpdateLayeredWindow( hwnd, 0, &pos, &size, hdc, &src, 0, NULL, ULW_OPAQUE );

1 0

Andrey Gusev : api-ms-win-core-appcompat-l1-1-1: Add dll.
by Alexandre Julliard 27 Sep '16

27 Sep '16

Module: wine Branch: master Commit: 80829582e15079c53d149da585bed7efeefe8d14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80829582e15079c53d149da58… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Sep 27 00:02:26 2016 +0300 api-ms-win-core-appcompat-l1-1-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-appcompat-l1-1-1/Makefile.in | 1 + .../api-ms-win-core-appcompat-l1-1-1.spec | 10 ++++++++++ tools/make_specfiles | 1 + 5 files changed, 15 insertions(+) diff --git a/configure b/configure index 7ef7019..0959921 100755 --- a/configure +++ b/configure @@ -875,6 +875,7 @@ enable_advapi32 enable_advpack enable_amstream enable_api_ms_win_core_apiquery_l1_1_0 +enable_api_ms_win_core_appcompat_l1_1_1 enable_api_ms_win_core_appinit_l1_1_0 enable_api_ms_win_core_atoms_l1_1_0 enable_api_ms_win_core_com_l1_1_0 @@ -17557,6 +17558,7 @@ wine_fn_config_test dlls/advpack/tests advpack_test wine_fn_config_dll amstream enable_amstream clean wine_fn_config_test dlls/amstream/tests amstream_test wine_fn_config_dll api-ms-win-core-apiquery-l1-1-0 enable_api_ms_win_core_apiquery_l1_1_0 +wine_fn_config_dll api-ms-win-core-appcompat-l1-1-1 enable_api_ms_win_core_appcompat_l1_1_1 wine_fn_config_dll api-ms-win-core-appinit-l1-1-0 enable_api_ms_win_core_appinit_l1_1_0 wine_fn_config_dll api-ms-win-core-atoms-l1-1-0 enable_api_ms_win_core_atoms_l1_1_0 wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 diff --git a/configure.ac b/configure.ac index 950489b..67bde0e 100644 --- a/configure.ac +++ b/configure.ac @@ -2651,6 +2651,7 @@ WINE_CONFIG_TEST(dlls/advpack/tests) WINE_CONFIG_DLL(amstream,,[clean]) WINE_CONFIG_TEST(dlls/amstream/tests) WINE_CONFIG_DLL(api-ms-win-core-apiquery-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-appcompat-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-appinit-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-atoms-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) diff --git a/dlls/api-ms-win-core-appcompat-l1-1-1/Makefile.in b/dlls/api-ms-win-core-appcompat-l1-1-1/Makefile.in new file mode 100644 index 0000000..2107094 --- /dev/null +++ b/dlls/api-ms-win-core-appcompat-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-appcompat-l1-1-1.dll diff --git a/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec b/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec new file mode 100644 index 0000000..92a96af --- /dev/null +++ b/dlls/api-ms-win-core-appcompat-l1-1-1/api-ms-win-core-appcompat-l1-1-1.spec @@ -0,0 +1,10 @@ +@ stub BaseCheckAppcompatCache +@ stub BaseCheckAppcompatCacheEx +@ stub BaseCleanupAppcompatCacheSupport +@ stub BaseDumpAppcompatCache +@ stub BaseFlushAppcompatCache +@ stub BaseFreeAppCompatDataForProcess +@ stub BaseInitAppcompatCacheSupport +@ stub BaseIsAppcompatInfrastructureDisabled +@ stub BaseReadAppCompatDataForProcess +@ stub BaseUpdateAppcompatCache diff --git a/tools/make_specfiles b/tools/make_specfiles index 86dfeb6..29fb83b 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -138,6 +138,7 @@ my @dll_groups = "kernel32", "api-ms-win-downlevel-normaliz-l1-1-0", "api-ms-win-core-processthreads-l1-1-0", + "api-ms-win-core-appcompat-l1-1-1", "api-ms-win-core-atoms-l1-1-0", "api-ms-win-core-debug-l1-1-0", "api-ms-win-core-debug-l1-1-1",

1 0

Andrey Gusev : api-ms-win-core-bem-l1-1-0: Add dll.
by Alexandre Julliard 27 Sep '16

27 Sep '16

Module: wine Branch: master Commit: 784098229fc0e297ac0fe8dcb8425045a26facb3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=784098229fc0e297ac0fe8dcb… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Sep 27 00:12:07 2016 +0300 api-ms-win-core-bem-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-core-bem-l1-1-0/Makefile.in | 1 + dlls/api-ms-win-core-bem-l1-1-0/api-ms-win-core-bem-l1-1-0.spec | 5 +++++ tools/make_specfiles | 1 + 5 files changed, 10 insertions(+) diff --git a/configure b/configure index 0959921..d5be2ce 100755 --- a/configure +++ b/configure @@ -878,6 +878,7 @@ enable_api_ms_win_core_apiquery_l1_1_0 enable_api_ms_win_core_appcompat_l1_1_1 enable_api_ms_win_core_appinit_l1_1_0 enable_api_ms_win_core_atoms_l1_1_0 +enable_api_ms_win_core_bem_l1_1_0 enable_api_ms_win_core_com_l1_1_0 enable_api_ms_win_core_com_l1_1_1 enable_api_ms_win_core_console_l1_1_0 @@ -17561,6 +17562,7 @@ wine_fn_config_dll api-ms-win-core-apiquery-l1-1-0 enable_api_ms_win_core_apique wine_fn_config_dll api-ms-win-core-appcompat-l1-1-1 enable_api_ms_win_core_appcompat_l1_1_1 wine_fn_config_dll api-ms-win-core-appinit-l1-1-0 enable_api_ms_win_core_appinit_l1_1_0 wine_fn_config_dll api-ms-win-core-atoms-l1-1-0 enable_api_ms_win_core_atoms_l1_1_0 +wine_fn_config_dll api-ms-win-core-bem-l1-1-0 enable_api_ms_win_core_bem_l1_1_0 wine_fn_config_dll api-ms-win-core-com-l1-1-0 enable_api_ms_win_core_com_l1_1_0 wine_fn_config_dll api-ms-win-core-com-l1-1-1 enable_api_ms_win_core_com_l1_1_1 wine_fn_config_dll api-ms-win-core-console-l1-1-0 enable_api_ms_win_core_console_l1_1_0 diff --git a/configure.ac b/configure.ac index 67bde0e..62aa1d5 100644 --- a/configure.ac +++ b/configure.ac @@ -2654,6 +2654,7 @@ WINE_CONFIG_DLL(api-ms-win-core-apiquery-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-appcompat-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-appinit-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-atoms-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-core-bem-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-0) WINE_CONFIG_DLL(api-ms-win-core-com-l1-1-1) WINE_CONFIG_DLL(api-ms-win-core-console-l1-1-0) diff --git a/dlls/api-ms-win-core-bem-l1-1-0/Makefile.in b/dlls/api-ms-win-core-bem-l1-1-0/Makefile.in new file mode 100644 index 0000000..91e1116 --- /dev/null +++ b/dlls/api-ms-win-core-bem-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-core-bem-l1-1-0.dll diff --git a/dlls/api-ms-win-core-bem-l1-1-0/api-ms-win-core-bem-l1-1-0.spec b/dlls/api-ms-win-core-bem-l1-1-0/api-ms-win-core-bem-l1-1-0.spec new file mode 100644 index 0000000..2d8b123 --- /dev/null +++ b/dlls/api-ms-win-core-bem-l1-1-0/api-ms-win-core-bem-l1-1-0.spec @@ -0,0 +1,5 @@ +@ stub BemCopyReference +@ stub BemCreateContractFrom +@ stub BemCreateReference +@ stub BemFreeContract +@ stub BemFreeReference diff --git a/tools/make_specfiles b/tools/make_specfiles index 29fb83b..1d1c0ed 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -231,6 +231,7 @@ my @dll_groups = "advapi32", "user32", "kernelbase", + "api-ms-win-core-bem-l1-1-0", ], [ "ole32",

1 0

Andrey Gusev : api-ms-win-service-private-l1-1-1: Add dll.
by Alexandre Julliard 27 Sep '16

27 Sep '16

Module: wine Branch: master Commit: c1ec8a6769e2ff8c61c02815a4c3b6ed2060d6de URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1ec8a6769e2ff8c61c02815a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Sep 27 00:26:08 2016 +0300 api-ms-win-service-private-l1-1-1: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-service-private-l1-1-1/Makefile.in | 1 + .../api-ms-win-service-private-l1-1-1.spec | 16 ++++++++++++++++ tools/make_specfiles | 1 + 5 files changed, 21 insertions(+) diff --git a/configure b/configure index d5be2ce..151704a 100755 --- a/configure +++ b/configure @@ -1019,6 +1019,7 @@ enable_api_ms_win_service_core_l1_1_0 enable_api_ms_win_service_core_l1_1_1 enable_api_ms_win_service_management_l1_1_0 enable_api_ms_win_service_management_l2_1_0 +enable_api_ms_win_service_private_l1_1_1 enable_api_ms_win_service_winsvc_l1_1_0 enable_api_ms_win_service_winsvc_l1_2_0 enable_api_ms_win_shell_shellcom_l1_1_0 @@ -17703,6 +17704,7 @@ wine_fn_config_dll api-ms-win-service-core-l1-1-0 enable_api_ms_win_service_core wine_fn_config_dll api-ms-win-service-core-l1-1-1 enable_api_ms_win_service_core_l1_1_1 wine_fn_config_dll api-ms-win-service-management-l1-1-0 enable_api_ms_win_service_management_l1_1_0 wine_fn_config_dll api-ms-win-service-management-l2-1-0 enable_api_ms_win_service_management_l2_1_0 +wine_fn_config_dll api-ms-win-service-private-l1-1-1 enable_api_ms_win_service_private_l1_1_1 wine_fn_config_dll api-ms-win-service-winsvc-l1-1-0 enable_api_ms_win_service_winsvc_l1_1_0 wine_fn_config_dll api-ms-win-service-winsvc-l1-2-0 enable_api_ms_win_service_winsvc_l1_2_0 wine_fn_config_dll api-ms-win-shell-shellcom-l1-1-0 enable_api_ms_win_shell_shellcom_l1_1_0 diff --git a/configure.ac b/configure.ac index 62aa1d5..e97cd17 100644 --- a/configure.ac +++ b/configure.ac @@ -2795,6 +2795,7 @@ WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-core-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-management-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-management-l2-1-0) +WINE_CONFIG_DLL(api-ms-win-service-private-l1-1-1) WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-1-0) WINE_CONFIG_DLL(api-ms-win-service-winsvc-l1-2-0) WINE_CONFIG_DLL(api-ms-win-shell-shellcom-l1-1-0) diff --git a/dlls/api-ms-win-service-private-l1-1-1/Makefile.in b/dlls/api-ms-win-service-private-l1-1-1/Makefile.in new file mode 100644 index 0000000..4289f50 --- /dev/null +++ b/dlls/api-ms-win-service-private-l1-1-1/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-service-private-l1-1-1.dll diff --git a/dlls/api-ms-win-service-private-l1-1-1/api-ms-win-service-private-l1-1-1.spec b/dlls/api-ms-win-service-private-l1-1-1/api-ms-win-service-private-l1-1-1.spec new file mode 100644 index 0000000..6c72be5 --- /dev/null +++ b/dlls/api-ms-win-service-private-l1-1-1/api-ms-win-service-private-l1-1-1.spec @@ -0,0 +1,16 @@ +@ stub I_QueryTagInformation +@ stub I_ScBroadcastServiceControlMessage +@ stub I_ScIsSecurityProcess +@ stub I_ScPnPGetServiceName +@ stub I_ScQueryServiceConfig +@ stub I_ScRegisterDeviceNotification +@ stub I_ScRegisterPreshutdownRestart +@ stub I_ScRpcBind +@ stub I_ScSendPnPMessage +@ stub I_ScSendTSMessage +@ stub I_ScSetServiceBits +@ stub I_ScUnregisterDeviceNotification +@ stub I_ScValidatePnPService +@ stub SubscribeServiceChangeNotifications +@ stub UnsubscribeServiceChangeNotifications +@ stub WaitServiceState diff --git a/tools/make_specfiles b/tools/make_specfiles index 1d1c0ed..f3b5c5e 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -127,6 +127,7 @@ my @dll_groups = "api-ms-win-service-core-l1-1-1", "api-ms-win-service-management-l1-1-0", "api-ms-win-service-management-l2-1-0", + "api-ms-win-service-private-l1-1-1", "api-ms-win-service-winsvc-l1-1-0", "api-ms-win-service-winsvc-l1-2-0", ],

1 0

Matteo Bruni : wined3d: Use round() on core profile.
by Alexandre Julliard 27 Sep '16

27 Sep '16

Module: wine Branch: master Commit: 2b8766310ff3d1be7d55e2e258b7e1d27d0b0e69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b8766310ff3d1be7d55e2e25… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 27 00:04:11 2016 +0200 wined3d: Use round() on core profile. Signed-off-by: Matteo Bruni <mbruni(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 | 45 ++++++++++++++++++++++++++++++++------------- 1 file changed, 32 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1c37e1c..e2d624a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -315,15 +315,34 @@ static const char *shader_glsl_get_prefix(enum wined3d_shader_type type) } } -static const char *shader_glsl_get_version(const struct wined3d_gl_info *gl_info, +static unsigned int shader_glsl_get_version(const struct wined3d_gl_info *gl_info, const struct wined3d_shader_version *version) { if (!gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) - return "#version 150"; + return 150; else if (gl_info->glsl_version >= MAKEDWORD_VERSION(1, 30) && version && version->major >= 4) - return "#version 130"; + return 130; else - return "#version 120"; + return 120; +} + +static const char *shader_glsl_get_version_declaration(const struct wined3d_gl_info *gl_info, + const struct wined3d_shader_version *version) +{ + unsigned int glsl_version; + + switch (glsl_version = shader_glsl_get_version(gl_info, version)) + { + case 150: + return "#version 150"; + case 130: + return "#version 130"; + case 120: + return "#version 120"; + default: + FIXME("Unexpected GLSL version %u requested.\n", glsl_version); + return ""; + } } static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, const float *values) @@ -3400,12 +3419,12 @@ static void shader_glsl_mov(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "int(floor(%s)));\n", src0_param.param_str); } } - else if(ins->handler_idx == WINED3DSIH_MOVA) + else if (ins->handler_idx == WINED3DSIH_MOVA) { - /* We need to *round* to the nearest int here. */ + const struct wined3d_shader_version *version = &ins->ctx->shader->reg_maps.shader_version; unsigned int mask_size = shader_glsl_get_write_mask_size(write_mask); - if (gl_info->supported[EXT_GPU_SHADER4]) + if (shader_glsl_get_version(gl_info, version) >= 130 || gl_info->supported[EXT_GPU_SHADER4]) { if (mask_size > 1) shader_addline(buffer, "ivec%d(round(%s)));\n", mask_size, src0_param.param_str); @@ -5615,7 +5634,7 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl string_buffer_clear(buffer); - shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &vs->reg_maps.shader_version)); + shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &vs->reg_maps.shader_version)); if (per_vertex_point_size) { @@ -5867,7 +5886,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context priv_ctx.cur_np2fixup_info = np2fixup_info; priv_ctx.string_buffers = string_buffers; - shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); + shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &reg_maps->shader_version)); shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_DERIVATIVE_CONTROL]) @@ -5986,7 +6005,7 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context /* Create the hw GLSL shader program and assign it as the shader->prgId */ GLuint shader_id = GL_EXTCALL(glCreateShader(GL_VERTEX_SHADER)); - shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); + shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &reg_maps->shader_version)); shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_DRAW_INSTANCED]) @@ -6073,7 +6092,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context shader_id = GL_EXTCALL(glCreateShader(GL_GEOMETRY_SHADER)); - shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, &reg_maps->shader_version)); + shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, &reg_maps->shader_version)); shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_GEOMETRY_SHADER4]) @@ -6512,7 +6531,7 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr string_buffer_clear(buffer); - shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, NULL)); + shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, NULL)); if (shader_glsl_use_explicit_attrib_location(gl_info)) shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); @@ -7074,7 +7093,7 @@ static GLuint shader_glsl_generate_ffp_fragment_shader(struct shader_glsl_priv * } lowest_disabled_stage = stage; - shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, NULL)); + shader_addline(buffer, "%s\n", shader_glsl_get_version_declaration(gl_info, NULL)); if (gl_info->supported[ARB_TEXTURE_RECTANGLE]) shader_addline(buffer, "#extension GL_ARB_texture_rectangle : enable\n");

1 0

Matteo Bruni : wined3d: Enable lod and grad texture lookups on core profile.
by Alexandre Julliard 27 Sep '16

27 Sep '16

Module: wine Branch: master Commit: 791b0b9f5e64b843d71230e8632e09a7ba169686 URL: http://source.winehq.org/git/wine.git/?a=commit;h=791b0b9f5e64b843d71230e86… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 27 00:04:12 2016 +0200 wined3d: Enable lod and grad texture lookups on core profile. Signed-off-by: Matteo Bruni <mbruni(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 | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e2d624a..b0f3224 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2881,6 +2881,12 @@ static const char *shader_glsl_get_rel_op(enum wined3d_shader_rel_op op) } } +static BOOL shader_glsl_has_core_grad(const struct wined3d_gl_info *gl_info, + const struct wined3d_shader_version *version) +{ + return shader_glsl_get_version(gl_info, version) >= 130 || gl_info->supported[EXT_GPU_SHADER4]; +} + static void shader_glsl_get_sample_function(const struct wined3d_shader_context *ctx, DWORD resource_idx, DWORD sampler_idx, DWORD flags, struct glsl_sample_function *sample_function) { @@ -2942,7 +2948,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context if (!type_part[0]) FIXME("Unhandled resource type %#x.\n", resource_type); - if (!lod && grad && !gl_info->supported[EXT_GPU_SHADER4]) + if (!lod && grad && !shader_glsl_has_core_grad(gl_info, &ctx->shader->reg_maps.shader_version)) { if (gl_info->supported[ARB_SHADER_TEXTURE_LOD]) suffix = "ARB"; @@ -4558,7 +4564,8 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) DWORD sampler_idx; DWORD swizzle = ins->src[1].swizzle; - if (!gl_info->supported[ARB_SHADER_TEXTURE_LOD] && !gl_info->supported[EXT_GPU_SHADER4]) + if (!shader_glsl_has_core_grad(gl_info, &ins->ctx->shader->reg_maps.shader_version) + && !gl_info->supported[ARB_SHADER_TEXTURE_LOD]) { FIXME("texldd used, but not supported by hardware. Falling back to regular tex\n"); shader_glsl_tex(ins); @@ -4579,11 +4586,12 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) { + const struct wined3d_shader_version *shader_version = &ins->ctx->reg_maps->shader_version; const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; struct glsl_src_param coord_param, lod_param; struct glsl_sample_function sample_function; - DWORD sampler_idx; DWORD swizzle = ins->src[1].swizzle; + DWORD sampler_idx; sampler_idx = ins->src[1].reg.idx[0].offset; @@ -4592,8 +4600,8 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param); - if (!gl_info->supported[ARB_SHADER_TEXTURE_LOD] && !gl_info->supported[EXT_GPU_SHADER4] - && ins->ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL) + if (shader_version->type == WINED3D_SHADER_TYPE_PIXEL && !shader_glsl_has_core_grad(gl_info, shader_version) + && !gl_info->supported[ARB_SHADER_TEXTURE_LOD]) { /* Plain GLSL only supports Lod sampling functions in vertex shaders. * However, the NVIDIA drivers allow them in fragment shaders as well, @@ -8581,9 +8589,9 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s && gl_info->supported[ARB_SHADER_BIT_ENCODING] && gl_info->supported[ARB_SAMPLER_OBJECTS] && gl_info->supported[ARB_TEXTURE_SWIZZLE]) shader_model = 4; - /* ARB_shader_texture_lod or EXT_gpu_shader4 is required for the SM3 - * texldd and texldl instructions. */ - else if (gl_info->supported[ARB_SHADER_TEXTURE_LOD] || gl_info->supported[EXT_GPU_SHADER4]) + /* Support for texldd and texldl instructions in pixel shaders is required + * for SM3. */ + else if (shader_glsl_has_core_grad(gl_info, NULL) || gl_info->supported[ARB_SHADER_TEXTURE_LOD]) shader_model = 3; else shader_model = 2;

1 0

Matteo Bruni : wined3d: Fix ps_3_0 packed inputs limit.
by Alexandre Julliard 27 Sep '16

27 Sep '16

Module: wine Branch: master Commit: 630998123a2bf241eab3d5dd704d7d4ba588d973 URL: http://source.winehq.org/git/wine.git/?a=commit;h=630998123a2bf241eab3d5dd7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 27 00:04:13 2016 +0200 wined3d: Fix ps_3_0 packed inputs limit. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 28d5972..1c48589 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -598,7 +598,7 @@ static void shader_set_limits(struct wined3d_shader *shader) {WINED3D_SHADER_VERSION(1, 4), WINED3D_SHADER_VERSION(1, 4), { 6, 0, 8, 0, 0, 0}}, {WINED3D_SHADER_VERSION(2, 0), WINED3D_SHADER_VERSION(2, 0), {16, 0, 32, 0, 0, 0}}, {WINED3D_SHADER_VERSION(2, 1), WINED3D_SHADER_VERSION(2, 1), {16, 16, 32, 16, 0, 0}}, - {WINED3D_SHADER_VERSION(3, 0), WINED3D_SHADER_VERSION(3, 0), {16, 16, 224, 16, 0, 12}}, + {WINED3D_SHADER_VERSION(3, 0), WINED3D_SHADER_VERSION(3, 0), {16, 16, 224, 16, 0, 10}}, {WINED3D_SHADER_VERSION(4, 0), WINED3D_SHADER_VERSION(5, 0), {16, 0, 0, 0, 0, 32}}, {0} },

1 0

Matteo Bruni : wined3d: Fix doublebuffer mode trace.
by Alexandre Julliard 27 Sep '16

27 Sep '16

Module: wine Branch: master Commit: b877d4177fc1a2cefaef59a31150c30d13f7690b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b877d4177fc1a2cefaef59a31… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 27 00:04:14 2016 +0200 wined3d: Fix doublebuffer mode trace. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/buffer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index b927105..b50132a 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1308,10 +1308,10 @@ static HRESULT buffer_init(struct wined3d_buffer *buffer, struct wined3d_device if (device->create_parms.flags & WINED3DCREATE_SOFTWARE_VERTEXPROCESSING || pool == WINED3D_POOL_MANAGED) { - /* SWvp always returns the same pointer in buffer maps and retains data in DISCARD maps. - * Keep a system memory copy of the buffer to provide the same behavior to the application. - * Still use a VBO to support OpenGL 3 core contexts. */ - TRACE("Using doublebuffer mode because of software vertex processing.\n"); + /* SWvp and managed buffers always return the same pointer in buffer + * maps and retain data in DISCARD maps. Keep a system memory copy of + * the buffer to provide the same behavior to the application. */ + TRACE("Using doublebuffer mode.\n"); buffer->flags |= WINED3D_BUFFER_DOUBLEBUFFER; }

1 0

Matteo Bruni : wined3d: Call glGetIntegerv() through the gl_info function pointer.
by Alexandre Julliard 27 Sep '16

27 Sep '16

Module: wine Branch: master Commit: bbab63cfcf8834820be631fe2d599bf4550331a3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbab63cfcf8834820be631fe2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Sep 27 00:04:15 2016 +0200 wined3d: Call glGetIntegerv() through the gl_info function pointer. Fixes a1e718ccabc7c330dd16c7face78022965b03e20. Signed-off-by: Matteo Bruni <mbruni(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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7ab68aa..05e04e8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3629,7 +3629,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD if (gl_version >= MAKEDWORD_VERSION(3, 2)) { - glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &context_profile); + gl_info->gl_ops.gl.p_glGetIntegerv(GL_CONTEXT_PROFILE_MASK, &context_profile); checkGLcall("Querying context profile"); } if (context_profile & GL_CONTEXT_CORE_PROFILE_BIT)

1 0

Piotr Caban : msvcp140: Introduce _Mbstatet structure.
by Alexandre Julliard 27 Sep '16

27 Sep '16

Module: wine Branch: master Commit: 3b62083443c419d96692985368ff527bbfd98050 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b62083443c419d9669298536… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 27 09:32:51 2016 +0200 msvcp140: Introduce _Mbstatet structure. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/ios.c | 297 +++++++++++++++++++++++++++---------------------- dlls/msvcp90/locale.c | 105 +++++++++-------- dlls/msvcp90/msvcp90.h | 23 +++- 3 files changed, 235 insertions(+), 190 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3b62083443c419d966929…

1 0