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

Alexandre Julliard : msxml4: Build with msvcrt.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 1ba737d376231642a6eb5f746c85a443fddab3e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1ba737d376231642a6eb5f74… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:21:06 2019 +0200 msxml4: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml4/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msxml4/Makefile.in b/dlls/msxml4/Makefile.in index d628ebc..2952910 100644 --- a/dlls/msxml4/Makefile.in +++ b/dlls/msxml4/Makefile.in @@ -1,6 +1,8 @@ MODULE = msxml4.dll IMPORTS = ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : msxml6: Build with msvcrt.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 63decbd7aa67595f8a69810be75ea5a16e769bd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=63decbd7aa67595f8a69810b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:21:11 2019 +0200 msxml6: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msxml6/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msxml6/Makefile.in b/dlls/msxml6/Makefile.in index 61a61a7..da4c212 100644 --- a/dlls/msxml6/Makefile.in +++ b/dlls/msxml6/Makefile.in @@ -1,6 +1,8 @@ MODULE = msxml6.dll IMPORTS = oleaut32 ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c

1 0

Alexandre Julliard : mtxdm: Build with msvcrt.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 6e9e84c928e32aef69805e96d89b1c31e4455b19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6e9e84c928e32aef69805e96… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:21:22 2019 +0200 mtxdm: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mtxdm/Makefile.in | 2 ++ dlls/mtxdm/mtxdm_main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mtxdm/Makefile.in b/dlls/mtxdm/Makefile.in index 63a99b6..e104bd3 100644 --- a/dlls/mtxdm/Makefile.in +++ b/dlls/mtxdm/Makefile.in @@ -1,5 +1,7 @@ MODULE = mtxdm.dll IMPORTS = uuid ole32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ mtxdm_main.c diff --git a/dlls/mtxdm/mtxdm_main.c b/dlls/mtxdm/mtxdm_main.c index 9b7e1df..94c4c7e 100644 --- a/dlls/mtxdm/mtxdm_main.c +++ b/dlls/mtxdm/mtxdm_main.c @@ -16,8 +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 : ncrypt: Build with msvcrt.
by Alexandre Julliard 14 Jun '19

14 Jun '19

Module: wine Branch: master Commit: 1c6256575b2c015e86be7f6eea78b087a4aa472e URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c6256575b2c015e86be7f6e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jun 14 09:21:52 2019 +0200 ncrypt: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ncrypt/Makefile.in | 2 ++ dlls/ncrypt/main.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ncrypt/Makefile.in b/dlls/ncrypt/Makefile.in index d54b921..c387c35 100644 --- a/dlls/ncrypt/Makefile.in +++ b/dlls/ncrypt/Makefile.in @@ -1,4 +1,6 @@ MODULE = ncrypt.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 6e79eeb..bfda1d8 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/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

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

13 Jun '19

