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

Matteo Bruni : wined3d: Add support for core OpenGL geometry shaders.
by Alexandre Julliard May 23, 2016

May 23, 2016

Module: wine Branch: master Commit: 91537b9f1f3e9a7c8e2e26e92df4f68e728a7e41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91537b9f1f3e9a7c8e2e26e92… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 20 19:55:58 2016 +0200 wined3d: Add support for core OpenGL geometry shaders. 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 | 98 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 77 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 74fbe41..324b606 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1635,6 +1635,37 @@ static const char *get_fragment_output(const struct wined3d_gl_info *gl_info) return needs_legacy_glsl_syntax(gl_info) ? "gl_FragData" : "ps_out"; } +static const char *glsl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) +{ + switch (primitive_type) + { + case WINED3D_PT_POINTLIST: + return "points"; + + case WINED3D_PT_LINELIST: + return "lines"; + + case WINED3D_PT_LINESTRIP: + return "line_strip"; + + case WINED3D_PT_TRIANGLELIST: + return "triangles"; + + case WINED3D_PT_TRIANGLESTRIP: + return "triangle_strip"; + + case WINED3D_PT_LINELIST_ADJ: + return "lines_adjacency"; + + case WINED3D_PT_TRIANGLELIST_ADJ: + return "triangles_adjacency"; + + default: + FIXME("Unhandled primitive type %s.\n", debug_d3dprimitivetype(primitive_type)); + return ""; + } +} + static BOOL glsl_is_color_reg_read(const struct wined3d_shader *shader, unsigned int idx) { const struct wined3d_shader_signature *input_signature = &shader->input_signature; @@ -1959,7 +1990,17 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } else if (version->type == WINED3D_SHADER_TYPE_GEOMETRY) { - shader_addline(buffer, "varying in vec4 gs_in[][%u];\n", shader->limits->packed_input); + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + { + shader_addline(buffer, "varying in vec4 gs_in[][%u];\n", shader->limits->packed_input); + } + else + { + shader_addline(buffer, "layout(%s) in;\n", glsl_primitive_type_from_d3d(shader->u.gs.input_type)); + shader_addline(buffer, "layout(%s, max_vertices = %u) out;\n", + glsl_primitive_type_from_d3d(shader->u.gs.output_type), shader->u.gs.vertices_out); + shader_addline(buffer, "in vs_gs_iface { vec4 gs_in[%u]; } gs_in[];\n", shader->limits->packed_input); + } } else if (version->type == WINED3D_SHADER_TYPE_PIXEL) { @@ -2206,17 +2247,24 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * if (reg->idx[0].rel_addr) { if (reg->idx[1].rel_addr) - sprintf(register_name, "gs_in[%s + %u][%s + %u]", - rel_param0.param_str, reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); + sprintf(register_name, "gs_in[%s + %u]%s[%s + %u]", + rel_param0.param_str, reg->idx[0].offset, + gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? "" : ".gs_in", + rel_param1.param_str, reg->idx[1].offset); else - sprintf(register_name, "gs_in[%s + %u][%u]", - rel_param0.param_str, reg->idx[0].offset, reg->idx[1].offset); + sprintf(register_name, "gs_in[%s + %u]%s[%u]", + rel_param0.param_str, reg->idx[0].offset, + gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? "" : ".gs_in", + reg->idx[1].offset); } else if (reg->idx[1].rel_addr) - sprintf(register_name, "gs_in[%u][%s + %u]", - reg->idx[0].offset, rel_param1.param_str, reg->idx[1].offset); + sprintf(register_name, "gs_in[%u]%s[%s + %u]", reg->idx[0].offset, + gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? "" : ".gs_in", + rel_param1.param_str, reg->idx[1].offset); else - sprintf(register_name, "gs_in[%u][%u]", reg->idx[0].offset, reg->idx[1].offset); + sprintf(register_name, "gs_in[%u]%s[%u]", reg->idx[0].offset, + gl_info->supported[WINED3D_GL_LEGACY_CONTEXT] ? "" : ".gs_in", + reg->idx[1].offset); break; } @@ -5292,12 +5340,17 @@ static void shader_glsl_generate_vs_gs_setup(struct shader_glsl_priv *priv, const struct wined3d_shader *vs, unsigned int input_count, const struct wined3d_gl_info *gl_info) { + BOOL legacy_context = gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]; struct wined3d_string_buffer *buffer = &priv->shader_buffer; - shader_addline(buffer, "varying out vec4 gs_in[%u];\n", input_count); + if (legacy_context) + shader_addline(buffer, "varying out vec4 gs_in[%u];\n", input_count); + else + shader_addline(buffer, "out vs_gs_iface { vec4 gs_in[%u]; } gs_in;\n", input_count); shader_addline(buffer, "void setup_vs_output(in vec4 shader_out[%u])\n{\n", vs->limits->packed_output); - shader_glsl_setup_sm4_shader_output(priv, input_count, &vs->output_signature, &vs->reg_maps, "gs_in"); + shader_glsl_setup_sm4_shader_output(priv, input_count, &vs->output_signature, &vs->reg_maps, + legacy_context ? "gs_in" : "gs_in.gs_in"); shader_addline(buffer, "}\n"); } @@ -7544,17 +7597,20 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const GL_EXTCALL(glAttachShader(program_id, gs_id)); checkGLcall("glAttachShader"); - TRACE("input type %s, output type %s, vertices out %u.\n", - debug_d3dprimitivetype(gshader->u.gs.input_type), - debug_d3dprimitivetype(gshader->u.gs.output_type), - gshader->u.gs.vertices_out); - GL_EXTCALL(glProgramParameteriARB(program_id, GL_GEOMETRY_INPUT_TYPE_ARB, - gl_primitive_type_from_d3d(gshader->u.gs.input_type))); - GL_EXTCALL(glProgramParameteriARB(program_id, GL_GEOMETRY_OUTPUT_TYPE_ARB, - gl_primitive_type_from_d3d(gshader->u.gs.output_type))); - GL_EXTCALL(glProgramParameteriARB(program_id, GL_GEOMETRY_VERTICES_OUT_ARB, - gshader->u.gs.vertices_out)); - checkGLcall("glProgramParameteriARB"); + if (gl_info->supported[WINED3D_GL_LEGACY_CONTEXT]) + { + TRACE("input type %s, output type %s, vertices out %u.\n", + debug_d3dprimitivetype(gshader->u.gs.input_type), + debug_d3dprimitivetype(gshader->u.gs.output_type), + gshader->u.gs.vertices_out); + GL_EXTCALL(glProgramParameteriARB(program_id, GL_GEOMETRY_INPUT_TYPE_ARB, + gl_primitive_type_from_d3d(gshader->u.gs.input_type))); + GL_EXTCALL(glProgramParameteriARB(program_id, GL_GEOMETRY_OUTPUT_TYPE_ARB, + gl_primitive_type_from_d3d(gshader->u.gs.output_type))); + GL_EXTCALL(glProgramParameteriARB(program_id, GL_GEOMETRY_VERTICES_OUT_ARB, + gshader->u.gs.vertices_out)); + checkGLcall("glProgramParameteriARB"); + } list_add_head(&gshader->linked_programs, &entry->gs.shader_entry); }

