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

Henri Verbeet : wined3d: Get rid of some unused declarations.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 27dac1eea39d3eebae3175b121f19a08ead677c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27dac1eea39d3eebae3175b12… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 22 18:23:09 2016 +0200 wined3d: Get rid of some unused declarations. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/wined3d_private.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 65270d4..43d0daf 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2715,8 +2715,6 @@ HRESULT surface_load_location(struct wined3d_surface *surface, void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) DECLSPEC_HIDDEN; -void surface_set_dirty(struct wined3d_surface *surface) DECLSPEC_HIDDEN; -void surface_set_texture_target(struct wined3d_surface *surface, GLenum target, GLint level) DECLSPEC_HIDDEN; void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) DECLSPEC_HIDDEN; HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, struct wined3d_surface *src_surface, const RECT *src_rect) DECLSPEC_HIDDEN;

1 0

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

23 May '16

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: Use debug_color() in wined3d_format_convert_from_float().
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: a911bff8fda1b9d1d2f576823de74c7e6adae5d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a911bff8fda1b9d1d2f576823… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 22 18:23:11 2016 +0200 wined3d: Use debug_color() in wined3d_format_convert_from_float(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/utils.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8769bd7..34d4626 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4594,8 +4594,7 @@ DWORD wined3d_format_convert_from_float(const struct wined3d_format *format, con }; unsigned int i; - TRACE("Converting color {%.8e %.8e %.8e %.8e} to format %s.\n", - color->r, color->g, color->b, color->a, debug_d3dformat(format->id)); + TRACE("Converting color %s to format %s.\n", debug_color(color), debug_d3dformat(format->id)); for (i = 0; i < sizeof(conv) / sizeof(*conv); ++i) {

1 0

Matteo Bruni : wined3d: Alpha test emulation for core profile contexts.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: f5aee34d98a73f0e3d683b0ec5d767202e16d14e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5aee34d98a73f0e3d683b0ec… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 20 19:55:52 2016 +0200 wined3d: Alpha test emulation for core profile contexts. 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 | 103 +++++++++++++++++++++++++++++++++-------- dlls/wined3d/shader.c | 9 +++- dlls/wined3d/utils.c | 7 +++ dlls/wined3d/wined3d_private.h | 37 +++++++++------ 4 files changed, 123 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f5aee34d98a73f0e3d683…

1 0

Matteo Bruni : wined3d: Clean up VS-PS interface matching in GLSL.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 2c90b9aee068c74546139ce728c837cc5ebc5d5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c90b9aee068c74546139ce72… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 20 19:55:53 2016 +0200 wined3d: Clean up VS-PS interface matching in GLSL. It makes easier to add similar handling for GS inputs and outputs. Functionally this should be a NOP. 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 | 138 ++++++++++++++++++++++++++------------------- 1 file changed, 80 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2c90b9aee068c74546139…

1 0

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

23 May '16

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

Matteo Bruni : wined3d: Get rid of the "reorder shaders" for SM4+.
by Alexandre Julliard 23 May '16

23 May '16

Module: wine Branch: master Commit: 0f062f510829ef39b90a7e33464cc924dc9873f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f062f510829ef39b90a7e334… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri May 20 19:55:55 2016 +0200 wined3d: Get rid of the "reorder shaders" for SM4+. 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 | 149 +++++++++++++++++++++++++---------------- dlls/wined3d/shader.c | 9 +++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 103 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0f062f510829ef39b90a7…

1 0

Matteo Bruni : wined3d: Handle GS inputs and outputs.
by Alexandre Julliard 23 May '16

23 May '16

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: Fixup vertex position in geometry shaders.
by Alexandre Julliard 23 May '16

23 May '16

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: Add support for core OpenGL geometry shaders.
by Alexandre Julliard 23 May '16

23 May '16

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