June 2019 - Wine-commits - list.winehq.org

Alexandre Julliard : wuaueng: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: 55604f852b0adccbfd82b27d1cb311d289340b41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=55604f852b0adccbfd82b27d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:45:34 2019 +0200 wuaueng: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wuaueng/Makefile.in | 2 ++ dlls/wuaueng/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wuaueng/Makefile.in b/dlls/wuaueng/Makefile.in index c3307bd..c74d7d9 100644 --- a/dlls/wuaueng/Makefile.in +++ b/dlls/wuaueng/Makefile.in @@ -1,5 +1,7 @@ MODULE = wuaueng.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/wuaueng/main.c b/dlls/wuaueng/main.c index 8e11b01..d49d3b0 100644 --- a/dlls/wuaueng/main.c +++ b/dlls/wuaueng/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : xinput1: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: 0115cba69d245c5841c762cf02652a00980143a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0115cba69d245c5841c762cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:48:47 2019 +0200 xinput1: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_1/Makefile.in | 2 ++ dlls/xinput1_2/Makefile.in | 2 ++ dlls/xinput1_3/Makefile.in | 2 ++ dlls/xinput1_3/hid.c | 9 +++------ dlls/xinput1_3/xinput_main.c | 1 - dlls/xinput1_4/Makefile.in | 2 ++ dlls/xinput9_1_0/Makefile.in | 2 ++ 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/dlls/xinput1_1/Makefile.in b/dlls/xinput1_1/Makefile.in index d1c4258..a2b17a2 100644 --- a/dlls/xinput1_1/Makefile.in +++ b/dlls/xinput1_1/Makefile.in @@ -2,6 +2,8 @@ MODULE = xinput1_1.dll PARENTSRC = ../xinput1_3 DELAYIMPORTS = hid setupapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ hid.c \ xinput_main.c diff --git a/dlls/xinput1_2/Makefile.in b/dlls/xinput1_2/Makefile.in index 822ec15..fd38c6f 100644 --- a/dlls/xinput1_2/Makefile.in +++ b/dlls/xinput1_2/Makefile.in @@ -2,6 +2,8 @@ MODULE = xinput1_2.dll PARENTSRC = ../xinput1_3 DELAYIMPORTS = hid setupapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ hid.c \ xinput_main.c diff --git a/dlls/xinput1_3/Makefile.in b/dlls/xinput1_3/Makefile.in index 9c873f9..3b4968f 100644 --- a/dlls/xinput1_3/Makefile.in +++ b/dlls/xinput1_3/Makefile.in @@ -2,6 +2,8 @@ MODULE = xinput1_3.dll IMPORTLIB = xinput DELAYIMPORTS = hid setupapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ hid.c \ xinput_main.c diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index dc5601c..aa46f35 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <assert.h> #include <stdarg.h> @@ -44,7 +42,6 @@ #include "xinput.h" #include "xinput_private.h" -#include "wine/unicode.h" WINE_DEFAULT_DEBUG_CHANNEL(xinput); @@ -190,7 +187,7 @@ static void build_private(struct hid_platform_private *private, PHIDP_PREPARSED_ private->current_report = 0; private->reports[0] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); private->reports[1] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); - size = (strlenW(path) + 1) * sizeof(WCHAR); + size = (lstrlenW(path) + 1) * sizeof(WCHAR); private->device_path = HeapAlloc(GetProcessHeap(), 0, size); memcpy(private->device_path, path, size); private->enabled = TRUE; @@ -238,13 +235,13 @@ void HID_find_gamepads(xinput_controller *devices) &interface_data, data, sizeof(*data) + detail_size, NULL, NULL)) continue; - if (!strstrW(data->DevicePath, ig)) + if (!wcsstr(data->DevicePath, ig)) continue; for (i = 0; i < XUSER_MAX_COUNT; i++) { struct hid_platform_private *private = devices[i].platform_private; - if (devices[i].connected && !strcmpW(data->DevicePath, private->device_path)) + if (devices[i].connected && !wcscmp(data->DevicePath, private->device_path)) break; } if (i != XUSER_MAX_COUNT) diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index c412887..57337e0 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -17,7 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <assert.h> #include <stdarg.h> #include <string.h> diff --git a/dlls/xinput1_4/Makefile.in b/dlls/xinput1_4/Makefile.in index 7acb9dc..cdf4b4f 100644 --- a/dlls/xinput1_4/Makefile.in +++ b/dlls/xinput1_4/Makefile.in @@ -2,6 +2,8 @@ MODULE = xinput1_4.dll PARENTSRC = ../xinput1_3 DELAYIMPORTS = hid setupapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ hid.c \ xinput_main.c diff --git a/dlls/xinput9_1_0/Makefile.in b/dlls/xinput9_1_0/Makefile.in index c07022a..dc8739c 100644 --- a/dlls/xinput9_1_0/Makefile.in +++ b/dlls/xinput9_1_0/Makefile.in @@ -2,6 +2,8 @@ MODULE = xinput9_1_0.dll PARENTSRC = ../xinput1_3 DELAYIMPORTS = hid setupapi +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ hid.c \ xinput_main.c