Module: wine Branch: master Commit: f3ee4d40ce79cfedba849b04827e864bf638c0e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3ee4d40ce79cfedba849b04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 13 16:28:35 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_texture_gl_set_compatible_renderbuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 76b5858..a56576d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -613,7 +613,7 @@ static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_contex else if (depth_stencil->resource->type == WINED3D_RTYPE_TEXTURE_2D) { wined3d_texture_gl_set_compatible_renderbuffer(wined3d_texture_gl(ds_texture), - &context_gl->c, ds_level, &render_targets[0]); + context_gl, ds_level, &render_targets[0]); } } diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index d3c58cb..3f6d620 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1452,9 +1452,9 @@ HRESULT CDECL wined3d_texture_set_color_key(struct wined3d_texture *texture, /* TODO: We should synchronize the renderbuffer's content with the texture's content. */ /* Context activation is done by the caller. */ void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl, - struct wined3d_context *context, unsigned int level, const struct wined3d_rendertarget_info *rt) + struct wined3d_context_gl *context_gl, unsigned int level, const struct wined3d_rendertarget_info *rt) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_renderbuffer_entry *entry; unsigned int src_width, src_height; unsigned int width, height; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 91570ed..ece1aca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3626,7 +3626,7 @@ void wined3d_texture_gl_bind_and_dirtify(struct wined3d_texture_gl *texture_gl, void wined3d_texture_gl_prepare_texture(struct wined3d_texture_gl *texture_gl, struct wined3d_context_gl *context_gl, BOOL srgb) DECLSPEC_HIDDEN; void wined3d_texture_gl_set_compatible_renderbuffer(struct wined3d_texture_gl *texture_gl, - struct wined3d_context *context, unsigned int level, + struct wined3d_context_gl *context_gl, unsigned int level, const struct wined3d_rendertarget_info *rt) DECLSPEC_HIDDEN; #define WINED3D_LOCATION_DISCARDED 0x00000001

1 0

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

13 Jun '19

Module: wine Branch: master Commit: 90485cdcc723616d6ba1f56e1468498f422c2564 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90485cdcc723616d6ba1f56e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 13 16:28:36 2019 +0430 wined3d: Pass a wined3d_context_gl structure to wined3d_sampler_bind(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/sampler.c | 5 ++--- dlls/wined3d/state.c | 2 +- dlls/wined3d/view.c | 4 ++-- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/sampler.c b/dlls/wined3d/sampler.c index 8c3a947..bfc3aec 100644 --- a/dlls/wined3d/sampler.c +++ b/dlls/wined3d/sampler.c @@ -182,10 +182,9 @@ static void texture_gl_apply_base_level(struct wined3d_texture_gl *texture_gl, /* This function relies on the correct texture being bound and loaded. */ void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, - struct wined3d_texture_gl *texture_gl, const struct wined3d_context *context) + struct wined3d_texture_gl *texture_gl, const struct wined3d_context_gl *context_gl) { - const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (gl_info->supported[ARB_SAMPLER_OBJECTS]) { diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index d87f608..06b30ba 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3638,7 +3638,7 @@ static void sampler(struct wined3d_context *context, const struct wined3d_state } } - wined3d_sampler_bind(sampler, mapped_stage, texture_gl, context); + wined3d_sampler_bind(sampler, mapped_stage, texture_gl, context_gl); /* Trigger shader constant reloading (for NP2 texcoord fixup) */ if (!(texture_gl->t.flags & WINED3D_TEXTURE_POW2_MAT_IDENT)) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 06e24fb..d74c36f 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -839,7 +839,7 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl if (view_gl->gl_view.name) { wined3d_context_gl_bind_texture(context_gl, view_gl->gl_view.target, view_gl->gl_view.name); - wined3d_sampler_bind(sampler, unit, NULL, context); + wined3d_sampler_bind(sampler, unit, NULL, context_gl); return; } @@ -851,7 +851,7 @@ void wined3d_shader_resource_view_gl_bind(struct wined3d_shader_resource_view_gl texture_gl = wined3d_texture_gl(wined3d_texture_from_resource(view_gl->v.resource)); wined3d_texture_gl_bind(texture_gl, context_gl, FALSE); - wined3d_sampler_bind(sampler, unit, texture_gl, context); + wined3d_sampler_bind(sampler, unit, texture_gl, context_gl); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ece1aca..31eb31a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3685,7 +3685,7 @@ struct wined3d_sampler }; void wined3d_sampler_bind(struct wined3d_sampler *sampler, unsigned int unit, - struct wined3d_texture_gl *texture_gl, const struct wined3d_context *context) DECLSPEC_HIDDEN; + struct wined3d_texture_gl *texture_gl, const struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; struct wined3d_vertex_declaration_element {

1 0

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

13 Jun '19

Module: wine Branch: master Commit: f7c80fae5159aef3f2e8ca7940aafdbc2a711c77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7c80fae5159aef3f2e8ca79… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 13 16:28:37 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_attach_gl_texture_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index a56576d..be34614 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -127,10 +127,10 @@ static void context_attach_depth_stencil_rb(const struct wined3d_gl_info *gl_inf } } -static void context_attach_gl_texture_fbo(struct wined3d_context *context, +static void wined3d_context_gl_attach_gl_texture_fbo(struct wined3d_context_gl *context_gl, GLenum fbo_target, GLenum attachment, const struct wined3d_fbo_resource *resource) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (!resource) { @@ -177,6 +177,7 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, GLenum fbo_target, const struct wined3d_fbo_resource *resource, BOOL rb_namespace, DWORD flags) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; if (resource->object) @@ -191,24 +192,24 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, else { if (flags & WINED3D_FBO_ENTRY_FLAG_DEPTH) - context_attach_gl_texture_fbo(context, fbo_target, GL_DEPTH_ATTACHMENT, resource); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_DEPTH_ATTACHMENT, resource); if (flags & WINED3D_FBO_ENTRY_FLAG_STENCIL) - context_attach_gl_texture_fbo(context, fbo_target, GL_STENCIL_ATTACHMENT, resource); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_STENCIL_ATTACHMENT, resource); } if (!(flags & WINED3D_FBO_ENTRY_FLAG_DEPTH)) - context_attach_gl_texture_fbo(context, fbo_target, GL_DEPTH_ATTACHMENT, NULL); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_DEPTH_ATTACHMENT, NULL); if (!(flags & WINED3D_FBO_ENTRY_FLAG_STENCIL)) - context_attach_gl_texture_fbo(context, fbo_target, GL_STENCIL_ATTACHMENT, NULL); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_STENCIL_ATTACHMENT, NULL); } else { TRACE("Attach depth stencil 0.\n"); - context_attach_gl_texture_fbo(context, fbo_target, GL_DEPTH_ATTACHMENT, NULL); - context_attach_gl_texture_fbo(context, fbo_target, GL_STENCIL_ATTACHMENT, NULL); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_DEPTH_ATTACHMENT, NULL); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_STENCIL_ATTACHMENT, NULL); } } @@ -216,7 +217,8 @@ static void context_attach_depth_stencil_fbo(struct wined3d_context *context, static void context_attach_surface_fbo(struct wined3d_context *context, GLenum fbo_target, DWORD idx, const struct wined3d_fbo_resource *resource, BOOL rb_namespace) { - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; TRACE("Attach GL object %u to %u.\n", resource->object, idx); @@ -230,12 +232,12 @@ static void context_attach_surface_fbo(struct wined3d_context *context, } else { - context_attach_gl_texture_fbo(context, fbo_target, GL_COLOR_ATTACHMENT0 + idx, resource); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_COLOR_ATTACHMENT0 + idx, resource); } } else { - context_attach_gl_texture_fbo(context, fbo_target, GL_COLOR_ATTACHMENT0 + idx, NULL); + wined3d_context_gl_attach_gl_texture_fbo(context_gl, fbo_target, GL_COLOR_ATTACHMENT0 + idx, NULL); } }