1 0

Matteo Bruni : wined3d: Fixup vertex position in geometry shaders.
by Alexandre Julliard May 23, 2016

May 23, 2016

Module: wine Branch: master Commit: f5dc7a43b01542466aad5434c4f025f3afa613f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5dc7a43b01542466aad5434c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 20 19:55:57 2016 +0200 wined3d: Fixup vertex position in geometry shaders. 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 | 73 +++++++++++++++++++++++++++++------------- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 52 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5dc7a43b01542466aad5…

1 0

Matteo Bruni : wined3d: Handle GS inputs and outputs.
by Alexandre Julliard May 23, 2016

May 23, 2016

Module: wine Branch: master Commit: 9a14d78de9fde8547729d01c5514364ffdb97ef2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a14d78de9fde8547729d01c5… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 20 19:55:56 2016 +0200 wined3d: Handle GS inputs and outputs. 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 | 107 +++++++++++++++++++++++++++++++++-------- dlls/wined3d/shader.c | 10 ++++ dlls/wined3d/wined3d_private.h | 11 ++++- 3 files changed, 106 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a14d78de9fde8547729d…

1 0

Matteo Bruni : wined3d: Simplify shader interface matching for SM4+ vertex shaders.
by Alexandre Julliard May 23, 2016

May 23, 2016