1 0

Alexandre Julliard : xmllite: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: 705d089259399538141e82d3ac1d06dc4515355a URL: https://source.winehq.org/git/wine.git/?a=commit;h=705d089259399538141e82d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:49:21 2019 +0200 xmllite: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/Makefile.in | 2 ++ dlls/xmllite/reader.c | 19 ++++++++--------- dlls/xmllite/writer.c | 53 ++++++++++++++++++++++++------------------------ 3 files changed, 37 insertions(+), 37 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=705d089259399538141e…

1 0

Alexandre Julliard : xolehlp: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: 335388cacac169d6716b9c076865facc940401f5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=335388cacac169d6716b9c07… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:49:33 2019 +0200 xolehlp: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xolehlp/Makefile.in | 2 ++ dlls/xolehlp/xolehlp.c | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/xolehlp/Makefile.in b/dlls/xolehlp/Makefile.in index 58651a1..37b1d01 100644 --- a/dlls/xolehlp/Makefile.in +++ b/dlls/xolehlp/Makefile.in @@ -1,4 +1,6 @@ MODULE = xolehlp.dll IMPORTS = adsiid uuid +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = xolehlp.c diff --git a/dlls/xolehlp/xolehlp.c b/dlls/xolehlp/xolehlp.c index 2a741f4..4baf31f 100644 --- a/dlls/xolehlp/xolehlp.c +++ b/dlls/xolehlp/xolehlp.c @@ -23,7 +23,6 @@ #include "transact.h" #include "initguid.h" #include "txdtc.h" -#include "wine/unicode.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(xolehlp); @@ -662,8 +661,8 @@ static BOOL is_local_machineW( const WCHAR *server ) WCHAR buffer[MAX_COMPUTERNAME_LENGTH + 1]; DWORD len = ARRAY_SIZE( buffer ); - if (!server || !strcmpW( server, dotW )) return TRUE; - if (GetComputerNameW( buffer, &len ) && !strcmpiW( server, buffer )) return TRUE; + if (!server || !wcscmp( server, dotW )) return TRUE; + if (GetComputerNameW( buffer, &len ) && !wcsicmp( server, buffer )) return TRUE; return FALSE; }

1 0

Alexandre Julliard : xpsprint: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: c2f9afd1f863e2ae5a3cba55281d15f41604b8b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c2f9afd1f863e2ae5a3cba55… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:49:47 2019 +0200 xpsprint: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xpsprint/Makefile.in | 2 ++ dlls/xpsprint/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/xpsprint/Makefile.in b/dlls/xpsprint/Makefile.in index db1ac26..12639f1 100644 --- a/dlls/xpsprint/Makefile.in +++ b/dlls/xpsprint/Makefile.in @@ -1,5 +1,7 @@ MODULE = xpsprint.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/xpsprint/main.c b/dlls/xpsprint/main.c index be70473..734d922 100644 --- a/dlls/xpsprint/main.c +++ b/dlls/xpsprint/main.c @@ -18,8 +18,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" - #include <stdarg.h> #include "windef.h"