1 0

Henri Verbeet : wined3d: Get rid of the unused "gl_info" argument to compute_texture_matrix().
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: ec6a83013097b180afef97c6de6ec6cc048850e7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ec6a83013097b180afef97c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 13 16:28:38 2019 +0430 wined3d: Get rid of the unused "gl_info" argument to compute_texture_matrix(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a83d444..44b6c48 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -5470,9 +5470,8 @@ void get_projection_matrix(const struct wined3d_context *context, const struct w } /* Setup this textures matrix according to the texture flags. */ -static void compute_texture_matrix(const struct wined3d_gl_info *gl_info, const struct wined3d_matrix *matrix, - DWORD flags, BOOL calculated_coords, BOOL transformed, enum wined3d_format_id format_id, - BOOL ffp_proj_control, struct wined3d_matrix *out_matrix) +static void compute_texture_matrix(const struct wined3d_matrix *matrix, uint32_t flags, BOOL calculated_coords, + BOOL transformed, enum wined3d_format_id format_id, BOOL ffp_proj_control, struct wined3d_matrix *out_matrix) { struct wined3d_matrix mat; @@ -5586,13 +5585,12 @@ void get_texture_matrix(const struct wined3d_context *context, const struct wine unsigned int tex, struct wined3d_matrix *mat) { const struct wined3d_device *device = context->device; - const struct wined3d_gl_info *gl_info = context->gl_info; BOOL generated = (state->texture_states[tex][WINED3D_TSS_TEXCOORD_INDEX] & 0xffff0000) != WINED3DTSS_TCI_PASSTHRU; unsigned int coord_idx = min(state->texture_states[tex][WINED3D_TSS_TEXCOORD_INDEX & 0x0000ffff], WINED3D_MAX_TEXTURES - 1); - compute_texture_matrix(gl_info, &state->transforms[WINED3D_TS_TEXTURE0 + tex], + compute_texture_matrix(&state->transforms[WINED3D_TS_TEXTURE0 + tex], state->texture_states[tex][WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS], generated, context->last_was_rhw, context->stream_info.use_map & (1u << (WINED3D_FFP_TEXCOORD0 + coord_idx))

1 0

Henri Verbeet : wined3d: Upload texture data through the texture ops in wined3d_texture_upload_from_texture ().
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: eb5afc560cd87a5470a06b42eb36e4b619974eaf URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb5afc560cd87a5470a06b42… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 13 16:28:39 2019 +0430 wined3d: Upload texture data through the texture ops in wined3d_texture_upload_from_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3f6d620..71bec04 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -3850,15 +3850,15 @@ void wined3d_texture_upload_from_texture(struct wined3d_texture *dst_texture, un wined3d_texture_prepare_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); else wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, context, WINED3D_LOCATION_TEXTURE_RGB); - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(dst_texture), wined3d_context_gl(context), FALSE); src_level = src_sub_resource_idx % src_texture->level_count; wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &data, src_texture->sub_resources[src_sub_resource_idx].locations); wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); - wined3d_texture_upload_data(dst_texture, dst_sub_resource_idx, context, src_texture->resource.format, - src_box, wined3d_const_bo_address(&data), src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, FALSE); + dst_texture->texture_ops->texture_upload_data(context, wined3d_const_bo_address(&data), + src_texture->resource.format, src_box, src_row_pitch, src_slice_pitch, dst_texture, + dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB, dst_x, dst_y, dst_z); context_release(context);

1 0

Paul Gofman : wined3d: Use 3 component norm for 'nrm' opcode in GLSL backend.
by Alexandre Julliard 13 Jun '19

13 Jun '19

Module: wine Branch: master Commit: 447c9523f84f8bc973a1080bb29d3b60e6d190f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=447c9523f84f8bc973a1080b… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Thu Jun 13 16:56:59 2019 +0300 wined3d: Use 3 component norm for 'nrm' opcode in GLSL backend. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=8848 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> 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, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index bb510ec..9202fb6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4109,8 +4109,12 @@ static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) mask_size = shader_glsl_get_write_mask_size(write_mask); shader_glsl_add_src_param(ins, &ins->src[0], write_mask, &src_param); - shader_addline(buffer, "tmp0.x = dot(%s, %s);\n", - src_param.param_str, src_param.param_str); + if (mask_size > 3) + shader_addline(buffer, "tmp0.x = dot(vec3(%s), vec3(%s));\n", + src_param.param_str, src_param.param_str); + else + shader_addline(buffer, "tmp0.x = dot(%s, %s);\n", + src_param.param_str, src_param.param_str); shader_glsl_append_dst(buffer, ins); if (mask_size > 1)

1 0