wine-commits May 2017

wine-commits@winehq.org

2 participants
640 discussions

Józef Kucia : wined3d: Merge shader_glsl_generate_sm4_rasterizer_input_setup() into shader_glsl_generate_output_setup().
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 321591f8340a82013c8a881aac84b12f4fea277e URL: http://source.winehq.org/git/wine.git/?a=commit;h=321591f8340a82013c8a881aa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 8 09:48:04 2017 +0200 wined3d: Merge shader_glsl_generate_sm4_rasterizer_input_setup() into shader_glsl_generate_output_setup(). 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 | 43 ++++++++++++++----------------------------- 1 file changed, 14 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 37a1352..5305182 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6815,38 +6815,27 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl return ret; } -static void shader_glsl_generate_sm4_rasterizer_input_setup(struct shader_glsl_priv *priv, +static void shader_glsl_generate_sm4_output_setup(struct shader_glsl_priv *priv, const struct wined3d_shader *shader, unsigned int input_count, - const struct wined3d_gl_info *gl_info) + const struct wined3d_gl_info *gl_info, BOOL rasterizer_setup) { + const char *prefix = shader_glsl_get_prefix(shader->reg_maps.shader_version.type); struct wined3d_string_buffer *buffer = &priv->shader_buffer; - input_count = min(vec4_varyings(4, gl_info), input_count); + if (rasterizer_setup) + input_count = min(vec4_varyings(4, gl_info), input_count); + if (input_count) shader_glsl_declare_shader_outputs(gl_info, buffer, input_count); shader_addline(buffer, "void setup_%s_output(in vec4 outputs[%u])\n{\n", - shader_glsl_get_prefix(shader->reg_maps.shader_version.type), shader->limits->packed_output); - - shader_glsl_setup_sm3_rasterizer_input(priv, gl_info, NULL, NULL, - NULL, input_count, &shader->output_signature, &shader->reg_maps, FALSE); - - shader_addline(buffer, "}\n"); -} - -static void shader_glsl_generate_sm4_output_setup(struct shader_glsl_priv *priv, - const struct wined3d_shader *shader, unsigned int input_count, - const struct wined3d_gl_info *gl_info) -{ - const char *prefix = shader_glsl_get_prefix(shader->reg_maps.shader_version.type); - struct wined3d_string_buffer *buffer = &priv->shader_buffer; - - shader_addline(buffer, "out shader_in_out { vec4 reg[%u]; } shader_out;\n", input_count); - shader_addline(buffer, "void setup_%s_output(in vec4 outputs[%u])\n{\n", prefix, shader->limits->packed_output); - shader_glsl_setup_sm4_shader_output(priv, input_count, - &shader->output_signature, &shader->reg_maps); + if (rasterizer_setup) + shader_glsl_setup_sm3_rasterizer_input(priv, gl_info, NULL, NULL, + NULL, input_count, &shader->output_signature, &shader->reg_maps, FALSE); + else + shader_glsl_setup_sm4_shader_output(priv, input_count, &shader->output_signature, &shader->reg_maps); shader_addline(buffer, "}\n"); } @@ -7337,12 +7326,8 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "uniform vec4 pos_fixup;\n"); if (reg_maps->shader_version.major >= 4) - { - if (args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL) - shader_glsl_generate_sm4_rasterizer_input_setup(priv, shader, args->next_shader_input_count, gl_info); - else if (args->next_shader_type == WINED3D_SHADER_TYPE_GEOMETRY) - shader_glsl_generate_sm4_output_setup(priv, shader, args->next_shader_input_count, gl_info); - } + shader_glsl_generate_sm4_output_setup(priv, shader, args->next_shader_input_count, + gl_info, args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL); shader_addline(buffer, "void main()\n{\n"); @@ -7394,7 +7379,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context if (!gl_info->supported[ARB_CLIP_CONTROL]) shader_addline(buffer, "uniform vec4 pos_fixup;\n"); - shader_glsl_generate_sm4_rasterizer_input_setup(priv, shader, args->output_count, gl_info); + shader_glsl_generate_sm4_output_setup(priv, shader, args->output_count, gl_info, TRUE); shader_addline(buffer, "void main()\n{\n"); if (FAILED(shader_generate_main(shader, buffer, reg_maps, &priv_ctx))) return 0;

1 0

