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

Andrey Gusev : d3d10: Fix a typo in depthstencilstate_count variable name.
by Alexandre Julliard June 2, 2016

June 2, 2016

Module: wine Branch: master Commit: 0cd12e294ea74057e78fb65c9d0ead546ceb6f82 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cd12e294ea74057e78fb65c9… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 2 13:12:04 2016 +0300 d3d10: Fix a typo in depthstencilstate_count variable name. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10/d3d10_private.h | 2 +- dlls/d3d10/effect.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 6f75295..5700b86 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -236,7 +236,7 @@ struct d3d10_effect DWORD technique_count; DWORD index_offset; DWORD texture_count; - DWORD dephstencilstate_count; + DWORD depthstencilstate_count; DWORD blendstate_count; DWORD rasterizerstate_count; DWORD samplerstate_count; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 2adbc08..ff00aa1 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -2228,8 +2228,8 @@ static HRESULT parse_fx10(struct d3d10_effect *e, const char *data, DWORD data_s read_dword(&ptr, &e->texture_count); TRACE("Texture count: %u\n", e->texture_count); - read_dword(&ptr, &e->dephstencilstate_count); - TRACE("Depthstencilstate count: %u\n", e->dephstencilstate_count); + read_dword(&ptr, &e->depthstencilstate_count); + TRACE("Depthstencilstate count: %u\n", e->depthstencilstate_count); read_dword(&ptr, &e->blendstate_count); TRACE("Blendstate count: %u\n", e->blendstate_count);

1 0

Józef Kucia : d3d11: Set blend states only when blending is enabled.
by Alexandre Julliard June 2, 2016

June 2, 2016

Module: wine Branch: master Commit: 022867e5b15a9a986f24bfbbedb4f06ccf3bf351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=022867e5b15a9a986f24bfbbe… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 2 11:14:14 2016 +0200 d3d11: Set blend states only when blending is enabled. 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 | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 25c333d..0e4ef97 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -653,16 +653,22 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi FIXME("Per-rendertarget blend not implemented.\n"); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_ALPHABLENDENABLE, desc->RenderTarget[0].BlendEnable); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLEND, desc->RenderTarget[0].SrcBlend); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLEND, desc->RenderTarget[0].DestBlend); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOP, desc->RenderTarget[0].BlendOp); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, - desc->RenderTarget[0].SrcBlendAlpha); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, - desc->RenderTarget[0].DestBlendAlpha); - wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, - desc->RenderTarget[0].BlendOpAlpha); + if (desc->RenderTarget[0].BlendEnable) + { + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLEND, + desc->RenderTarget[0].SrcBlend); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLEND, + desc->RenderTarget[0].DestBlend); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOP, + desc->RenderTarget[0].BlendOp); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SEPARATEALPHABLENDENABLE, TRUE); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SRCBLENDALPHA, + desc->RenderTarget[0].SrcBlendAlpha); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_DESTBLENDALPHA, + desc->RenderTarget[0].DestBlendAlpha); + wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_BLENDOPALPHA, + desc->RenderTarget[0].BlendOpAlpha); + } FIXME("Color mask > 3 not implemented.\n"); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_COLORWRITEENABLE, desc->RenderTarget[0].RenderTargetWriteMask);

1 0

Józef Kucia : wined3d: Implement index buffer offset.
by Alexandre Julliard June 2, 2016

June 2, 2016

Module: wine Branch: master Commit: 42fcf202211f62ccec21863b36076c2d5e02c1da URL: http://source.winehq.org/git/wine.git/?a=commit;h=42fcf202211f62ccec21863b3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 2 11:14:13 2016 +0200 wined3d: Implement index buffer offset. 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/d3d10core/tests/device.c | 2 +- dlls/d3d11/device.c | 13 ++++--------- dlls/d3d8/device.c | 9 ++++----- dlls/d3d9/device.c | 9 ++++----- dlls/ddraw/device.c | 6 +++--- dlls/wined3d/cs.c | 5 ++++- dlls/wined3d/device.c | 19 ++++++++++++------- dlls/wined3d/drawprim.c | 15 ++++++++------- dlls/wined3d/stateblock.c | 7 +++++-- dlls/wined3d/wined3d.spec | 4 ++-- dlls/wined3d/wined3d_private.h | 7 ++++--- include/wine/wined3d.h | 4 ++-- 12 files changed, 53 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=42fcf202211f62ccec218…

1 0