1 0

Alexandre Julliard : xpssvcs: Build with msvcrt.
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: cb9e8fcc87e929320a686f3f720e4be25912d805 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cb9e8fcc87e929320a686f3f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 27 21:49:55 2019 +0200 xpssvcs: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xpssvcs/Makefile.in | 2 ++ dlls/xpssvcs/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/xpssvcs/Makefile.in b/dlls/xpssvcs/Makefile.in index ba07c0d..bb41d26 100644 --- a/dlls/xpssvcs/Makefile.in +++ b/dlls/xpssvcs/Makefile.in @@ -1,4 +1,6 @@ MODULE = xpssvcs.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/xpssvcs/main.c b/dlls/xpssvcs/main.c index 36ec42d..39fb3c3 100644 --- a/dlls/xpssvcs/main.c +++ b/dlls/xpssvcs/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h> #include "windef.h"

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_pshader().
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: c65d522f917226a418da44a2f7c74d1a9e73c3fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c65d522f917226a418da44a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 28 02:12:24 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_pshader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3c74ff7..f6f0c46 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7518,17 +7518,16 @@ static void shader_glsl_generate_ps_epilogue(const struct wined3d_gl_info *gl_in } /* Context activation is done by the caller. */ -static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context, +static GLuint shader_glsl_generate_fragment_shader(const struct wined3d_context_gl *context_gl, struct wined3d_string_buffer *buffer, struct wined3d_string_buffer_list *string_buffers, - const struct wined3d_shader *shader, - const struct ps_compile_args *args, struct ps_np2fixup_info *np2fixup_info) + const struct wined3d_shader *shader, const struct ps_compile_args *args, + struct ps_np2fixup_info *np2fixup_info) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; - const char *prefix = shader_glsl_get_prefix(version->type); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; const BOOL legacy_syntax = needs_legacy_glsl_syntax(gl_info); + const char *prefix = shader_glsl_get_prefix(version->type); unsigned int i, extra_constants_needed = 0; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; @@ -7683,7 +7682,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context { if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) { - if (context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) + if (context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) shader_addline(buffer, "layout(%spixel_center_integer) in vec4 gl_FragCoord;\n", args->render_offscreen ? "" : "origin_upper_left, "); else if (!args->render_offscreen) @@ -7765,7 +7764,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context { if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) shader_addline(buffer, "vpos = gl_FragCoord;\n"); - else if (context->d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) + else if (context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_PIXEL_CENTER_INTEGER) shader_addline(buffer, "vpos = floor(vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1));\n"); else @@ -8384,6 +8383,7 @@ static GLuint find_glsl_pshader(const struct wined3d_context *context, struct wined3d_shader *shader, const struct ps_compile_args *args, const struct ps_np2fixup_info **np2fixup_info) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_ps_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; struct ps_np2fixup_info *np2fixup; @@ -8448,7 +8448,7 @@ static GLuint find_glsl_pshader(const struct wined3d_context *context, pixelshader_update_resource_types(shader, args->tex_types); string_buffer_clear(buffer); - ret = shader_glsl_generate_pshader(context, buffer, string_buffers, shader, args, np2fixup); + ret = shader_glsl_generate_fragment_shader(context_gl, buffer, string_buffers, shader, args, np2fixup); gl_shaders[shader_data->num_gl_shaders++].id = ret; return ret;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_vshader().
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: c85df2edc602a2aa90e16ec80d61afb5099370d0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c85df2edc602a2aa90e16ec8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 28 02:12:25 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_vshader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f6f0c46..f72d6eb 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7870,15 +7870,14 @@ static void shader_glsl_generate_vs_epilogue(const struct wined3d_gl_info *gl_in } /* Context activation is done by the caller. */ -static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context, +static GLuint shader_glsl_generate_vertex_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct vs_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; const struct wined3d_shader_version *version = &reg_maps->shader_version; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer = &priv->shader_buffer; - const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; unsigned int i; @@ -8479,11 +8478,11 @@ static inline BOOL vs_args_equal(const struct vs_compile_args *stored, const str static GLuint find_glsl_vshader(const struct wined3d_context *context, struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct vs_compile_args *args) { - UINT i; - DWORD new_size; - DWORD use_map = context->stream_info.use_map; + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_vs_compiled_shader *gl_shaders, *new_array; + uint32_t use_map = context->stream_info.use_map; struct glsl_shader_private *shader_data; + unsigned int i, new_size; GLuint ret; if (!shader->backend_data) @@ -8534,7 +8533,7 @@ static GLuint find_glsl_vshader(const struct wined3d_context *context, struct sh gl_shaders[shader_data->num_gl_shaders].args = *args; string_buffer_clear(&priv->shader_buffer); - ret = shader_glsl_generate_vshader(context, priv, shader, args); + ret = shader_glsl_generate_vertex_shader(context_gl, priv, shader, args); gl_shaders[shader_data->num_gl_shaders++].id = ret; return ret;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_hull_shader() .
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: eaf48206c1cec875f5ebfda5440328ff926af95c URL: https://source.winehq.org/git/wine.git/?a=commit;h=eaf48206c1cec875f5ebfda5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 28 02:12:26 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_hull_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index f72d6eb..ae08f61 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8013,14 +8013,13 @@ static void shader_glsl_generate_shader_phase_invocation(struct wined3d_string_b } } -static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context *context, +static GLuint shader_glsl_generate_hull_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, const struct wined3d_shader *shader) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer = &priv->shader_buffer; - const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_hull_shader *hs = &shader->u.hs; const struct wined3d_shader_phase *phase; struct shader_glsl_ctx_priv priv_ctx; @@ -8542,6 +8541,7 @@ static GLuint find_glsl_vshader(const struct wined3d_context *context, struct sh static GLuint find_glsl_hull_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, struct wined3d_shader *shader) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_hs_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int new_size; @@ -8578,7 +8578,7 @@ static GLuint find_glsl_hull_shader(const struct wined3d_context *context, gl_shaders = new_array; string_buffer_clear(&priv->shader_buffer); - ret = shader_glsl_generate_hull_shader(context, priv, shader); + ret = shader_glsl_generate_hull_shader(context_gl, priv, shader); gl_shaders[shader_data->num_gl_shaders++].id = ret; return ret;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_domain_shader ().
by Alexandre Julliard 28 Jun '19

28 Jun '19

Module: wine Branch: master Commit: 03a06f4ef254954baa7b5b3ba5263568d706fcda URL: https://source.winehq.org/git/wine.git/?a=commit;h=03a06f4ef254954baa7b5b3b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jun 28 02:12:27 2019 +0430 wined3d: Pass a wined3d_context_gl structure to shader_glsl_generate_domain_shader(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ae08f61..a793bf7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8109,14 +8109,13 @@ static void shader_glsl_generate_ds_epilogue(const struct wined3d_gl_info *gl_in shader_glsl_fixup_position(buffer, FALSE); } -static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context *context, +static GLuint shader_glsl_generate_domain_shader(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct ds_compile_args *args) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer = &priv->shader_buffer; - const struct wined3d_gl_info *gl_info = context->gl_info; struct shader_glsl_ctx_priv priv_ctx; GLuint shader_id; @@ -8587,6 +8586,7 @@ static GLuint find_glsl_hull_shader(const struct wined3d_context *context, static GLuint find_glsl_domain_shader(const struct wined3d_context *context, struct shader_glsl_priv *priv, struct wined3d_shader *shader, const struct ds_compile_args *args) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_ds_compiled_shader *gl_shaders, *new_array; struct glsl_shader_private *shader_data; unsigned int i, new_size; @@ -8632,7 +8632,7 @@ static GLuint find_glsl_domain_shader(const struct wined3d_context *context, gl_shaders = new_array; string_buffer_clear(&priv->shader_buffer); - ret = shader_glsl_generate_domain_shader(context, priv, shader, args); + ret = shader_glsl_generate_domain_shader(context_gl, priv, shader, args); gl_shaders[shader_data->num_gl_shaders].args = *args; gl_shaders[shader_data->num_gl_shaders++].id = ret;

1 0