Józef Kucia : wined3d: Use interface blocks for shader inputs and outputs in GLSL 1.50.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: eb30543b1a55df61c0745e851fd2753a6227d188 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb30543b1a55df61c0745e851… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 8 09:48:03 2017 +0200 wined3d: Use interface blocks for shader inputs and outputs in GLSL 1.50. We always use interfaces blocks for SM4+ shaders. 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 | 66 +++++++++++++++++++++++++++++++++------------- 1 file changed, 48 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 20e1b0b..37a1352 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -808,7 +808,7 @@ static void shader_glsl_generate_transform_feedback_varyings(const struct wined3 continue; } - string_buffer_sprintf(buffer, "ps_link[%u]", e->register_idx); + string_buffer_sprintf(buffer, "shader_in_out.reg[%u]", e->register_idx); append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); } @@ -2029,6 +2029,11 @@ static BOOL shader_glsl_use_explicit_attrib_location(const struct wined3d_gl_inf && shader_glsl_use_layout_qualifier(gl_info) && !needs_legacy_glsl_syntax(gl_info); } +static BOOL shader_glsl_use_interface_blocks(const struct wined3d_gl_info *gl_info) +{ + return shader_glsl_get_version(gl_info) >= 150; +} + static const char *get_attribute_keyword(const struct wined3d_gl_info *gl_info) { return needs_legacy_glsl_syntax(gl_info) ? "attribute" : "in"; @@ -2074,6 +2079,34 @@ static void PRINTF_ATTR(4, 5) declare_out_varying(const struct wined3d_gl_info * } } +static const char *shader_glsl_shader_input_name(const struct wined3d_gl_info *gl_info) +{ + return shader_glsl_use_interface_blocks(gl_info) ? "shader_in.reg" : "ps_link"; +} + +static const char *shader_glsl_shader_output_name(const struct wined3d_gl_info *gl_info) +{ + return shader_glsl_use_interface_blocks(gl_info) ? "shader_out.reg" : "ps_link"; +} + +static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_info, + struct wined3d_string_buffer *buffer, unsigned int element_count) +{ + if (shader_glsl_use_interface_blocks(gl_info)) + shader_addline(buffer, "in shader_in_out { vec4 reg[%u]; } shader_in;\n", element_count); + else + declare_in_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", element_count); +} + +static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_info, + struct wined3d_string_buffer *buffer, unsigned int element_count) +{ + if (shader_glsl_use_interface_blocks(gl_info)) + shader_addline(buffer, "out shader_in_out { vec4 reg[%u]; } shader_out;\n", element_count); + else + declare_out_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", element_count); +} + static const char *get_fragment_output(const struct wined3d_gl_info *gl_info) { return needs_legacy_glsl_syntax(gl_info) ? "gl_FragData" : "ps_out"; @@ -6367,8 +6400,9 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w { if (input->sysval_semantic) FIXME("Unhandled sysval semantic %#x.\n", input->sysval_semantic); - shader_addline(buffer, "ps_in[%u]%s = ps_link[%u]%s;\n", + shader_addline(buffer, "ps_in[%u]%s = %s[%u]%s;\n", shader->u.ps.input_reg_map[input->register_idx], reg_mask, + shader_glsl_shader_input_name(gl_info), shader->u.ps.input_reg_map[input->register_idx], reg_mask); } } @@ -6453,9 +6487,10 @@ static void shader_glsl_setup_vs3_output(struct shader_glsl_priv *priv, const struct wined3d_shader_signature *input_signature, const struct wined3d_shader_reg_maps *reg_maps_in, const struct wined3d_shader_signature *output_signature, - const struct wined3d_shader_reg_maps *reg_maps_out, const char *out_array_name) + const struct wined3d_shader_reg_maps *reg_maps_out) { struct wined3d_string_buffer *destination = string_buffer_get(&priv->string_buffers); + const char *out_array_name = shader_glsl_shader_output_name(gl_info); struct wined3d_string_buffer *buffer = &priv->shader_buffer; unsigned int in_count = vec4_varyings(3, gl_info); unsigned int max_varyings = needs_legacy_glsl_syntax(gl_info) ? in_count + 2 : in_count; @@ -6553,9 +6588,8 @@ static void shader_glsl_setup_vs3_output(struct shader_glsl_priv *priv, static void shader_glsl_setup_sm4_shader_output(struct shader_glsl_priv *priv, unsigned int input_count, const struct wined3d_shader_signature *output_signature, - const struct wined3d_shader_reg_maps *reg_maps_out, const char *out_array_name) + const struct wined3d_shader_reg_maps *reg_maps_out) { - 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; @@ -6573,15 +6607,11 @@ static void shader_glsl_setup_sm4_shader_output(struct shader_glsl_priv *priv, if (output->register_idx >= input_count) 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 = outputs[%u]%s;\n", - destination->buffer, reg_mask, output->register_idx, reg_mask); + shader_addline(buffer, "shader_out.reg[%u]%s = outputs[%u]%s;\n", + output->register_idx, 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, @@ -6636,9 +6666,9 @@ static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv /* Then, setup the pixel shader input. */ 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"); + output_signature, reg_maps_out); else - shader_glsl_setup_sm4_shader_output(priv, input_count, output_signature, reg_maps_out, "ps_link"); + shader_glsl_setup_sm4_shader_output(priv, input_count, output_signature, reg_maps_out); } /* Context activation is done by the caller. */ @@ -6768,9 +6798,9 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl } else { - UINT in_count = min(vec4_varyings(ps_major, gl_info), ps->limits->packed_input); + unsigned int in_count = min(vec4_varyings(ps_major, gl_info), ps->limits->packed_input); - declare_out_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", in_count); + shader_glsl_declare_shader_outputs(gl_info, buffer, in_count); shader_addline(buffer, "void setup_vs_output(in vec4 outputs[%u])\n{\n", vs->limits->packed_output); shader_glsl_setup_sm3_rasterizer_input(priv, gl_info, ps->u.ps.input_reg_map, &ps->input_signature, &ps->reg_maps, 0, &vs->output_signature, &vs->reg_maps, per_vertex_point_size); @@ -6793,7 +6823,7 @@ static void shader_glsl_generate_sm4_rasterizer_input_setup(struct shader_glsl_p input_count = min(vec4_varyings(4, gl_info), input_count); if (input_count) - declare_out_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", input_count); + shader_glsl_declare_shader_outputs(gl_info, buffer, input_count); shader_addline(buffer, "void setup_%s_output(in vec4 outputs[%u])\n{\n", shader_glsl_get_prefix(shader->reg_maps.shader_version.type), shader->limits->packed_output); @@ -6816,7 +6846,7 @@ static void shader_glsl_generate_sm4_output_setup(struct shader_glsl_priv *priv, prefix, shader->limits->packed_output); shader_glsl_setup_sm4_shader_output(priv, input_count, - &shader->output_signature, &shader->reg_maps, "shader_out.reg"); + &shader->output_signature, &shader->reg_maps); shader_addline(buffer, "}\n"); } @@ -7056,7 +7086,7 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context unsigned int in_count = min(vec4_varyings(version->major, gl_info), shader->limits->packed_input); if (args->vp_mode == vertexshader) - declare_in_varying(gl_info, buffer, FALSE, "vec4 %s_link[%u];\n", prefix, in_count); + shader_glsl_declare_shader_inputs(gl_info, buffer, in_count); shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); }