Matteo Bruni : wined3d: Fix FFP vertex shaders with ARB_explicit_attrib_location.
by Alexandre Julliard June 2, 2016

June 2, 2016

Module: wine Branch: master Commit: 785baaa94bc4bacf04ebceac7290bf55d3fd2a68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=785baaa94bc4bacf04ebceac7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 1 23:16:52 2016 +0200 wined3d: Fix FFP vertex shaders with ARB_explicit_attrib_location. 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e5a0e69..4e773b6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6363,10 +6363,15 @@ static GLuint shader_glsl_generate_ffp_vertex_shader(struct shader_glsl_priv *pr shader_addline(buffer, "%s\n", shader_glsl_get_version(gl_info, NULL)); + if (shader_glsl_use_explicit_attrib_location(gl_info)) + shader_addline(buffer, "#extension GL_ARB_explicit_attrib_location : enable\n"); + for (i = 0; i < WINED3D_FFP_ATTRIBS_COUNT; ++i) { const char *type = i < ARRAY_SIZE(attrib_info) ? attrib_info[i].type : "vec4"; + if (shader_glsl_use_explicit_attrib_location(gl_info)) + shader_addline(buffer, "layout(location = %u) ", i); shader_addline(buffer, "%s %s vs_in%u;\n", get_attribute_keyword(gl_info), type, i); } shader_addline(buffer, "\n");

1 0

Józef Kucia : wined3d: Add support for NULL sampler.
by Alexandre Julliard June 2, 2016

June 2, 2016

Module: wine Branch: master Commit: 3bac75c040eb1391eb567e52dd56256350dc1371 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bac75c040eb1391eb567e52d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 2 11:14:12 2016 +0200 wined3d: Add support for NULL 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/d3d10core/tests/device.c | 2 +- dlls/d3d11/tests/d3d11.c | 2 +- dlls/wined3d/context.c | 9 +-------- dlls/wined3d/device.c | 39 ++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 28 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 46c437a..8a00952 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -6251,7 +6251,7 @@ static void test_swapchain_flip(void) color = get_texture_color(offscreen, 120, 240); /* blue, buf 0 */ todo_wine ok(compare_color(color, 0x7fff0000, 1), "Got unexpected color 0x%08x.\n", color); color = get_texture_color(offscreen, 360, 240); /* red, buf 1 */ - todo_wine ok(compare_color(color, 0x7f0000ff, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x7f0000ff, 1), "Got unexpected color 0x%08x.\n", color); color = get_texture_color(backbuffer_0, 320, 240); /* blue */ ok(compare_color(color, 0x7fff0000, 1), "Got unexpected color 0x%08x.\n", color); diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 61d02ab..74feaa2 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -6173,7 +6173,7 @@ static void test_swapchain_flip(void) color = get_texture_color(offscreen, 120, 240); /* blue, buf 0 */ todo_wine ok(compare_color(color, 0x7fff0000, 1), "Got unexpected color 0x%08x.\n", color); color = get_texture_color(offscreen, 360, 240); /* red, buf 1 */ - todo_wine ok(compare_color(color, 0x7f0000ff, 1), "Got unexpected color 0x%08x.\n", color); + ok(compare_color(color, 0x7f0000ff, 1), "Got unexpected color 0x%08x.\n", color); color = get_texture_color(backbuffer_0, 320, 240); /* blue */ ok(compare_color(color, 0x7fff0000, 1), "Got unexpected color 0x%08x.\n", color); diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index f07b3ab..845ca1d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3339,18 +3339,11 @@ static void context_bind_shader_resources(struct wined3d_context *context, const } if (entry->sampler_idx == WINED3D_SAMPLER_DEFAULT) - { sampler_name = device->default_sampler; - } else if ((sampler = state->sampler[shader_types[i].type][entry->sampler_idx])) - { sampler_name = sampler->name; - } else - { - WARN("No sampler object bound at index %u, %u.\n", shader_types[i].type, entry->sampler_idx); - continue; - } + sampler_name = device->null_sampler; texture = texture_from_resource(view->resource); context_active_texture(context, gl_info, shader_types[i].base_idx + entry->bind_idx); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ddfc715..88ca8fb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -814,43 +814,52 @@ static void destroy_dummy_textures(struct wined3d_device *device, const struct w } /* Context activation is done by the caller. */ -static void create_default_sampler(struct wined3d_device *device) +static void create_default_samplers(struct wined3d_device *device) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - /* - * In SM4+ shaders there is a separation between resources and samplers. Some shader - * instructions allow access to resources without using samplers. - * In GLSL, resources are always accessed through sampler or image variables. The default - * sampler object is used to emulate the direct resource access when there is no sampler state - * to use. - */ if (gl_info->supported[ARB_SAMPLER_OBJECTS]) { + /* In SM4+ shaders there is a separation between resources and samplers. Some shader + * instructions allow access to resources without using samplers. + * In GLSL, resources are always accessed through sampler or image variables. The default + * sampler object is used to emulate the direct resource access when there is no sampler state + * to use. + */ GL_EXTCALL(glGenSamplers(1, &device->default_sampler)); - checkGLcall("glGenSamplers"); GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MAG_FILTER, GL_NEAREST)); GL_EXTCALL(glSamplerParameteri(device->default_sampler, GL_TEXTURE_MIN_FILTER, GL_NEAREST_MIPMAP_NEAREST)); - checkGLcall("glSamplerParameteri"); + checkGLcall("Create default sampler"); + + /* In D3D10+, a NULL sampler maps to the default sampler state. */ + GL_EXTCALL(glGenSamplers(1, &device->null_sampler)); + GL_EXTCALL(glSamplerParameteri(device->null_sampler, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR)); + GL_EXTCALL(glSamplerParameteri(device->null_sampler, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE)); + GL_EXTCALL(glSamplerParameteri(device->null_sampler, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE)); + GL_EXTCALL(glSamplerParameteri(device->null_sampler, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE)); + checkGLcall("Create null sampler"); } else { device->default_sampler = 0; + device->null_sampler = 0; } } /* Context activation is done by the caller. */ -static void destroy_default_sampler(struct wined3d_device *device) +static void destroy_default_samplers(struct wined3d_device *device) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; if (gl_info->supported[ARB_SAMPLER_OBJECTS]) { GL_EXTCALL(glDeleteSamplers(1, &device->default_sampler)); + GL_EXTCALL(glDeleteSamplers(1, &device->null_sampler)); checkGLcall("glDeleteSamplers"); } device->default_sampler = 0; + device->null_sampler = 0; } static LONG fullscreen_style(LONG style) @@ -1058,7 +1067,7 @@ HRESULT CDECL wined3d_device_init_3d(struct wined3d_device *device, context = context_acquire(device, swapchain->front_buffer->sub_resources[0].u.surface); create_dummy_textures(device, context); - create_default_sampler(device); + create_default_samplers(device); device->contexts[0]->last_was_rhw = 0; @@ -1183,7 +1192,7 @@ HRESULT CDECL wined3d_device_uninit_3d(struct wined3d_device *device) device->blitter->free_private(device); device->shader_backend->shader_free_private(device); destroy_dummy_textures(device, gl_info); - destroy_default_sampler(device); + destroy_default_samplers(device); /* Release the context again as soon as possible. In particular, * releasing the render target views below may release the last reference @@ -4548,7 +4557,7 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d device->blitter->free_private(device); device->shader_backend->shader_free_private(device); destroy_dummy_textures(device, gl_info); - destroy_default_sampler(device); + destroy_default_samplers(device); context_release(context); @@ -4604,7 +4613,7 @@ static HRESULT create_primary_opengl_context(struct wined3d_device *device, stru swapchain->context[0] = context; swapchain->num_contexts = 1; create_dummy_textures(device, context); - create_default_sampler(device); + create_default_samplers(device); context_release(context); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1a5e2a0..5879aed 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2351,6 +2351,7 @@ struct wined3d_device /* Default sampler used to emulate the direct resource access without using wined3d_sampler */ GLuint default_sampler; + GLuint null_sampler; /* Command stream */ struct wined3d_cs *cs;

1 0

Matteo Bruni : wined3d: User clip planes emulation for core profile contexts.
by Alexandre Julliard June 2, 2016

June 2, 2016

Module: wine Branch: master Commit: d9f8c853ac43c8ae5244f9f2e94fd9b75c2e11e3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9f8c853ac43c8ae5244f9f2e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 1 23:16:56 2016 +0200 wined3d: User clip planes 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 | 201 +++++++++++++++++++++++++++++++---------- dlls/wined3d/wined3d_private.h | 37 ++++---- 2 files changed, 172 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d9f8c853ac43c8ae5244f…

1 0

Matteo Bruni : wined3d: Cleanup state_clipping() a bit.
by Alexandre Julliard June 2, 2016

June 2, 2016

Module: wine Branch: master Commit: 1755be42f56197bad20a32b1b09e1ae2f5ae3955 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1755be42f56197bad20a32b1b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jun 1 23:16:55 2016 +0200 wined3d: Cleanup state_clipping() a bit. 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/state.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index adb0cde..bc55263 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -574,8 +574,8 @@ void state_alpha_test(struct wined3d_context *context, const struct wined3d_stat void state_clipping(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; - DWORD enable = 0xffffffff; - DWORD disable = 0x00000000; + unsigned int clipplane_count = gl_info->limits.clipplanes; + unsigned int i, enable_mask, disable_mask; if (use_vs(state) && !context->d3d_info->vs_clipping) { @@ -607,29 +607,29 @@ void state_clipping(struct wined3d_context *context, const struct wined3d_state */ if (state->render_states[WINED3D_RS_CLIPPING]) { - enable = state->render_states[WINED3D_RS_CLIPPLANEENABLE]; - disable = ~state->render_states[WINED3D_RS_CLIPPLANEENABLE]; + enable_mask = state->render_states[WINED3D_RS_CLIPPLANEENABLE]; + disable_mask = ~state->render_states[WINED3D_RS_CLIPPLANEENABLE]; } else { - disable = 0xffffffff; - enable = 0x00; + enable_mask = 0; + disable_mask = ~0u; } - if (enable & WINED3DCLIPPLANE0) gl_info->gl_ops.gl.p_glEnable(GL_CLIP_PLANE0); - if (enable & WINED3DCLIPPLANE1) gl_info->gl_ops.gl.p_glEnable(GL_CLIP_PLANE1); - if (enable & WINED3DCLIPPLANE2) gl_info->gl_ops.gl.p_glEnable(GL_CLIP_PLANE2); - if (enable & WINED3DCLIPPLANE3) gl_info->gl_ops.gl.p_glEnable(GL_CLIP_PLANE3); - if (enable & WINED3DCLIPPLANE4) gl_info->gl_ops.gl.p_glEnable(GL_CLIP_PLANE4); - if (enable & WINED3DCLIPPLANE5) gl_info->gl_ops.gl.p_glEnable(GL_CLIP_PLANE5); + if (clipplane_count < 32) + { + enable_mask &= (1u << clipplane_count) - 1; + disable_mask &= (1u << clipplane_count) - 1; + } + + for (i = 0; enable_mask && i < clipplane_count; enable_mask >>= 1, ++i) + if (enable_mask & 1) + gl_info->gl_ops.gl.p_glEnable(GL_CLIP_DISTANCE0 + i); checkGLcall("clip plane enable"); - if (disable & WINED3DCLIPPLANE0) gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE0); - if (disable & WINED3DCLIPPLANE1) gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE1); - if (disable & WINED3DCLIPPLANE2) gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE2); - if (disable & WINED3DCLIPPLANE3) gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE3); - if (disable & WINED3DCLIPPLANE4) gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE4); - if (disable & WINED3DCLIPPLANE5) gl_info->gl_ops.gl.p_glDisable(GL_CLIP_PLANE5); + for (i = 0; disable_mask && i < clipplane_count; disable_mask >>= 1, ++i) + if (disable_mask & 1) + gl_info->gl_ops.gl.p_glDisable(GL_CLIP_DISTANCE0 + i); checkGLcall("clip plane disable"); }

