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

Józef Kucia : wined3d: Introduce wined3d_buffer_drop_bo() helper function.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 0572f8ad9e4a299f56c1c6fb73f25f13f3e14360 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0572f8ad9e4a299f56c1c6fb7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 23 12:07:57 2016 +0200 wined3d: Introduce wined3d_buffer_drop_bo() helper function. 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/buffer.c | 51 ++++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 6f66b97..8adc2a1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -540,6 +540,22 @@ static void buffer_unload(struct wined3d_resource *resource) resource_unload(resource); } +static void wined3d_buffer_drop_bo(struct wined3d_buffer *buffer) +{ + struct wined3d_device *device = buffer->resource.device; + + buffer->flags &= ~WINED3D_BUFFER_USE_BO; + buffer_unload(&buffer->resource); + + /* The stream source state handler might have read the memory of + * the vertex buffer already and got the memory in the vbo which + * is not valid any longer. Dirtify the stream source to force a + * reload. This happens only once per changed vertexbuffer and + * should occur rather rarely. */ + if (buffer->resource.bind_count) + device_invalidate_state(device, STATE_STREAMSRC); +} + ULONG CDECL wined3d_buffer_decref(struct wined3d_buffer *buffer) { ULONG refcount = InterlockedDecrement(&buffer->resource.ref); @@ -789,17 +805,8 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte if (buffer->decl_change_count > VB_MAXDECLCHANGES || (buffer->conversion_map && (buffer->resource.usage & WINED3DUSAGE_DYNAMIC))) { - FIXME("Too many declaration changes or converting dynamic buffer, stopping converting\n"); - - buffer->flags &= ~WINED3D_BUFFER_USE_BO; - buffer_unload(&buffer->resource); - - /* The stream source state handler might have read the memory of - * the vertex buffer already and got the memory in the vbo which - * is not valid any longer. Dirtify the stream source to force a - * reload. This happens only once per changed vertexbuffer and - * should occur rather rarely. */ - device_invalidate_state(device, STATE_STREAMSRC); + FIXME("Too many declaration changes or converting dynamic buffer, stopping converting.\n"); + wined3d_buffer_drop_bo(buffer); return; } @@ -824,10 +831,7 @@ void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_conte if (buffer->full_conversion_count > VB_MAXFULLCONVERSIONS) { FIXME("Too many full buffer conversions, stopping converting.\n"); - buffer->flags &= ~WINED3D_BUFFER_USE_BO; - buffer_unload(&buffer->resource); - if (buffer->resource.bind_count) - device_invalidate_state(device, STATE_STREAMSRC); + wined3d_buffer_drop_bo(buffer); return; } } @@ -938,7 +942,7 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN LONG count; BYTE *base; - TRACE("buffer %p, offset %u, size %u, data %p, flags %#x\n", buffer, offset, size, data, flags); + TRACE("buffer %p, offset %u, size %u, data %p, flags %#x.\n", buffer, offset, size, data, flags); flags = wined3d_resource_sanitize_map_flags(&buffer->resource, flags); /* Filter redundant WINED3D_MAP_DISCARD maps. The 3DMark2001 multitexture @@ -1003,17 +1007,14 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN { /* The extra copy is more expensive than not using VBOs at * all on the Nvidia Linux driver, which is the only driver - * that returns unaligned pointers + * that returns unaligned pointers. */ - TRACE("Dynamic buffer, dropping VBO\n"); - buffer->flags &= ~WINED3D_BUFFER_USE_BO; - buffer_unload(&buffer->resource); - if (buffer->resource.bind_count) - device_invalidate_state(device, STATE_STREAMSRC); + TRACE("Dynamic buffer, dropping VBO.\n"); + wined3d_buffer_drop_bo(buffer); } else { - TRACE("Falling back to doublebuffered operation\n"); + TRACE("Falling back to doublebuffered operation.\n"); buffer_get_sysmem(buffer, context); } TRACE("New pointer is %p.\n", buffer->resource.heap_memory); @@ -1357,14 +1358,14 @@ HRESULT CDECL wined3d_buffer_create(struct wined3d_device *device, const struct struct wined3d_buffer *object; HRESULT hr; - TRACE("device %p, desc %p, data %p, parent %p, parent_ops %p, buffer %p\n", + TRACE("device %p, desc %p, data %p, parent %p, parent_ops %p, buffer %p.\n", device, desc, data, parent, parent_ops, buffer); object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); if (!object) return E_OUTOFMEMORY; - FIXME("Ignoring access flags (pool)\n"); + FIXME("Ignoring access flags (pool).\n"); hr = buffer_init(object, device, desc->byte_width, desc->usage, WINED3DFMT_UNKNOWN, WINED3D_POOL_MANAGED, GL_ARRAY_BUFFER_ARB, data, parent, parent_ops);

1 0

Józef Kucia : wined3d: Add SV_ClipDistance semantic.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: cdd2469fca19bd5361f0c8031aaba1e4669cb675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdd2469fca19bd5361f0c8031… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 23 12:07:58 2016 +0200 wined3d: Add SV_ClipDistance semantic. 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.c | 1 + include/wine/wined3d.h | 1 + 2 files changed, 2 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 4a3f53d..1085fda 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -251,6 +251,7 @@ static const struct sysval_semantic_names[] = { {WINED3D_SV_POSITION, "SV_Position"}, + {WINED3D_SV_CLIP_DISTANCE, "SV_ClipDistance"}, {WINED3D_SV_VERTEX_ID, "SV_VertexID"}, {WINED3D_SV_INSTANCE_ID, "SV_InstanceID"}, {WINED3D_SV_PRIMITIVE_ID, "SV_PrimitiveID"}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9becd6f..da102c6 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -744,6 +744,7 @@ enum wined3d_decl_usage enum wined3d_sysval_semantic { WINED3D_SV_POSITION = 1, + WINED3D_SV_CLIP_DISTANCE = 2, WINED3D_SV_VERTEX_ID = 6, WINED3D_SV_PRIMITIVE_ID = 7, WINED3D_SV_INSTANCE_ID = 8,

1 0

Józef Kucia : wined3d: Recognize SM4 indexable temporary registers.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 50c090dc15e658c445f33e373cc074c60bf26e2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=50c090dc15e658c445f33e373… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 23 12:07:59 2016 +0200 wined3d: Recognize SM4 indexable temporary registers. 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.c | 4 ++++ dlls/wined3d/shader_sm4.c | 3 ++- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1085fda..e9a4a84 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1771,6 +1771,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vThreadIDInGroupFlattened"); break; + case WINED3DSPR_IDXTEMP: + shader_addline(buffer, "x"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 8961dc5..b17140d 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -239,6 +239,7 @@ enum wined3d_sm4_register_type WINED3D_SM4_RT_TEMP = 0x0, WINED3D_SM4_RT_INPUT = 0x1, WINED3D_SM4_RT_OUTPUT = 0x2, + WINED3D_SM4_RT_INDEXABLE_TEMP = 0x3, WINED3D_SM4_RT_IMMCONST = 0x4, WINED3D_SM4_RT_SAMPLER = 0x6, WINED3D_SM4_RT_RESOURCE = 0x7, @@ -828,7 +829,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM4_RT_TEMP */ WINED3DSPR_TEMP, /* WINED3D_SM4_RT_INPUT */ WINED3DSPR_INPUT, /* WINED3D_SM4_RT_OUTPUT */ WINED3DSPR_OUTPUT, - /* UNKNOWN */ ~0u, + /* WINED3D_SM4_RT_INDEXABLE_TEMP */ WINED3DSPR_IDXTEMP, /* WINED3D_SM4_RT_IMMCONST */ WINED3DSPR_IMMCONST, /* UNKNOWN */ ~0u, /* WINED3D_SM4_RT_SAMPLER */ WINED3DSPR_SAMPLER, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ce094ca..f89573c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -392,6 +392,7 @@ enum wined3d_shader_register_type WINED3DSPR_THREADGROUPID, WINED3DSPR_LOCALTHREADID, WINED3DSPR_LOCALTHREADINDEX, + WINED3DSPR_IDXTEMP, }; enum wined3d_data_type

1 0

Józef Kucia : wined3d: Recognize SM4 dcl_indexableTemp opcode.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 944ebf3dd880b16c5c27f1a49b0f322cf537c5e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=944ebf3dd880b16c5c27f1a49… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 23 12:08:00 2016 +0200 wined3d: Recognize SM4 dcl_indexableTemp 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 | 8 ++++++++ dlls/wined3d/shader_sm4.c | 12 ++++++++++++ dlls/wined3d/wined3d_private.h | 9 +++++++++ 5 files changed, 31 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2e070fb..5a0cdba 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5232,6 +5232,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, + /* WINED3DSIH_DCL_INDEXABLE_TEMP */ NULL, /* WINED3DSIH_DCL_INPUT */ NULL, /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3aa9626..d22798f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8567,6 +8567,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ NULL, /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ NULL, /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ NULL, + /* WINED3DSIH_DCL_INDEXABLE_TEMP */ NULL, /* WINED3DSIH_DCL_INPUT */ shader_glsl_nop, /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ NULL, /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index e9a4a84..700b7c1 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -62,6 +62,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT */ "dcl_hs_fork_phase_instance_count", /* WINED3DSIH_DCL_HS_MAX_TESSFACTOR */ "dcl_hs_max_tessfactor", /* WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER */ "dcl_immediateConstantBuffer", + /* WINED3DSIH_DCL_INDEXABLE_TEMP */ "dcl_indexableTemp", /* WINED3DSIH_DCL_INPUT */ "dcl_input", /* WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT */ "dcl_input_control_point_count", /* WINED3DSIH_DCL_INPUT_PRIMITIVE */ "dcl_inputPrimitive", @@ -2205,6 +2206,13 @@ static void shader_trace_init(const struct wined3d_shader_frontend *fe, void *fe } shader_addline(&buffer, "}"); } + else if (ins.handler_idx == WINED3DSIH_DCL_INDEXABLE_TEMP) + { + shader_addline(&buffer, "%s x[%u][%u], %u", shader_opcode_names[ins.handler_idx], + ins.declaration.indexable_temp.register_idx, + ins.declaration.indexable_temp.register_size, + ins.declaration.indexable_temp.component_count); + } else if (ins.handler_idx == WINED3DSIH_DCL_INPUT_PS) { shader_addline(&buffer, "%s ", shader_opcode_names[ins.handler_idx]); diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index b17140d..c90c2d4 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -199,6 +199,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DCL_OUTPUT = 0x65, WINED3D_SM4_OP_DCL_OUTPUT_SIV = 0x67, WINED3D_SM4_OP_DCL_TEMPS = 0x68, + WINED3D_SM4_OP_DCL_INDEXABLE_TEMP = 0x69, WINED3D_SM4_OP_DCL_GLOBAL_FLAGS = 0x6a, WINED3D_SM4_OP_GATHER4 = 0x6d, WINED3D_SM5_OP_HS_DECLS = 0x71, @@ -576,6 +577,15 @@ static void shader_sm4_read_dcl_input_ps_siv(struct wined3d_shader_instruction * ins->declaration.register_semantic.sysval_semantic = *tokens; } +static void shader_sm4_read_dcl_indexable_temp(struct wined3d_shader_instruction *ins, + DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, + struct wined3d_sm4_data *priv) +{ + ins->declaration.indexable_temp.register_idx = *tokens++; + ins->declaration.indexable_temp.register_size = *tokens++; + ins->declaration.indexable_temp.component_count = *tokens; +} + static void shader_sm4_read_dcl_global_flags(struct wined3d_shader_instruction *ins, DWORD opcode, DWORD opcode_token, const DWORD *tokens, unsigned int token_count, struct wined3d_sm4_data *priv) @@ -776,6 +786,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_declaration_register_semantic}, {WINED3D_SM4_OP_DCL_TEMPS, WINED3DSIH_DCL_TEMPS, "", "", shader_sm4_read_declaration_count}, + {WINED3D_SM4_OP_DCL_INDEXABLE_TEMP, WINED3DSIH_DCL_INDEXABLE_TEMP, "", "", + shader_sm4_read_dcl_indexable_temp}, {WINED3D_SM4_OP_DCL_GLOBAL_FLAGS, WINED3DSIH_DCL_GLOBAL_FLAGS, "", "", shader_sm4_read_dcl_global_flags}, {WINED3D_SM4_OP_GATHER4, WINED3DSIH_GATHER4, "u", "fRS"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f89573c..8fb6f4d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -577,6 +577,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT, WINED3DSIH_DCL_HS_MAX_TESSFACTOR, WINED3DSIH_DCL_IMMEDIATE_CONSTANT_BUFFER, + WINED3DSIH_DCL_INDEXABLE_TEMP, WINED3DSIH_DCL_INPUT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_PRIMITIVE, @@ -895,6 +896,13 @@ struct wined3d_shader_src_param enum wined3d_shader_src_modifier modifiers; }; +struct wined3d_shader_indexable_temp +{ + unsigned int register_idx; + unsigned int register_size; + unsigned int component_count; +}; + struct wined3d_shader_semantic { enum wined3d_decl_usage usage; @@ -968,6 +976,7 @@ struct wined3d_shader_instruction enum wined3d_tessellator_output_primitive tessellator_output_primitive; enum wined3d_tessellator_partitioning tessellator_partitioning; float max_tessellation_factor; + struct wined3d_shader_indexable_temp indexable_temp; } declaration; };

1 0

Józef Kucia : wined3d: Fix sample_d for array textures.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 0afcd1aeb3768b28ef234088abb71a112078b04f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0afcd1aeb3768b28ef234088a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 23 12:08:01 2016 +0200 wined3d: Fix sample_d for array textures. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 51 +++++++++++++++++++++++----------------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d22798f..c6b3c1b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -65,7 +65,8 @@ struct glsl_src_param struct glsl_sample_function { struct wined3d_string_buffer *name; - DWORD coord_mask; + unsigned int coord_mask; + unsigned int deriv_mask; enum wined3d_data_type data_type; BOOL output_single_component; unsigned int offset_size; @@ -2803,24 +2804,23 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context static const struct { unsigned int coord_size; - unsigned int offset_size; const char *type_part; } resource_types[] = { - {0, 0, ""}, /* WINED3D_SHADER_RESOURCE_NONE */ - {1, 0, ""}, /* WINED3D_SHADER_RESOURCE_BUFFER */ - {1, 1, "1D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ - {2, 2, "2D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ - {2, 0, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ - {3, 3, "3D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ - {3, 0, "Cube"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ - {2, 1, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ - {3, 2, "2DArray"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ - {3, 0, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ + {0, ""}, /* WINED3D_SHADER_RESOURCE_NONE */ + {1, ""}, /* WINED3D_SHADER_RESOURCE_BUFFER */ + {1, "1D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1D */ + {2, "2D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2D */ + {2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMS */ + {3, "3D"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_3D */ + {3, "Cube"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_CUBE */ + {2, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY */ + {3, "2DArray"}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY */ + {3, ""}, /* WINED3D_SHADER_RESOURCE_TEXTURE_2DMSARRAY */ }; - struct shader_glsl_ctx_priv *priv = ctx->backend_data; enum wined3d_shader_resource_type resource_type = ctx->reg_maps->resource_info[resource_idx].type; + struct shader_glsl_ctx_priv *priv = ctx->backend_data; 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; @@ -2831,7 +2831,8 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context BOOL grad = flags & WINED3D_GLSL_SAMPLE_GRAD; BOOL offset = flags & WINED3D_GLSL_SAMPLE_OFFSET; const char *base = "texture", *type_part = "", *suffix = ""; - unsigned int coord_size; + unsigned int coord_size, deriv_size; + BOOL array; sample_function->data_type = ctx->reg_maps->resource_info[resource_idx].data_type; @@ -2840,6 +2841,8 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context ERR("Unexpected resource type %#x.\n", resource_type); resource_type = WINED3D_SHADER_RESOURCE_TEXTURE_2D; } + array = resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_1DARRAY + || resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_2DARRAY; /* Note that there's no such thing as a projected cube texture. */ if (resource_type == WINED3D_SHADER_RESOURCE_TEXTURE_CUBE) @@ -2875,21 +2878,19 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context type_part = ""; } - sample_function->offset_size = offset ? resource_types[resource_type].offset_size : 0; - if (offset && !sample_function->offset_size) - { - FIXME("Offset not supported for resource type %#x.\n", resource_type); - offset = FALSE; - } - sample_function->name = string_buffer_get(priv->string_buffers); string_buffer_sprintf(sample_function->name, "%s%s%s%s%s%s", base, type_part, projected ? "Proj" : "", lod ? "Lod" : grad ? "Grad" : "", offset ? "Offset" : "", suffix); coord_size = resource_types[resource_type].coord_size; + deriv_size = coord_size; if (shadow) ++coord_size; + if (array) + --deriv_size; + sample_function->offset_size = offset ? deriv_size : 0; sample_function->coord_mask = (1u << coord_size) - 1; + sample_function->deriv_mask = (1u << deriv_size) - 1; sample_function->output_single_component = shadow && !needs_legacy_glsl_syntax(gl_info); } @@ -4464,8 +4465,8 @@ static void shader_glsl_texldd(const struct wined3d_shader_instruction *ins) 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); + shader_glsl_add_src_param(ins, &ins->src[2], sample_function.deriv_mask, &dx_param); + shader_glsl_add_src_param(ins, &ins->src[3], sample_function.deriv_mask, &dy_param); shader_glsl_gen_sample_code(ins, sampler_idx, &sample_function, swizzle, dx_param.param_str, dy_param.param_str, NULL, NULL, "%s", coord_param.param_str); @@ -4641,8 +4642,8 @@ static void shader_glsl_sample(const struct wined3d_shader_instruction *ins) lod_param_str = lod_param.param_str; break; case WINED3DSIH_SAMPLE_GRAD: - shader_glsl_add_src_param(ins, &ins->src[3], sample_function.coord_mask, &dx_param); - shader_glsl_add_src_param(ins, &ins->src[4], sample_function.coord_mask, &dy_param); + shader_glsl_add_src_param(ins, &ins->src[3], sample_function.deriv_mask, &dx_param); + shader_glsl_add_src_param(ins, &ins->src[4], sample_function.deriv_mask, &dy_param); dx_param_str = dx_param.param_str; dy_param_str = dy_param.param_str; break;

1 0

Iván Matellanes : msvcirt: Set the error flag in writepad without locking.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 3be6ac0d338f6908ca5cbd2e10fc0fb87238e618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3be6ac0d338f6908ca5cbd2e1… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Thu Jun 23 10:46:59 2016 +0100 msvcirt: Set the error flag in writepad without locking. writepad() is always called between opfx() and osfx(), so the ios object is already locked. Signed-off-by: Iván Matellanes <matellanes.ivan(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcirt/msvcirt.c b/dlls/msvcirt/msvcirt.c index 666c44c..5f44854 100644 --- a/dlls/msvcirt/msvcirt.c +++ b/dlls/msvcirt/msvcirt.c @@ -2572,22 +2572,22 @@ ostream* __thiscall ostream_writepad(ostream *this, const char *str1, const char /* left of the padding */ if (base->flags & (FLAGS_left|FLAGS_internal)) { if (streambuf_sputn(base->sb, str1, len1) != len1) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; if (!(base->flags & FLAGS_internal)) if (streambuf_sputn(base->sb, str2, len2) != len2) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; } /* add padding to fill the width */ for (i = len1 + len2; i < base->width; i++) if (streambuf_sputc(base->sb, base->fill) == EOF) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; /* right of the padding */ if ((base->flags & (FLAGS_left|FLAGS_internal)) != FLAGS_left) { if (!(base->flags & (FLAGS_left|FLAGS_internal))) if (streambuf_sputn(base->sb, str1, len1) != len1) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; if (streambuf_sputn(base->sb, str2, len2) != len2) - ios_clear(base, base->state | IOSTATE_failbit | IOSTATE_badbit); + base->state |= IOSTATE_failbit | IOSTATE_badbit; } return this; }

1 0

Jacek Caban : mshtml: Added IHTMLLinkElement:: onload property implementation.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 589248c1e28d415738084deae6a46f3e34136274 URL: http://source.winehq.org/git/wine.git/?a=commit;h=589248c1e28d415738084deae… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jun 23 15:32:56 2016 +0200 mshtml: Added IHTMLLinkElement::onload property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmllink.c | 13 +++++++---- dlls/mshtml/tests/events.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmllink.c b/dlls/mshtml/htmllink.c index 22ccd0e..d2097e7 100644 --- a/dlls/mshtml/htmllink.c +++ b/dlls/mshtml/htmllink.c @@ -29,6 +29,7 @@ #include "wine/debug.h" #include "mshtml_private.h" +#include "htmlevent.h" WINE_DEFAULT_DEBUG_CHANNEL(mshtml); @@ -242,15 +243,19 @@ static HRESULT WINAPI HTMLLinkElement_get_onreadystatechange(IHTMLLinkElement *i static HRESULT WINAPI HTMLLinkElement_put_onload(IHTMLLinkElement *iface, VARIANT v) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%s)\n", This, debugstr_variant(&v)); - return E_NOTIMPL; + + TRACE("(%p)->(%s)\n", This, debugstr_variant(&v)); + + return set_node_event(&This->element.node, EVENTID_LOAD, &v); } static HRESULT WINAPI HTMLLinkElement_get_onload(IHTMLLinkElement *iface, VARIANT *p) { HTMLLinkElement *This = impl_from_IHTMLLinkElement(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return get_node_event(&This->element.node, EVENTID_LOAD, p); } static HRESULT WINAPI HTMLLinkElement_put_onerror(IHTMLLinkElement *iface, VARIANT v) diff --git a/dlls/mshtml/tests/events.c b/dlls/mshtml/tests/events.c index 79ec153..2bd85fc 100644 --- a/dlls/mshtml/tests/events.c +++ b/dlls/mshtml/tests/events.c @@ -73,6 +73,7 @@ DEFINE_EXPECT(iframe_onreadystatechange_complete); DEFINE_EXPECT(iframedoc_onreadystatechange); DEFINE_EXPECT(img_onload); DEFINE_EXPECT(img_onerror); +DEFINE_EXPECT(link_onload); DEFINE_EXPECT(input_onfocus); DEFINE_EXPECT(input_onblur); DEFINE_EXPECT(div_onfocusin); @@ -115,6 +116,9 @@ static const char readystate_doc_str[] = static const char img_doc_str[] = "<html><body><img id=\"imgid\"></img></body></html>"; +static const char link_doc_str[] = + "<html><body><link id=\"linkid\" rel=\"stylesheet\" type=\"text/css\"></link></body></html>"; + static const char input_doc_str[] = "<html><body><div id=\"divid\"><input id=\"inputid\"></input></div></body></html>"; @@ -948,6 +952,17 @@ static HRESULT WINAPI img_onload(IDispatchEx *iface, DISPID id, LCID lcid, WORD EVENT_HANDLER_FUNC_OBJ(img_onload); +static HRESULT WINAPI link_onload(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, + VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) +{ + CHECK_EXPECT(link_onload); + test_event_args(&DIID_DispHTMLLinkElement, id, wFlags, pdp, pvarRes, pei, pspCaller); + test_event_src("LINK"); + return S_OK; +} + +EVENT_HANDLER_FUNC_OBJ(link_onload); + static HRESULT WINAPI unattached_img_onload(IDispatchEx *iface, DISPID id, LCID lcid, WORD wFlags, DISPPARAMS *pdp, VARIANT *pvarRes, EXCEPINFO *pei, IServiceProvider *pspCaller) { @@ -1997,6 +2012,48 @@ static void test_imgload(IHTMLDocument2 *doc) IHTMLImgElement_Release(img); } +static void test_link_load(IHTMLDocument2 *doc) +{ + IHTMLLinkElement *link; + IHTMLElement *elem; + VARIANT v; + BSTR str; + HRESULT hres; + + elem = get_elem_id(doc, "linkid"); + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLLinkElement, (void**)&link); + IHTMLElement_Release(elem); + ok(hres == S_OK, "Could not get IHTMLLinkElement iface: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLLinkElement_get_onload(link, &v); + ok(hres == S_OK, "get_onload failed: %08x\n", hres); + ok(V_VT(&v) == VT_NULL, "V_VT(onload) = %d\n", V_VT(&v)); + + V_VT(&v) = VT_DISPATCH; + V_DISPATCH(&v) = (IDispatch*)&link_onload_obj; + hres = IHTMLLinkElement_put_onload(link, v); + ok(hres == S_OK, "put_onload failed: %08x\n", hres); + + V_VT(&v) = VT_EMPTY; + hres = IHTMLLinkElement_get_onload(link, &v); + ok(hres == S_OK, "get_onload failed: %08x\n", hres); + ok(V_VT(&v) == VT_DISPATCH, "V_VT(onload) = %d\n", V_VT(&v)); + ok(V_DISPATCH(&v) == (IDispatch*)&link_onload_obj, "V_DISPATCH(onload) != onloadkFunc\n"); + VariantClear(&v); + + str = a2bstr("http://test.winehq.org/tests/winehq_snapshot/index_files/styles.css"); + hres = IHTMLLinkElement_put_href(link, str); + ok(hres == S_OK, "put_src failed: %08x\n", hres); + SysFreeString(str); + + SET_EXPECT(link_onload); + pump_msgs(&called_link_onload); + CHECK_CALLED(link_onload); + + IHTMLLinkElement_Release(link); +} + static void test_focus(IHTMLDocument2 *doc) { IHTMLElement2 *elem2; @@ -3069,6 +3126,7 @@ START_TEST(events) run_test(click_doc_str, test_onclick); run_test(readystate_doc_str, test_onreadystatechange); run_test(img_doc_str, test_imgload); + run_test(link_doc_str, test_link_load); run_test(input_doc_str, test_focus); run_test(form_doc_str, test_submit); run_test(iframe_doc_str, test_iframe_connections);

1 0

Andrey Gusev : kernel32/tests: Fix a typo in skip() message.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: e1a42658672d7c632821ae46dac09fef241d86d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1a42658672d7c632821ae46d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 23 14:31:03 2016 +0300 kernel32/tests: Fix a typo in skip() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index f42e7ec..4f472db 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -4717,7 +4717,7 @@ static void test_GetSystemPreferredUILanguages(void) size_buffer = max(size_id, size_name); if(!size_buffer) { - skip("No vaild buffer size\n"); + skip("No valid buffer size\n"); return; }

1 0

Andrey Gusev : setupapi/tests: Fix a typo in comment.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 3e8d4e31030e33817071a0aa1a71e4896723803d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e8d4e31030e33817071a0aa1… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 23 14:34:59 2016 +0300 setupapi/tests: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/install.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/install.c b/dlls/setupapi/tests/install.c index d12d683..5015e31 100644 --- a/dlls/setupapi/tests/install.c +++ b/dlls/setupapi/tests/install.c @@ -656,7 +656,7 @@ static void test_inffilelist(void) ok(ERROR_DIRECTORY == GetLastError(), "expected error ERROR_DIRECTORY, got %d\n", GetLastError()); - /* now check the buffer content of a vaild call + /* now check the buffer contents of a valid call */ *ptr = 0; expected = 3 + strlen(inffile) + strlen(inffile2);

1 0

Hugh McMaster : regedit: Replace error_unknown_switch() with simpler error handling.
by Alexandre Julliard 23 Jun '16

23 Jun '16

Module: wine Branch: master Commit: 7e72247d07014feb61843f24c4e45c4177b7825f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e72247d07014feb61843f24c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jun 22 12:02:56 2016 +0000 regedit: Replace error_unknown_switch() with simpler error handling. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 2cbd4bb..050a031 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -230,24 +230,6 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, LPSTR s) return TRUE; } -/** - * Process unknown switch. - * - * Params: - * chu - the switch character in upper-case. - * s - the command line string where s points to the switch character. - */ -static void error_unknown_switch(char chu, char *s) -{ - if (isalpha(chu)) { - fprintf(stderr,"%s: Undefined switch /%c!\n", getAppName(), chu); - } else { - fprintf(stderr,"%s: Alphabetic character is expected after '%c' " - "in switch specification\n", getAppName(), *(s - 1)); - } - exit(1); -} - BOOL ProcessCmdLine(LPSTR lpCmdLine) { REGEDIT_ACTION action = ACTION_UNDEF; @@ -284,7 +266,8 @@ BOOL ProcessCmdLine(LPSTR lpCmdLine) exit(0); break; default: - error_unknown_switch(chu, s); + fprintf(stderr, "regedit: Invalid or unrecognized switch [/%c]\n", chu); + exit(1); break; } } @@ -301,7 +284,8 @@ BOOL ProcessCmdLine(LPSTR lpCmdLine) } break; default: - error_unknown_switch(chu, s); + fprintf(stderr, "regedit: Invalid or unrecognized switch [/%c]\n", chu); + exit(1); break; } } else {

1 0