1 0

Józef Kucia : wined3d: Pass correct input count to shader_glsl_setup_sm3_rasterizer_input().
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 620e2d671860799830e4d79ff19bb0a8f5fd9365 URL: http://source.winehq.org/git/wine.git/?a=commit;h=620e2d671860799830e4d79ff… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 8 09:48:02 2017 +0200 wined3d: Pass correct input count to shader_glsl_setup_sm3_rasterizer_input(). We declare min(vec4_varyings(4, gl_info), input_count) shader outputs. 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ef6b759..20e1b0b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6791,8 +6791,9 @@ static void shader_glsl_generate_sm4_rasterizer_input_setup(struct shader_glsl_p { struct wined3d_string_buffer *buffer = &priv->shader_buffer; + input_count = min(vec4_varyings(4, gl_info), input_count); if (input_count) - declare_out_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", min(vec4_varyings(4, gl_info), input_count)); + declare_out_varying(gl_info, buffer, FALSE, "vec4 ps_link[%u];\n", input_count); shader_addline(buffer, "void setup_%s_output(in vec4 outputs[%u])\n{\n", shader_glsl_get_prefix(shader->reg_maps.shader_version.type), shader->limits->packed_output);

1 0

Józef Kucia : wined3d: Rework geometry shader inputs/ outputs handling.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 2da2b9669cd63b437f038c34475d9e26e1eb4915 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2da2b9669cd63b437f038c344… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 8 09:48:01 2017 +0200 wined3d: Rework geometry shader inputs/outputs handling. We want to always use the same name for input and output blocks in order to make matching between different shader types easier. This will be helpful for tessellation shaders. This commit changes the input and output blocks for geometry shaders to the following definitions: in shader_in_out { vec4 reg[n]; } shader_in[]; out shader_in_out { vec4 reg[n]; } shader_out; 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 | 73 +++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 36 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2da2b9669cd63b437f038…

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_DSGetSamplers().
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 4638ba7003e0f35f606e2890e89ebcce5a9da4a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4638ba7003e0f35f606e2890e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 8 09:48:00 2017 +0200 d3d11: Implement d3d11_immediate_context_DSGetSamplers(). 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/d3d11/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index f4e540c..136917b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2185,8 +2185,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct wined3d_sampler *wined3d_sampler; + struct d3d_sampler_state *sampler_impl; + + if (!(wined3d_sampler = wined3d_device_get_ds_sampler(device->wined3d_device, start_slot + i))) + { + samplers[i] = NULL; + continue; + } + + sampler_impl = wined3d_sampler_get_parent(wined3d_sampler); + ID3D11SamplerState_AddRef(samplers[i] = &sampler_impl->ID3D11SamplerState_iface); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_DSGetConstantBuffers(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_ds_sampler().
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 3f3699b56166b2e6a69c030a9ffe77440f95f637 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f3699b56166b2e6a69c030a9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon May 8 09:47:59 2017 +0200 wined3d: Introduce wined3d_device_get_ds_sampler(). 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/device.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b5f07cb..2637411 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2789,6 +2789,13 @@ void CDECL wined3d_device_set_ds_sampler(struct wined3d_device *device, wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_DOMAIN, idx, sampler); } +struct wined3d_sampler * CDECL wined3d_device_get_ds_sampler(const struct wined3d_device *device, unsigned int idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_DOMAIN, idx); +} + void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev = device->update_state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index a90c215..916d296 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -63,6 +63,7 @@ @ cdecl wined3d_device_get_domain_shader(ptr) @ cdecl wined3d_device_get_ds_cb(ptr long) @ cdecl wined3d_device_get_ds_resource_view(ptr long) +@ cdecl wined3d_device_get_ds_sampler(ptr long) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_geometry_shader(ptr) @ cdecl wined3d_device_get_gs_cb(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index d54666e..0bf3e55 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2218,6 +2218,7 @@ struct wined3d_shader * __cdecl wined3d_device_get_domain_shader(const struct wi struct wined3d_buffer * __cdecl wined3d_device_get_ds_cb(const struct wined3d_device *device, unsigned int idx); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_ds_resource_view(const struct wined3d_device *device, unsigned int idx); +struct wined3d_sampler * __cdecl wined3d_device_get_ds_sampler(const struct wined3d_device *device, unsigned int idx); void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device);

1 0

Matteo Bruni : wined3d: Ignore lights out of maximum range for legacy FFP lighting too.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 43b6bfbc3708a0824792dc76e1e9a869a144446a URL: http://source.winehq.org/git/wine.git/?a=commit;h=43b6bfbc3708a0824792dc76e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun May 7 20:32:38 2017 +0200 wined3d: Ignore lights out of maximum range for legacy FFP lighting too. 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/ddraw/tests/ddraw2.c | 25 +++++++++++++++++++++++++ dlls/ddraw/tests/ddraw4.c | 25 +++++++++++++++++++++++++ dlls/wined3d/glsl_shader.c | 14 ++++++-------- 3 files changed, 56 insertions(+), 8 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index f81be7f..9d77521 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -7101,6 +7101,17 @@ static void test_specular_lighting(void) 100.0f, 0.0f, 1.0f, 0.0f, 0.0f, + }, + point_far = + { + sizeof(D3DLIGHT2), + D3DLIGHT_POINT, + {{1.0f}, {1.0f}, {1.0f}, {0.0f}}, + {{0.0f}, {0.0f}, {0.1f}}, + {{0.0f}, {0.0f}, {0.0f}}, + 1.0f, + 0.0f, + 1.0f, 0.0f, 0.0f, }; static const struct expected_color { @@ -7166,6 +7177,18 @@ static void test_specular_lighting(void) {160, 360, 0x00000000}, {320, 360, 0x00000000}, {480, 360, 0x00000000}, + }, + expected_point_far[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x00000000}, + {480, 120, 0x00000000}, + {160, 240, 0x00000000}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00000000}, + {160, 360, 0x00000000}, + {320, 360, 0x00000000}, + {480, 360, 0x00000000}, }; static const struct { @@ -7186,6 +7209,8 @@ static void test_specular_lighting(void) sizeof(expected_parallelpoint) / sizeof(expected_parallelpoint[0])}, {&point_side, 0.0f, expected_point_side, sizeof(expected_point_side) / sizeof(expected_point_side[0])}, + {&point_far, 1.0f, expected_point_far, + sizeof(expected_point_far) / sizeof(expected_point_far[0])}, }; IDirect3D2 *d3d; IDirect3DDevice2 *device; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 47b94f7..b401544 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4156,6 +4156,17 @@ static void test_specular_lighting(void) 100.0f, 0.0f, 1.0f, 0.0f, 0.0f, + }, + point_far = + { + sizeof(D3DLIGHT2), + D3DLIGHT_POINT, + {{1.0f}, {1.0f}, {1.0f}, {0.0f}}, + {{0.0f}, {0.0f}, {0.1f}}, + {{0.0f}, {0.0f}, {0.0f}}, + 1.0f, + 0.0f, + 1.0f, 0.0f, 0.0f, }; static const struct expected_color { @@ -4221,6 +4232,18 @@ static void test_specular_lighting(void) {160, 360, 0x00000000}, {320, 360, 0x00000000}, {480, 360, 0x00000000}, + }, + expected_point_far[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x00000000}, + {480, 120, 0x00000000}, + {160, 240, 0x00000000}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00000000}, + {160, 360, 0x00000000}, + {320, 360, 0x00000000}, + {480, 360, 0x00000000}, }; static const struct { @@ -4246,6 +4269,8 @@ static void test_specular_lighting(void) sizeof(expected_parallelpoint) / sizeof(expected_parallelpoint[0])}, {&point_side, TRUE, 0.0f, expected_point_side, sizeof(expected_point_side) / sizeof(expected_point_side[0])}, + {&point_far, TRUE, 1.0f, expected_point_far, + sizeof(expected_point_far) / sizeof(expected_point_far[0])}, }; IDirect3D3 *d3d; IDirect3DDevice3 *device; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dfbe46d..166a4ae 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -7720,6 +7720,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer { shader_addline(buffer, "dst.y = (ffp_light[%u].range - dst.y) / ffp_light[%u].range;\n", idx, idx); shader_addline(buffer, "dst.z = dst.y * dst.y;\n"); + shader_addline(buffer, "if (dst.y > 0.0)\n{\n"); } else { @@ -7732,14 +7733,12 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "ambient += ffp_light[%u].ambient.xyz * att;\n", idx); if (!settings->normal) { - if (!legacy_lighting) - shader_addline(buffer, "}\n"); + shader_addline(buffer, "}\n"); continue; } shader_addline(buffer, "dir = normalize(dir);\n"); shader_glsl_ffp_vertex_lighting_footer(buffer, settings, i); - if (!legacy_lighting) - shader_addline(buffer, "}\n"); + shader_addline(buffer, "}\n"); } for (i = 0; i < settings->spot_light_count; ++i, ++idx) @@ -7752,6 +7751,7 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer { shader_addline(buffer, "dst.y = (ffp_light[%u].range - dst.y) / ffp_light[%u].range;\n", idx, idx); shader_addline(buffer, "dst.z = dst.y * dst.y;\n"); + shader_addline(buffer, "if (dst.y > 0.0)\n{\n"); } else { @@ -7775,13 +7775,11 @@ static void shader_glsl_ffp_vertex_lighting(struct wined3d_string_buffer *buffer shader_addline(buffer, "ambient += ffp_light[%u].ambient.xyz * att;\n", idx); if (!settings->normal) { - if (!legacy_lighting) - shader_addline(buffer, "}\n"); + shader_addline(buffer, "}\n"); continue; } shader_glsl_ffp_vertex_lighting_footer(buffer, settings, i); - if (!legacy_lighting) - shader_addline(buffer, "}\n"); + shader_addline(buffer, "}\n"); } for (i = 0; i < settings->directional_light_count; ++i, ++idx)

1 0

Matteo Bruni : wined3d: Fix specular lighting calculation.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: c329ee5673c5c9864611d9276e892abdf1d1a852 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c329ee5673c5c9864611d9276… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun May 7 20:32:37 2017 +0200 wined3d: Fix specular lighting calculation. 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/d3d8/tests/visual.c | 61 +++++++++++++++++++++++++++++++++------------- dlls/d3d9/tests/visual.c | 61 +++++++++++++++++++++++++++++++++------------- dlls/ddraw/tests/ddraw2.c | 49 ++++++++++++++++++++++++++++--------- dlls/ddraw/tests/ddraw4.c | 51 +++++++++++++++++++++++++++++--------- dlls/ddraw/tests/ddraw7.c | 59 ++++++++++++++++++++++++++++++++------------ dlls/wined3d/glsl_shader.c | 50 +++++++++++++++---------------------- 6 files changed, 227 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c329ee5673c5c9864611d…

1 0

Matteo Bruni : wined3d: Release context on CPU blit failure.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 1ed54d6ce376ea7029a8baf8ef2f8edc1ae5561f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ed54d6ce376ea7029a8baf8e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Sun May 7 20:32:33 2017 +0200 wined3d: Release context on CPU blit failure. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e86119d..c68c4c1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2929,6 +2929,8 @@ static HRESULT surface_cpu_blt(struct wined3d_texture *dst_texture, unsigned int { FIXME("Cannot convert %s to %s.\n", debug_d3dformat(src_texture->resource.format->id), debug_d3dformat(dst_texture->resource.format->id)); + if (context) + context_release(context); return WINED3DERR_NOTAVAILABLE; } src_texture = converted_texture;

1 0

Björn Bidar : wined3d: Add NVIDIA GTX 1080 Ti to the GPU list.
by Alexandre Julliard 08 May '17

08 May '17

Module: wine Branch: master Commit: 5f0fd6c063e2ed4d5d8f0d798625adf1966909fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f0fd6c063e2ed4d5d8f0d798… Author: Björn Bidar <theodorstormgrade(a)googlemail.com> Date: Fri May 5 19:28:26 2017 +0200 wined3d: Add NVIDIA GTX 1080 Ti to the GPU list. Signed-off-by: Björn Bidar <theodorstormgrade(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index f5d4882..fc015a8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1390,6 +1390,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1060, "NVIDIA GeForce GTX 1060", DRIVER_NVIDIA_GEFORCE8, 6144}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1070, "NVIDIA GeForce GTX 1070", DRIVER_NVIDIA_GEFORCE8, 8192}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080, "NVIDIA GeForce GTX 1080", DRIVER_NVIDIA_GEFORCE8, 8192}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX1080TI, "NVIDIA GeForce GTX 1080 Ti", DRIVER_NVIDIA_GEFORCE8, 11264}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_TITANX_PASCAL, "NVIDIA TITAN X (Pascal)", DRIVER_NVIDIA_GEFORCE8, 12288}, /* AMD cards */ @@ -1876,6 +1877,7 @@ cards_nvidia_binary[] = { /* Direct 3D 11 */ {"TITAN X (Pascal)", CARD_NVIDIA_TITANX_PASCAL}, /* GeForce 1000 - highend */ + {"GTX 1080 Ti", CARD_NVIDIA_GEFORCE_GTX1080TI}, /* GeForce 1000 - highend */ {"GTX 1080", CARD_NVIDIA_GEFORCE_GTX1080}, /* GeForce 1000 - highend */ {"GTX 1070", CARD_NVIDIA_GEFORCE_GTX1070}, /* GeForce 1000 - highend */ {"GTX 1060", CARD_NVIDIA_GEFORCE_GTX1060}, /* GeForce 1000 - midend high */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2e0e8e9..d628ba5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2201,6 +2201,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GTX1060 = 0x1c03, CARD_NVIDIA_GEFORCE_GTX1070 = 0x1b81, CARD_NVIDIA_GEFORCE_GTX1080 = 0x1b80, + CARD_NVIDIA_GEFORCE_GTX1080TI = 0x1b06, CARD_NVIDIA_TITANX_PASCAL = 0x1b00, CARD_VMWARE_SVGA3D = 0x0405,

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
64
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2017