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

Matteo Bruni : wined3d: Don' t flag vertex color clamping for changes on core profile.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 618e825e57d65e149fa9822dc644122268e2dbde URL: http://source.winehq.org/git/wine.git/?a=commit;h=618e825e57d65e149fa9822dc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 25 22:50:25 2016 +0100 wined3d: Don't flag vertex color clamping for changes on core profile. glClampColorARB(GL_CLAMP_VERTEX_COLOR) is not supported on core profile and we can't use builtin color varyings there anyway. 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 | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9e6a631..7c367e4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7345,14 +7345,24 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const pshader ? min(pshader->limits->constant_float, gl_info->limits.glsl_ps_float_constants) : 0); checkGLcall("Find glsl program uniform locations"); - if (pshader && pshader->reg_maps.shader_version.major >= 3 - && pshader->u.ps.declared_in_count > vec4_varyings(3, gl_info)) + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) { - TRACE("Shader %d needs vertex color clamping disabled.\n", program_id); - entry->vs.vertex_color_clamp = GL_FALSE; + if (pshader && pshader->reg_maps.shader_version.major >= 3 + && pshader->u.ps.declared_in_count > vec4_varyings(3, gl_info)) + { + TRACE("Shader %d needs vertex color clamping disabled.\n", program_id); + entry->vs.vertex_color_clamp = GL_FALSE; + } + else + { + entry->vs.vertex_color_clamp = GL_FIXED_ONLY_ARB; + } } else { + /* With core profile we never change vertex_color_clamp from + * GL_FIXED_ONLY_MODE (which is also the initial value) so we never call + * glClampColorARB(). */ entry->vs.vertex_color_clamp = GL_FIXED_ONLY_ARB; }

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_uav_typed opcode.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 1bc6a15183ccb4306f72ec07b46fbe51f808aff7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bc6a15183ccb4306f72ec07b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 19:53:38 2016 +0100 wined3d: Recognize SM5 dcl_uav_typed opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 14 +++++++++++--- dlls/wined3d/shader_sm4.c | 13 +++++++++++-- dlls/wined3d/wined3d_private.h | 3 +++ 5 files changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e42f2b4..8ef944d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5242,6 +5242,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ NULL, /* WINED3DSIH_DCL_SAMPLER */ NULL, /* WINED3DSIH_DCL_TEMPS */ NULL, + /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_hw_nop, /* WINED3DSIH_DEF */ shader_hw_nop, /* WINED3DSIH_DEFB */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4b0f2a1..716650a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8128,6 +8128,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ NULL, /* WINED3DSIH_DCL_SAMPLER */ shader_glsl_nop, /* WINED3DSIH_DCL_TEMPS */ shader_glsl_nop, + /* WINED3DSIH_DCL_UAV_TYPED */ NULL, /* WINED3DSIH_DCL_VERTICES_OUT */ shader_glsl_nop, /* WINED3DSIH_DEF */ shader_glsl_nop, /* WINED3DSIH_DEFB */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a0e707c..5aded18 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -70,6 +70,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_RESOURCE_STRUCTURED */ "dcl_resource_structured", /* WINED3DSIH_DCL_SAMPLER */ "dcl_sampler", /* WINED3DSIH_DCL_TEMPS */ "dcl_temps", + /* WINED3DSIH_DCL_UAV_TYPED */ "dcl_uav_typed", /* WINED3DSIH_DCL_VERTICES_OUT */ "dcl_maxOutputVertexCount", /* WINED3DSIH_DEF */ "def", /* WINED3DSIH_DEFB */ "defb", @@ -1310,9 +1311,12 @@ static void shader_dump_decl_usage(struct wined3d_string_buffer *buffer, break; } } - else if (semantic->reg.reg.type == WINED3DSPR_RESOURCE) + else if (semantic->reg.reg.type == WINED3DSPR_RESOURCE || semantic->reg.reg.type == WINED3DSPR_UAV) { - shader_addline(buffer, "_resource_"); + if (semantic->reg.reg.type == WINED3DSPR_RESOURCE) + shader_addline(buffer, "_resource_"); + else + shader_addline(buffer, "_uav_"); switch (semantic->resource_type) { case WINED3D_SHADER_RESOURCE_BUFFER: @@ -1572,6 +1576,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "t"); break; + case WINED3DSPR_UAV: + shader_addline(buffer, "u"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; @@ -1953,7 +1961,7 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe continue; } - if (ins.handler_idx == WINED3DSIH_DCL) + if (ins.handler_idx == WINED3DSIH_DCL || ins.handler_idx == WINED3DSIH_DCL_UAV_TYPED) { shader_dump_decl_usage(&buffer, &ins.declaration.semantic, &shader_version); shader_dump_ins_modifiers(&buffer, &ins.declaration.semantic.reg); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 0923b63..cb3f18e 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -188,6 +188,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, + WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, }; @@ -205,6 +206,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_PRIMID = 0xb, WINED3D_SM4_RT_DEPTHOUT = 0xc, WINED3D_SM4_RT_NULL = 0xd, + WINED3D_SM5_RT_UAV = 0xe, }; enum wined3d_sm4_output_primitive_type @@ -304,6 +306,7 @@ struct wined3d_sm4_opcode_info * u -> WINED3D_DATA_UINT * R -> WINED3D_DATA_RESOURCE * S -> WINED3D_DATA_SAMPLER + * U -> WINED3D_DATA_UAV */ static const struct wined3d_sm4_opcode_info opcode_table[] = { @@ -396,6 +399,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, + {WINED3D_SM5_OP_DCL_UAV_TYPED, WINED3DSIH_DCL_UAV_TYPED, "", ""}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", ""}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "uuR"}, }; @@ -416,6 +420,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_PRIMID */ WINED3DSPR_PRIMID, /* WINED3D_SM4_RT_DEPTHOUT */ WINED3DSPR_DEPTHOUT, /* WINED3D_SM4_RT_NULL */ WINED3DSPR_NULL, + /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, }; static const enum wined3d_primitive_type output_primitive_type_table[] = @@ -518,6 +523,8 @@ static enum wined3d_data_type map_data_type(char t) return WINED3D_DATA_RESOURCE; case 'S': return WINED3D_DATA_SAMPLER; + case 'U': + return WINED3D_DATA_UAV; default: ERR("Invalid data type '%c'.\n", t); return WINED3D_DATA_FLOAT; @@ -937,10 +944,11 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi memcpy(priv->icb.data, p, sizeof(*p) * icb_size); ins->declaration.icb = &priv->icb; } - else if (opcode == WINED3D_SM4_OP_DCL_RESOURCE) + else if (opcode == WINED3D_SM4_OP_DCL_RESOURCE || opcode == WINED3D_SM5_OP_DCL_UAV_TYPED) { enum wined3d_sm4_resource_type resource_type; enum wined3d_sm4_data_type data_type; + enum wined3d_data_type reg_data_type; DWORD components; resource_type = (opcode_token & WINED3D_SM4_RESOURCE_TYPE_MASK) >> WINED3D_SM4_RESOURCE_TYPE_SHIFT; @@ -953,7 +961,8 @@ static void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct wi { ins->declaration.semantic.resource_type = resource_type_table[resource_type]; } - shader_sm4_read_dst_param(priv, &p, WINED3D_DATA_RESOURCE, &ins->declaration.semantic.reg); + reg_data_type = opcode == WINED3D_SM4_OP_DCL_RESOURCE ? WINED3D_DATA_RESOURCE : WINED3D_DATA_UAV; + shader_sm4_read_dst_param(priv, &p, reg_data_type, &ins->declaration.semantic.reg); components = *p++; if ((components & 0xfff0) != (components & 0xf) * 0x1110) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 390c494..d2970c4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -365,6 +365,7 @@ enum wined3d_shader_register_type WINED3DSPR_PRIMID, WINED3DSPR_NULL, WINED3DSPR_RESOURCE, + WINED3DSPR_UAV, }; enum wined3d_data_type @@ -373,6 +374,7 @@ enum wined3d_data_type WINED3D_DATA_INT, WINED3D_DATA_RESOURCE, WINED3D_DATA_SAMPLER, + WINED3D_DATA_UAV, WINED3D_DATA_UINT, WINED3D_DATA_UNORM, WINED3D_DATA_SNORM, @@ -522,6 +524,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_SAMPLER, WINED3DSIH_DCL_TEMPS, + WINED3DSIH_DCL_UAV_TYPED, WINED3DSIH_DCL_VERTICES_OUT, WINED3DSIH_DEF, WINED3DSIH_DEFB,

1 0

Józef Kucia : wined3d: Use lower case letters for simple data types in SM4 "opcode_table".
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: d5192995226f9fc217dcb8d0f3990da724650d1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5192995226f9fc217dcb8d0f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 19:53:37 2016 +0100 wined3d: Use lower case letters for simple data types in SM4 "opcode_table". 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/shader_sm4.c | 146 +++++++++++++++++++++++----------------------- 1 file changed, 73 insertions(+), 73 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d5192995226f9fc217dcb…

1 0

Alexandre Julliard : winegcc: Use explicit library file name when loading cross libraries.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 33147c94750099f09674b12ba27398b3b16082f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33147c94750099f09674b12ba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:18:59 2016 +0900 winegcc: Use explicit library file name when loading cross libraries. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 1dffe74..8b69053 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -958,7 +958,7 @@ static void build(struct options* opts) strarray_add(link_args, name); break; case 'a': - if (strchr(name, '/')) + if (!opts->lib_suffix && strchr(name, '/')) { /* turn the path back into -Ldir -lfoo options * this makes sure that we use the specified libs even

1 0

Alexandre Julliard : makefiles: Add tool dependencies for winegcc and winebuild.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 444025d7fb2d8612e20eaec667066522ce9ea52a URL: http://source.winehq.org/git/wine.git/?a=commit;h=444025d7fb2d8612e20eaec66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 28 12:27:32 2016 +0900 makefiles: Add tool dependencies for winegcc and winebuild. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/makedep.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/makedep.c b/tools/makedep.c index 98645db..9ad6e39 100644 --- a/tools/makedep.c +++ b/tools/makedep.c @@ -2683,6 +2683,8 @@ static struct strarray output_sources( const struct makefile *make ) output_filenames_obj_dir( make, object_files ); output_filenames_obj_dir( make, res_files ); output_filenames( dep_libs ); + output_filename( tools_path( make, "winebuild" )); + output_filename( tools_path( make, "winegcc" )); output( "\n" ); output( "\t%s -o $@", tools_path( make, "winegcc" )); output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" ))); @@ -2907,6 +2909,8 @@ static struct strarray output_sources( const struct makefile *make ) output_filenames_obj_dir( make, object_files ); output_filenames_obj_dir( make, res_files ); output_filenames( dep_libs ); + output_filename( tools_path( make, "winebuild" )); + output_filename( tools_path( make, "winegcc" )); output( "\n" ); if (!make->disabled) @@ -2929,6 +2933,8 @@ static struct strarray output_sources( const struct makefile *make ) output_filenames_obj_dir( make, crossobj_files ); output_filenames_obj_dir( make, res_files ); output_filenames( dep_libs ); + output_filename( tools_path( make, "winebuild" )); + output_filename( tools_path( make, "winegcc" )); output( "\n" ); output( "\t%s -o $@ -b %s", tools_path( make, "winegcc" ), crosstarget ); output_filename( strmake( "-B%s", tools_dir_path( make, "winebuild" )));

1 0

Matteo Bruni : wined3d: Don't call glClampColorARB() on core profile.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 9ba6784d22ee054b5cc692af84ee37b7b0e494f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9ba6784d22ee054b5cc692af8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 25 22:50:26 2016 +0100 wined3d: Don't call glClampColorARB() 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7c367e4..2dd7b29 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7668,7 +7668,7 @@ static void shader_glsl_disable(void *shader_priv, struct wined3d_context *conte priv->vertex_pipe->vp_enable(gl_info, FALSE); priv->fragment_pipe->enable_extension(gl_info, FALSE); - if (gl_info->supported[ARB_COLOR_BUFFER_FLOAT]) + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] && gl_info->supported[ARB_COLOR_BUFFER_FLOAT]) { GL_EXTCALL(glClampColorARB(GL_CLAMP_VERTEX_COLOR_ARB, GL_FIXED_ONLY_ARB)); checkGLcall("glClampColorARB");

1 0

Matteo Bruni : wined3d: Get rid of WINED3D_GLSL_SAMPLE_NPOT.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: 50dc7b95d188e87a40d00021813c00f4f4f61e68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50dc7b95d188e87a40d000218… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Mar 25 22:50:23 2016 +0100 wined3d: Get rid of WINED3D_GLSL_SAMPLE_NPOT. 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 | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 53a9191..717b9f8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -45,11 +45,10 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); WINE_DECLARE_DEBUG_CHANNEL(winediag); #define WINED3D_GLSL_SAMPLE_PROJECTED 0x01 -#define WINED3D_GLSL_SAMPLE_NPOT 0x02 -#define WINED3D_GLSL_SAMPLE_LOD 0x04 -#define WINED3D_GLSL_SAMPLE_GRAD 0x08 -#define WINED3D_GLSL_SAMPLE_LOAD 0x10 -#define WINED3D_GLSL_SAMPLE_OFFSET 0x20 +#define WINED3D_GLSL_SAMPLE_LOD 0x02 +#define WINED3D_GLSL_SAMPLE_GRAD 0x04 +#define WINED3D_GLSL_SAMPLE_LOAD 0x08 +#define WINED3D_GLSL_SAMPLE_OFFSET 0x10 struct glsl_dst_param { @@ -2689,7 +2688,9 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context const struct wined3d_gl_info *gl_info = ctx->gl_info; BOOL shadow = glsl_is_shadow_sampler(ctx->shader, priv->cur_ps_args, resource_idx, sampler_idx); BOOL projected = flags & WINED3D_GLSL_SAMPLE_PROJECTED; - BOOL texrect = flags & WINED3D_GLSL_SAMPLE_NPOT && gl_info->supported[ARB_TEXTURE_RECTANGLE]; + BOOL texrect = ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL + && priv->cur_ps_args->np2_fixup & (1u << resource_idx) + && gl_info->supported[ARB_TEXTURE_RECTANGLE]; BOOL lod = flags & WINED3D_GLSL_SAMPLE_LOD; BOOL grad = flags & WINED3D_GLSL_SAMPLE_GRAD; BOOL offset = flags & WINED3D_GLSL_SAMPLE_OFFSET; @@ -4222,9 +4223,6 @@ static void shader_glsl_tex(const struct wined3d_shader_instruction *ins) } } - if (priv->cur_ps_args->np2_fixup & (1u << resource_idx)) - sample_flags |= WINED3D_GLSL_SAMPLE_NPOT; - shader_glsl_get_sample_function(ins->ctx, resource_idx, resource_idx, sample_flags, &sample_function); mask |= sample_function.coord_mask; sample_function.coord_mask = mask; @@ -4263,11 +4261,9 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) { const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; struct glsl_src_param coord_param, dx_param, dy_param; - DWORD sample_flags = WINED3D_GLSL_SAMPLE_GRAD; struct glsl_sample_function sample_function; DWORD sampler_idx; DWORD swizzle = ins->src[1].swizzle; - const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; if (!gl_info->supported[ARB_SHADER_TEXTURE_LOD] && !gl_info->supported[EXT_GPU_SHADER4]) { @@ -4277,10 +4273,8 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) } sampler_idx = ins->src[1].reg.idx[0].offset; - if (priv->cur_ps_args->np2_fixup & (1u << sampler_idx)) - sample_flags |= WINED3D_GLSL_SAMPLE_NPOT; - shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, sample_flags, &sample_function); + shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, WINED3D_GLSL_SAMPLE_GRAD, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); shader_glsl_add_src_param(ins, &ins->src[2], sample_function.coord_mask, &dx_param); shader_glsl_add_src_param(ins, &ins->src[3], sample_function.coord_mask, &dy_param); @@ -4294,18 +4288,13 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) { const struct wined3d_gl_info *gl_info = ins->ctx->gl_info; struct glsl_src_param coord_param, lod_param; - DWORD sample_flags = WINED3D_GLSL_SAMPLE_LOD; struct glsl_sample_function sample_function; DWORD sampler_idx; DWORD swizzle = ins->src[1].swizzle; - const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; sampler_idx = ins->src[1].reg.idx[0].offset; - if (ins->ctx->reg_maps->shader_version.type == WINED3D_SHADER_TYPE_PIXEL - && priv->cur_ps_args->np2_fixup & (1u << sampler_idx)) - sample_flags |= WINED3D_GLSL_SAMPLE_NPOT; - shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, sample_flags, &sample_function); + shader_glsl_get_sample_function(ins->ctx, sampler_idx, sampler_idx, WINED3D_GLSL_SAMPLE_LOD, &sample_function); shader_glsl_add_src_param(ins, &ins->src[0], sample_function.coord_mask, &coord_param); shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &lod_param);

1 0

Józef Kucia : wined3d: Recognize SM5 dcl_resource_structured opcode.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: f294f56a5ac808f02464db4b1a3a81a97dd1738b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f294f56a5ac808f02464db4b1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 19:53:36 2016 +0100 wined3d: Recognize SM5 dcl_resource_structured opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 7 + dlls/wined3d/shader_sm4.c | 367 +++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 8 + 5 files changed, 204 insertions(+), 180 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f294f56a5ac808f02464d…

1 0

Józef Kucia : d3dcompiler: Avoid '\n' in middle of TRACE() messages.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: c9df3cd980058789c8fb7116f2121e0e9a292f5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c9df3cd980058789c8fb7116f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 25 14:26:27 2016 +0100 d3dcompiler: Avoid '\n' in middle of TRACE() messages. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_43/compiler.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/d3dcompiler_43/compiler.c b/dlls/d3dcompiler_43/compiler.c index 33ef916..17e58fe 100644 --- a/dlls/d3dcompiler_43/compiler.c +++ b/dlls/d3dcompiler_43/compiler.c @@ -471,8 +471,8 @@ HRESULT WINAPI D3DAssemble(const void *data, SIZE_T datasize, const char *filena { HRESULT hr; - TRACE("data %p, datasize %lu, filename %s, defines %p, include %p, sflags %#x,\n" - "shader %p, error_messages %p\n", + TRACE("data %p, datasize %lu, filename %s, defines %p, include %p, sflags %#x, " + "shader %p, error_messages %p.\n", data, datasize, debugstr_a(filename), defines, include, flags, shader, error_messages); EnterCriticalSection(&wpp_mutex); @@ -700,9 +700,9 @@ HRESULT WINAPI D3DCompile2(const void *data, SIZE_T data_size, const char *filen { HRESULT hr; - TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s,\n" - "target %s, sflags %#x, eflags %#x, secondary_flags %#x, secondary_data %p,\n" - "secondary_data_size %lu, shader %p, error_messages %p\n", + TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s, " + "target %s, sflags %#x, eflags %#x, secondary_flags %#x, secondary_data %p, " + "secondary_data_size %lu, shader %p, error_messages %p.\n", data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), debugstr_a(target), sflags, eflags, secondary_flags, secondary_data, secondary_data_size, shader, error_messages); @@ -728,8 +728,8 @@ HRESULT WINAPI D3DCompile(const void *data, SIZE_T data_size, const char *filena const D3D_SHADER_MACRO *defines, ID3DInclude *include, const char *entrypoint, const char *target, UINT sflags, UINT eflags, ID3DBlob **shader, ID3DBlob **error_messages) { - TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s,\n" - "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p\n", + TRACE("data %p, data_size %lu, filename %s, defines %p, include %p, entrypoint %s, " + "target %s, sflags %#x, eflags %#x, shader %p, error_messages %p.\n", data, data_size, debugstr_a(filename), defines, include, debugstr_a(entrypoint), debugstr_a(target), sflags, eflags, shader, error_messages);

1 0

Aaryaman Vasishta : d3drm: Fix signature macro of IDirect3DRM*:: CreateObject.
by Alexandre Julliard March 28, 2016

March 28, 2016

Module: wine Branch: master Commit: f3dcf19bd3220d3f7ad8fdaa12e5abd3b6b9ca85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3dcf19bd3220d3f7ad8fdaa1… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sun Mar 27 01:52:16 2016 +0530 d3drm: Fix signature macro of IDirect3DRM*::CreateObject. 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> --- include/d3drm.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/d3drm.h b/include/d3drm.h index e1e0d23..126695c 100644 --- a/include/d3drm.h +++ b/include/d3drm.h @@ -110,7 +110,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) #define IDirect3DRM_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirect3DRM_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DRM methods ***/ -#define IDirect3DRM_CreateObject(p,a,b,c,d) (p)->lpVtbl->CreateObject(p,a,b,d) +#define IDirect3DRM_CreateObject(p,a,b,c,d) (p)->lpVtbl->CreateObject(p,a,b,c,d) #define IDirect3DRM_CreateFrame(p,a,b) (p)->lpVtbl->CreateFrame(p,a,b) #define IDirect3DRM_CreateMesh(p,a) (p)->lpVtbl->CreateMesh(p,a) #define IDirect3DRM_CreateMeshBuilder(p,a) (p)->lpVtbl->CreateMeshBuilder(p,a) @@ -148,7 +148,7 @@ DECLARE_INTERFACE_(IDirect3DRM,IUnknown) #define IDirect3DRM_AddRef(p) (p)->AddRef() #define IDirect3DRM_Release(p) (p)->Release() /*** IDirect3DRM methods ***/ -#define IDirect3DRM_CreateObject(p,a,b,c,d) (p)->CreateObject(a,b,d) +#define IDirect3DRM_CreateObject(p,a,b,c,d) (p)->CreateObject(a,b,c,d) #define IDirect3DRM_CreateFrame(p,a,b) (p)->CreateFrame(a,b) #define IDirect3DRM_CreateMesh(p,a) (p)->CreateMesh(a) #define IDirect3DRM_CreateMeshBuilder(p,a) (p)->CreateMeshBuilder(a) @@ -251,7 +251,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) #define IDirect3DRM2_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirect3DRM2_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DRM2 methods ***/ -#define IDirect3DRM2_CreateObject(p,a,b,c,d) (p)->lpVtbl->CreateObject(p,a,b,d) +#define IDirect3DRM2_CreateObject(p,a,b,c,d) (p)->lpVtbl->CreateObject(p,a,b,c,d) #define IDirect3DRM2_CreateFrame(p,a,b) (p)->lpVtbl->CreateFrame(p,a,b) #define IDirect3DRM2_CreateMesh(p,a) (p)->lpVtbl->CreateMesh(p,a) #define IDirect3DRM2_CreateMeshBuilder(p,a) (p)->lpVtbl->CreateMeshBuilder(p,a) @@ -290,7 +290,7 @@ DECLARE_INTERFACE_(IDirect3DRM2,IUnknown) #define IDirect3DRM2_AddRef(p) (p)->AddRef() #define IDirect3DRM2_Release(p) (p)->Release() /*** IDirect3DRM2 methods ***/ -#define IDirect3DRM2_CreateObject(p,a,b,c,d) (p)->CreateObject(a,b,d) +#define IDirect3DRM2_CreateObject(p,a,b,c,d) (p)->CreateObject(a,b,c,d) #define IDirect3DRM2_CreateFrame(p,a,b) (p)->CreateFrame(a,b) #define IDirect3DRM2_CreateMesh(p,a) (p)->CreateMesh(a) #define IDirect3DRM2_CreateMeshBuilder(p,a) (p)->CreateMeshBuilder(a) @@ -399,7 +399,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) #define IDirect3DRM3_AddRef(p) (p)->lpVtbl->AddRef(p) #define IDirect3DRM3_Release(p) (p)->lpVtbl->Release(p) /*** IDirect3DRM3 methods ***/ -#define IDirect3DRM3_CreateObject(p,a,b,c,d) (p)->lpVtbl->CreateObject(p,a,b,d) +#define IDirect3DRM3_CreateObject(p,a,b,c,d) (p)->lpVtbl->CreateObject(p,a,b,c,d) #define IDirect3DRM3_CreateFrame(p,a,b) (p)->lpVtbl->CreateFrame(p,a,b) #define IDirect3DRM3_CreateMesh(p,a) (p)->lpVtbl->CreateMesh(p,a) #define IDirect3DRM3_CreateMeshBuilder(p,a) (p)->lpVtbl->CreateMeshBuilder(p,a) @@ -443,7 +443,7 @@ DECLARE_INTERFACE_(IDirect3DRM3,IUnknown) #define IDirect3DRM3_AddRef(p) (p)->AddRef() #define IDirect3DRM3_Release(p) (p)->Release() /*** IDirect3DRM3 methods ***/ -#define IDirect3DRM3_CreateObject(p,a,b,c,d) (p)->CreateObject(a,b,d) +#define IDirect3DRM3_CreateObject(p,a,b,c,d) (p)->CreateObject(a,b,c,d) #define IDirect3DRM3_CreateFrame(p,a,b) (p)->CreateFrame(a,b) #define IDirect3DRM3_CreateMesh(p,a) (p)->CreateMesh(a) #define IDirect3DRM3_CreateMeshBuilder(p,a) (p)->CreateMeshBuilder(a)

1 0