1 0

Andrey Gusev : wined3d: Fix a typo in comment.
by Alexandre Julliard June 2, 2016

June 2, 2016

Module: wine Branch: master Commit: 436d7cc2dbc33f6d9b0b10784f4974d5d1eb25c3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=436d7cc2dbc33f6d9b0b10784… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 2 13:17:10 2016 +0300 wined3d: Fix a typo in comment. Signed-off-by: Andrey Gusev <andrey.goosev(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 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index fbfbb49..2472c67 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4462,7 +4462,7 @@ static BOOL wined3d_check_pixel_format_depth(const struct wined3d_gl_info *gl_in lockable = TRUE; /* On some modern cards like the Geforce8/9, GLX doesn't offer some - * dephth/stencil formats which D3D9 reports. We can safely report + * depth/stencil formats which D3D9 reports. We can safely report * "compatible" formats (e.g. D24 can be used for D16) as long as we * aren't dealing with a lockable format. This also helps D3D <= 7 as they * expect D16 which isn't offered without this on Geforce8 cards. */

1 0

Andrey Gusev : ddraw: Fix a typo in WARN() messages.
by Alexandre Julliard June 2, 2016

June 2, 2016

Module: wine Branch: master Commit: 2aa6894af678e604796cabb1a8b43b8f8d287ca4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aa6894af678e604796cabb1a… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Jun 2 12:39:59 2016 +0300 ddraw: Fix a typo in WARN() messages. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/utils.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ddraw/utils.c b/dlls/ddraw/utils.c index c85abb5..3ec8768 100644 --- a/dlls/ddraw/utils.c +++ b/dlls/ddraw/utils.c @@ -486,19 +486,19 @@ enum wined3d_format_id wined3dformat_from_ddrawformat(const DDPIXELFORMAT *DDPix { case 16: if (DDPixelFormat->u2.dwStencilBitDepth == 1) return WINED3DFMT_S1_UINT_D15_UNORM; - WARN("Unknown depth stenil format: 16 z bits, %u stencil bits\n", + WARN("Unknown depth stencil format: 16 z bits, %u stencil bits.\n", DDPixelFormat->u2.dwStencilBitDepth); return WINED3DFMT_UNKNOWN; case 32: if (DDPixelFormat->u2.dwStencilBitDepth == 8) return WINED3DFMT_D24_UNORM_S8_UINT; else if (DDPixelFormat->u2.dwStencilBitDepth == 4) return WINED3DFMT_S4X4_UINT_D24_UNORM; - WARN("Unknown depth stenil format: 32 z bits, %u stencil bits\n", + WARN("Unknown depth stencil format: 32 z bits, %u stencil bits.\n", DDPixelFormat->u2.dwStencilBitDepth); return WINED3DFMT_UNKNOWN; default: - WARN("Unknown depth stenil format: %u z bits, %u stencil bits\n", + WARN("Unknown depth stencil format: %u z bits, %u stencil bits.\n", DDPixelFormat->u1.dwZBufferBitDepth, DDPixelFormat->u2.dwStencilBitDepth); return WINED3DFMT_UNKNOWN; }

1 0

Michael Stefaniuc : include: Add an inline version of EqualRect() too.
by Alexandre Julliard June 2, 2016

June 2, 2016

Module: wine Branch: master Commit: 71f975f6bdf96a3c4f69cdea0b3a51b2118d63cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=71f975f6bdf96a3c4f69cdea0… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jun 2 13:44:28 2016 +0200 include: Add an inline version of EqualRect() too. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winuser.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/include/winuser.h b/include/winuser.h index 2b56a0c..157a6ef 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3539,7 +3539,6 @@ WINUSERAPI BOOL WINAPI EnumWindows(WNDENUMPROC,LPARAM); WINUSERAPI BOOL WINAPI EnumWindowStationsA(WINSTAENUMPROCA,LPARAM); WINUSERAPI BOOL WINAPI EnumWindowStationsW(WINSTAENUMPROCW,LPARAM); #define EnumWindowStations WINELIB_NAME_AW(EnumWindowStations) -WINUSERAPI BOOL WINAPI EqualRect(const RECT*,const RECT*); WINUSERAPI INT WINAPI ExcludeUpdateRgn(HDC,HWND); #define ExitWindows(a,b) ExitWindowsEx(EWX_LOGOFF,0xffffffff) WINUSERAPI BOOL WINAPI ExitWindowsEx(UINT,DWORD); @@ -4091,6 +4090,7 @@ WINUSERAPI INT WINAPI wvsprintfW(LPWSTR,LPCWSTR,__ms_va_list); #if !defined(__WINESRC__) || defined(WINE_NO_INLINE_RECT) +WINUSERAPI BOOL WINAPI EqualRect(const RECT*,const RECT*); WINUSERAPI BOOL WINAPI IsRectEmpty(const RECT*); WINUSERAPI BOOL WINAPI SetRect(LPRECT,INT,INT,INT,INT); WINUSERAPI BOOL WINAPI SetRectEmpty(LPRECT); @@ -4099,6 +4099,13 @@ WINUSERAPI BOOL WINAPI SetRectEmpty(LPRECT); /* Inline versions of common RECT helpers */ +static inline BOOL WINAPI EqualRect(const RECT *rect1, const RECT *rect2) +{ + if (!rect1 || !rect2) return FALSE; + return ((rect1->left == rect2->left) && (rect1->right == rect2->right) && + (rect1->top == rect2->top) && (rect1->bottom == rect2->bottom)); +} + static inline BOOL WINAPI IsRectEmpty(const RECT *rect) { if (!rect) return TRUE;

1 0