Module: wine Branch: master Commit: cf52d1635c6e77bac2c6676f11c31ab6d1fb48b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf52d1635c6e77bac2c6676f1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 20 19:55:54 2016 +0200 wined3d: Simplify shader interface matching for SM4+ vertex shaders. After some testing it looks like, with SM4+ on Windows: 1. Output registers have to match with input registers from the following shader stage (register index and mask). There is no "smart" matching of semantics like in SM3. 2. Using uninitialized varyings in SM4+ shaders doesn't give consistent results. That means we can simplify the relevant code quite a bit. Applications shouldn't be able to depend on particular values for uninitialized varyings so we can avoid explicitly initializing them. 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 | 36 +++++++++++++++++++++++++++++++++--- dlls/wined3d/shader.c | 3 ++- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 00dbc7c..a9c38ae 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5152,7 +5152,7 @@ static void delete_glsl_program_entry(struct shader_glsl_priv *priv, const struc HeapFree(GetProcessHeap(), 0, entry); } -static void shader_glsl_setup_shader_output(struct shader_glsl_priv *priv, +static void shader_glsl_setup_vs3_output(struct shader_glsl_priv *priv, const struct wined3d_gl_info *gl_info, const DWORD *map, const struct wined3d_shader_signature *input_signature, const struct wined3d_shader_reg_maps *reg_maps_in, @@ -5256,6 +5256,33 @@ static void shader_glsl_setup_shader_output(struct shader_glsl_priv *priv, string_buffer_release(&priv->string_buffers, destination); } +static void shader_glsl_setup_sm4_shader_output(struct shader_glsl_priv *priv, + const struct wined3d_shader_signature *output_signature, + const struct wined3d_shader_reg_maps *reg_maps_out, const char *out_array_name) +{ + struct wined3d_string_buffer *destination = string_buffer_get(&priv->string_buffers); + struct wined3d_string_buffer *buffer = &priv->shader_buffer; + char reg_mask[6]; + unsigned int i; + + for (i = 0; i < output_signature->element_count; ++i) + { + const struct wined3d_shader_signature_element *output = &output_signature->elements[i]; + + if (!(reg_maps_out->output_registers & (1u << output->register_idx))) + continue; + + string_buffer_sprintf(destination, "%s[%u]", out_array_name, output->register_idx); + + shader_glsl_write_mask_to_str(output->mask, reg_mask); + + shader_addline(buffer, "%s%s = shader_out[%u]%s;\n", + destination->buffer, reg_mask, output->register_idx, reg_mask); + } + + string_buffer_release(&priv->string_buffers, destination); +} + static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv, const struct wined3d_gl_info *gl_info, const DWORD *map, const struct wined3d_shader_signature *input_signature, @@ -5294,8 +5321,11 @@ static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv } /* Then, setup the pixel shader input. */ - shader_glsl_setup_shader_output(priv, gl_info, map, input_signature, reg_maps_in, - output_signature, reg_maps_out, "ps_link"); + if (reg_maps_out->shader_version.major < 4) + shader_glsl_setup_vs3_output(priv, gl_info, map, input_signature, reg_maps_in, + output_signature, reg_maps_out, "ps_link"); + else + shader_glsl_setup_sm4_shader_output(priv, output_signature, reg_maps_out, "ps_link"); } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9cfd5d7..f3f8833 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3139,7 +3139,8 @@ static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_d /* Don't do any register mapping magic if it is not needed, or if we can't * achieve anything anyway */ if (highest_reg_used < (gl_info->limits.glsl_varyings / 4) - || num_regs_used > (gl_info->limits.glsl_varyings / 4)) + || num_regs_used > (gl_info->limits.glsl_varyings / 4) + || shader->reg_maps.shader_version.major >= 4) { if (num_regs_used > (gl_info->limits.glsl_varyings / 4)) {

1 0

Henri Verbeet : wined3d: Don't import libuuid.
by Alexandre Julliard May 23, 2016

May 23, 2016

Module: wine Branch: master Commit: eb3aae96d1de4202fa672eaf1de57c08c806ab43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb3aae96d1de4202fa672eaf1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 22 18:23:10 2016 +0200 wined3d: Don't import libuuid. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/Makefile.in b/dlls/wined3d/Makefile.in index 655800b..e631a15 100644 --- a/dlls/wined3d/Makefile.in +++ b/dlls/wined3d/Makefile.in @@ -1,6 +1,6 @@ MODULE = wined3d.dll IMPORTLIB = wined3d -IMPORTS = uuid opengl32 user32 gdi32 advapi32 +IMPORTS = opengl32 user32 gdi32 advapi32 C_SRCS = \ arb_program_shader.c \

1 0

Henri Verbeet : wined3d: Send shader constant updates through the command stream.
by Alexandre Julliard May 23, 2016

May 23, 2016

Module: wine Branch: master Commit: aa666adfed929a2f711d9570fe389856bcaac346 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa666adfed929a2f711d9570f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 22 18:23:07 2016 +0200 wined3d: Send shader constant updates through the command stream. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 12 ----------- dlls/wined3d/cs.c | 44 +++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 22 ++++++-------------- dlls/wined3d/glsl_shader.c | 10 --------- dlls/wined3d/wined3d_private.h | 18 ++++++++++++++++ 5 files changed, 68 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 0fb2f67..80702a2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -729,12 +729,6 @@ static void shader_arb_update_float_vertex_constants(struct wined3d_device *devi { struct wined3d_context *context = context_get_current(); struct shader_arb_priv *priv = device->shader_priv; - unsigned int i; - - for (i = 0; i < device->context_count; ++i) - { - device->contexts[i]->constant_update_mask |= WINED3D_SHADER_CONST_VS_F; - } /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active * context. On a context switch the old context will be fully dirtified */ @@ -748,12 +742,6 @@ static void shader_arb_update_float_pixel_constants(struct wined3d_device *devic { struct wined3d_context *context = context_get_current(); struct shader_arb_priv *priv = device->shader_priv; - unsigned int i; - - for (i = 0; i < device->context_count; ++i) - { - device->contexts[i]->constant_update_mask |= WINED3D_SHADER_CONST_PS_F; - } /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active * context. On a context switch the old context will be fully dirtified */ diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index ea4778c..edb5cf2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1070,10 +1070,54 @@ static void wined3d_cs_st_submit(struct wined3d_cs *cs) wined3d_cs_op_handlers[opcode](cs, cs->data); } +static void wined3d_cs_st_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, + unsigned int start_idx, unsigned int count, const void *constants) +{ + struct wined3d_device *device = cs->device; + unsigned int context_count; + unsigned int i; + size_t offset; + + static const struct + { + size_t offset; + size_t size; + DWORD mask; + } + push_constant_info[] = + { + /* WINED3D_PUSH_CONSTANTS_VS_F */ + {FIELD_OFFSET(struct wined3d_state, vs_consts_f), sizeof(struct wined3d_vec4), WINED3D_SHADER_CONST_VS_F}, + /* WINED3D_PUSH_CONSTANTS_PS_F */ + {FIELD_OFFSET(struct wined3d_state, ps_consts_f), sizeof(struct wined3d_vec4), WINED3D_SHADER_CONST_PS_F}, + /* WINED3D_PUSH_CONSTANTS_VS_I */ + {FIELD_OFFSET(struct wined3d_state, vs_consts_i), sizeof(struct wined3d_ivec4), WINED3D_SHADER_CONST_VS_I}, + /* WINED3D_PUSH_CONSTANTS_PS_I */ + {FIELD_OFFSET(struct wined3d_state, ps_consts_i), sizeof(struct wined3d_ivec4), WINED3D_SHADER_CONST_PS_I}, + /* WINED3D_PUSH_CONSTANTS_VS_B */ + {FIELD_OFFSET(struct wined3d_state, vs_consts_b), sizeof(BOOL), WINED3D_SHADER_CONST_VS_B}, + /* WINED3D_PUSH_CONSTANTS_PS_B */ + {FIELD_OFFSET(struct wined3d_state, ps_consts_b), sizeof(BOOL), WINED3D_SHADER_CONST_PS_B}, + }; + + if (p == WINED3D_PUSH_CONSTANTS_VS_F) + device->shader_backend->shader_update_float_vertex_constants(device, start_idx, count); + else if (p == WINED3D_PUSH_CONSTANTS_PS_F) + device->shader_backend->shader_update_float_pixel_constants(device, start_idx, count); + + offset = push_constant_info[p].offset + start_idx * push_constant_info[p].size; + memcpy((BYTE *)&cs->state + offset, constants, count * push_constant_info[p].size); + for (i = 0, context_count = device->context_count; i < context_count; ++i) + { + device->contexts[i]->constant_update_mask |= push_constant_info[p].mask; + } +} + static const struct wined3d_cs_ops wined3d_cs_st_ops = { wined3d_cs_st_require_space, wined3d_cs_st_submit, + wined3d_cs_st_push_constants, }; struct wined3d_cs *wined3d_cs_create(struct wined3d_device *device) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index da83b56..967a831 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2363,16 +2363,6 @@ struct wined3d_sampler * CDECL wined3d_device_get_vs_sampler(const struct wined3 return device->state.sampler[WINED3D_SHADER_TYPE_VERTEX][idx]; } -static void device_invalidate_shader_constants(const struct wined3d_device *device, DWORD mask) -{ - UINT i; - - for (i = 0; i < device->context_count; ++i) - { - device->contexts[i]->constant_update_mask |= mask; - } -} - HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const BOOL *constants) { @@ -2400,7 +2390,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_b(struct wined3d_device *device, } else { - device_invalidate_shader_constants(device, WINED3D_SHADER_CONST_VS_B); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_B, start_idx, count, constants); } return WINED3D_OK; @@ -2449,7 +2439,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device, } else { - device_invalidate_shader_constants(device, WINED3D_SHADER_CONST_VS_I); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_I, start_idx, count, constants); } return WINED3D_OK; @@ -2494,7 +2484,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_f(struct wined3d_device *device, memset(&device->recording->changed.vs_consts_f[start_idx], 1, count * sizeof(*device->recording->changed.vs_consts_f)); else - device->shader_backend->shader_update_float_vertex_constants(device, start_idx, count); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_F, start_idx, count, constants); return WINED3D_OK; } @@ -2633,7 +2623,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_b(struct wined3d_device *device, } else { - device_invalidate_shader_constants(device, WINED3D_SHADER_CONST_PS_B); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_B, start_idx, count, constants); } return WINED3D_OK; @@ -2682,7 +2672,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device, } else { - device_invalidate_shader_constants(device, WINED3D_SHADER_CONST_PS_I); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_I, start_idx, count, constants); } return WINED3D_OK; @@ -2728,7 +2718,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_f(struct wined3d_device *device, memset(&device->recording->changed.ps_consts_f[start_idx], 1, count * sizeof(*device->recording->changed.ps_consts_f)); else - device->shader_backend->shader_update_float_pixel_constants(device, start_idx, count); + wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_F, start_idx, count, constants); return WINED3D_OK; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8c22468..b228718 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1540,11 +1540,6 @@ static void shader_glsl_update_float_vertex_constants(struct wined3d_device *dev { update_heap_entry(heap, i, priv->next_constant_version); } - - for (i = 0; i < device->context_count; ++i) - { - device->contexts[i]->constant_update_mask |= WINED3D_SHADER_CONST_VS_F; - } } static void shader_glsl_update_float_pixel_constants(struct wined3d_device *device, UINT start, UINT count) @@ -1557,11 +1552,6 @@ static void shader_glsl_update_float_pixel_constants(struct wined3d_device *devi { update_heap_entry(heap, i, priv->next_constant_version); } - - for (i = 0; i < device->context_count; ++i) - { - device->contexts[i]->constant_update_mask |= WINED3D_SHADER_CONST_PS_F; - } } static unsigned int vec4_varyings(DWORD shader_major, const struct wined3d_gl_info *gl_info) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 00f34e9..65270d4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2837,10 +2837,22 @@ void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, DWORD flags) DECLSPEC_HIDDEN; void state_unbind_resources(struct wined3d_state *state) DECLSPEC_HIDDEN; +enum wined3d_push_constants +{ + WINED3D_PUSH_CONSTANTS_VS_F, + WINED3D_PUSH_CONSTANTS_PS_F, + WINED3D_PUSH_CONSTANTS_VS_I, + WINED3D_PUSH_CONSTANTS_PS_I, + WINED3D_PUSH_CONSTANTS_VS_B, + WINED3D_PUSH_CONSTANTS_PS_B, +}; + struct wined3d_cs_ops { void *(*require_space)(struct wined3d_cs *cs, size_t size); void (*submit)(struct wined3d_cs *cs); + void (*push_constants)(struct wined3d_cs *cs, enum wined3d_push_constants p, + unsigned int start_idx, unsigned int count, const void *constants); }; struct wined3d_cs @@ -2905,6 +2917,12 @@ void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; +static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, + unsigned int start_idx, unsigned int count, const void *constants) +{ + cs->ops->push_constants(cs, p, start_idx, count, constants); +} + /* Direct3D terminology with little modifications. We do not have an issued state * because only the driver knows about it, but we have a created state because d3d * allows GetData on a created issue, but opengl doesn't

1 0

Alexandre Julliard : user32: Only start reusing DCEs after the cache reached its limit.
by Alexandre Julliard May 23, 2016

May 23, 2016

Module: wine Branch: master Commit: d1048914332e118c2ae107177f24910807471367 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1048914332e118c2ae107177… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sat May 21 09:55:18 2016 +0900 user32: Only start reusing DCEs after the cache reached its limit. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/painting.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/user32/painting.c b/dlls/user32/painting.c index ba1967c..30dabfe 100644 --- a/dlls/user32/painting.c +++ b/dlls/user32/painting.c @@ -56,6 +56,8 @@ struct dce static struct list dce_list = LIST_INIT(dce_list); +#define DCE_CACHE_SIZE 64 + static BOOL CALLBACK dc_hook( HDC hDC, WORD code, DWORD_PTR data, LPARAM lParam ); static const WCHAR displayW[] = { 'D','I','S','P','L','A','Y',0 }; @@ -429,10 +431,11 @@ void invalidate_dce( WND *win, const RECT *extra_rect ) LIST_FOR_EACH_ENTRY( dce, &dce_list, struct dce, entry ) { + if (!dce->hwnd) continue; + TRACE( "%p: hwnd %p dcx %08x %s %s\n", dce, dce->hwnd, dce->flags, (dce->flags & DCX_CACHE) ? "Cache" : "Owned", dce->count ? "InUse" : "" ); - if (!dce->hwnd) continue; if ((dce->hwnd == win->parent) && !(dce->flags & DCX_CLIPCHILDREN)) continue; /* child window positions don't bother us */ @@ -1001,7 +1004,8 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) if ((flags & DCX_CACHE) || !(dce = get_window_dce( hwnd ))) { - struct dce *dceEmpty = NULL, *dceUnused = NULL; + struct dce *dceEmpty = NULL, *dceUnused = NULL, *found = NULL; + unsigned int count = 0; /* Strategy: First, we attempt to find a non-empty but unused DCE with * compatible flags. Next, we look for an empty entry. If the cache is @@ -1010,24 +1014,23 @@ HDC WINAPI GetDCEx( HWND hwnd, HRGN hrgnClip, DWORD flags ) USER_Lock(); LIST_FOR_EACH_ENTRY( dce, &dce_list, struct dce, entry ) { - if ((dce->flags & DCX_CACHE) && !dce->count) + if (!(dce->flags & DCX_CACHE)) break; + count++; + if (dce->count) continue; + dceUnused = dce; + if (!dce->hwnd) dceEmpty = dce; + else if ((dce->hwnd == hwnd) && !((dce->flags ^ flags) & clip_flags)) { - dceUnused = dce; - - if (!dce->hwnd) dceEmpty = dce; - else if ((dce->hwnd == hwnd) && !((dce->flags ^ flags) & clip_flags)) - { - TRACE("\tfound valid %p dce [%p], flags %08x\n", - dce, hwnd, dce->flags ); - bUpdateVisRgn = FALSE; - break; - } + TRACE( "found valid %p dce [%p], flags %08x\n", dce, hwnd, dce->flags ); + found = dce; + bUpdateVisRgn = FALSE; + break; } } + if (!found) found = dceEmpty; + if (!found && count >= DCE_CACHE_SIZE) found = dceUnused; - if (&dce->entry == &dce_list) /* nothing found */ - dce = dceEmpty ? dceEmpty : dceUnused; - + dce = found; if (dce) dce->count = 1; USER_Unlock();

1 0

Aaryaman Vasishta : d3drm: Keep a reference to IDirect3DRM in d3drm_texture.
by Alexandre Julliard May 23, 2016

May 23, 2016

Module: wine Branch: master Commit: bebe679d51817f429755cd194d9ebec13fac761a URL: http://source.winehq.org/git/wine.git/?a=commit;h=bebe679d51817f429755cd194… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sat May 21 02:55:38 2016 +0530 d3drm: Keep a reference to IDirect3DRM in d3drm_texture. 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> --- dlls/d3drm/d3drm.c | 29 ++++++++++++++++++----------- dlls/d3drm/d3drm_private.h | 3 ++- dlls/d3drm/meshbuilder.c | 2 +- dlls/d3drm/texture.c | 3 ++- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index edb46df..4376aa6 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -200,7 +200,7 @@ static HRESULT WINAPI d3drm1_CreateTexture(IDirect3DRM *iface, FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, texture); - if (FAILED(hr = d3drm_texture_create(&object))) + if (FAILED(hr = d3drm_texture_create(&object, iface))) return hr; *texture = &object->IDirect3DRMTexture_iface; @@ -418,7 +418,7 @@ static HRESULT WINAPI d3drm1_LoadTexture(IDirect3DRM *iface, FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); - if (FAILED(hr = d3drm_texture_create(&object))) + if (FAILED(hr = d3drm_texture_create(&object, iface))) return hr; *texture = &object->IDirect3DRMTexture_iface; @@ -434,7 +434,7 @@ static HRESULT WINAPI d3drm1_LoadTextureFromResource(IDirect3DRM *iface, FIXME("iface %p, resource %p, texture %p stub!\n", iface, resource, texture); - if (FAILED(hr = d3drm_texture_create(&object))) + if (FAILED(hr = d3drm_texture_create(&object, iface))) return hr; *texture = &object->IDirect3DRMTexture_iface; @@ -661,12 +661,13 @@ static HRESULT WINAPI d3drm2_CreateAnimationSet(IDirect3DRM2 *iface, IDirect3DRM static HRESULT WINAPI d3drm2_CreateTexture(IDirect3DRM2 *iface, D3DRMIMAGE *image, IDirect3DRMTexture2 **texture) { + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); struct d3drm_texture *object; HRESULT hr; FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, texture); - if (FAILED(hr = d3drm_texture_create(&object))) + if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) return hr; *texture = &object->IDirect3DRMTexture2_iface; @@ -857,29 +858,31 @@ static HRESULT WINAPI d3drm2_CreateUserVisual(IDirect3DRM2 *iface, static HRESULT WINAPI d3drm2_LoadTexture(IDirect3DRM2 *iface, const char *filename, IDirect3DRMTexture2 **texture) { + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); struct d3drm_texture *object; HRESULT hr; FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); - if (FAILED(hr = d3drm_texture_create(&object))) + if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) return hr; *texture = &object->IDirect3DRMTexture2_iface; - return D3DRM_OK; + return hr; } static HRESULT WINAPI d3drm2_LoadTextureFromResource(IDirect3DRM2 *iface, HMODULE module, const char *resource_name, const char *resource_type, IDirect3DRMTexture2 **texture) { + struct d3drm *d3drm = impl_from_IDirect3DRM2(iface); struct d3drm_texture *object; HRESULT hr; FIXME("iface %p, resource_name %s, resource_type %s, texture %p stub!\n", iface, debugstr_a(resource_name), debugstr_a(resource_type), texture); - if (FAILED(hr = d3drm_texture_create(&object))) + if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) return hr; *texture = &object->IDirect3DRMTexture2_iface; @@ -1058,6 +1061,7 @@ static ULONG WINAPI d3drm3_Release(IDirect3DRM3 *iface) static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, REFCLSID clsid, IUnknown *outer, REFIID iid, void **out) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); IUnknown *object; HRESULT hr; @@ -1083,7 +1087,7 @@ static HRESULT WINAPI d3drm3_CreateObject(IDirect3DRM3 *iface, if (IsEqualGUID(clsid, &CLSID_CDirect3DRMTexture)) { struct d3drm_texture *texture; - if (FAILED(hr = d3drm_texture_create(&texture))) + if (FAILED(hr = d3drm_texture_create(&texture, &d3drm->IDirect3DRM_iface))) { *out = NULL; return hr; @@ -1150,12 +1154,13 @@ static HRESULT WINAPI d3drm3_CreateAnimationSet(IDirect3DRM3 *iface, IDirect3DRM static HRESULT WINAPI d3drm3_CreateTexture(IDirect3DRM3 *iface, D3DRMIMAGE *image, IDirect3DRMTexture3 **texture) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); struct d3drm_texture *object; HRESULT hr; FIXME("iface %p, image %p, texture %p partial stub.\n", iface, image, texture); - if (FAILED(hr = d3drm_texture_create(&object))) + if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) return hr; *texture = &object->IDirect3DRMTexture3_iface; @@ -1396,12 +1401,13 @@ static HRESULT WINAPI d3drm3_CreateUserVisual(IDirect3DRM3 *iface, static HRESULT WINAPI d3drm3_LoadTexture(IDirect3DRM3 *iface, const char *filename, IDirect3DRMTexture3 **texture) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); struct d3drm_texture *object; HRESULT hr; FIXME("iface %p, filename %s, texture %p stub!\n", iface, debugstr_a(filename), texture); - if (FAILED(hr = d3drm_texture_create(&object))) + if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) return hr; *texture = &object->IDirect3DRMTexture3_iface; @@ -1412,13 +1418,14 @@ static HRESULT WINAPI d3drm3_LoadTexture(IDirect3DRM3 *iface, static HRESULT WINAPI d3drm3_LoadTextureFromResource(IDirect3DRM3 *iface, HMODULE module, const char *resource_name, const char *resource_type, IDirect3DRMTexture3 **texture) { + struct d3drm *d3drm = impl_from_IDirect3DRM3(iface); struct d3drm_texture *object; HRESULT hr; FIXME("iface %p, module %p, resource_name %s, resource_type %s, texture %p stub!\n", iface, module, debugstr_a(resource_name), debugstr_a(resource_type), texture); - if (FAILED(hr = d3drm_texture_create(&object))) + if (FAILED(hr = d3drm_texture_create(&object, &d3drm->IDirect3DRM_iface))) return hr; *texture = &object->IDirect3DRMTexture3_iface; diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index 2eb8e4d..21c46b7 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -40,6 +40,7 @@ struct d3drm_texture IDirect3DRMTexture IDirect3DRMTexture_iface; IDirect3DRMTexture2 IDirect3DRMTexture2_iface; IDirect3DRMTexture3 IDirect3DRMTexture3_iface; + IDirect3DRM *d3drm; }; void d3drm_object_init(struct d3drm_object *object) DECLSPEC_HIDDEN; @@ -48,7 +49,7 @@ HRESULT d3drm_object_delete_destroy_callback(struct d3drm_object *object, D3DRMO void d3drm_object_cleanup(IDirect3DRMObject *iface, struct d3drm_object *object) DECLSPEC_HIDDEN; HRESULT d3drm_device_create(struct d3drm_device **out) DECLSPEC_HIDDEN; -HRESULT d3drm_texture_create(struct d3drm_texture **texture) DECLSPEC_HIDDEN; +HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) DECLSPEC_HIDDEN; IDirect3DRMDevice *IDirect3DRMDevice_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; IDirect3DRMDevice2 *IDirect3DRMDevice2_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; IDirect3DRMDevice3 *IDirect3DRMDevice3_from_impl(struct d3drm_device *device) DECLSPEC_HIDDEN; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 57429a5..72c4473 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1300,7 +1300,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *pData, if (file != INVALID_HANDLE_VALUE) { CloseHandle(file); - if (FAILED(hr = d3drm_texture_create(&texture_object))) + if (FAILED(hr = d3drm_texture_create(&texture_object, NULL))) { IDirectXFileData_Release(data); goto end; diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 886bb0b..5596bf5 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -1044,7 +1044,7 @@ static const struct IDirect3DRMTexture3Vtbl d3drm_texture3_vtbl = d3drm_texture3_SetValidationCallback, }; -HRESULT d3drm_texture_create(struct d3drm_texture **texture) +HRESULT d3drm_texture_create(struct d3drm_texture **texture, IDirect3DRM *d3drm) { struct d3drm_texture *object; @@ -1056,6 +1056,7 @@ HRESULT d3drm_texture_create(struct d3drm_texture **texture) object->IDirect3DRMTexture_iface.lpVtbl = &d3drm_texture1_vtbl; object->IDirect3DRMTexture2_iface.lpVtbl = &d3drm_texture2_vtbl; object->IDirect3DRMTexture3_iface.lpVtbl = &d3drm_texture3_vtbl; + object->d3drm = d3drm; d3drm_object_init(&object->obj);

1 0

Matteo Bruni : wined3d: Reselect the current GLSL geometry shader when possible even if the VS changed.
by Alexandre Julliard May 23, 2016

May 23, 2016

Module: wine Branch: master Commit: 54d8f57cc58e5d0d9b962559fe2f7bc071144637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d8f57cc58e5d0d9b962559f… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 20 19:55:59 2016 +0200 wined3d: Reselect the current GLSL geometry shader when possible even if the VS changed. 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 | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 324b606..d3a0ebf 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7447,7 +7447,9 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_GEOMETRY)) && ctx_data->glsl_program->gs.id) + { gs_id = ctx_data->glsl_program->gs.id; + } else if (gshader) { struct gs_compile_args args; @@ -7462,12 +7464,18 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const struct vs_compile_args vs_compile_args; vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; + gshader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; find_vs_compile_args(state, vshader, context->stream_info.swizzle_map, &vs_compile_args, d3d_info); vs_id = find_glsl_vshader(context, priv, vshader, &vs_compile_args); vs_list = &vshader->linked_programs; - if ((gshader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY])) + if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_GEOMETRY)) + && ctx_data->glsl_program->gs.id) + { + gs_id = ctx_data->glsl_program->gs.id; + } + else if (gshader) { struct gs_compile_args gs_compile_args;

1 0

Aaryaman Vasishta : d3drm: Introduce d3drm_texture_destroy helper.
by Alexandre Julliard May 23, 2016

May 23, 2016

Module: wine Branch: master Commit: 07c038c2b4c250f5aef042a7955f32cf9293e44d URL: http://source.winehq.org/git/wine.git/?a=commit;h=07c038c2b4c250f5aef042a79… Author: Aaryaman Vasishta <jem456.vasishta(a)gmail.com> Date: Sat May 21 02:55:39 2016 +0530 d3drm: Introduce d3drm_texture_destroy helper. 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> --- dlls/d3drm/texture.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index 5596bf5..eb8dfe0 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -44,6 +44,14 @@ static inline struct d3drm_texture *impl_from_IDirect3DRMTexture3(IDirect3DRMTex return CONTAINING_RECORD(iface, struct d3drm_texture, IDirect3DRMTexture3_iface); } +static void d3drm_texture_destroy(struct d3drm_texture *texture) +{ + TRACE("texture %p is being destroyed.\n", texture); + + d3drm_object_cleanup((IDirect3DRMObject*)&texture->IDirect3DRMTexture3_iface, &texture->obj); + HeapFree(GetProcessHeap(), 0, texture); +} + static HRESULT WINAPI d3drm_texture1_QueryInterface(IDirect3DRMTexture *iface, REFIID riid, void **out) { struct d3drm_texture *texture = impl_from_IDirect3DRMTexture(iface); @@ -722,10 +730,7 @@ static ULONG WINAPI d3drm_texture3_Release(IDirect3DRMTexture3 *iface) TRACE("%p decreasing refcount to %u.\n", iface, refcount); if (!refcount) - { - d3drm_object_cleanup((IDirect3DRMObject*)iface, &texture->obj); - HeapFree(GetProcessHeap(), 0, texture); - } + d3drm_texture_destroy(texture); return refcount; }

1 0